From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e5.ny.us.ibm.com (8.13.8/8.13.8) with ESMTP id mA1InAhZ013490 for ; Sat, 1 Nov 2008 14:49:10 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id mA1InAt7132816 for ; Sat, 1 Nov 2008 14:49:10 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id mA1In1ZY007600 for ; Sat, 1 Nov 2008 14:49:01 -0400 From: Balbir Singh Date: Sun, 02 Nov 2008 00:19:02 +0530 Message-Id: <20081101184902.2575.11443.sendpatchset@balbir-laptop> In-Reply-To: <20081101184812.2575.68112.sendpatchset@balbir-laptop> References: <20081101184812.2575.68112.sendpatchset@balbir-laptop> Subject: [mm] [PATCH 4/4] Memory cgroup hierarchy feature selector Sender: owner-linux-mm@kvack.org Return-Path: To: linux-mm@kvack.org Cc: YAMAMOTO Takashi , Paul Menage , lizf@cn.fujitsu.com, linux-kernel@vger.kernel.org, Nick Piggin , David Rientjes , Pavel Emelianov , Dhaval Giani , Balbir Singh , Andrew Morton , KAMEZAWA Hiroyuki List-ID: Don't enable multiple hierarchy support by default. This patch introduces a features element that can be set to enable the nested depth hierarchy feature. This feature can only be enabled when there is just one cgroup (the root cgroup). Signed-off-by: Balbir Singh --- mm/memcontrol.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff -puN mm/memcontrol.c~memcg-add-hierarchy-selector mm/memcontrol.c --- linux-2.6.28-rc2/mm/memcontrol.c~memcg-add-hierarchy-selector 2008-11-02 00:15:00.000000000 +0530 +++ linux-2.6.28-rc2-balbir/mm/memcontrol.c 2008-11-02 00:15:00.000000000 +0530 @@ -40,6 +40,9 @@ struct cgroup_subsys mem_cgroup_subsys __read_mostly; #define MEM_CGROUP_RECLAIM_RETRIES 5 +static unsigned long mem_cgroup_features; +#define MEM_CGROUP_FEAT_HIERARCHY 0x1 + /* * Statistics for memory cgroup. */ @@ -1080,6 +1083,31 @@ out: return ret; } +static u64 mem_cgroup_feature_read(struct cgroup *cont, struct cftype *cft) +{ + return mem_cgroup_features; +} + +static int mem_cgroup_feature_write(struct cgroup *cont, struct cftype *cft, + u64 val) +{ + int retval = 0; + struct cgroup *cgroup = init_mem_cgroup.css.cgroup; + + if (val & MEM_CGROUP_FEAT_HIERARCHY) { + if (list_empty(&cgroup->children)) + mem_cgroup_features |= MEM_CGROUP_FEAT_HIERARCHY; + else + retval = -EBUSY; + } else { + if (list_empty(&cgroup->children)) + mem_cgroup_features &= ~MEM_CGROUP_FEAT_HIERARCHY; + else + retval = -EBUSY; + } + return retval; +} + static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft) { return res_counter_read_u64(&mem_cgroup_from_cont(cont)->res, @@ -1214,6 +1242,11 @@ static struct cftype mem_cgroup_files[] .name = "stat", .read_map = mem_control_stat_show, }, + { + .name = "features", + .write_u64 = mem_cgroup_feature_write, + .read_u64 = mem_cgroup_feature_read, + }, }; static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *mem, int node) @@ -1292,7 +1325,10 @@ mem_cgroup_create(struct cgroup_subsys * return ERR_PTR(-ENOMEM); } - res_counter_init(&mem->res, parent ? &parent->res : NULL); + if ((mem_cgroup_features & MEM_CGROUP_FEAT_HIERARCHY) && parent) + res_counter_init(&mem->res, &parent->res); + else + res_counter_init(&mem->res, NULL); for_each_node_state(node, N_POSSIBLE) if (alloc_mem_cgroup_per_zone_info(mem, node)) _ -- Balbir -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org