Commit 82b3aa26 authored by Yue Zhao's avatar Yue Zhao Committed by Andrew Morton

mm, memcg: Prevent memory.swappiness load/store tearing

The knob for cgroup v1 memory controller: memory.swappiness is not
protected by any locking so it can be modified while it is used.  This is
not an actual problem because races are unlikely.  But it is better to use
[READ|WRITE]_ONCE to prevent compiler from doing anything funky.

The access of memcg->swappiness and vm_swappiness is lockless, so both of
them can be concurrently set at the same time as we are trying to read
them.  All occurrences of memcg->swappiness and vm_swappiness are updated
with [READ|WRITE]_ONCE.

[findns94@gmail.com: v3]
  Link: https://lkml.kernel.org/r/20230308162555.14195-3-findns94@gmail.com
Link: https://lkml.kernel.org/r/20230306154138.3775-3-findns94@gmail.comSigned-off-by: default avatarYue Zhao <findns94@gmail.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarShakeel Butt <shakeelb@google.com>
Acked-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Tang Yizhou <tangyeechou@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent eaf7b66b
...@@ -620,18 +620,18 @@ static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg) ...@@ -620,18 +620,18 @@ static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg)
{ {
/* Cgroup2 doesn't have per-cgroup swappiness */ /* Cgroup2 doesn't have per-cgroup swappiness */
if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) if (cgroup_subsys_on_dfl(memory_cgrp_subsys))
return vm_swappiness; return READ_ONCE(vm_swappiness);
/* root ? */ /* root ? */
if (mem_cgroup_disabled() || mem_cgroup_is_root(memcg)) if (mem_cgroup_disabled() || mem_cgroup_is_root(memcg))
return vm_swappiness; return READ_ONCE(vm_swappiness);
return memcg->swappiness; return READ_ONCE(memcg->swappiness);
} }
#else #else
static inline int mem_cgroup_swappiness(struct mem_cgroup *mem) static inline int mem_cgroup_swappiness(struct mem_cgroup *mem)
{ {
return vm_swappiness; return READ_ONCE(vm_swappiness);
} }
#endif #endif
......
...@@ -4179,9 +4179,9 @@ static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css, ...@@ -4179,9 +4179,9 @@ static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css,
return -EINVAL; return -EINVAL;
if (!mem_cgroup_is_root(memcg)) if (!mem_cgroup_is_root(memcg))
memcg->swappiness = val; WRITE_ONCE(memcg->swappiness, val);
else else
vm_swappiness = val; WRITE_ONCE(vm_swappiness, val);
return 0; return 0;
} }
...@@ -5353,7 +5353,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) ...@@ -5353,7 +5353,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
#endif #endif
page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX); page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX);
if (parent) { if (parent) {
memcg->swappiness = mem_cgroup_swappiness(parent); WRITE_ONCE(memcg->swappiness, mem_cgroup_swappiness(parent));
memcg->oom_kill_disable = parent->oom_kill_disable; memcg->oom_kill_disable = parent->oom_kill_disable;
page_counter_init(&memcg->memory, &parent->memory); page_counter_init(&memcg->memory, &parent->memory);
......
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