From patchwork Fri Apr 19 16:42:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 238058 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 341ED2C0210 for ; Sat, 20 Apr 2013 02:44:50 +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 1UTEOv-0002mk-Cg; Fri, 19 Apr 2013 16:43:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTEO9-0002Ig-CP; Fri, 19 Apr 2013 16:42:17 +0000 Received: from mail-da0-x22b.google.com ([2607:f8b0:400e:c00::22b]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTEO7-0002I7-Io for linux-mtd@lists.infradead.org; Fri, 19 Apr 2013 16:42:16 +0000 Received: by mail-da0-f43.google.com with SMTP id u36so2030958dak.2 for ; Fri, 19 Apr 2013 09:42:14 -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=C/45dgMm2FGt5XEKO3R6TJmeH9OhuUTd30qVs3cNHck=; b=MLaXuoTc1pPTQbcCkgRReTh25SBdbWRw7WBNREd5c6nwW250e+8ogtDa3UlyAsfMdd +GpFOOsWwNuwRSzk8TepA5VChX/fmazGFPIFrixyXsxmDrMCmK3MhYm0al2WcgNgaUbo 8vGPCJ6lSb7xtcV2V0N62w2TJFHTpQg8QXdKsGabZd8MQ5Ev3VALsT72QOD3vz1A6dNh tqybjieC9c+HPl3sbYc05R2jq8od9fpurzdkyF1TW9bSHZzgTQ+BdHtWKTxw34W9XpMh uZU3pAtXIL+tBY5n7tHbekb8oYclMACv650gBYM/lNKwjdMHt0ZI8KWUCs0r1bhiU9n0 zvFA== X-Received: by 10.66.122.167 with SMTP id lt7mr16972172pab.168.1366389734079; Fri, 19 Apr 2013 09:42:14 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id wi6sm13949706pbc.22.2013.04.19.09.42.10 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Apr 2013 09:42:13 -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 7/9] brd: use generic helper to set max_discard_sectors Date: Sat, 20 Apr 2013 01:42:06 +0900 Message-Id: <1366389726-19553-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_124215_702824_A5E29591 X-CRM114-Status: GOOD ( 11.13 ) 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 It is better to use blk_queue_max_discard_sectors helper function to set max_discard_sectors as it checks max_discard_sectors upper limit UINT_MAX >> 9 similar issue was reported for mmc in below link https://lkml.org/lkml/2013/4/1/292 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. Signed-off-by: Namjae Jeon Signed-off-by: Vivek Trivedi --- drivers/block/brd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/brd.c b/drivers/block/brd.c index f1a29f8..108646d 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -479,7 +479,7 @@ static struct brd_device *brd_alloc(int i) blk_queue_bounce_limit(brd->brd_queue, BLK_BOUNCE_ANY); brd->brd_queue->limits.discard_granularity = PAGE_SIZE; - brd->brd_queue->limits.max_discard_sectors = UINT_MAX; + blk_queue_max_discard_sectors(brd->brd_queue, UINT_MAX >> 9); brd->brd_queue->limits.discard_zeroes_data = 1; queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, brd->brd_queue);