From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754336AbbCBRjI (ORCPT ); Mon, 2 Mar 2015 12:39:08 -0500 Received: from gum.cmpxchg.org ([85.214.110.215]:48745 "EHLO gum.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751918AbbCBRjG (ORCPT ); Mon, 2 Mar 2015 12:39:06 -0500 From: Johannes Weiner To: Andrew Morton Cc: Vladimir Davydov , Michal Hocko , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [patch] memcg: disable hierarchy support if bound to the legacy cgroup hierarchy Date: Mon, 2 Mar 2015 12:38:59 -0500 Message-Id: <1425317939-13305-1-git-send-email-hannes@cmpxchg.org> X-Mailer: git-send-email 2.3.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Davydov 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: Vladimir Davydov Signed-off-by: Johannes Weiner --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Andrew, could you please pick this up for 4.0? I don't think it's urgent enough for -stable, though. Thanks! diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 0c86945bcc9a..68d4890fc4bd 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5238,7 +5238,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, -- 2.3.0