From: Kemeng Shi <shikemeng@huaweicloud.com>
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 [thread overview]
Message-ID: <20240429034738.138609-2-shikemeng@huaweicloud.com> (raw)
In-Reply-To: <20240429034738.138609-1-shikemeng@huaweicloud.com>
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 <shikemeng@huaweicloud.com>
---
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;
}
--
2.30.0
next prev parent reply other threads:[~2024-04-29 3:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 3:47 [PATCH 00/10] Add helper functions to remove repeated code and Kemeng Shi
2024-04-29 3:47 ` Kemeng Shi [this message]
2024-05-01 16:40 ` [PATCH 01/10] writeback: factor out wb_bg_dirty_limits to remove repeated code Tejun Heo
2024-04-29 3:47 ` [PATCH 02/10] writeback: add general function domain_dirty_avail to calculate dirty and avail of domain Kemeng Shi
2024-05-01 16:49 ` Tejun Heo
2024-05-06 1:32 ` Kemeng Shi
2024-04-29 3:47 ` [PATCH 03/10] writeback: factor out domain_over_bg_thresh to remove repeated code Kemeng Shi
2024-05-01 16:53 ` Tejun Heo
2024-04-29 3:47 ` [PATCH 04/10] writeback use [global/wb]_domain_dirty_avail helper in cgwb_calc_thresh Kemeng Shi
2024-05-01 16:56 ` Tejun Heo
2024-05-06 1:36 ` Kemeng Shi
2024-04-29 3:47 ` [PATCH 05/10] writeback: call domain_dirty_avail in balance_dirty_pages Kemeng Shi
2024-05-01 16:57 ` Tejun Heo
2024-05-06 1:36 ` Kemeng Shi
2024-04-29 3:47 ` [PATCH 06/10] writeback: Factor out code of freerun to remove repeated code Kemeng Shi
2024-05-01 17:15 ` Tejun Heo
2024-05-06 1:38 ` Kemeng Shi
2024-04-29 3:47 ` [PATCH 07/10] writeback: factor out wb_dirty_freerun to remove more repeated freerun code Kemeng Shi
2024-05-01 17:18 ` Tejun Heo
2024-05-06 1:53 ` Kemeng Shi
2024-04-29 3:47 ` [PATCH 08/10] writeback: factor out balance_domain_limits to remove repeated code Kemeng Shi
2024-05-01 17:21 ` Tejun Heo
2024-04-29 3:47 ` [PATCH 09/10] writeback: factor out wb_dirty_exceeded " Kemeng Shi
2024-04-30 7:24 ` Dan Carpenter
2024-05-06 2:15 ` Kemeng Shi
2024-05-01 17:28 ` Tejun Heo
2024-04-29 3:47 ` [PATCH 10/10] writeback: factor out balance_wb_limits " Kemeng Shi
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=20240429034738.138609-2-shikemeng@huaweicloud.com \
--to=shikemeng@huaweicloud.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--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).