mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
Revert "memcg: drop kmem.limit_in_bytes"
This reverts commit75bb29b6c4
which is commit86327e8eb9
upstream. It breaks existing runc systems, as the tool always thinks the file should be present. Reported-by: Jeremi Piotrowski <jpiotrowski@linux.microsoft.com> Link: https://lore.kernel.org/r/20230920081101.GA12096@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net Cc: Michal Hocko <mhocko@suse.com> Cc: Shakeel Butt <shakeelb@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Roman Gushchin <roman.gushchin@linux.dev> Cc: Muchun Song <muchun.song@linux.dev> Cc: Tejun Heo <tj@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
23e3c3f1f2
commit
1204b65e85
2 changed files with 12 additions and 0 deletions
|
@ -92,6 +92,8 @@ Brief summary of control files.
|
|||
memory.oom_control set/show oom controls.
|
||||
memory.numa_stat show the number of memory usage per numa
|
||||
node
|
||||
memory.kmem.limit_in_bytes This knob is deprecated and writing to
|
||||
it will return -ENOTSUPP.
|
||||
memory.kmem.usage_in_bytes show current kernel memory allocation
|
||||
memory.kmem.failcnt show the number of kernel memory usage
|
||||
hits limits
|
||||
|
|
|
@ -3871,6 +3871,10 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of,
|
|||
case _MEMSWAP:
|
||||
ret = mem_cgroup_resize_max(memcg, nr_pages, true);
|
||||
break;
|
||||
case _KMEM:
|
||||
/* kmem.limit_in_bytes is deprecated. */
|
||||
ret = -EOPNOTSUPP;
|
||||
break;
|
||||
case _TCP:
|
||||
ret = memcg_update_tcp_max(memcg, nr_pages);
|
||||
break;
|
||||
|
@ -5081,6 +5085,12 @@ static struct cftype mem_cgroup_legacy_files[] = {
|
|||
.seq_show = memcg_numa_stat_show,
|
||||
},
|
||||
#endif
|
||||
{
|
||||
.name = "kmem.limit_in_bytes",
|
||||
.private = MEMFILE_PRIVATE(_KMEM, RES_LIMIT),
|
||||
.write = mem_cgroup_write,
|
||||
.read_u64 = mem_cgroup_read_u64,
|
||||
},
|
||||
{
|
||||
.name = "kmem.usage_in_bytes",
|
||||
.private = MEMFILE_PRIVATE(_KMEM, RES_USAGE),
|
||||
|
|
Loading…
Reference in a new issue