From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8204CC43387 for ; Fri, 28 Dec 2018 12:22:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4968720675 for ; Fri, 28 Dec 2018 12:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545999728; bh=+uoofZKX5yY4/5+wmwT8yBy2ajUlZQw6kcy+bSFjU4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RcjKVqZdBQwPXgg5qTjci5TqWPZR4twGunFqEZSYRICyV5ObEt9C+KB5ETa4rvhMv 2Bkofeyy+Gbzni84hTEk8zl2mZzbHEQFUBq7W21dT4q2VL//7cqhlfn75KQewdo+rW siFdoPk1X2iS1J+CB89AmhAuidy30Fb4Gl5rjV4M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732489AbeL1MPj (ORCPT ); Fri, 28 Dec 2018 07:15:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:34626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732455AbeL1MPe (ORCPT ); Fri, 28 Dec 2018 07:15:34 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 531C92184B; Fri, 28 Dec 2018 12:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545999333; bh=+uoofZKX5yY4/5+wmwT8yBy2ajUlZQw6kcy+bSFjU4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WylIJFo3Dn4YCKVa7IxnOidmkmOQsnVteV7TAE0TMgIiQZ0fPWSXIR6WT67zxO9+9 rfqcytMMoFg8E54o0RaGLOpIdg+GaB7RqxS6fajyWIhUj31M6SevifAWplzGKkJZlM KcvRshS9ca0dcXXaKCR0JvRvyn/X5qnAKHAfKuTY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Darrick J. Wong" , Omar Sandoval , Jens Axboe , Sasha Levin Subject: [PATCH 4.14 01/36] block: break discard submissions into the user defined size Date: Fri, 28 Dec 2018 12:52:17 +0100 Message-Id: <20181228113126.631472098@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181228113126.526729877@linuxfoundation.org> References: <20181228113126.526729877@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit af097f5d199e2aa3ab3ef777f0716e487b8f7b08 ] Don't build discards bigger than what the user asked for, if the user decided to limit the size by writing to 'discard_max_bytes'. Reviewed-by: Darrick J. Wong Reviewed-by: Omar Sandoval Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-lib.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 2bc544ce3d2e..53a45663e688 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -59,10 +59,16 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, unsigned int req_sects; sector_t end_sect, tmp; - /* Make sure bi_size doesn't overflow */ - req_sects = min_t(sector_t, nr_sects, UINT_MAX >> 9); + /* + * Issue in chunks of the user defined max discard setting, + * ensuring that bi_size doesn't overflow + */ + req_sects = min_t(sector_t, nr_sects, + q->limits.max_discard_sectors); + if (req_sects > UINT_MAX >> 9) + req_sects = UINT_MAX >> 9; - /** + /* * If splitting a request, and the next starting sector would be * misaligned, stop the discard at the previous aligned sector. */ -- 2.19.1