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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F50DC352A1 for ; Thu, 1 Dec 2022 00:10:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230300AbiLAAKr (ORCPT ); Wed, 30 Nov 2022 19:10:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230310AbiLAAIt (ORCPT ); Wed, 30 Nov 2022 19:08:49 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D471D8E590 for ; Wed, 30 Nov 2022 16:03:03 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 49A846176C for ; Thu, 1 Dec 2022 00:03:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60133C433D7; Thu, 1 Dec 2022 00:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1669852982; bh=sA0w2/o7Zx0tOP0b8k77yLBopfXqNpg4sWwyi+BuAno=; h=Date:To:From:Subject:From; b=QKtvFNfrZ9PGyp85A/Erads0+7VcLjTOSw+FAFo/75IDtZUQhPudsz73y2L9PzWFs iYKbtnQGMGxhZbTBpptClOL5tWd3jxKGU/miWdBZ3T556j33uGE0NIs+tVv1F4t0if hMYbmcfwY5XExKiBBboQNfVYPWWVNwOka8ZI7DWY= Date: Wed, 30 Nov 2022 16:03:01 -0800 To: mm-commits@vger.kernel.org, clm@meta.com, axboe@kernel.dk, shr@devkernel.io, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-add-bdi_set_max_ratio_no_scale-function.patch removed from -mm tree Message-Id: <20221201000302.60133C433D7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm: add bdi_set_max_ratio_no_scale() function has been removed from the -mm tree. Its filename was mm-add-bdi_set_max_ratio_no_scale-function.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Stefan Roesch Subject: mm: add bdi_set_max_ratio_no_scale() function Date: Fri, 18 Nov 2022 16:52:10 -0800 This introduces bdi_set_max_ratio_no_scale(). It uses the max granularity for the ratio. This function by the new sysfs knob max_ratio_fine. Link: https://lkml.kernel.org/r/20221119005215.3052436-16-shr@devkernel.io Signed-off-by: Stefan Roesch Cc: Chris Mason Cc: Jens Axboe Signed-off-by: Andrew Morton --- include/linux/backing-dev.h | 1 + mm/page-writeback.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) --- a/include/linux/backing-dev.h~mm-add-bdi_set_max_ratio_no_scale-function +++ a/include/linux/backing-dev.h @@ -109,6 +109,7 @@ u64 bdi_get_min_bytes(struct backing_dev u64 bdi_get_max_bytes(struct backing_dev_info *bdi); int bdi_set_min_ratio(struct backing_dev_info *bdi, unsigned int min_ratio); int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio); +int bdi_set_max_ratio_no_scale(struct backing_dev_info *bdi, unsigned int max_ratio); int bdi_set_min_bytes(struct backing_dev_info *bdi, u64 min_bytes); int bdi_set_max_bytes(struct backing_dev_info *bdi, u64 max_bytes); int bdi_set_strict_limit(struct backing_dev_info *bdi, unsigned int strict_limit); --- a/mm/page-writeback.c~mm-add-bdi_set_max_ratio_no_scale-function +++ a/mm/page-writeback.c @@ -719,6 +719,9 @@ static int __bdi_set_max_ratio(struct ba { int ret = 0; + if (max_ratio > 100 * BDI_RATIO_SCALE) + return -EINVAL; + spin_lock_bh(&bdi_lock); if (bdi->min_ratio > max_ratio) { ret = -EINVAL; @@ -731,6 +734,11 @@ static int __bdi_set_max_ratio(struct ba return ret; } +int bdi_set_max_ratio_no_scale(struct backing_dev_info *bdi, unsigned int max_ratio) +{ + return __bdi_set_max_ratio(bdi, max_ratio); +} + int bdi_set_min_ratio(struct backing_dev_info *bdi, unsigned int min_ratio) { return __bdi_set_min_ratio(bdi, min_ratio * BDI_RATIO_SCALE); @@ -738,9 +746,6 @@ int bdi_set_min_ratio(struct backing_dev int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio) { - if (max_ratio > 100) - return -EINVAL; - return __bdi_set_max_ratio(bdi, max_ratio * BDI_RATIO_SCALE); } EXPORT_SYMBOL(bdi_set_max_ratio); _ Patches currently in -mm which might be from shr@devkernel.io are