kevin/linux
1
Fork 0
Code

memcg: initiate deprecation of oom_control

Browse Source 
The oom_control provides functionality to disable memcg oom-killer,
notifications on oom-kill and reading the stats regarding oom-kills.  This
interface was mainly introduced to provide functionality for userspace
oom-killers.  However it is not robust enough and only supports OOM
handling in the page fault path.

For v2, the users can use the combination of memory.events notifications,
memory.high and PSI to provide userspace OOM-killing functionality. 
Actually LMKD in Android and OOMd in systemd and Meta infrastructure
already use PSI in combination with other stats to implement userspace
OOM-killing.

Let's start the deprecation process for v1 and gather the info on how the
current users are using this interface and work on providing a more robust
functionality in v2.

Link: https://lkml.kernel.org/r/20240814220021.3208384-4-shakeel.butt@linux.dev
Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
Reviewed-by: T.J. Mercier <tjmercier@google.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Shakeel Butt 2024-08-14 15:00:20 -07:00 committed by Andrew Morton
parent 569c4f62d8
commit 6df4ad7047
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/admin-guide/cgroup-v1/memory.rst
View File

@ -92,6 +92,8 @@ Brief summary of control files.
This knob is deprecated and shouldn't be This knob is deprecated and shouldn't be
used. used.
memory.oom_control set/show oom controls. memory.oom_control set/show oom controls.
This knob is deprecated and shouldn't be
used.
memory.numa_stat show the number of memory usage per numa memory.numa_stat show the number of memory usage per numa
node node
memory.kmem.limit_in_bytes Deprecated knob to set and read the kernel memory.kmem.limit_in_bytes Deprecated knob to set and read the kernel
@ -846,8 +848,10 @@ It's applicable for root and non-root cgroup.
.. _cgroup-v1-memory-oom-control: .. _cgroup-v1-memory-oom-control:
10. OOM Control 10. OOM Control (DEPRECATED)
=============== ============================
THIS IS DEPRECATED!
memory.oom_control file is for OOM notification and other controls. memory.oom_control file is for OOM notification and other controls.

7
mm/memcontrol-v1.c
View File

@ -1994,6 +1994,9 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of,
event->register_event = mem_cgroup_usage_register_event; event->register_event = mem_cgroup_usage_register_event;
event->unregister_event = mem_cgroup_usage_unregister_event; event->unregister_event = mem_cgroup_usage_unregister_event;
} else if (!strcmp(name, "memory.oom_control")) { } else if (!strcmp(name, "memory.oom_control")) {
pr_warn_once("oom_control is deprecated and will be removed. "
"Please report your usecase to linux-mm-@kvack.org"
" if you depend on this functionality. \n");
event->register_event = mem_cgroup_oom_register_event; event->register_event = mem_cgroup_oom_register_event;
event->unregister_event = mem_cgroup_oom_unregister_event; event->unregister_event = mem_cgroup_oom_unregister_event;
} else if (!strcmp(name, "memory.pressure_level")) { } else if (!strcmp(name, "memory.pressure_level")) {
@ -2841,6 +2844,10 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css,
{ {
struct mem_cgroup *memcg = mem_cgroup_from_css(css); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
pr_warn_once("oom_control is deprecated and will be removed. "
"Please report your usecase to linux-mm-@kvack.org if you "
"depend on this functionality. \n");
/* cannot set to root cgroup and only 0 and 1 are allowed */ /* cannot set to root cgroup and only 0 and 1 are allowed */
if (mem_cgroup_is_root(memcg) || !((val == 0) || (val == 1))) if (mem_cgroup_is_root(memcg) || !((val == 0) || (val == 1)))
return -EINVAL; return -EINVAL;