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

Commit 7feee590 authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Linus Torvalds
Browse files

memcg: disable hierarchy support if bound to the legacy cgroup hierarchy 



If the memory cgroup controller is initially mounted in the scope of the
default cgroup hierarchy and then remounted to a legacy hierarchy, it will
still have hierarchy support enabled, which is incorrect.  We should
disable hierarchy support if bound to the legacy cgroup hierarchy.

Signed-off-by: default avatarVladimir Davydov <vdavydov@parallels.com>
Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a5a6579d

mm/memcontrol.c

+3 −1
Original line number Diff line number Diff line
@@ -5232,7 +5232,9 @@ static void mem_cgroup_bind(struct cgroup_subsys_state *root_css) 
	 * on for the root memcg is enough.

	 */

	if (cgroup_on_dfl(root_css->cgroup))

		mem_cgroup_from_css(root_css)->use_hierarchy = true;

		root_mem_cgroup->use_hierarchy = true;

	else

		root_mem_cgroup->use_hierarchy = false;

}



static u64 memory_current_read(struct cgroup_subsys_state *css,