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: 2466371 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 023863FD8C for ; Fri, 19 Apr 2013 16:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031048Ab3DSQmR (ORCPT ); Fri, 19 Apr 2013 12:42:17 -0400 Received: from mail-da0-f48.google.com ([209.85.210.48]:63575 "EHLO mail-da0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968392Ab3DSQmO (ORCPT ); Fri, 19 Apr 2013 12:42:14 -0400 Received: by mail-da0-f48.google.com with SMTP id f10so403371dak.21 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 Cc: 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 , Namjae Jeon , Vivek Trivedi 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 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);