From: Kemeng Shi <shikemeng@huaweicloud.com>
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 5/8] writeback: factor out wb_dirty_freerun to remove more repeated freerun code
Date: Tue, 14 May 2024 20:52:51 +0800 [thread overview]
Message-ID: <20240514125254.142203-6-shikemeng@huaweicloud.com> (raw)
In-Reply-To: <20240514125254.142203-1-shikemeng@huaweicloud.com>
Factor out wb_dirty_freerun to remove more repeated freerun code.
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
mm/page-writeback.c | 55 +++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index b7478eacd3ff..b9c8db7089ef 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1746,6 +1746,27 @@ static void domain_dirty_freerun(struct dirty_throttle_control *dtc,
dtc->freerun = dirty <= dirty_freerun_ceiling(thresh, bg_thresh);
}
+static void wb_dirty_freerun(struct dirty_throttle_control *dtc,
+ bool strictlimit)
+{
+ dtc->freerun = false;
+
+ /* was already handled in domain_dirty_freerun */
+ if (strictlimit)
+ return;
+
+ wb_dirty_limits(dtc);
+ /*
+ * LOCAL_THROTTLE tasks must not be throttled when below the per-wb
+ * freerun ceiling.
+ */
+ if (!(current->flags & PF_LOCAL_THROTTLE))
+ return;
+
+ dtc->freerun = dtc->wb_dirty <
+ dirty_freerun_ceiling(dtc->wb_thresh, dtc->wb_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
@@ -1838,19 +1859,9 @@ static int balance_dirty_pages(struct bdi_writeback *wb,
* Calculate global domain's pos_ratio and select the
* global dtc by default.
*/
- if (!strictlimit) {
- wb_dirty_limits(gdtc);
-
- if ((current->flags & PF_LOCAL_THROTTLE) &&
- gdtc->wb_dirty <
- dirty_freerun_ceiling(gdtc->wb_thresh,
- gdtc->wb_bg_thresh))
- /*
- * LOCAL_THROTTLE tasks must not be throttled
- * when below the per-wb freerun ceiling.
- */
- goto free_running;
- }
+ wb_dirty_freerun(gdtc, strictlimit);
+ if (gdtc->freerun)
+ goto free_running;
dirty_exceeded = (gdtc->wb_dirty > gdtc->wb_thresh) &&
((gdtc->dirty > gdtc->thresh) || strictlimit);
@@ -1865,20 +1876,10 @@ static int balance_dirty_pages(struct bdi_writeback *wb,
* both global and memcg domains. Choose the one
* w/ lower pos_ratio.
*/
- if (!strictlimit) {
- wb_dirty_limits(mdtc);
-
- if ((current->flags & PF_LOCAL_THROTTLE) &&
- mdtc->wb_dirty <
- dirty_freerun_ceiling(mdtc->wb_thresh,
- mdtc->wb_bg_thresh))
- /*
- * LOCAL_THROTTLE tasks must not be
- * throttled when below the per-wb
- * freerun ceiling.
- */
- goto free_running;
- }
+ wb_dirty_freerun(mdtc, strictlimit);
+ if (mdtc->freerun)
+ goto free_running;
+
dirty_exceeded |= (mdtc->wb_dirty > mdtc->wb_thresh) &&
((mdtc->dirty > mdtc->thresh) || strictlimit);
--
2.30.0
next prev parent reply other threads:[~2024-05-14 12:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-14 12:52 [PATCH v2 0/8] Add helper functions to remove repeated code and improve readability of cgroup writeback Kemeng Shi
2024-05-14 12:52 ` [PATCH v2 1/8] writeback: factor out wb_bg_dirty_limits to remove repeated code Kemeng Shi
2024-05-14 12:52 ` [PATCH v2 2/8] writeback: add general function domain_dirty_avail to calculate dirty and avail of domain Kemeng Shi
2024-05-30 18:19 ` Tejun Heo
2024-05-14 12:52 ` [PATCH v2 3/8] writeback: factor out domain_over_bg_thresh to remove repeated code Kemeng Shi
2024-05-14 12:52 ` [PATCH v2 4/8] writeback: Factor out code of freerun " Kemeng Shi
2024-05-14 12:52 ` Kemeng Shi [this message]
2024-05-30 18:29 ` [PATCH v2 5/8] writeback: factor out wb_dirty_freerun to remove more repeated freerun code Tejun Heo
2024-05-14 12:52 ` [PATCH v2 6/8] writeback: factor out balance_domain_limits to remove repeated code Kemeng Shi
2024-05-14 12:52 ` [PATCH v2 7/8] writeback: factor out wb_dirty_exceeded " Kemeng Shi
2024-05-30 18:31 ` Tejun Heo
2024-05-14 12:52 ` [PATCH v2 8/8] writeback: factor out balance_wb_limits " Kemeng Shi
2024-05-30 18:33 ` Tejun Heo
2024-06-03 6:39 ` Kemeng Shi
2024-06-03 18:09 ` Tejun Heo
2024-06-06 3:24 ` Kemeng Shi
2024-05-30 18:35 ` [PATCH v2 0/8] Add helper functions to remove repeated code and improve readability of cgroup writeback Tejun Heo
2024-05-30 18:55 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240514125254.142203-6-shikemeng@huaweicloud.com \
--to=shikemeng@huaweicloud.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=tj@kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).