Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757689Ab2EaBcd (ORCPT ); Wed, 30 May 2012 21:32:33 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:53150 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757644Ab2EaBcc (ORCPT ); Wed, 30 May 2012 21:32:32 -0400 Date: Wed, 30 May 2012 21:32:25 -0400 From: Konrad Rzeszutek Wilk To: "Aneesh Kumar K.V" Cc: linux-mm@kvack.org, kamezawa.hiroyu@jp.fujitsu.com, dhillf@gmail.com, rientjes@google.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: Re: [PATCH -V7 11/14] hugetlbfs: add hugetlb cgroup control files Message-ID: <20120531013225.GF401@localhost.localdomain> References: <1338388739-22919-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1338388739-22919-12-git-send-email-aneesh.kumar@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1338388739-22919-12-git-send-email-aneesh.kumar@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7987 Lines: 260 On Wed, May 30, 2012 at 08:08:56PM +0530, Aneesh Kumar K.V wrote: > From: "Aneesh Kumar K.V" > > Add the control files for hugetlb controller > > Signed-off-by: Aneesh Kumar K.V > --- > include/linux/hugetlb.h | 5 ++ > include/linux/hugetlb_cgroup.h | 6 ++ > mm/hugetlb.c | 2 + > mm/hugetlb_cgroup.c | 130 ++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 143 insertions(+) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index dcd55c7..92f75a5 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -4,6 +4,7 @@ > #include > #include > #include > +#include > > struct ctl_table; > struct user_struct; > @@ -221,6 +222,10 @@ struct hstate { > unsigned int nr_huge_pages_node[MAX_NUMNODES]; > unsigned int free_huge_pages_node[MAX_NUMNODES]; > unsigned int surplus_huge_pages_node[MAX_NUMNODES]; > +#ifdef CONFIG_CGROUP_HUGETLB_RES_CTLR > + /* cgroup control files */ > + struct cftype cgroup_files[5]; Why five? Should there be a #define for this magic value? > +#endif > char name[HSTATE_NAME_LEN]; > }; > > diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h > index 5794be4..fbf8c5f 100644 > --- a/include/linux/hugetlb_cgroup.h > +++ b/include/linux/hugetlb_cgroup.h > @@ -42,6 +42,7 @@ extern void hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages, > struct page *page); > extern void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, > struct hugetlb_cgroup *h_cg); > +extern int hugetlb_cgroup_file_init(int idx) __init; > #else > static inline bool hugetlb_cgroup_disabled(void) > { > @@ -75,5 +76,10 @@ hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, > { > return; > } > + > +static inline int __init hugetlb_cgroup_file_init(int idx) > +{ > + return 0; > +} > #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ > #endif > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 53840dd..6330de2 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include "internal.h" > > const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL; > @@ -1912,6 +1913,7 @@ void __init hugetlb_add_hstate(unsigned order) > h->next_nid_to_free = first_node(node_states[N_HIGH_MEMORY]); > snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB", > huge_page_size(h)/1024); > + hugetlb_cgroup_file_init(hugetlb_max_hstate - 1); > > parsed_hstate = h; > } > diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c > index 3a288f7..49a3f20 100644 > --- a/mm/hugetlb_cgroup.c > +++ b/mm/hugetlb_cgroup.c > @@ -19,6 +19,11 @@ > #include > #include > > +/* lifted from mem control */ Might also include the comment from said file explaining the purpose of these #define. > +#define MEMFILE_PRIVATE(x, val) (((x) << 16) | (val)) > +#define MEMFILE_IDX(val) (((val) >> 16) & 0xffff) > +#define MEMFILE_ATTR(val) ((val) & 0xffff) > + > struct cgroup_subsys hugetlb_subsys __read_mostly; > struct hugetlb_cgroup *root_h_cgroup __read_mostly; > > @@ -271,6 +276,131 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, > return; > } > > +static ssize_t hugetlb_cgroup_read(struct cgroup *cgroup, struct cftype *cft, > + struct file *file, char __user *buf, > + size_t nbytes, loff_t *ppos) > +{ > + u64 val; > + char str[64]; I would think there would be a define for this somewhere? > + int idx, name, len; > + struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); > + > + idx = MEMFILE_IDX(cft->private); > + name = MEMFILE_ATTR(cft->private); > + > + val = res_counter_read_u64(&h_cg->hugepage[idx], name); > + len = scnprintf(str, sizeof(str), "%llu\n", (unsigned long long)val); > + return simple_read_from_buffer(buf, nbytes, ppos, str, len); > +} > + > +static int hugetlb_cgroup_write(struct cgroup *cgroup, struct cftype *cft, > + const char *buffer) > +{ > + int idx, name, ret; > + unsigned long long val; > + struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); > + > + idx = MEMFILE_IDX(cft->private); > + name = MEMFILE_ATTR(cft->private); > + > + switch (name) { > + case RES_LIMIT: > + if (hugetlb_cgroup_is_root(h_cg)) { > + /* Can't set limit on root */ > + ret = -EINVAL; > + break; > + } > + /* This function does all necessary parse...reuse it */ > + ret = res_counter_memparse_write_strategy(buffer, &val); > + if (ret) > + break; > + ret = res_counter_set_limit(&h_cg->hugepage[idx], val); > + break; > + default: > + ret = -EINVAL; > + break; > + } > + return ret; > +} > + > +static int hugetlb_cgroup_reset(struct cgroup *cgroup, unsigned int event) > +{ > + int idx, name, ret = 0; > + struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); > + > + idx = MEMFILE_IDX(event); > + name = MEMFILE_ATTR(event); > + > + switch (name) { > + case RES_MAX_USAGE: > + res_counter_reset_max(&h_cg->hugepage[idx]); > + break; > + case RES_FAILCNT: > + res_counter_reset_failcnt(&h_cg->hugepage[idx]); > + break; > + default: > + ret = -EINVAL; > + break; > + } > + return ret; > +} > + > +static char *mem_fmt(char *buf, int size, unsigned long hsize) > +{ > + if (hsize >= (1UL << 30)) > + snprintf(buf, size, "%luGB", hsize >> 30); > + else if (hsize >= (1UL << 20)) > + snprintf(buf, size, "%luMB", hsize >> 20); > + else > + snprintf(buf, size, "%luKB", hsize >> 10); > + return buf; > +} > + > +int __init hugetlb_cgroup_file_init(int idx) > +{ > + char buf[32]; #define pls. > + struct cftype *cft; > + struct hstate *h = &hstates[idx]; > + > + /* format the size */ > + mem_fmt(buf, 32, huge_page_size(h)); > + > + /* Add the limit file */ > + cft = &h->cgroup_files[0]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "%s.limit_in_bytes", buf); > + cft->private = MEMFILE_PRIVATE(idx, RES_LIMIT); > + cft->read = hugetlb_cgroup_read; > + cft->write_string = hugetlb_cgroup_write; > + > + /* Add the usage file */ > + cft = &h->cgroup_files[1]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "%s.usage_in_bytes", buf); > + cft->private = MEMFILE_PRIVATE(idx, RES_USAGE); > + cft->read = hugetlb_cgroup_read; > + > + /* Add the MAX usage file */ > + cft = &h->cgroup_files[2]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "%s.max_usage_in_bytes", buf); > + cft->private = MEMFILE_PRIVATE(idx, RES_MAX_USAGE); > + cft->trigger = hugetlb_cgroup_reset; > + cft->read = hugetlb_cgroup_read; > + > + /* Add the failcntfile */ > + cft = &h->cgroup_files[3]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "%s.failcnt", buf); > + cft->private = MEMFILE_PRIVATE(idx, RES_FAILCNT); > + cft->trigger = hugetlb_cgroup_reset; > + cft->read = hugetlb_cgroup_read; > + > + /* NULL terminate the last cft */ > + cft = &h->cgroup_files[4]; > + memset(cft, 0, sizeof(*cft)); > + > + WARN_ON(cgroup_add_cftypes(&hugetlb_subsys, h->cgroup_files)); > + Wouldn't doing: return cgroup_add_cftypes(&hugetlb_subsys, h->cgroup_files); be more appropiate? > + return 0; > +} > + > struct cgroup_subsys hugetlb_subsys = { > .name = "hugetlb", > .create = hugetlb_cgroup_create, > -- > 1.7.10 > > -- > 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/ . > Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ > Don't email: email@kvack.org > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/