The patch titled
Subject: mm: vmscan: reset sc->priority on retry
has been added to the -mm mm-unstable branch. Its filename is
mm-vmscan-restore-incremental-cgroup-iteration-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-vmscan-restore-incremental-cgroup-iteration-fix.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Shakeel Butt <shakeel.butt@xxxxxxxxx>
Subject: mm: vmscan: reset sc->priority on retry
Date: Wed, 29 May 2024 08:49:11 -0700
The commit 6be5e186fd65 ("mm: vmscan: restore incremental cgroup
iteration") added a retry reclaim heuristic to iterate all the cgroups
before returning an unsuccessful reclaim but missed to reset the
sc->priority. Let's fix it.
Link: https://lkml.kernel.org/r/20240529154911.3008025-1-shakeel.butt@xxxxxxxxx
Fixes: 6be5e186fd65 ("mm: vmscan: restore incremental cgroup iteration")
Signed-off-by: Shakeel Butt <shakeel.butt@xxxxxxxxx>
Reported-by: syzbot+17416257cb95200cba44@xxxxxxxxxxxxxxxxxxxxxxxxx
Tested-by: syzbot+17416257cb95200cba44@xxxxxxxxxxxxxxxxxxxxxxxxx
Reviewed-by: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/vmscan.c | 1 +
1 file changed, 1 insertion(+)
--- a/mm/vmscan.c~mm-vmscan-restore-incremental-cgroup-iteration-fix
+++ a/mm/vmscan.c
@@ -6304,6 +6304,7 @@ retry:
* meaningful forward progress. Avoid false OOMs in this case.
*/
if (!sc->memcg_full_walk) {
+ sc->priority = initial_priority;
sc->memcg_full_walk = 1;
goto retry;
}
_
Patches currently in -mm which might be from shakeel.butt@xxxxxxxxx are
mm-vmscan-restore-incremental-cgroup-iteration-fix.patch
