From patchwork Sat Apr 13 13:39:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 2440751 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0B983DFB78 for ; Sat, 13 Apr 2013 13:40:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753834Ab3DMNjz (ORCPT ); Sat, 13 Apr 2013 09:39:55 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:32903 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753613Ab3DMNjx (ORCPT ); Sat, 13 Apr 2013 09:39:53 -0400 Received: by mail-pa0-f44.google.com with SMTP id bi5so1888179pad.31 for ; Sat, 13 Apr 2013 06:39:52 -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=0J0vqBpC2Qm63H5tULn7ux6DFuSokTIvwg3ErM9hsfrFjOBd3Q+OKXCcav/X/sxnjC 4VcD7k4jOH8PBy33p+0d0njfxPm++Bnawn2Nqzez1S4Xe6NxIiFMPrzAZORv0ngW3MNv ORzYljG0h4LmVEEEgNssgfIkUF5Sogt6zyEs+nScSXX9zSecFxnzrJwyt8AsO8nwqSD8 dhq1Gb2tGon8aJOFB2gq3tjiDHtWkOemFnZOAaK6OT5Zvqs1/ZKy0Mq7d2OSRcwMLST/ sMT16TrZNGOhQCliAizuoM7hlRwYcmHWvvTgG9lDSQC4iIyygnJYYJd1mNtzZQOlHGn8 V5KQ== X-Received: by 10.66.118.5 with SMTP id ki5mr20560170pab.74.1365860392689; Sat, 13 Apr 2013 06:39:52 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id vk7sm12629817pbc.41.2013.04.13.06.39.48 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Apr 2013 06:39:52 -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 Cc: 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, Namjae Jeon , Namjae Jeon , Vivek Trivedi Subject: [PATCH 6/8] brd: use generic helper to set max_discard_sectors Date: Sat, 13 Apr 2013 22:39:42 +0900 Message-Id: <1365860382-21430-1-git-send-email-linkinjeon@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.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);