The patch titled
Subject: memcg, oom: unmark under_oom after the oom killer is done
has been added to the -mm mm-unstable branch. Its filename is
memcg-oom-unmark-under_oom-after-the-oom-killer-is-done.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/memcg-oom-unmark-under_oom-after-the-oom-killer-is-done.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: Haifeng Xu <haifeng.xu@xxxxxxxxxx>
Subject: memcg, oom: unmark under_oom after the oom killer is done
Date: Sat, 23 Sep 2023 08:17:39 +0000
When application in userland receives oom notification from kernel and
reads the oom_control file, it's confusing that under_oom is 0 though the
omm killer hasn't finished. The reason is that under_oom is cleared
before invoking mem_cgroup_out_of_memory(), so move the action that unmark
under_oom after completing oom handler. Therefore the value of under_oom
won't mislead users.
Link: https://lkml.kernel.org/r/20230923081739.398912-1-haifeng.xu@xxxxxxxxxx
Signed-off-by: Haifeng Xu <haifeng.xu@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/memcontrol.c~memcg-oom-unmark-under_oom-after-the-oom-killer-is-done
+++ a/mm/memcontrol.c
@@ -2006,8 +2006,8 @@ static bool mem_cgroup_oom(struct mem_cg
if (locked)
mem_cgroup_oom_notify(memcg);
- mem_cgroup_unmark_under_oom(memcg);
ret = mem_cgroup_out_of_memory(memcg, mask, order);
+ mem_cgroup_unmark_under_oom(memcg);
if (locked)
mem_cgroup_oom_unlock(memcg);
_
Patches currently in -mm which might be from haifeng.xu@xxxxxxxxxx are
memcg-oom-unmark-under_oom-after-the-oom-killer-is-done.patch
