author: Dave Hansen <dave.hansen@linux.intel.com> 2021-09-02 14:59:30 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-09-03 09:58:16 -0700
commit: 3a235693d3930e1276c8d9cc0ca5807ef292cf0a
parent: a2a36488a61cefe3129295c6e75b3987b9d7fd13
Commit Summary:
Diffstat:
1 file changed, 7 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index b0970769b100..43289f5f8488 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -524,8 +524,13 @@ static long add_nr_deferred(long nr, struct shrinker *shrinker,
static bool can_demote(int nid, struct scan_control *sc)
{
- if (sc && sc->no_demotion)
- return false;
+ if (sc) {
+ if (sc->no_demotion)
+ return false;
+ /* It is pointless to do demotion in memcg reclaim */
+ if (cgroup_reclaim(sc))
+ return false;
+ }
if (next_demotion_node(nid) == NUMA_NO_NODE)
return false;