From patchwork Mon Apr 29 03:47:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13646257 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 6A1A3C4345F for ; Mon, 29 Apr 2024 03:48:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F06266B0088; Sun, 28 Apr 2024 23:47:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 784B96B0093; Sun, 28 Apr 2024 23:47:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35BB16B008C; Sun, 28 Apr 2024 23:47:56 -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 595966B0093 for ; Sun, 28 Apr 2024 23:47:55 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0E323121779 for ; Mon, 29 Apr 2024 03:47:55 +0000 (UTC) X-FDA: 82061185710.07.E1A3920 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf04.hostedemail.com (Postfix) with ESMTP id AD59540002 for ; Mon, 29 Apr 2024 03:47:51 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 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=rzDhs/JLGc/krFNNQofSHPqT5pI+BJvr+/OC+Nf6FmY=; b=rP7Loq2dQjXMsXkhub8PKBGv2nfbmegXyA03pmHrpHXZm7EyF5mRqUKrYGlmLt53BntaEQ cqQj5FhSzYm5z4UilnRv5veNtKfpjr52kfxDbmpE24A3nuELRPOapbX9vdO28yQHRw9nPI UuK8eGvt8XIA8Qz6bkyDFWRdihdUtfU= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 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=f4XjrzkduiPiROO4F9YvwYS4MoGAEOJdXM6m96EJes83SB/2aPAUiIhpZNvFrf4pUFadqi 1gkseLgd22pHx6KR6184l+aaRTgSqKlX4dtfCf1SRrr6UTOc66nzxxupLikQLE9l+Kzgif EElTwKnMitKQkdl2LzsA5PQOy3+RN/E= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4VSTms3FB3z4f3kpG for ; Mon, 29 Apr 2024 11:47:41 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 76CC81A0175 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--.38879S4; 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 02/10] writeback: add general function domain_dirty_avail to calculate dirty and avail of domain Date: Mon, 29 Apr 2024 11:47:30 +0800 Message-Id: <20240429034738.138609-3-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--.38879S4 X-Coremail-Antispam: 1UD129KBjvJXoWxGrWxCF1Uur4UWr4rGr1Utrb_yoW5Xw48pF 43Jw4YkFWUJF42grn3JFWj9rW3K397trWUtryxCa1SvF1fur1UGFy8urykZr17CF97Jrya yrsIyr97Gr48CrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvGb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUXw A2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr 0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY 17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcV C0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY 6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa 73UjIFyTuYvjxU2_MaUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: AD59540002 X-Stat-Signature: wcjboiyiuu1gucrqzmsxmomycmyd9t1t X-HE-Tag: 1714362471-835752 X-HE-Meta: U2FsdGVkX19BzgaHsNMewYk0R7+9vKN5684K3mXRZOGoBUxNtKBsx7msrLbVsDYRUf9wbFCEvu4F4E0QTsww2zywMyhgUpwbP9cweODtbIO+H2Ze58ChNic6L4TDGdUnUVpPU4VgeUrgEqrxOmsw5GSs7lfBT2pU5O8eq7OntDCHvTcUj+lMMqlt00rnfK/y5V30EnpVIKvCIwqzeUcj/YqpcKu6Eah6PKn9bGq2b3fva6Kqm//CNbppd2IbSrrNdTJgTw+47I57Ky5Zdc3h44Rf22R8/aRggNAWcFjggYnNSXLt8xe/AEoyBNgdUtNHRo6T4c4iB83qxHippRrZ7WzIi+HG1SzWPir4aRWC4g1/G27AokNtBj2N0g0I3mLX9Kb9nMqHv68snY6usR/OaG0aA5OD3fyk47UGfldtMGCmvaeIIlMV7WYNqAzyIrvFsKrSlwQLnOdQORvCJ/IxIxsyzA+yRh4A7pEriAj8sNi2lujp9sImheCRxKRiI2XjV1r0qs0lJgcP5qHQ92OUEIr5Y78aHXX1m9fXUJMUAid5diAR9rJW2NkK6ejOEDX0iQxMIFKdj9LpoDM/hAD2be6PL0ZStX7qGP/uaWAd2WegQAC8NXf3nGBw4s9QW8zKszS+l9PA95KScPA3Ld4C1hYRh6ab2zpZUhSO8Swsb/4lf3NTIMYu5/2JwJx8CdHWjCoMMrGv+6xmAUZhYYDoXvEO1/TrJDH3kNY6liALvCxeHqb7BoJuHyt8gcU/oDPMBGqiQm18F+r6MfDccfRITeAtJ4yvBofF77F30oq/3m/jopKNU5JGze+Xot3vQXxN+oZs2tIh9yKl4P3F7t+/9v3+70Lt9kMasgH8CvUjrp8K7R/+Tl0JoShuWMf9ohc2qbi11Z25YJ/yfkJ81IXIzcOC/mdlWUm/xrOjoww4CIFly8IiMpGJA38GVQbTuv3av7XmYvjbtGImnCYDGvz bfGuDnx0 uqGM6eiOADmLVWY+7ctiXjCZk/HFQFqBZifMVvnb49v0nAIb5HB1lMhOi0T3PmH9ejIooPIq9bXIQF6/iziKP45cCVqETO7jcXm9xsCOJJ1DkPTJmpE+8rOSvmxyiLKCIvoYsYnN/duKA/wFUurO1MklQtbCGuEpgsjkhIN1sNOntegdmbsEg5Zs4zz0LzcH/T1DhztLxr00+SQuPn27VezCCjg== 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: Add general function domain_dirty_avail to calculate dirty and avail for either dirty limit or background writeback in either global domain or wb domain. Signed-off-by: Kemeng Shi --- mm/page-writeback.c | 50 +++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e1f73643aca1..e4f181d52035 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -837,6 +837,41 @@ static void mdtc_calc_avail(struct dirty_throttle_control *mdtc, mdtc->avail = filepages + min(headroom, other_clean); } +static inline void +global_domain_dirty_avail(struct dirty_throttle_control *dtc, bool bg) +{ + dtc->avail = global_dirtyable_memory(); + dtc->dirty = global_node_page_state(NR_FILE_DIRTY); + if (!bg) + dtc->dirty += global_node_page_state(NR_WRITEBACK); +} + +static inline void +wb_domain_dirty_avail(struct dirty_throttle_control *dtc, bool bg) +{ + unsigned long filepages = 0, headroom = 0, writeback = 0; + + mem_cgroup_wb_stats(dtc->wb, &filepages, &headroom, &dtc->dirty, + &writeback); + if (!bg) + dtc->dirty += writeback; + mdtc_calc_avail(dtc, filepages, headroom); +} + +/* + * Dirty background will ignore pages being written as we're trying to + * decide whether to put more under writeback. + */ +static void domain_dirty_avail(struct dirty_throttle_control *dtc, bool bg) +{ + struct dirty_throttle_control *gdtc = mdtc_gdtc(dtc); + + if (gdtc) + wb_domain_dirty_avail(dtc, bg); + else + global_domain_dirty_avail(dtc, bg); +} + /** * __wb_calc_thresh - @wb's share of dirty threshold * @dtc: dirty_throttle_context of interest @@ -2119,14 +2154,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb) struct dirty_throttle_control * const mdtc = mdtc_valid(&mdtc_stor) ? &mdtc_stor : NULL; - /* - * Similar to balance_dirty_pages() but ignores pages being written - * as we're trying to decide whether to put more under writeback. - */ - gdtc->avail = global_dirtyable_memory(); - gdtc->dirty = global_node_page_state(NR_FILE_DIRTY); + domain_dirty_avail(gdtc, true); domain_dirty_limits(gdtc); - if (gdtc->dirty > gdtc->bg_thresh) return true; @@ -2135,13 +2164,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb) return true; if (mdtc) { - unsigned long filepages, headroom, writeback; - - mem_cgroup_wb_stats(wb, &filepages, &headroom, &mdtc->dirty, - &writeback); - mdtc_calc_avail(mdtc, filepages, headroom); + domain_dirty_avail(mdtc, true); domain_dirty_limits(mdtc); /* ditto, ignore writeback */ - if (mdtc->dirty > mdtc->bg_thresh) return true;