[PATCH] mm: add group_oom_kill memory.event fix
From: Dan Schatzberg <hidden>
Date: 2021-12-13 16:25:57
Also in:
cgroups, linux-mm, lkml
Subsystem:
control group (cgroup), control group - memory resource controller (memcg), documentation, memory management, the rest · Maintainers:
Tejun Heo, Johannes Weiner, Michal Koutný, Michal Hocko, Roman Gushchin, Shakeel Butt, Jonathan Corbet, Andrew Morton, Linus Torvalds
Andrew, could you please amend the prior patch "mm: add group_oom_kill memory.event" with these changes from Johannes and Chris? Also - small nit: it makes better sense to s/group_oom_kill/oom_group_kill/g in the patch title. Reviewed-by: Roman Gushchin <redacted> Acked-by: Chris Down <chris@chrisdown.name> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Dan Schatzberg <redacted> --- Documentation/admin-guide/cgroup-v2.rst | 3 +-- mm/memcontrol.c | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index eec830ce2068..8269bfa240f4 100644
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst@@ -1269,8 +1269,7 @@ PAGE_SIZE multiple when read back. killed by any kind of OOM killer. oom_group_kill - The number of times all tasks in the cgroup were killed - due to memory.oom.group. + The number of times a group OOM has occurred. memory.events.local Similar to memory.events but the fields in the file are local
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 5ab3b9ce90de..b5454d8fc344 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c@@ -4390,9 +4390,6 @@ static int mem_cgroup_oom_control_read(struct seq_file *sf, void *v) seq_printf(sf, "under_oom %d\n", (bool)memcg->under_oom); seq_printf(sf, "oom_kill %lu\n", atomic_long_read(&memcg->memory_events[MEMCG_OOM_KILL])); - seq_printf(sf, "oom_group_kill %lu\n", - atomic_long_read( - &memcg->memory_events[MEMCG_OOM_GROUP_KILL])); return 0; }
--
2.30.2