From patchwork Sat Apr 20 19:50:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 2468481 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 30B563FD8C for ; Sat, 20 Apr 2013 19:50:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753399Ab3DTTuo (ORCPT ); Sat, 20 Apr 2013 15:50:44 -0400 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:40785 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753020Ab3DTTun (ORCPT ); Sat, 20 Apr 2013 15:50:43 -0400 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 2566A8EE0F1; Sat, 20 Apr 2013 12:50:42 -0700 (PDT) Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wDfWpi6ZBFds; Sat, 20 Apr 2013 12:50:42 -0700 (PDT) Received: from [10.0.0.6] (c-24-18-112-117.hsd1.wa.comcast.net [24.18.112.117]) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id 1D7388EE0A4; Sat, 20 Apr 2013 12:50:41 -0700 (PDT) Message-ID: <1366487439.1993.9.camel@dabdike> Subject: Re: [PATCH v2 0/9] fix max discard sectors limit From: James Bottomley To: Namjae Jeon Cc: dwmw2@infradead.org, axboe@kernel.dk, shli@kernel.org, Paul.Clements@steeleye.com, npiggin@kernel.dk, neilb@suse.de, cjb@laptop.org, adrian.hunter@intel.com, linux-scsi@vger.kernel.org, linux-mtd@lists.infradead.org, nbd-general@lists.sourceforge.net, linux-raid@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, jcmvbkbc@gmail.com, Namjae Jeon Date: Sat, 20 Apr 2013 12:50:39 -0700 In-Reply-To: <1366389602-19313-1-git-send-email-linkinjeon@gmail.com> References: <1366389602-19313-1-git-send-email-linkinjeon@gmail.com> X-Mailer: Evolution 3.6.3 Mime-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org On Sat, 2013-04-20 at 01:40 +0900, Namjae Jeon wrote: > From: Namjae Jeon > > linux-v3.8-rc1 and later support for plug for blkdev_issue_discard with > commit 0cfbcafcae8b7364b5fa96c2b26ccde7a3a296a9 > (block: add plug for blkdev_issue_discard ) > > For example, > 1) DISCARD rq-1 with size size 4GB > 2) DISCARD rq-2 with size size 1GB > > If these 2 discard requests get merged, final request size will be 5GB. > > In this case, request's __data_len field may overflow as it can store > max 4GB(unsigned int). > > This issue was observed while doing mkfs.f2fs on 5GB SD card: > https://lkml.org/lkml/2013/4/1/292 > > # mkfs.f2fs /dev/mmcblk0p3 > Info: sector size = 512 > Info: total sectors = 11370496 (in 512bytes) > Info: zone aligned segment0 blkaddr: 512 > [ 257.789764] blk_update_request: bio idx 0 >= vcnt 0 > > mkfs process gets stuck in D state and I see the following in the dmesg: > > [ 257.789733] __end_that: dev mmcblk0: type=1, flags=122c8081 > [ 257.789764] sector 4194304, nr/cnr 2981888/4294959104 > [ 257.789764] bio df3840c0, biotail df3848c0, buffer (null), len 1526726656 > [ 257.789764] blk_update_request: bio idx 0 >= vcnt 0 > [ 257.794921] request botched: dev mmcblk0: type=1, flags=122c8081 > [ 257.794921] sector 4194304, nr/cnr 2981888/4294959104 > [ 257.794921] bio df3840c0, biotail df3848c0, buffer (null), len 1526726656 > > Few drivers(e.g. mmc, mtd..) set q->limits.max_discard_sectors > more than UINT_MAX >> 9 sectors which is incorrect and it may lead to overflow > of request's __data_len field if merged discard request's size exceeds 4GB. > > This patchset fixes this issue by updating helper function > blk_queue_max_discard_sectors which is used to set max_discard_sectors limit. > > This patchset also replaces "q->limits.max_discard_sector = max_discard_sectors" > with blk_queue_max_discard_sectors call in other drivers like mmc, mtd etc. I really don't understand this explanation. How can you be affected by the incorrect setting of q->limits.max_discard sectors when n the blkdev_issue_discard() code you see: max_discard_sectors = min(q->limits.max_discard_sectors, UINT_MAX >> 9); ? The problem is not that we issue discards bigger than __data_len can allow, the problem is that we merge them larger than __data_len will allow. That means the merge code needs fixing to pay attention to max_discard_sectors, so isn't this the correct fix: James --- -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 78feda9..33f358f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -838,7 +838,7 @@ static inline unsigned int blk_queue_get_max_sectors(struct request_queue *q, unsigned int cmd_flags) { if (unlikely(cmd_flags & REQ_DISCARD)) - return q->limits.max_discard_sectors; + return min(q->limits.max_discard_sectors, UINT_MAX >> 9); if (unlikely(cmd_flags & REQ_WRITE_SAME)) return q->limits.max_write_same_sectors;