[to-be-updated] mm-memcg-v1-fix-memorymemswfailcnt-accounting.patch removed from -mm tree
Andrew Morton <[email protected]>
| Newsgroups | org.kernel.vger.mm-commits,org.kernel.vger.stable |
|---|---|
| Message-ID | <[email protected]> |
The quilt patch titled
Subject: mm: memcg-v1: fix memory.memsw.failcnt accounting
has been removed from the -mm tree. Its filename was
mm-memcg-v1-fix-memorymemswfailcnt-accounting.patch
This patch was dropped because an updated version will be issued
------------------------------------------------------
From: Guopeng Zhang <[email protected]>
Subject: mm: memcg-v1: fix memory.memsw.failcnt accounting
Date: Mon, 10 Aug 2026 15:42:47 +0800
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.
Consequently, memory.memsw.failcnt remains zero when the memory+swap limit
is hit. Enable failcnt accounting for the v1 memsw counter.
Reproducer:
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.
Link: https://lore.kernel.org/[email protected]
Fixes: 0e2759afcaf9 ("page_counter: track failcnt only for legacy cgroups")
Signed-off-by: Guopeng Zhang <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Acked-by: Johannes Weiner <[email protected]>
Cc: Muchun Song <[email protected]>
Cc: Roman Gushchin <[email protected]>
Cc: Shakeel Butt <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
mm/memcontrol.c | 1 +
1 file changed, 1 insertion(+)
--- a/mm/memcontrol.c~mm-memcg-v1-fix-memorymemswfailcnt-accounting
+++ a/mm/memcontrol.c
@@ -4180,6 +4180,7 @@ mem_cgroup_css_alloc(struct cgroup_subsy
page_counter_init(&memcg->swap, &parent->swap, false);
#ifdef CONFIG_MEMCG_V1
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);
_
Patches currently in -mm which might be from [email protected] are
mm-memcg-v1-fix-memsw-and-tcp-failcnt-accounting.patch
mm-memcg-stop-reclaim-when-a-limit-update-is-superseded.patch