Commit 462966dc authored by Shakeel Butt's avatar Shakeel Butt Committed by Andrew Morton
Browse files

mm: vmscan: reset sc->priority on retry 

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@linux.dev


Fixes: 6be5e186fd65 ("mm: vmscan: restore incremental cgroup iteration")
Signed-off-by: default avatarShakeel Butt <shakeel.butt@linux.dev>
Reported-by: default avatar <syzbot+17416257cb95200cba44@syzkaller.appspotmail.com>
Tested-by: default avatar <syzbot+17416257cb95200cba44@syzkaller.appspotmail.com>
Reviewed-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b82b5307

mm/vmscan.c

+1 −0
Original line number Diff line number Diff line
@@ -6304,6 +6304,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, 
	 * 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;

	}