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

Commit ad4ca5f4 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

memcg: fix thresholds with use_hierarchy == 1 



We need to check parent's thresholds if parent has use_hierarchy == 1 to
be sure that parent's threshold events will be triggered even if parent
itself is not active (no MEM_CGROUP_EVENTS).

Signed-off-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
Reviewed-by: default avatarDaisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarBalbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f241e660

mm/memcontrol.c

+7 −3
Original line number Diff line number Diff line
@@ -3587,9 +3587,13 @@ static void __mem_cgroup_threshold(struct mem_cgroup *memcg, bool swap) 


static void mem_cgroup_threshold(struct mem_cgroup *memcg)

{

	while (memcg) {

		__mem_cgroup_threshold(memcg, false);

		if (do_swap_account)

			__mem_cgroup_threshold(memcg, true);



		memcg = parent_mem_cgroup(memcg);

	}

}



static int compare_thresholds(const void *a, const void *b)