From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <ying.huang@intel.com>, <songmuchun@bytedance.com>,
<hch@infradead.org>, <willy@infradead.org>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>, <linmiaohe@huawei.com>
Subject: [PATCH v2 3/9] mm/vmscan: introduce helper function reclaim_page_list()
Date: Sat, 9 Apr 2022 17:34:54 +0800 [thread overview]
Message-ID: <20220409093500.10329-4-linmiaohe@huawei.com> (raw)
In-Reply-To: <20220409093500.10329-1-linmiaohe@huawei.com>
Introduce helper function reclaim_page_list() to eliminate the duplicated
code of doing shrink_page_list() and putback_lru_page. Also We can separate
node reclaim from node page list operation this way. No functional change
intended.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
mm/vmscan.c | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 01f5db75a507..59b96320f481 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2531,14 +2531,12 @@ static void shrink_active_list(unsigned long nr_to_scan,
nr_deactivate, nr_rotated, sc->priority, file);
}
-unsigned long reclaim_pages(struct list_head *page_list)
+static unsigned int reclaim_page_list(struct list_head *page_list,
+ struct pglist_data *pgdat)
{
- int nid = NUMA_NO_NODE;
- unsigned int nr_reclaimed = 0;
- LIST_HEAD(node_page_list);
struct reclaim_stat dummy_stat;
- struct page *page;
- unsigned int noreclaim_flag;
+ unsigned int nr_reclaimed;
+ struct folio *folio;
struct scan_control sc = {
.gfp_mask = GFP_KERNEL,
.may_writepage = 1,
@@ -2547,6 +2545,24 @@ unsigned long reclaim_pages(struct list_head *page_list)
.no_demotion = 1,
};
+ nr_reclaimed = shrink_page_list(page_list, pgdat, &sc, &dummy_stat, false);
+ while (!list_empty(page_list)) {
+ folio = lru_to_folio(page_list);
+ list_del(&folio->lru);
+ putback_lru_page(&folio->page);
+ }
+
+ return nr_reclaimed;
+}
+
+unsigned long reclaim_pages(struct list_head *page_list)
+{
+ int nid = NUMA_NO_NODE;
+ unsigned int nr_reclaimed = 0;
+ LIST_HEAD(node_page_list);
+ struct page *page;
+ unsigned int noreclaim_flag;
+
noreclaim_flag = memalloc_noreclaim_save();
while (!list_empty(page_list)) {
@@ -2562,28 +2578,12 @@ unsigned long reclaim_pages(struct list_head *page_list)
continue;
}
- nr_reclaimed += shrink_page_list(&node_page_list,
- NODE_DATA(nid),
- &sc, &dummy_stat, false);
- while (!list_empty(&node_page_list)) {
- page = lru_to_page(&node_page_list);
- list_del(&page->lru);
- putback_lru_page(page);
- }
-
+ nr_reclaimed += reclaim_page_list(&node_page_list, NODE_DATA(nid));
nid = NUMA_NO_NODE;
}
- if (!list_empty(&node_page_list)) {
- nr_reclaimed += shrink_page_list(&node_page_list,
- NODE_DATA(nid),
- &sc, &dummy_stat, false);
- while (!list_empty(&node_page_list)) {
- page = lru_to_page(&node_page_list);
- list_del(&page->lru);
- putback_lru_page(page);
- }
- }
+ if (!list_empty(&node_page_list))
+ nr_reclaimed += reclaim_page_list(&node_page_list, NODE_DATA(nid));
memalloc_noreclaim_restore(noreclaim_flag);
--
2.23.0
next prev parent reply other threads:[~2022-04-09 9:51 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-09 9:34 [PATCH v2 0/9] A few cleanup and fixup patches for vmscan Miaohe Lin
2022-04-09 9:34 ` [PATCH v2 1/9] mm/vmscan: add a comment about MADV_FREE pages check in folio_check_dirty_writeback Miaohe Lin
2022-04-11 11:50 ` ying.huang
2022-04-12 3:07 ` Miaohe Lin
2022-04-11 14:16 ` Christoph Hellwig
2022-04-12 3:15 ` Miaohe Lin
2022-04-12 8:44 ` Oscar Salvador
2022-04-09 9:34 ` [PATCH v2 2/9] mm/vmscan: remove unneeded can_split_huge_page check Miaohe Lin
2022-04-11 14:18 ` Christoph Hellwig
2022-04-12 3:14 ` Miaohe Lin
2022-04-12 0:52 ` ying.huang
2022-04-12 8:59 ` Oscar Salvador
2022-04-12 13:42 ` Miaohe Lin
2022-04-12 14:59 ` David Hildenbrand
2022-04-13 1:26 ` ying.huang
2022-04-13 2:17 ` Miaohe Lin
2022-04-15 3:07 ` ying.huang
2022-04-16 2:34 ` Miaohe Lin
2022-04-09 9:34 ` Miaohe Lin [this message]
2022-04-09 13:44 ` [PATCH v2 3/9] mm/vmscan: introduce helper function reclaim_page_list() Matthew Wilcox
2022-04-11 1:53 ` Miaohe Lin
2022-04-11 3:17 ` Matthew Wilcox
2022-04-11 3:26 ` Miaohe Lin
2022-04-09 9:34 ` [PATCH v2 4/9] mm/vmscan: save a bit of stack space in shrink_lruvec Miaohe Lin
2022-04-12 0:57 ` ying.huang
2022-04-12 3:13 ` Miaohe Lin
2022-04-09 9:34 ` [PATCH v2 5/9] mm/vmscan: activate swap-backed executable folios after first usage Miaohe Lin
2022-04-12 0:59 ` ying.huang
2022-04-09 9:34 ` [PATCH v2 6/9] mm/vmscan: take all base pages of THP into account when race with speculative reference Miaohe Lin
2022-04-09 9:34 ` [PATCH v2 7/9] mm/vmscan: take min_slab_pages into account when try to call shrink_node Miaohe Lin
2022-04-12 1:36 ` ying.huang
2022-04-09 9:34 ` [PATCH v2 8/9] mm/vmscan: remove obsolete comment in kswapd_run Miaohe Lin
2022-04-09 9:35 ` [PATCH v2 9/9] mm/vmscan: use helper folio_is_file_lru() Miaohe Lin
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=20220409093500.10329-4-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=songmuchun@bytedance.com \
--cc=willy@infradead.org \
--cc=ying.huang@intel.com \
/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 NNTP newsgroup(s).