From: Jacob Wen <jian.w.wen@oracle.com>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, jian.w.wen@oracle.com
Subject: [PATCH] mm/vmscan: DRY cleanup for do_try_to_free_pages()
Date: Fri, 18 Dec 2020 18:22:17 +0800 [thread overview]
Message-ID: <20201218102217.186836-1-jian.w.wen@oracle.com> (raw)
This patch reduces repetition of set_task_reclaim_state() around
do_try_to_free_pages().
Signed-off-by: Jacob Wen <jian.w.wen@oracle.com>
---
mm/vmscan.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 257cba79a96d..4bc244b23686 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3023,6 +3023,10 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
pg_data_t *last_pgdat;
struct zoneref *z;
struct zone *zone;
+ unsigned long ret;
+
+ set_task_reclaim_state(current, &sc->reclaim_state);
+
retry:
delayacct_freepages_start();
@@ -3069,12 +3073,16 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
delayacct_freepages_end();
- if (sc->nr_reclaimed)
- return sc->nr_reclaimed;
+ if (sc->nr_reclaimed) {
+ ret = sc->nr_reclaimed;
+ goto out;
+ }
/* Aborted reclaim to try compaction? don't OOM, then */
- if (sc->compaction_ready)
- return 1;
+ if (sc->compaction_ready) {
+ ret = 1;
+ goto out;
+ }
/*
* We make inactive:active ratio decisions based on the node's
@@ -3101,7 +3109,10 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
goto retry;
}
- return 0;
+ ret = 0;
+out:
+ set_task_reclaim_state(current, NULL);
+ return ret;
}
static bool allow_direct_reclaim(pg_data_t *pgdat)
@@ -3269,13 +3280,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
if (throttle_direct_reclaim(sc.gfp_mask, zonelist, nodemask))
return 1;
- set_task_reclaim_state(current, &sc.reclaim_state);
trace_mm_vmscan_direct_reclaim_begin(order, sc.gfp_mask);
nr_reclaimed = do_try_to_free_pages(zonelist, &sc);
trace_mm_vmscan_direct_reclaim_end(nr_reclaimed);
- set_task_reclaim_state(current, NULL);
return nr_reclaimed;
}
@@ -3347,7 +3356,6 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,
*/
struct zonelist *zonelist = node_zonelist(numa_node_id(), sc.gfp_mask);
- set_task_reclaim_state(current, &sc.reclaim_state);
trace_mm_vmscan_memcg_reclaim_begin(0, sc.gfp_mask);
noreclaim_flag = memalloc_noreclaim_save();
@@ -3355,7 +3363,6 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,
memalloc_noreclaim_restore(noreclaim_flag);
trace_mm_vmscan_memcg_reclaim_end(nr_reclaimed);
- set_task_reclaim_state(current, NULL);
return nr_reclaimed;
}
@@ -4023,11 +4030,9 @@ unsigned long shrink_all_memory(unsigned long nr_to_reclaim)
fs_reclaim_acquire(sc.gfp_mask);
noreclaim_flag = memalloc_noreclaim_save();
- set_task_reclaim_state(current, &sc.reclaim_state);
nr_reclaimed = do_try_to_free_pages(zonelist, &sc);
- set_task_reclaim_state(current, NULL);
memalloc_noreclaim_restore(noreclaim_flag);
fs_reclaim_release(sc.gfp_mask);
--
2.25.1
next reply other threads:[~2020-12-18 10:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 10:22 Jacob Wen [this message]
2020-12-18 10:51 ` [PATCH] mm/vmscan: DRY cleanup for do_try_to_free_pages() Michal Hocko
2020-12-18 13:51 ` Jacob Wen
2020-12-18 14:27 ` Michal Hocko
2020-12-18 17:41 ` Jacob Wen
2020-12-19 1:21 ` Chris Down
2020-12-19 3:18 ` Jacob Wen
2020-12-18 12:17 ` Matthew Wilcox
2020-12-18 13:54 ` Jacob Wen
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=20201218102217.186836-1-jian.w.wen@oracle.com \
--to=jian.w.wen@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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 NNTP newsgroup(s).