mm: memcg-v1: fix memsw and TCP failcnt accounting
Subsystems (3)
PATCH v2 1/1 mm: memcg-v1: fix memsw and TCP failcnt accounting
From: Guopeng Zhang <[email protected]>
Commit 0e2759afcaf9 ("page_counter: track failcnt only for legacy cgroups") made failcnt accounting conditional on track_failcnt. It enabled the flag for memcg->memory, but not for memcg->memsw or memcg->tcpmem.
Consequently, memory.memsw.failcnt remains zero when the memory+swap limit is hit. memory.kmem.tcp.limit_in_bytes still sets memcg->tcpmem.max, but TCP charge failures are not reflected in memory.kmem.tcp.failcnt.
Enable failcnt accounting for both v1 counters.
To reproduce memory.memsw.failcnt:
CG=/sys/fs/cgroup/memory/memsw-test
LIMIT=33554432
mkdir "$CG"
echo "$LIMIT" > "$CG/memory.limit_in_bytes"
echo "$LIMIT" > "$CG/memory.memsw.limit_in_bytes"Start a child process in the cgroup and make it allocate and touch 96 MiB of memory, causing a memcg OOM.
cat "$CG/memory.memsw.failcnt"
Without the patch, memory.memsw.failcnt is 0. With the patch, memory.memsw.failcnt is greater than 0.
To reproduce memory.kmem.tcp.failcnt:
CG=/sys/fs/cgroup/memory/tcpmem-test
LIMIT=65536
mkdir "$CG"
echo "$LIMIT" > "$CG/memory.kmem.tcp.limit_in_bytes"Start a child process in the cgroup, create a TCP socket, and reserve 1 MiB of socket memory with SO_RESERVE_MEM. The reservation fails with ENOMEM.
cat "$CG/memory.kmem.tcp.failcnt"
Without the patch, memory.kmem.tcp.failcnt is 0. With the patch, memory.kmem.tcp.failcnt is greater than 0.
---
Changes in v2:
- Enable failcnt tracking for tcpmem as suggested by Johannes Weiner.
- Add the memory.kmem.tcp.failcnt reproducer and test result.
- Update the subject and changelog to cover both counters.
- Add Cc: [email protected] and the received Acked-by tags.
Link to v1: https://lore.kernel.org/r/[email protected]
mm/memcontrol.c | 2 ++ 1 file changed, 2 insertions(+)
mm/memcontrol.c +2 -0
@@ -4235,9 +4235,11 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)#ifdef CONFIG_MEMCG_V1 WRITE_ONCE (memcg->swappiness,mem_cgroup_swappiness (parent)); memcg->memory.track_failcnt = !memcg_on_dfl; + memcg->memsw.track_failcnt = !memcg_on_dfl;WRITE_ONCE (memcg->oom_kill_disable,READ_ONCE (parent->oom_kill_disable));page_counter_init (&memcg->kmem, &parent->kmem, false);page_counter_init (&memcg->tcpmem, &parent->tcpmem, false); + memcg->tcpmem.track_failcnt = !memcg_on_dfl;#endif }else {init_memcg_stats ();
Signature · 1 line
2.43.0
Quoted 70 lines · Guopeng Zhang
From: Guopeng Zhang <[email protected]>
Commit
0e2759afcaf9("page_counter: track failcnt only for legacy cgroups") made failcnt accounting conditional ontrack_failcnt. It enabled the flag formemcg->memory, but not formemcg->memswormemcg->tcpmem.Consequently, memory.memsw.failcnt remains zero when the memory+swap limit is hit. memory.kmem.tcp.limit_in_bytes still sets
memcg->tcpmem.max, but TCP charge failures are not reflected in memory.kmem.tcp.failcnt.Enable failcnt accounting for both v1 counters.
To reproduce memory.memsw.failcnt:
CG=/sys/fs/cgroup/memory/memsw-test LIMIT=33554432 mkdir "$CG" echo "$LIMIT" > "$CG/memory.limit_in_bytes" echo "$LIMIT" > "$CG/memory.memsw.limit_in_bytes"Start a child process in the cgroup and make it allocate and touch 96 MiB of memory, causing a memcg OOM.
cat "$CG/memory.memsw.failcnt"
Without the patch, memory.memsw.failcnt is 0. With the patch, memory.memsw.failcnt is greater than 0.
To reproduce memory.kmem.tcp.failcnt:
CG=/sys/fs/cgroup/memory/tcpmem-test LIMIT=65536 mkdir "$CG" echo "$LIMIT" > "$CG/memory.kmem.tcp.limit_in_bytes"Start a child process in the cgroup, create a TCP socket, and reserve 1 MiB of socket memory with
SO_RESERVE_MEM. The reservation fails with ENOMEM.cat "$CG/memory.kmem.tcp.failcnt"
Without the patch, memory.kmem.tcp.failcnt is 0. With the patch, memory.kmem.tcp.failcnt is greater than 0.
Fixes 0e2759afcaf9 ("page_counter: track failcnt only for legacy cgroups")Acked-by Johannes Weiner <[email protected]>Acked-by Michal Hocko <[email protected]>Signed-off-by Guopeng Zhang <[email protected]>---
Changes in v2:
- Enable failcnt tracking for tcpmem as suggested by Johannes Weiner.
- Add the memory.kmem.tcp.failcnt reproducer and test result.
- Update the subject and changelog to cover both counters.
- Add Cc: [email protected] and the received Acked-by tags.Link to v1: https://lore.kernel.org/r/[email protected]
mm/memcontrol.c | 2 ++ 1 file changed, 2 insertions(+)mm/memcontrol.c +0
-0@@ -4235,9 +4235,11 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)#ifdef CONFIG_MEMCG_V1
mm/memcontrol.c mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) · line 4245
Quoted 10 lines
mm/memcontrol.c +2
-0WRITE_ONCE (memcg->swappiness,mem_cgroup_swappiness (parent)); memcg->memory.track_failcnt = !memcg_on_dfl; + memcg->memsw.track_failcnt = !memcg_on_dfl;WRITE_ONCE (memcg->oom_kill_disable,READ_ONCE (parent->oom_kill_disable));page_counter_init (&memcg->kmem, &parent->kmem, false);page_counter_init (&memcg->tcpmem, &parent->tcpmem, false); + memcg->tcpmem.track_failcnt = !memcg_on_dfl;#endif }else {init_memcg_stats ();
Quoted 46 lines · Guopeng Zhang
From: Guopeng Zhang <[email protected]>
Commit
0e2759afcaf9("page_counter: track failcnt only for legacy cgroups") made failcnt accounting conditional ontrack_failcnt. It enabled the flag formemcg->memory, but not formemcg->memswormemcg->tcpmem.Consequently, memory.memsw.failcnt remains zero when the memory+swap limit is hit. memory.kmem.tcp.limit_in_bytes still sets
memcg->tcpmem.max, but TCP charge failures are not reflected in memory.kmem.tcp.failcnt.Enable failcnt accounting for both v1 counters.
To reproduce memory.memsw.failcnt:
CG=/sys/fs/cgroup/memory/memsw-test LIMIT=33554432 mkdir "$CG" echo "$LIMIT" > "$CG/memory.limit_in_bytes" echo "$LIMIT" > "$CG/memory.memsw.limit_in_bytes"Start a child process in the cgroup and make it allocate and touch 96 MiB of memory, causing a memcg OOM.
cat "$CG/memory.memsw.failcnt"
Without the patch, memory.memsw.failcnt is 0. With the patch, memory.memsw.failcnt is greater than 0.
To reproduce memory.kmem.tcp.failcnt:
CG=/sys/fs/cgroup/memory/tcpmem-test LIMIT=65536 mkdir "$CG" echo "$LIMIT" > "$CG/memory.kmem.tcp.limit_in_bytes"Start a child process in the cgroup, create a TCP socket, and reserve 1 MiB of socket memory with
SO_RESERVE_MEM. The reservation fails with ENOMEM.cat "$CG/memory.kmem.tcp.failcnt"
Without the patch, memory.kmem.tcp.failcnt is 0. With the patch, memory.kmem.tcp.failcnt is greater than 0.
Quoted 6 lines
Fixes 0e2759afcaf9 ("page_counter: track failcnt only for legacy cgroups")Acked-by Johannes Weiner <[email protected]>Acked-by Michal Hocko <[email protected]>Signed-off-by Guopeng Zhang <[email protected]>