Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp941486pxk; Thu, 1 Oct 2020 18:41:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDYFGZnD4xyyYc1DSLMk+p0phjwaxgkmSd1JCGlQnWMBLeApdrtchiN9Ei7J6ZDJyBlSSd X-Received: by 2002:a17:906:3955:: with SMTP id g21mr11210607eje.69.1601602885066; Thu, 01 Oct 2020 18:41:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601602885; cv=none; d=google.com; s=arc-20160816; b=bCGSGkSQMkfzT+5SMqSKbVhKqwrIsNHKGbLOoAAr48vkRqSaUgM9D8JqxHur1Re4j2 Ws1UpEkPmtm6ALwX46DOZYFS3fX5g0zflq+Ii6SgFvi10mEHTqD+1zlXKhGtmzDfeNlW M3gMUXDBG8ECMTpX0NZR3/D5GtPARLq3FhPd1IePsMgZqEs5vTgErmS+l8+DGMQ0A65a xtOEBoa8w2N+ZG4+olDBNDeus2elt/Ybot9ooVI3CQmCOnoW1Q4eWahx+iSAiGgSCNd+ EMJ1FMU3pU6f+7zQkAsNTcI1O3AwXiErCKAn3RMdt8ED94jea6TV/K8o8EvkQbgnfPrq rnZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=qUMuL4sLMx9M8pKwEv3We0xgZ78HEjHwNORgEfyOvI8=; b=NVBLs2xBBNAlie+Yf7Sypucke8ttiqCqsxdy+G88UNeFO2NRCF33KuqdNB+WDTRqEM QYjZ00tSbOaorE2AOSZD7lK1BQKQnjxFkhn5beH4fUGcXrHMBJFGg07KEVvYBnnmd6sY xTSf25qRFif/oFwDe6H5EHhD2Eancbv017026j7DT4cHlX7OkoQL+wKYehlf13g12iOI XahkEh8a4G9fcT2Dt7ZTrGCMjpd7/q4FVzSTC1JtiMuOoP3nNuiLiwwTSUBWY0jjSH1N KlPW89vjddzRIIOx0WjdKTwL8WEd9Vk8W6bhmyofely+wgV2NXfSyCcqsPJPVloh5/yN 7PHw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id oq7si5389739ejb.650.2020.10.01.18.40.42; Thu, 01 Oct 2020 18:41:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387516AbgJBBj3 (ORCPT + 99 others); Thu, 1 Oct 2020 21:39:29 -0400 Received: from mx2.suse.de ([195.135.220.15]:55694 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387483AbgJBBj3 (ORCPT ); Thu, 1 Oct 2020 21:39:29 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 11E18B225; Fri, 2 Oct 2020 01:39:28 +0000 (UTC) From: Coly Li To: linux-mmc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Coly Li , Vicente Bergas , Adrian Hunter , Ulf Hansson Subject: [PATCH v4] mmc: core: don't set limits.discard_granularity as 0 Date: Fri, 2 Oct 2020 09:38:52 +0800 Message-Id: <20201002013852.51968-1-colyli@suse.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In mmc_queue_setup_discard() the mmc driver queue's discard_granularity might be set as 0 (when card->pref_erase > max_discard) while the mmc device still declares to support discard operation. This is buggy and triggered the following kernel warning message, WARNING: CPU: 0 PID: 135 at __blkdev_issue_discard+0x200/0x294 CPU: 0 PID: 135 Comm: f2fs_discard-17 Not tainted 5.9.0-rc6 #1 Hardware name: Google Kevin (DT) pstate: 00000005 (nzcv daif -PAN -UAO BTYPE=--) pc : __blkdev_issue_discard+0x200/0x294 lr : __blkdev_issue_discard+0x54/0x294 sp : ffff800011dd3b10 x29: ffff800011dd3b10 x28: 0000000000000000 x27: ffff800011dd3cc4 x26: ffff800011dd3e18 x25: 000000000004e69b x24: 0000000000000c40 x23: ffff0000f1deaaf0 x22: ffff0000f2849200 x21: 00000000002734d8 x20: 0000000000000008 x19: 0000000000000000 x18: 0000000000000000 x17: 0000000000000000 x16: 0000000000000000 x15: 0000000000000000 x14: 0000000000000394 x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000000 x10: 00000000000008b0 x9 : ffff800011dd3cb0 x8 : 000000000004e69b x7 : 0000000000000000 x6 : ffff0000f1926400 x5 : ffff0000f1940800 x4 : 0000000000000000 x3 : 0000000000000c40 x2 : 0000000000000008 x1 : 00000000002734d8 x0 : 0000000000000000 Call trace: __blkdev_issue_discard+0x200/0x294 __submit_discard_cmd+0x128/0x374 __issue_discard_cmd_orderly+0x188/0x244 __issue_discard_cmd+0x2e8/0x33c issue_discard_thread+0xe8/0x2f0 kthread+0x11c/0x120 ret_from_fork+0x10/0x1c ---[ end trace e4c8023d33dfe77a ]--- This patch fixes the issue by setting discard_granularity as SECTOR_SIZE instead of 0 when (card->pref_erase > max_discard) is true. Now no more complain from __blkdev_issue_discard() for the improper value of discard granularity. This issue is exposed after commit b35fd7422c2f ("block: check queue's limits.discard_granularity in __blkdev_issue_discard()"), a "Fixes:" tag is also added for the commit to make sure people won't miss this patch after applying the change of __blkdev_issue_discard(). Fixes: e056a1b5b67b ("mmc: queue: let host controllers specify maximum discard timeout") Fixes: b35fd7422c2f ("block: check queue's limits.discard_granularity in __blkdev_issue_discard()"). Reported-and-tested-by: Vicente Bergas Signed-off-by: Coly Li Acked-by: Adrian Hunter Cc: Ulf Hansson --- Changelog, v4, update to Reported-and-tested-by tag for Vicente Bergas. v3, add Fixes tag for both commits. v2, change commit id of the Fixes tag. v1, initial version. drivers/mmc/core/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 6c022ef0f84d..350d0cc4ee62 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -190,7 +190,7 @@ static void mmc_queue_setup_discard(struct request_queue *q, q->limits.discard_granularity = card->pref_erase << 9; /* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) - q->limits.discard_granularity = 0; + q->limits.discard_granularity = SECTOR_SIZE; if (mmc_can_secure_erase_trim(card)) blk_queue_flag_set(QUEUE_FLAG_SECERASE, q); } -- 2.26.2