commit b8d031e43c01810a48be9e47419ac567faded03e
author Kalesh Singh <kaleshsingh@google.com> Mon Apr 03 15:28:17 2023 -0700
committer Will Deacon <willdeacon@google.com> Wed Apr 05 07:19:11 2023 +0000
tree 0348bb0d7abbe04cc800c8afc863839e5524046b
parent 340c38afcd618e58c37f97f77fd7a8a7636ea197

ANDROID: MGLRU: Avoid reactivation of anon pages on swap full

Avoid anon reclaim if swapping full since this reactivates the
pages.

Bug: 261619133
Bug: 276521916
Change-Id: Ia3af7fe8d5b29405830a812e73f95d11a0f8ee3a
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>

mm/vmscan.c

diff --git a/mm/vmscan.c b/mm/vmscan.c
index e94a122..69b52e1 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2957,7 +2957,8 @@ static int get_swappiness(struct lruvec *lruvec, struct scan_control *sc)
 	if (!sc->may_swap)
 		return 0;
 
-	if (!can_demote(pgdat->node_id, sc))
+	if (!can_demote(pgdat->node_id, sc) &&
+		mem_cgroup_get_nr_swap_pages(memcg) <= 0)
 		return 0;
 
 	return mem_cgroup_swappiness(memcg);