Skip to contentSkip to conversation

mm: memcg: reset zswap settings in css_reset

PATCH Superseded Jiayuan Chen 4 participants 5 messages Jul 2 – Jul 6

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mm: memcg: reset zswap settings in css_reset

From: Jiayuan Chen <[email protected]>

mem_cgroup_css_reset() is called when the memory controller is disabled on a cgroup but the memcg cannot be destroyed because it is pinned by a subsystem dependency -- for example, the io controller declares .depends_on = 1 << memory_cgrp_id, so memory remains in the cgroup_ss_mask and the css is hidden rather than killed.

The purpose of css_reset is to revert the memcg to its vanilla state so that no policies are applied and the css can be safely made visible again later. Currently, all page counters (memory.max, swap.max, kmem.max, tcpmem.max) and other limits (soft_limit, memory.high, swap.high) are reset to their defaults, but zswap_max and zswap_writeback are not.

These fields are initialized in css_alloc (zswap_max = PAGE_COUNTER_MAX, zswap_writeback inherited from parent) but were missing from css_reset. As a result, stale zswap policies remain in effect after css_reset: the zswap charge path (obj_cgroup_may_zswap) continues to enforce the old zswap_max limit, and the writeback path continues to honor the old zswap_writeback setting, even though the memory controller has been "disabled" on this cgroup.

Reset zswap_max to PAGE_COUNTER_MAX and zswap_writeback to true, matching their defaults in css_alloc.

Test:
echo "+memory +io" > /sys/fs/cgroup/cgroup.subtree_control

mkdir /sys/fs/cgroup/test
mkdir /sys/fs/cgroup/test/child

echo "+memory +io" > /sys/fs/cgroup/test/cgroup.subtree_control echo 10000 > /sys/fs/cgroup/test/child/memory.zswap.max

# child/memory.swap.max and child/memory.zswam.max disappear echo "-memory" > /sys/fs/cgroup/test/cgroup.subtree_control

# re-enable memory control
echo "+memory" > /sys/fs/cgroup/test/cgroup.subtree_control

# before this patch
cat /sys/fs/cgroup/test/child/memory.zswap.max
8192

# after this patch, same as memory.swap.max cat /sys/fs/cgroup/test/child/memory.zswap.max
max

---
v1 -> v2 : add WRITE_ONCE.
https://lore.kernel.org/linux-mm/[email protected]/

---
 mm/memcontrol.c | 4 ++++
 1 file changed, 4 insertions(+)
mm/memcontrol.c +4 -0
index d20ffc827306..c20ef3c1d6fe 100644
@@ -4362,6 +4362,10 @@ static void mem_cgroup_css_reset(struct cgroup_subsys_state *css)
 
 	page_counter_set_max(&memcg->memory, PAGE_COUNTER_MAX);
 	page_counter_set_max(&memcg->swap, PAGE_COUNTER_MAX);
+#ifdef CONFIG_ZSWAP
+	WRITE_ONCE(memcg->zswap_max, PAGE_COUNTER_MAX);
+	WRITE_ONCE(memcg->zswap_writeback, true);
+#endif
 #ifdef CONFIG_MEMCG_V1
 	page_counter_set_max(&memcg->kmem, PAGE_COUNTER_MAX);
 	page_counter_set_max(&memcg->tcpmem, PAGE_COUNTER_MAX);
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 28 lines · Jiayuan Chen

From: Jiayuan Chen <[email protected]>

mem_cgroup_css_reset() is called when the memory controller is disabled on a cgroup but the memcg cannot be destroyed because it is pinned by a subsystem dependency -- for example, the io controller declares .depends_on = 1 << memory_cgrp_id, so memory remains in the cgroup_ss_mask and the css is hidden rather than killed.

The purpose of css_reset is to revert the memcg to its vanilla state so that no policies are applied and the css can be safely made visible again later. Currently, all page counters (memory.max, swap.max, kmem.max, tcpmem.max) and other limits (soft_limit, memory.high, swap.high) are reset to their defaults, but zswap_max and zswap_writeback are not.

These fields are initialized in css_alloc (zswap_max = PAGE_COUNTER_MAX, zswap_writeback inherited from parent) but were missing from css_reset. As a result, stale zswap policies remain in effect after css_reset: the zswap charge path (obj_cgroup_may_zswap) continues to enforce the old zswap_max limit, and the writeback path continues to honor the old zswap_writeback setting, even though the memory controller has been "disabled" on this cgroup.

Reset zswap_max to PAGE_COUNTER_MAX and zswap_writeback to true, matching their defaults in css_alloc.

Test:
echo "+memory +io" > /sys/fs/cgroup/cgroup.subtree_control

Quoted 9 lines

mkdir /sys/fs/cgroup/test
mkdir /sys/fs/cgroup/test/child

echo "+memory +io" > /sys/fs/cgroup/test/cgroup.subtree_control echo 10000 > /sys/fs/cgroup/test/child/memory.zswap.max

# child/memory.swap.max and child/memory.zswam.max disappear echo "-memory" > /sys/fs/cgroup/test/cgroup.subtree_control

Looks good to me.

One trivial nit on the commit message (not the patch):

  # child/memory.swap.max and child/memory.zswam.max disappear
  zswam  -> zswap
Quoted 35 lines
	# re-enable memory control
	echo "+memory" > /sys/fs/cgroup/test/cgroup.subtree_control
	# before this patch
	cat /sys/fs/cgroup/test/child/memory.zswap.max
	    8192
	# after this patch, same as memory.swap.max
	cat /sys/fs/cgroup/test/child/memory.zswap.max
	    max

---
v1 -> v2 : add WRITE_ONCE.
https://lore.kernel.org/linux-mm/[email protected]/

---
 mm/memcontrol.c | 4 ++++
 1 file changed, 4 insertions(+)
mm/memcontrol.c +4 -0
index d20ffc827306..c20ef3c1d6fe 100644
@@ -4362,6 +4362,10 @@ static void mem_cgroup_css_reset(struct cgroup_subsys_state *css)
 
 	page_counter_set_max(&memcg->memory, PAGE_COUNTER_MAX);
 	page_counter_set_max(&memcg->swap, PAGE_COUNTER_MAX);
+#ifdef CONFIG_ZSWAP
+	WRITE_ONCE(memcg->zswap_max, PAGE_COUNTER_MAX);
+	WRITE_ONCE(memcg->zswap_writeback, true);
+#endif
 #ifdef CONFIG_MEMCG_V1
 	page_counter_set_max(&memcg->kmem, PAGE_COUNTER_MAX);
 	page_counter_set_max(&memcg->tcpmem, PAGE_COUNTER_MAX);
maintainer
#2 lore raw
Quoted 9 lines · On Thu, 2 Jul 2026 12:07:23 +0800 Tao Cui <[email protected]> wrote:
Quoted 3 lines
	# child/memory.swap.max and child/memory.zswam.max disappear
	echo "-memory" > /sys/fs/cgroup/test/cgroup.subtree_control

Looks good to me.

One trivial nit on the commit message (not the patch):

  # child/memory.swap.max and child/memory.zswam.max disappear
  zswam  -> zswap

I fixed that in the mm.git copy of this patch.

Quoted 1 line

Thanks.

maintainer
#3 lore raw
In reply to Jiayuan Chen
Quoted 40 lines · On Thu, 2 Jul 2026 10:48:25 +0800 Jiayuan Chen <[email protected]> wrote:

From: Jiayuan Chen <[email protected]>

mem_cgroup_css_reset() is called when the memory controller is disabled on a cgroup but the memcg cannot be destroyed because it is pinned by a subsystem dependency -- for example, the io controller declares .depends_on = 1 << memory_cgrp_id, so memory remains in the cgroup_ss_mask and the css is hidden rather than killed.

The purpose of css_reset is to revert the memcg to its vanilla state so that no policies are applied and the css can be safely made visible again later. Currently, all page counters (memory.max, swap.max, kmem.max, tcpmem.max) and other limits (soft_limit, memory.high, swap.high) are reset to their defaults, but zswap_max and zswap_writeback are not.

These fields are initialized in css_alloc (zswap_max = PAGE_COUNTER_MAX, zswap_writeback inherited from parent) but were missing from css_reset. As a result, stale zswap policies remain in effect after css_reset: the zswap charge path (obj_cgroup_may_zswap) continues to enforce the old zswap_max limit, and the writeback path continues to honor the old zswap_writeback setting, even though the memory controller has been "disabled" on this cgroup.

Reset zswap_max to PAGE_COUNTER_MAX and zswap_writeback to true, matching their defaults in css_alloc.

Test:
echo "+memory +io" > /sys/fs/cgroup/cgroup.subtree_control

mkdir /sys/fs/cgroup/test
mkdir /sys/fs/cgroup/test/child

echo "+memory +io" > /sys/fs/cgroup/test/cgroup.subtree_control echo 10000 > /sys/fs/cgroup/test/child/memory.zswap.max

# child/memory.swap.max and child/memory.zswam.max disappear echo "-memory" > /sys/fs/cgroup/test/cgroup.subtree_control

# re-enable memory control
echo "+memory" > /sys/fs/cgroup/test/cgroup.subtree_control

Quoted 7 lines

# before this patch
cat /sys/fs/cgroup/test/child/memory.zswap.max
8192

# after this patch, same as memory.swap.max cat /sys/fs/cgroup/test/child/memory.zswap.max
max

Thanks.

You convinced me, so I'll queue this for testing.

The problem is old and doesn't sound serious, so I'll target 7.3-rc1, no cc:stable. If people disagree, please speak up.

AI review suggest that memcg->oom_group is missing similar treatment:

	https://sashiko.dev/#/patchset/[email protected]
reviewer Reviewed-by on v2 1/1
#4 lore raw
In reply to Jiayuan Chen
Quoted 48 lines · Jiayuan Chen

From: Jiayuan Chen <[email protected]>

mem_cgroup_css_reset() is called when the memory controller is disabled on a cgroup but the memcg cannot be destroyed because it is pinned by a subsystem dependency -- for example, the io controller declares .depends_on = 1 << memory_cgrp_id, so memory remains in the cgroup_ss_mask and the css is hidden rather than killed.

The purpose of css_reset is to revert the memcg to its vanilla state so that no policies are applied and the css can be safely made visible again later. Currently, all page counters (memory.max, swap.max, kmem.max, tcpmem.max) and other limits (soft_limit, memory.high, swap.high) are reset to their defaults, but zswap_max and zswap_writeback are not.

These fields are initialized in css_alloc (zswap_max = PAGE_COUNTER_MAX, zswap_writeback inherited from parent) but were missing from css_reset. As a result, stale zswap policies remain in effect after css_reset: the zswap charge path (obj_cgroup_may_zswap) continues to enforce the old zswap_max limit, and the writeback path continues to honor the old zswap_writeback setting, even though the memory controller has been "disabled" on this cgroup.

Reset zswap_max to PAGE_COUNTER_MAX and zswap_writeback to true, matching their defaults in css_alloc.

Test:
echo "+memory +io" > /sys/fs/cgroup/cgroup.subtree_control

mkdir /sys/fs/cgroup/test
mkdir /sys/fs/cgroup/test/child

echo "+memory +io" > /sys/fs/cgroup/test/cgroup.subtree_control echo 10000 > /sys/fs/cgroup/test/child/memory.zswap.max

# child/memory.swap.max and child/memory.zswam.max disappear
echo "-memory" > /sys/fs/cgroup/test/cgroup.subtree_control
# re-enable memory control
echo "+memory" > /sys/fs/cgroup/test/cgroup.subtree_control
# before this patch
cat /sys/fs/cgroup/test/child/memory.zswap.max
   8192
Quoted 6 lines
# after this patch, same as memory.swap.max
cat /sys/fs/cgroup/test/child/memory.zswap.max
   max

Thanks.