提交 ad4ca5f4 编写于 作者: K Kirill A. Shutemov 提交者: Linus Torvalds

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: NKirill A. Shutemov <kirill@shutemov.name>
Reviewed-by: NDaisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Acked-by: NKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: NBalbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 f241e660
...@@ -3587,9 +3587,13 @@ static void __mem_cgroup_threshold(struct mem_cgroup *memcg, bool swap) ...@@ -3587,9 +3587,13 @@ static void __mem_cgroup_threshold(struct mem_cgroup *memcg, bool swap)
static void mem_cgroup_threshold(struct mem_cgroup *memcg) static void mem_cgroup_threshold(struct mem_cgroup *memcg)
{ {
while (memcg) {
__mem_cgroup_threshold(memcg, false); __mem_cgroup_threshold(memcg, false);
if (do_swap_account) if (do_swap_account)
__mem_cgroup_threshold(memcg, true); __mem_cgroup_threshold(memcg, true);
memcg = parent_mem_cgroup(memcg);
}
} }
static int compare_thresholds(const void *a, const void *b) static int compare_thresholds(const void *a, const void *b)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册