Commit e3992573 authored by Mike Yuan's avatar Mike Yuan Committed by Andrew Morton

mm/memcontrol: respect zswap.writeback setting from parent cg too

Currently, the behavior of zswap.writeback wrt.  the cgroup hierarchy
seems a bit odd.  Unlike zswap.max, it doesn't honor the value from parent
cgroups.  This surfaced when people tried to globally disable zswap
writeback, i.e.  reserve physical swap space only for hibernation [1] -
disabling zswap.writeback only for the root cgroup results in subcgroups
with zswap.writeback=1 still performing writeback.

The inconsistency became more noticeable after I introduced the
MemoryZSwapWriteback= systemd unit setting [2] for controlling the knob.
The patch assumed that the kernel would enforce the value of parent
cgroups.  It could probably be workarounded from systemd's side, by going
up the slice unit tree and inheriting the value.  Yet I think it's more
sensible to make it behave consistently with zswap.max and friends.

[1] https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Disable_zswap_writeback_to_use_the_swap_space_only_for_hibernation
[2] https://github.com/systemd/systemd/pull/31734

Link: https://lkml.kernel.org/r/20240823162506.12117-1-me@yhndnzj.com
Fixes: 501a06fe ("zswap: memcontrol: implement zswap writeback disabling")
Signed-off-by: default avatarMike Yuan <me@yhndnzj.com>
Reviewed-by: default avatarNhat Pham <nphamcs@gmail.com>
Acked-by: default avatarYosry Ahmed <yosryahmed@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Koutný <mkoutny@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a3f6a89c
...@@ -1717,9 +1717,10 @@ The following nested keys are defined. ...@@ -1717,9 +1717,10 @@ The following nested keys are defined.
entries fault back in or are written out to disk. entries fault back in or are written out to disk.
memory.zswap.writeback memory.zswap.writeback
A read-write single value file. The default value is "1". The A read-write single value file. The default value is "1".
initial value of the root cgroup is 1, and when a new cgroup is Note that this setting is hierarchical, i.e. the writeback would be
created, it inherits the current value of its parent. implicitly disabled for child cgroups if the upper hierarchy
does so.
When this is set to 0, all swapping attempts to swapping devices When this is set to 0, all swapping attempts to swapping devices
are disabled. This included both zswap writebacks, and swapping due are disabled. This included both zswap writebacks, and swapping due
......
...@@ -3613,8 +3613,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) ...@@ -3613,8 +3613,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
memcg1_soft_limit_reset(memcg); memcg1_soft_limit_reset(memcg);
#ifdef CONFIG_ZSWAP #ifdef CONFIG_ZSWAP
memcg->zswap_max = PAGE_COUNTER_MAX; memcg->zswap_max = PAGE_COUNTER_MAX;
WRITE_ONCE(memcg->zswap_writeback, WRITE_ONCE(memcg->zswap_writeback, true);
!parent || READ_ONCE(parent->zswap_writeback));
#endif #endif
page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX); page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX);
if (parent) { if (parent) {
...@@ -5320,7 +5319,14 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size) ...@@ -5320,7 +5319,14 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size)
bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg) bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg)
{ {
/* if zswap is disabled, do not block pages going to the swapping device */ /* if zswap is disabled, do not block pages going to the swapping device */
return !zswap_is_enabled() || !memcg || READ_ONCE(memcg->zswap_writeback); if (!zswap_is_enabled())
return true;
for (; memcg; memcg = parent_mem_cgroup(memcg))
if (!READ_ONCE(memcg->zswap_writeback))
return false;
return true;
} }
static u64 zswap_current_read(struct cgroup_subsys_state *css, static u64 zswap_current_read(struct cgroup_subsys_state *css,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment