From patchwork Mon Apr 29 03:47:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13646251 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E73D5C19F4F for ; Mon, 29 Apr 2024 03:48:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1DD836B0087; Sun, 28 Apr 2024 23:47:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF50F6B0098; Sun, 28 Apr 2024 23:47:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C91D6B0085; Sun, 28 Apr 2024 23:47:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 20D826B0083 for ; Sun, 28 Apr 2024 23:47:55 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CA378C16CF for ; Mon, 29 Apr 2024 03:47:54 +0000 (UTC) X-FDA: 82061185668.17.5D318E5 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by imf27.hostedemail.com (Postfix) with ESMTP id 5260640005 for ; Mon, 29 Apr 2024 03:47:50 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf27.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714362473; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SQ/JBG66LmbW9o6Seu/f8heP05rH3ongsctM/QThBrk=; b=7HSihje2mkl7fDxgvLOvE5ZQlNfqwW68W583SbfswpnruurJWO7VtfTSTfBjbih7bAGGBl UC7HUCEZdW0G16gyNYqfosd16yiCrElg2Ugax8zAWgJwdHHu89r4lP3LWCo3khnHOa/9wt bQ5ziVISXDmYYzVweZnIfO7vlUNZSiw= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf27.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714362473; a=rsa-sha256; cv=none; b=P1JAfSBlNwKaKUVSY8DuA70vlHUMgkWNADCnTQsJnujVMs2CjWkIf93fLJHrTSRF3mSDhg AiRMC29cmKw/va8eTGdRjOTmdBJX+6bqgkwr/wgBFsJy9bg5H6hGaNI3KZJAFmmVMGM53s lAPfP2qQOZeVxL3B0PaeRa7yP8QCpJI= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4VSTmp2VCTz4f3jHs for ; Mon, 29 Apr 2024 11:47:38 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 277071A0568 for ; Mon, 29 Apr 2024 11:47:46 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgA3UwxgGC9m24__LA--.38879S3; Mon, 29 Apr 2024 11:47:46 +0800 (CST) From: Kemeng Shi To: willy@infradead.org, akpm@linux-foundation.org, jack@suse.cz, tj@kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] writeback: factor out wb_bg_dirty_limits to remove repeated code Date: Mon, 29 Apr 2024 11:47:29 +0800 Message-Id: <20240429034738.138609-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240429034738.138609-1-shikemeng@huaweicloud.com> References: <20240429034738.138609-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgA3UwxgGC9m24__LA--.38879S3 X-Coremail-Antispam: 1UD129KBjvJXoWxCw43ZF1rCw18Aw1kuFyDKFg_yoW5GF13pF ZrAw12vrW8Jr13trsxJFWUZr43tan3trW7Xr93CwnIyw17GryYgFyIkFZYvFyfGFW7Ja4f Zw4Yv34xJ34DKr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvGb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGw A2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr 0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY 17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcV C0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY 6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa 73UjIFyTuYvjxUzoGQUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: hmqnzysj8ickcdpaswcad7g8jt6w97cy X-Rspamd-Queue-Id: 5260640005 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714362470-20506 X-HE-Meta: U2FsdGVkX19keH7Pwd1C6fErt/7SRK62W59IIqDK9RyBpbyzZ1hXN9rKht0Uv/eHVaWrD3ojn+VEwHRGwxw2Ug72qWwCNmeRU2/q9cY6lyATBP69qUoR9wPKfjf+O+hKkjXvUd/3rHMGbfrZWNU0TQ2iV5bj5/n+F6yTe+sN/SQilAp7SFaqIwZSl0RXMVh3/g+RBuwYxHmGBcPeGNGKVUdSnRoABoNJuzRI13BpUL9Jf0aujENiz3tlkEKKpO8RHt3PUUZZ3bqZRssQQIfJRTfiO8i2I06CTnh2joUzPNDCMOhiLMq7k+HptWqYgiOOLaezqQSk7Kcc+1Kbm4JnGMBuy5zzw9yXvoY8Rx7K9dQhg/TEYW2n9Js0z3ssDr8pos5HuWnJ2W0bROfoWtGLNAOT+rMuFpx5JVKN8xOM8IpELjwTz7GFH3Hl7gQ7nJFoNTfDdSV08xmuzynXtNqMOi/uYxUJN/UloUFgK5c2mv2ppLuqXdi+m37klqSzm+xEYBORW8gGjgkqwsSUqM7TwUHzBFviZnbH/2F/LfyjDSHnG7KuXJ8PSv/kQje1X9lbkkNfl8b+KxF0UR2vRQbyEwm6nncwrhJcyGCDXNu6UuCr9atdc7Ev8J6b1n1XkW1e9EVxHjnikZn48vKzyk8BbFhdURCOOkWdexCOxzOl1FhPwQCuUNRzbKibxpm+inL0KZQSDpRFqNl45x/etdhu93PWZfBy15EHIY8iVS59pAMvKYrdX3Pabdxs4lLAMkd/UyiBWYE8BIIY/oFDt0K7kr3ahzQJvyO13rTdYOZOYc9Dpi2xRTQK0526+dgOAoWXspkNKQunO9dMwxSCaCS23D3pbyQGVlzdQR+SxV/mfl/SZ8/rM58CMcMfRa/OLoml1s9wkq8amRUDXhetPPkS30o28xI3q1XXjC5Jf7RKjx/CrpAmaf6FVHSvSR+1EgKWq6NC6Lp1WiauRmKP85h EDC4lkRR Inpf/ceHOPefIM6uOmgqLATjbalMVitQYNDUxCoBlegfJLKjTv12atKz6xOS6XXrxWV6Lx9ONwQPPPD0fcixS2HeOa9ApnYBXIABcCBjXt/t0/RBvNnAKNn7d2nhvT5NUd4ey/fdXSijCKRBQPRnNRYA4JGgY4rUWaS4XXXQ0WXjVHEOeC1AH+SEcGLGCvXsTRGcoz8OK0pFcybU905HtUtLOQ7Ewle23oOBAv1DpBbXDE0M+3KiN+iOSUU7AgyQxb/B/Sbws+gi7r3Q= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Similar to wb_dirty_limits which calculates dirty and thresh of wb, wb_bg_dirty_limits calculates background dirty and background thresh of wb. With wb_bg_dirty_limits, we could remove repeated code in wb_over_bg_thresh. Signed-off-by: Kemeng Shi Acked-by: Tejun Heo --- mm/page-writeback.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 692c0da04cbd..e1f73643aca1 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2087,6 +2087,21 @@ void balance_dirty_pages_ratelimited(struct address_space *mapping) } EXPORT_SYMBOL(balance_dirty_pages_ratelimited); +/* + * Similar to wb_dirty_limits, wb_bg_dirty_limits also calculates dirty + * and thresh, but it's for background writeback. + */ +static void wb_bg_dirty_limits(struct dirty_throttle_control *dtc) +{ + struct bdi_writeback *wb = dtc->wb; + + dtc->wb_bg_thresh = __wb_calc_thresh(dtc, dtc->bg_thresh); + if (dtc->wb_bg_thresh < 2 * wb_stat_error()) + dtc->wb_dirty = wb_stat_sum(wb, WB_RECLAIMABLE); + else + dtc->wb_dirty = wb_stat(wb, WB_RECLAIMABLE); +} + /** * wb_over_bg_thresh - does @wb need to be written back? * @wb: bdi_writeback of interest @@ -2103,8 +2118,6 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb) struct dirty_throttle_control * const gdtc = &gdtc_stor; struct dirty_throttle_control * const mdtc = mdtc_valid(&mdtc_stor) ? &mdtc_stor : NULL; - unsigned long reclaimable; - unsigned long thresh; /* * Similar to balance_dirty_pages() but ignores pages being written @@ -2117,13 +2130,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb) if (gdtc->dirty > gdtc->bg_thresh) return true; - thresh = __wb_calc_thresh(gdtc, gdtc->bg_thresh); - if (thresh < 2 * wb_stat_error()) - reclaimable = wb_stat_sum(wb, WB_RECLAIMABLE); - else - reclaimable = wb_stat(wb, WB_RECLAIMABLE); - - if (reclaimable > thresh) + wb_bg_dirty_limits(gdtc); + if (gdtc->wb_dirty > gdtc->wb_bg_thresh) return true; if (mdtc) { @@ -2137,13 +2145,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb) if (mdtc->dirty > mdtc->bg_thresh) return true; - thresh = __wb_calc_thresh(mdtc, mdtc->bg_thresh); - if (thresh < 2 * wb_stat_error()) - reclaimable = wb_stat_sum(wb, WB_RECLAIMABLE); - else - reclaimable = wb_stat(wb, WB_RECLAIMABLE); - - if (reclaimable > thresh) + wb_bg_dirty_limits(mdtc); + if (mdtc->wb_dirty > mdtc->wb_bg_thresh) return true; }