From patchwork Tue Mar 25 23:48:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 333749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C92E11400A3 for ; Wed, 26 Mar 2014 10:50:02 +1100 (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 1WSb6K-0008Bq-Ih; Tue, 25 Mar 2014 23:49:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSb6I-0006ku-GG; Tue, 25 Mar 2014 23:49:46 +0000 Received: from mail-qc0-f201.google.com ([209.85.216.201]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSb68-0006iI-V3 for linux-mtd@lists.infradead.org; Tue, 25 Mar 2014 23:49:38 +0000 Received: by mail-qc0-f201.google.com with SMTP id c9so170366qcz.0 for ; Tue, 25 Mar 2014 16:49:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2cp1FGXKTFXkiqu6m+tE8jOfTBTBAUlA7RxKHIs2QlY=; b=K5SK9GDG0QnOJjRGTL7d4RF458epNXhC0pBbCq2u6Qv/MkdBYgTUDAhwX7UyVECJVz qCb+9BGQbVSPEA8zbNhAGSU9CQrqE0pdxYw9RhgBbSBktWxtiC8R++r7w/5kGAzFfMjF 4v9FEAFKaV+8XcZjcTb+xB3J9z7kkUv6x8W9UJ1Do4FBl5uLpGPLmrymXeHD0afhUsRW 3itD13VUTOQ/6rZ5BBjzSGEJWFadD/YrGHghOpwp0H+HguUn0TeaAjOTWq1WWFEueSKt dkJWb3oqhZMHDLzAyQH41+9wsURH9cOvMNk+xIVPJzCBX8f3P6nCNg5EwWojEsh7jqSD HRgA== X-Gm-Message-State: ALoCoQmuSwR74AmjBjOZgQrGspnfJ9Gw8IvwemUcHUghgvUyrnM5hS6xwmSZfygl9zQ9HqO7NDuV7OYVxwBn4KnR8rBxSwZX5jtW0MxYyHVuKyEug1A0ylBiiaksa32vF/a8ldJmGmoTzldRzekTNX46gG78cTmTv0c/PyZrBixcbk+mdeYzdsw+n17S1fcPYmdRjKRZkJttnOByVLM8Ooz7ZDX5KpoIGA== X-Received: by 10.58.111.202 with SMTP id ik10mr19525288veb.4.1395791351501; Tue, 25 Mar 2014 16:49:11 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id i30si1651035yhc.0.2014.03.25.16.49.11 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Mar 2014 16:49:11 -0700 (PDT) Received: from gwendal.mtv.corp.google.com (gwendal.mtv.corp.google.com [172.22.72.115]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 544EA5A4208; Tue, 25 Mar 2014 16:49:11 -0700 (PDT) Received: by gwendal.mtv.corp.google.com (Postfix, from userid 60833) id 14F49141CFA; Tue, 25 Mar 2014 16:49:11 -0700 (PDT) From: Gwendal Grignou To: axboe@kernel.dk, ulf.hansson@linaro.org Subject: [PATCH 1/4] Limit max_discard_sectors to UINT_MAX>>9 Date: Tue, 25 Mar 2014 16:48:23 -0700 Message-Id: <1395791307-23727-2-git-send-email-gwendal@chromium.org> X-Mailer: git-send-email 1.9.1.423.g4596e3a In-Reply-To: <1395791307-23727-1-git-send-email-gwendal@chromium.org> References: <1395791307-23727-1-git-send-email-gwendal@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140325_194937_084368_D8D3D3C4 X-CRM114-Status: UNSURE ( 9.00 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.0 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.216.201 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-mmc@vger.kernel.org, Gwendal Grignou , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.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 max_discard_sectors can not be larger than UINT_MAX>>9, otherwise, there is a risk that discard requests would be merged into a request larger than 4GB. Signed-off-by: Gwendal Grignou --- 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 2dc3b51..f30128b 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -859,7 +859,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; + disk->queue->limits.max_discard_sectors = UINT_MAX >> 9; disk->queue->limits.discard_zeroes_data = 0; blk_queue_max_hw_sectors(disk->queue, 65536); disk->queue->limits.max_sectors = 256;