Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4550c4e1 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcontrol: let v2 cgroups follow changes in system swappiness 



Cgroup2 currently doesn't have a per-cgroup swappiness setting.  We
might want to add one later - that's a different discussion - but until
we do, the cgroups should always follow the system setting.  Otherwise
it will be unchangeably set to whatever the ancestor inherited from the
system setting at the time of cgroup creation.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarVladimir Davydov <vdavydov@virtuozzo.com>
Cc: <stable@vger.kernel.org>	[4.5]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 145bdaa1

include/linux/swap.h

+4 −0
Original line number Diff line number Diff line
@@ -533,6 +533,10 @@ static inline swp_entry_t get_swap_page(void) 
#ifdef CONFIG_MEMCG

static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg)

{

	/* Cgroup2 doesn't have per-cgroup swappiness */

	if (cgroup_subsys_on_dfl(memory_cgrp_subsys))

		return vm_swappiness;



	/* root ? */

	if (mem_cgroup_disabled() || !memcg->css.parent)

		return vm_swappiness;