From patchwork Fri Apr 19 16:41:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 2466381 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 3A9DB3FD8C for ; Fri, 19 Apr 2013 16:43:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967882Ab3DSQmE (ORCPT ); Fri, 19 Apr 2013 12:42:04 -0400 Received: from mail-da0-f48.google.com ([209.85.210.48]:64593 "EHLO mail-da0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967525Ab3DSQmB (ORCPT ); Fri, 19 Apr 2013 12:42:01 -0400 Received: by mail-da0-f48.google.com with SMTP id f10so404858dak.7 for ; Fri, 19 Apr 2013 09:42:01 -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=1riEJcU3t71E67rUf6SGa5Sg0yaKgnnpoe02E4V9uV8=; b=FUTKxCbv8kPaFSQVjUqeJ7mhSQNn7teDgfbl6mdKk3ij5hGeNFMXazq4lWkPkGVQ5l v+yGRUeTIFFZG9upU/MWH559IAs75lOFuCCnaAtUex6XED+wHAPCX6wdOaN16mulkOc9 C3q70z30o0HzIlGT7AIowV67cXOUgZixGvpeOoA4jb7oTWJoFvEByyArBS31HYFyv+2i cuaxt2EtMU1nUFb+c7KQZ4ITd1FKAHCuDdju1SaQG/MRlM8MYJjybRrfQg4u4iIZp3Sn T2Ptj+RtMVhjt+xDr8wr4T6rr9SQRN8PgO8uO53YEBFakDh74FRcWRZg/5mNPebyRK1B 9dMg== X-Received: by 10.66.72.3 with SMTP id z3mr16632357pau.125.1366389721045; Fri, 19 Apr 2013 09:42:01 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id tx9sm13938007pbc.27.2013.04.19.09.41.57 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Apr 2013 09:42:00 -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 6/9] nbd: use generic helper to set max_discard_sectors Date: Sat, 20 Apr 2013 01:41:53 +0900 Message-Id: <1366389713-19519-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/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 037288e..b9d3d2e 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -854,7 +854,7 @@ static int __init nbd_init(void) */ queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk->queue); disk->queue->limits.discard_granularity = 512; - disk->queue->limits.max_discard_sectors = UINT_MAX; + blk_queue_max_discard_sectors(disk->queue, UINT_MAX >> 9); disk->queue->limits.discard_zeroes_data = 0; blk_queue_max_hw_sectors(disk->queue, 65536); disk->queue->limits.max_sectors = 256;