The patch titled
Subject: mm, oom: return error on access to memory.oom_group if groupoom is disabled
has been removed from the -mm tree. Its filename was
mm-oom-introduce-memoryoom_group-fix.patch
This patch was dropped because it was folded into mm-oom-introduce-memoryoom_group.patch
------------------------------------------------------
From: Roman Gushchin <guro@xxxxxx>
Subject: mm, oom: return error on access to memory.oom_group if groupoom is disabled
Cgroup-aware OOM killer depends on cgroup mount option and is turned off
by default, despite the user interface (memory.oom_group file) is always
present. As it might be confusing to a user, let's return -ENOTSUPP on an
attempt to access to memory.oom_group if groupoom is not enabled globally.
Example:
$ cd /sys/fs/cgroup/user.slice/
$ cat memory.oom_group
cat: memory.oom_group: Unknown error 524
$ echo 1 > memory.oom_group
-bash: echo: write error: Unknown error 524
$ mount -o remount,groupoom /sys/fs/cgroup
$ echo 1 > memory.oom_group
$ cat memory.oom_group
1
Link: http://lkml.kernel.org/r/20171201170004.GA27436@xxxxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Roman Gushchin <guro@xxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/mm/memcontrol.c~mm-oom-introduce-memoryoom_group-fix
+++ a/mm/memcontrol.c
@@ -5680,6 +5680,9 @@ static int memory_oom_group_show(struct
struct mem_cgroup *memcg = mem_cgroup_from_css(seq_css(m));
bool oom_group = memcg->oom_group;
+ if (!(cgrp_dfl_root.flags & CGRP_GROUP_OOM))
+ return -ENOTSUPP;
+
seq_printf(m, "%d\n", oom_group);
return 0;
@@ -5693,6 +5696,9 @@ static ssize_t memory_oom_group_write(st
int oom_group;
int err;
+ if (!(cgrp_dfl_root.flags & CGRP_GROUP_OOM))
+ return -ENOTSUPP;
+
err = kstrtoint(strstrip(buf), 0, &oom_group);
if (err)
return err;
_
Patches currently in -mm which might be from guro@xxxxxx are
mm-introduce-mem_cgroup_put-helper.patch
mm-oom-refactor-the-oom_kill_process-function.patch
mm-implement-mem_cgroup_scan_tasks-for-the-root-memory-cgroup.patch
mm-oom-cgroup-aware-oom-killer.patch
mm-oom-introduce-memoryoom_group.patch
mm-oom-add-cgroup-v2-mount-option-for-cgroup-aware-oom-killer.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix.patch
cgroup-list-groupoom-in-cgroup-features.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
