From patchwork Fri Apr 19 16:40:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 238051 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 59F942C01E4 for ; Sat, 20 Apr 2013 02:40:57 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTEMj-000204-Cc; Fri, 19 Apr 2013 16:40:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTEMg-00029y-OC; Fri, 19 Apr 2013 16:40:46 +0000 Received: from mail-da0-x236.google.com ([2607:f8b0:400e:c00::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTEMd-00028w-Ot for linux-mtd@lists.infradead.org; Fri, 19 Apr 2013 16:40:44 +0000 Received: by mail-da0-f54.google.com with SMTP id p1so2031790dad.13 for ; Fri, 19 Apr 2013 09:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=Wg8bhI2rPFBScXLt+1E1/2rqZjanqFLzjuu6HWT5/cI=; b=EsV3+k0WIcTyxmTBPAoJuiLApjXN4ym3qtbYvgVzQkSmNy0wfjWmM387/hWoeVczGT VIU5lgGazYizkTlpjPL4wk1f0yM8pOLRgiufmlz2yta9Gb7gDb/M5q8RWhGJryRIwswd 03iCRxbfdlE1ZH+AJrkBa84rPNuQnEKmnqrggRzQCZTTK2u6Uz9VrbBGZtkzSTYSSKnc O7IYDAo2p97uKkrR1AQMSvqpLxhuAh4OWUKRBEZPaH7KTq8CG2Wa+lSA6P1kx2WUHKtw uOJVB/cVWln9WtDg+Dn7hndWohMnXIyqz/tLknIdwfnwfR7eQc5XucvtAZYT/lt/pmQH 2A9A== X-Received: by 10.68.184.132 with SMTP id eu4mr20589173pbc.87.1366389642136; Fri, 19 Apr 2013 09:40:42 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id j13sm15282314pat.17.2013.04.19.09.40.38 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Apr 2013 09:40:41 -0700 (PDT) From: Namjae Jeon To: 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, James.Bottomley@HansenPartnership.com, JBottomley@parallels.com Subject: [PATCH v2 1/9] block: fix max discard sectors limit Date: Sat, 20 Apr 2013 01:40:33 +0900 Message-Id: <1366389634-19348-1-git-send-email-linkinjeon@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130419_124043_901301_BDBC4E10 X-CRM114-Status: GOOD ( 11.15 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (linkinjeon[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: nbd-general@lists.sourceforge.net, Namjae Jeon , Vivek Trivedi , linux-scsi@vger.kernel.org, Namjae Jeon , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, jcmvbkbc@gmail.com, linux-mtd@lists.infradead.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Namjae Jeon https://lkml.org/lkml/2013/4/1/292 As per above discussion, it has been oberved that few drivers are setting q->limits.max_discard_sectors to more than (UINT_MAX >> 9) If multiple discard requests get merged, merged discard request's size exceeds 4GB, there is possibility that merged discard request's __data_len field may overflow. This patch fixes this issue. Also, adding BLK_DEF_MAX_DISCARD_SECTORS macro to use it instead of UINT_MAX >> 9. Reported-by: Max Filippov Signed-off-by: Namjae Jeon Signed-off-by: Vivek Trivedi --- block/blk-settings.c | 3 ++- include/linux/blkdev.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index c50ecf0..34e6b61 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -283,7 +283,8 @@ EXPORT_SYMBOL(blk_queue_max_hw_sectors); void blk_queue_max_discard_sectors(struct request_queue *q, unsigned int max_discard_sectors) { - q->limits.max_discard_sectors = max_discard_sectors; + q->limits.max_discard_sectors = min_t(unsigned int, max_discard_sectors, + BLK_DEF_MAX_DISCARD_SECTORS); } EXPORT_SYMBOL(blk_queue_max_discard_sectors); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 07aa5f6..efff505 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1105,6 +1105,7 @@ enum blk_default_limits { BLK_DEF_MAX_SECTORS = 1024, BLK_MAX_SEGMENT_SIZE = 65536, BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL, + BLK_DEF_MAX_DISCARD_SECTORS = UINT_MAX >> 9, }; #define blkdev_entry_to_request(entry) list_entry((entry), struct request, queuelist)