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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4D0AC25B7B for ; Tue, 14 May 2024 12:53:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64D626B0322; Tue, 14 May 2024 08:53:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5AEEC6B0323; Tue, 14 May 2024 08:53:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 428216B0324; Tue, 14 May 2024 08:53:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 198856B0322 for ; Tue, 14 May 2024 08:53:42 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 911DB1C1606 for ; Tue, 14 May 2024 12:53:41 +0000 (UTC) X-FDA: 82116993042.15.E178F3B Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf17.hostedemail.com (Postfix) with ESMTP id 1BC7840013 for ; Tue, 14 May 2024 12:53:37 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=none; spf=none (imf17.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715691219; 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=VpwvkJTJKj9ehosxWP/E50lK1hDX8qLG01cJAFmHKes=; b=cDSc6/lKSx/4YGu79+OFgLZ9HEVdHj8uQ7uGOcCb6Wk2BhqxP+LIfpDmYzGp/tin7GLz7z wmGOd1b63QI8qdA17r1FxBCaJDmB6ydRkQdPlISuhLla45XvtYqQ0VhcOk1jYc1KSWdeTk w0dzyLP4QpXt1jxNmNlP/Jz6rSlIj7k= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=none; spf=none (imf17.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715691219; a=rsa-sha256; cv=none; b=DdGgOGxV2eMbARNwW31JZ6eXwJ5vWhxtGiAqXFBMiLFbjoOrnjGlijDIcmi3xTnmQQKer3 4uObRN+lJmc0OvcWnY7y0l46GGbdLkIgMl9asLcXu/xOjO+dwbB127QTKxFc8S5V9kpAvJ lC9eri4yySfW9DuXYCRjVw9kiOJGi+s= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Vdx9Z4tf3z4f3kKy for ; Tue, 14 May 2024 20:53:22 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 38B221A017F for ; Tue, 14 May 2024 20:53:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP4 (Coremail) with SMTP id gCh0CgDHzG7EXkNmCyyLMw--.6596S9; Tue, 14 May 2024 20:53:28 +0800 (CST) From: Kemeng Shi To: willy@infradead.org, akpm@linux-foundation.org, tj@kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] writeback: factor out wb_dirty_exceeded to remove repeated code Date: Tue, 14 May 2024 20:52:53 +0800 Message-Id: <20240514125254.142203-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240514125254.142203-1-shikemeng@huaweicloud.com> References: <20240514125254.142203-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgDHzG7EXkNmCyyLMw--.6596S9 X-Coremail-Antispam: 1UD129KBjvJXoW7AFWfZr4xKF4rJr4kJw4fZrb_yoW8KF47pF ZrJw4Ik3yUJa1SgasxJFWDur43trs7JrWxJryUWw15ta13KF12gr92qFWFvr17ArZxJF4Y vrZ5t34xGw18Kr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvEb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7 v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF 1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIx AIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI 42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWI evJa73UjIFyTuYvjxUFgAwUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Queue-Id: 1BC7840013 X-Stat-Signature: j4yyk5mmw9m5smsdmk7de7wf7zz56a7w X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1715691217-104281 X-HE-Meta: U2FsdGVkX1/pJI9eGBv4D4EPgZwxYtj2qJNAX/RukcGzqnSIU1JXG+4Z+7olkHpCR5jSnoLEzMJvkYZ72RF3MAcxglshSVgreLSwOiLqAfFHPONKihksgtWiV2gioT4PNFKoTh5nMDsA6goZdcUXdvO04hLUVzZVk8WehjUXxntsLuie3qMPgNVzol1l5Yn1PJ+waOiEfXO9idNbv96wO2V7P9z9qTEJhBaDmmAcp9rIQoqHmBuwrymlPFlMIXFtdpuJiL7HJlx6FNg+AJJTMoObM/nCRjy2FhjB0ztvzgl2sy8Z30Yx0wlja1r+W0BygGuVkajiwo4/dmjbdirl3xsuGDKgXy/Xli3OuEUr0F/wYY14mj3FqM8EtXiol++U5ylBwV7CvpAsp6Y8Ew1YCq3jJaVx4gyolxDJF4U1Gw824gqoQAwaiHjiFkk64FOkKI8RjGz2ycO7u13nUiSwD5eHUTJ2y1ZL+uIkcA2HkP7zyqotCVjHjDyBRCs8v0okF9lH5e1ZmQ9qd6PMOqufnvtDqkGNE4Fo04D93Qi4kbzr9/GahkIUDstP5Ykj0bNEzNHc7Q1LnKPCztDCjUWWt+A/+19SW6MSjrw6aGTFtH78nTns1UGOnGVp95K6pPVLTgMc4VzHnQYEEeusJ+HyTiyELAwdg+/fdznvfPfuxgvS1UApDRUKnfctk+TcICstiAPXOqWqTPjcCS8J23tuK63mHmlPcAR07NbgaLKH88RqIBUGg8gkyWgft3uJ3OsOwU0wZz3oYE7uj9xcsFRCXKTlqIfJ7BTW2Q/XLYeblxbM06NuP45qw5Bd+0+16VXZzjVM0fj79wpGYaiw6iLn/hS7beoWLLIO4e0I2hNjyDHW7gV2u/2Y7tc2PwcPGIIM7GY4vdbB1cfXyPhP9NMXiKTB1GFP2bCWWABU4TR/d6gv++hSlMlju0HR0vWYwsWL2nTqYYlA/u+NYgdihpn EweTXKEh lwrMNYs62RzmiLoan19+5eVXosBdFvlfYK/PeLxPRfw5Fg0ZJv1K3AHCkefEwrwkon+DD9Zy9DaT5lKjRan5qD77BhFACBMvzyFEzZe7CSUFiY9d+HXAZ+79JSgK608++gJUjz/f/kyd/nYvrBkcjJcoQTLXVSgstcHMjG9mEPUYBibVE8ZzKrHFZ5Obl33XE0TOTlREH3IPv2YyQKQkx+SYEuZdDh0rkEglA 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: Factor out wb_dirty_exceeded to remove repeated code Signed-off-by: Kemeng Shi --- mm/page-writeback.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 97ee5b32b4ef..0f1f3e179be2 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -140,6 +140,7 @@ struct dirty_throttle_control { unsigned long pos_ratio; bool freerun; + bool dirty_exceeded; }; /* @@ -1775,6 +1776,13 @@ static void wb_dirty_freerun(struct dirty_throttle_control *dtc, dirty_freerun_ceiling(dtc->wb_thresh, dtc->wb_bg_thresh); } +static inline void wb_dirty_exceeded(struct dirty_throttle_control *dtc, + bool strictlimit) +{ + dtc->dirty_exceeded = (dtc->wb_dirty > dtc->wb_thresh) && + ((dtc->dirty > dtc->thresh) || strictlimit); +} + /* * balance_dirty_pages() must be called by processes which are generating dirty * data. It looks at the number of dirty pages in the machine and will force @@ -1797,7 +1805,6 @@ static int balance_dirty_pages(struct bdi_writeback *wb, long max_pause; long min_pause; int nr_dirtied_pause; - bool dirty_exceeded = false; unsigned long task_ratelimit; unsigned long dirty_ratelimit; struct backing_dev_info *bdi = wb->bdi; @@ -1866,9 +1873,7 @@ static int balance_dirty_pages(struct bdi_writeback *wb, if (gdtc->freerun) goto free_running; - dirty_exceeded = (gdtc->wb_dirty > gdtc->wb_thresh) && - ((gdtc->dirty > gdtc->thresh) || strictlimit); - + wb_dirty_exceeded(gdtc, strictlimit); wb_position_ratio(gdtc); sdtc = gdtc; @@ -1883,17 +1888,14 @@ static int balance_dirty_pages(struct bdi_writeback *wb, if (mdtc->freerun) goto free_running; - dirty_exceeded |= (mdtc->wb_dirty > mdtc->wb_thresh) && - ((mdtc->dirty > mdtc->thresh) || strictlimit); - + wb_dirty_exceeded(mdtc, strictlimit); wb_position_ratio(mdtc); if (mdtc->pos_ratio < gdtc->pos_ratio) sdtc = mdtc; } - if (dirty_exceeded != wb->dirty_exceeded) - wb->dirty_exceeded = dirty_exceeded; - + wb->dirty_exceeded = gdtc->dirty_exceeded || + (mdtc && mdtc->dirty_exceeded); if (time_is_before_jiffies(READ_ONCE(wb->bw_time_stamp) + BANDWIDTH_INTERVAL)) __wb_update_bandwidth(gdtc, mdtc, true); -- 2.30.0