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 A7EDDC04FFE for ; Tue, 14 May 2024 12:53:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A6DD6B0318; Tue, 14 May 2024 08:53:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 056FE6B0319; Tue, 14 May 2024 08:53:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E60AF6B031A; Tue, 14 May 2024 08:53:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C86A56B0318 for ; Tue, 14 May 2024 08:53:35 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7E3D014069B for ; Tue, 14 May 2024 12:53:35 +0000 (UTC) X-FDA: 82116992790.21.0609DB8 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf05.hostedemail.com (Postfix) with ESMTP id 764E910001B for ; Tue, 14 May 2024 12:53:32 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=none (imf05.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=1715691213; 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=ieEtLzMmMqCrvyQ9MTJSR7uAGtRW58Q2kyz2C00Y7o0=; b=aG7kan6MkCvISEf5Ctaq4MYn3zkdtNXV87Q9nr2ZinH5JpD0MRsj88ReqJmtJy9Qwod98L +CoiF1TrUtv8A/3Ir51VTF0RWvm2w6LTqat8i8uVhIU/jTi6XSF1RCEwyVUbkm9IgW6nQ1 GzWNEE5J25FclzapWljarf9sXGGFRBw= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=none (imf05.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=1715691213; a=rsa-sha256; cv=none; b=kOGpQjtj01oZ3SrRcUifVO+UnnGrhjI0qs9GTloke/Nwoyz+JHYJ0iubnLlxas3oWEOIJj Rux5mzD79SHOwWYcrMECg5UzNLzrjGdVw1qOxbKURbMwuFuHaJcVSnm4QMbH3w5sBRigUe A/eatMf2PlTZBe1yLyem3GlZM8tax7w= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Vdx9T1Cf2z4f3m78 for ; Tue, 14 May 2024 20:53:17 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 4D3FA1A0AD7 for ; Tue, 14 May 2024 20:53:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP4 (Coremail) with SMTP id gCh0CgDHzG7EXkNmCyyLMw--.6596S6; Tue, 14 May 2024 20:53:27 +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 4/8] writeback: Factor out code of freerun to remove repeated code Date: Tue, 14 May 2024 20:52:50 +0800 Message-Id: <20240514125254.142203-5-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--.6596S6 X-Coremail-Antispam: 1UD129KBjvJXoWxJF1kAFWDuw43KFyDZrWfAFb_yoWrur13pF WxJw4Yy3yDXa4IqrZxCF9rZrW3trsrW3y3XasrCw1Yqr13KF12gFy2yF95Ar17CFyxJF15 Za1aqF97J34kKFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvEb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7 v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF 1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIx AIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI 42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWI evJa73UjIFyTuYvjxUFgAwUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 764E910001B X-Stat-Signature: o5fp7a64s9arioj6nzf976da168ytfjc X-Rspam-User: X-HE-Tag: 1715691212-254826 X-HE-Meta: U2FsdGVkX194y+nAsQEcAVS+Npviodl4sSqFWMZ7fvfKJNAhH9AeN4VtoUhEgpZ1X9kdQCBljL8hMHxlUnsdVqx4OcY1N/GsJdXAHHVAK55yOUY3weT+UwjSe3MWXojdiMvKHu9M498++H1qc2MOjMVWZVPt/b6m9fc3W1LLq1OWMOGL0ri2TzixTwKYLsVEIGGCOUHGDNya6HeVG/P4iBoaFHgTDMJB8V2mY4sHV7SCTaRD2I+OHzDAHlKhKL2BCVWur3rJIxaKPQgpRpoo39+pYSr+VDIK9lh7Wb5iuUVjlje6dDgzR4yMkFAEbS6zrX1XKjnSLs4l91tuMXbMvbWBx/C+Pm6OqyE9ZTchli8Yv/BOs3pwIOB8Dwb+R1eHN8bxcPao7Z+rsaqMGRAvXMAvGwyHgOi2YP+KXdhoc9he+8/xKN25qlVfppUNlCPFRSLKBPVl3nB9Rsie4sc0XYVNQ2EvC4wWTYOE7X95NSolRuHUfWdTQmrMCTtoq0jZkU1QLBVLiquSwC1FaTXTISs4rheSmPBudDuekBROTidmaMObWYWmfDf7qLxax7o5Xn0j+McqgjsS/UdiLITTenAJ9Ax2hkfighsOfHTF2nCq7SjcZv6c4ppoWZ13kVw9zA3r5Yuz20tmlxSGI4TC4Ib7UiT3G43vMRgozhlvggz3PxHfLP6aRPqST5Tsy9+qSbp1Acwmbti8slJfPntrD5YdOwwyYu3mdJDm0x4eF+VKfQZwszFj9Px2MTtzi6dy9RzFqRjxS2rDER37Jdj66135LoTDsLpTaxQfj6CYEF0JsfiQV/OkCGSADaBPtlfqTab1qSGE/m6dpCTjLAYKyVHplQgyPq7eJUyAr7q7bP0oldwtJyD6DxFTIIGKPRnZo40g3NYDMrUMhGK2kL3XS+ifRA2ebFiqFJqDc8XcU0vtKP29sLQpNgQnpOCD/zl2v9SU/LhmiLJmC15hnAN uoSjn9nI V4mc+i9jVDb1717ar+UKgxfrPH4TaJl1te9zOzQiOZLbcx8bLTiqfDKeP0J/KKsWgaH62P0vJjBKeMVFv4UXvdR90umGhiHrDB3RjLcOfpxQsk0aG7/k1eUEP6at4tRmCjJF3YvLPl5EKjC6VEKbrler9sMnbRC+ynmFRN8uEQZ/4y422CXkVbv/w9mw245N4gRTCWu12HwwnFnMqH8d28U1IiMAhVFcBU3mBDUKq1WavZa/Z3+wHL8KiWA== 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 code of freerun into new helper functions domain_poll_intv and domain_dirty_freerun to remove repeated code. Signed-off-by: Kemeng Shi Acked-by: Tejun Heo --- mm/page-writeback.c | 89 +++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e7c6ad48f738..b7478eacd3ff 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -139,6 +139,7 @@ struct dirty_throttle_control { unsigned long wb_bg_thresh; unsigned long pos_ratio; + bool freerun; }; /* @@ -1702,6 +1703,49 @@ static inline void wb_dirty_limits(struct dirty_throttle_control *dtc) } } +static unsigned long domain_poll_intv(struct dirty_throttle_control *dtc, + bool strictlimit) +{ + unsigned long dirty, thresh; + + if (strictlimit) { + dirty = dtc->wb_dirty; + thresh = dtc->wb_thresh; + } else { + dirty = dtc->dirty; + thresh = dtc->thresh; + } + + return dirty_poll_interval(dirty, thresh); +} + +/* + * Throttle it only when the background writeback cannot catch-up. This avoids + * (excessively) small writeouts when the wb limits are ramping up in case of + * !strictlimit. + * + * In strictlimit case make decision based on the wb counters and limits. Small + * writeouts when the wb limits are ramping up are the price we consciously pay + * for strictlimit-ing. + */ +static void domain_dirty_freerun(struct dirty_throttle_control *dtc, + bool strictlimit) +{ + unsigned long dirty, thresh, bg_thresh; + + if (unlikely(strictlimit)) { + wb_dirty_limits(dtc); + dirty = dtc->wb_dirty; + thresh = dtc->wb_thresh; + bg_thresh = dtc->wb_bg_thresh; + } else { + dirty = dtc->dirty; + thresh = dtc->thresh; + bg_thresh = dtc->bg_thresh; + } + dtc->freerun = dirty <= dirty_freerun_ceiling(thresh, bg_thresh); +} + /* * 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 @@ -1734,27 +1778,12 @@ static int balance_dirty_pages(struct bdi_writeback *wb, for (;;) { unsigned long now = jiffies; - unsigned long dirty, thresh, bg_thresh; - unsigned long m_dirty = 0; /* stop bogus uninit warnings */ - unsigned long m_thresh = 0; - unsigned long m_bg_thresh = 0; nr_dirty = global_node_page_state(NR_FILE_DIRTY); domain_dirty_avail(gdtc, true); domain_dirty_limits(gdtc); - - if (unlikely(strictlimit)) { - wb_dirty_limits(gdtc); - - dirty = gdtc->wb_dirty; - thresh = gdtc->wb_thresh; - bg_thresh = gdtc->wb_bg_thresh; - } else { - dirty = gdtc->dirty; - thresh = gdtc->thresh; - bg_thresh = gdtc->bg_thresh; - } + domain_dirty_freerun(gdtc, strictlimit); if (mdtc) { /* @@ -1763,17 +1792,7 @@ static int balance_dirty_pages(struct bdi_writeback *wb, */ domain_dirty_avail(mdtc, true); domain_dirty_limits(mdtc); - - if (unlikely(strictlimit)) { - wb_dirty_limits(mdtc); - m_dirty = mdtc->wb_dirty; - m_thresh = mdtc->wb_thresh; - m_bg_thresh = mdtc->wb_bg_thresh; - } else { - m_dirty = mdtc->dirty; - m_thresh = mdtc->thresh; - m_bg_thresh = mdtc->bg_thresh; - } + domain_dirty_freerun(mdtc, strictlimit); } /* @@ -1790,31 +1809,21 @@ static int balance_dirty_pages(struct bdi_writeback *wb, wb_start_background_writeback(wb); /* - * Throttle it only when the background writeback cannot - * catch-up. This avoids (excessively) small writeouts - * when the wb limits are ramping up in case of !strictlimit. - * - * In strictlimit case make decision based on the wb counters - * and limits. Small writeouts when the wb limits are ramping - * up are the price we consciously pay for strictlimit-ing. - * * If memcg domain is in effect, @dirty should be under * both global and memcg freerun ceilings. */ - if (dirty <= dirty_freerun_ceiling(thresh, bg_thresh) && - (!mdtc || - m_dirty <= dirty_freerun_ceiling(m_thresh, m_bg_thresh))) { + if (gdtc->freerun && (!mdtc || mdtc->freerun)) { unsigned long intv; unsigned long m_intv; free_running: - intv = dirty_poll_interval(dirty, thresh); + intv = domain_poll_intv(gdtc, strictlimit); m_intv = ULONG_MAX; current->dirty_paused_when = now; current->nr_dirtied = 0; if (mdtc) - m_intv = dirty_poll_interval(m_dirty, m_thresh); + m_intv = domain_poll_intv(mdtc, strictlimit); current->nr_dirtied_pause = min(intv, m_intv); break; } -- 2.30.0