From mboxrd@z Thu Jan 1 00:00:00 1970 From: KAMEZAWA Hiroyuki Subject: Re: [PATCH -V5 10/14] hugetlbfs: Add memcg control files for hugetlbfs Date: Mon, 09 Apr 2012 15:00:24 +0900 Message-ID: <4F827AF8.9070204@jp.fujitsu.com> References: <1333738260-1329-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1333738260-1329-11-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1333738260-1329-11-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Sender: owner-linux-mm@kvack.org List-ID: Content-Type: text/plain; charset="us-ascii" To: "Aneesh Kumar K.V" Cc: linux-mm@kvack.org, mgorman@suse.de, dhillf@gmail.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org (2012/04/07 3:50), Aneesh Kumar K.V wrote: > From: "Aneesh Kumar K.V" > > This add control files for hugetlbfs in memcg > > Signed-off-by: Aneesh Kumar K.V seems ok. This uses Tejun's new interface...right ? It might be better to explain "this patch depends on "cgroup: implement cgroup_add_cftypes() and friends" patch via cgroup development tree. Anyway, Acked-by: KAMEZAWA Hiroyuki > --- > include/linux/hugetlb.h | 5 +++++ > include/linux/memcontrol.h | 7 ++++++ > mm/hugetlb.c | 2 +- > mm/memcontrol.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 64 insertions(+), 1 deletion(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index 995c238..d008342 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; > @@ -203,6 +204,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_MEM_RES_CTLR_HUGETLB > + /* mem cgroup control files */ > + struct cftype mem_cgroup_files[4]; > +#endif > char name[HSTATE_NAME_LEN]; > }; > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 1d07e14..4f17574 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -459,6 +459,7 @@ extern void mem_cgroup_hugetlb_uncharge_page(int idx, unsigned long nr_pages, > struct page *page); > extern void mem_cgroup_hugetlb_uncharge_memcg(int idx, unsigned long nr_pages, > struct mem_cgroup *memcg); > +extern int mem_cgroup_hugetlb_file_init(int idx) __init; > > #else > static inline int > @@ -489,6 +490,12 @@ mem_cgroup_hugetlb_uncharge_memcg(int idx, unsigned long nr_pages, > { > return; > } > + > +static inline int mem_cgroup_hugetlb_file_init(int idx) > +{ > + return 0; > +} > + > #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ > #endif /* _LINUX_MEMCONTROL_H */ > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index dd00087..340e575 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1931,7 +1931,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); > - > + mem_cgroup_hugetlb_file_init(hugetlb_max_hstate - 1); > parsed_hstate = h; > } > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 3bb3b42..7d3330e 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -5191,6 +5191,57 @@ static void mem_cgroup_destroy(struct cgroup *cont) > mem_cgroup_put(memcg); > } > > +#ifdef CONFIG_MEM_RES_CTLR_HUGETLB > +static char *mem_fmt(char *buf, unsigned long n) > +{ > + if (n >= (1UL << 30)) > + sprintf(buf, "%luGB", n >> 30); > + else if (n >= (1UL << 20)) > + sprintf(buf, "%luMB", n >> 20); > + else > + sprintf(buf, "%luKB", n >> 10); > + return buf; > +} > + > +int __init mem_cgroup_hugetlb_file_init(int idx) > +{ > + char buf[32]; > + struct cftype *cft; > + struct hstate *h = &hstates[idx]; > + > + /* format the size */ > + mem_fmt(buf, huge_page_size(h)); > + > + /* Add the limit file */ > + cft = &h->mem_cgroup_files[0]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "hugetlb.%s.limit_in_bytes", buf); > + cft->private = __MEMFILE_PRIVATE(idx, _MEMHUGETLB, RES_LIMIT); > + cft->read = mem_cgroup_read; > + cft->write_string = mem_cgroup_write; > + > + /* Add the usage file */ > + cft = &h->mem_cgroup_files[1]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "hugetlb.%s.usage_in_bytes", buf); > + cft->private = __MEMFILE_PRIVATE(idx, _MEMHUGETLB, RES_USAGE); > + cft->read = mem_cgroup_read; > + > + /* Add the MAX usage file */ > + cft = &h->mem_cgroup_files[2]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "hugetlb.%s.max_usage_in_bytes", buf); > + cft->private = __MEMFILE_PRIVATE(idx, _MEMHUGETLB, RES_MAX_USAGE); > + cft->trigger = mem_cgroup_reset; > + cft->read = mem_cgroup_read; > + > + /* NULL terminate the last cft */ > + cft = &h->mem_cgroup_files[3]; > + memset(cft, 0, sizeof(*cft)); > + > + WARN_ON(cgroup_add_cftypes(&mem_cgroup_subsys, h->mem_cgroup_files)); > + > + return 0; > +} > +#endif > + > static int mem_cgroup_populate(struct cgroup_subsys *ss, > struct cgroup *cont) > { -- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752360Ab2DIGCV (ORCPT ); Mon, 9 Apr 2012 02:02:21 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:45489 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672Ab2DIGCT (ORCPT ); Mon, 9 Apr 2012 02:02:19 -0400 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <4F827AF8.9070204@jp.fujitsu.com> Date: Mon, 09 Apr 2012 15:00:24 +0900 From: KAMEZAWA Hiroyuki User-Agent: Mozilla/5.0 (Windows NT 6.0; rv:11.0) Gecko/20120327 Thunderbird/11.0.1 MIME-Version: 1.0 To: "Aneesh Kumar K.V" CC: linux-mm@kvack.org, mgorman@suse.de, dhillf@gmail.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: Re: [PATCH -V5 10/14] hugetlbfs: Add memcg control files for hugetlbfs References: <1333738260-1329-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1333738260-1329-11-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1333738260-1329-11-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (2012/04/07 3:50), Aneesh Kumar K.V wrote: > From: "Aneesh Kumar K.V" > > This add control files for hugetlbfs in memcg > > Signed-off-by: Aneesh Kumar K.V seems ok. This uses Tejun's new interface...right ? It might be better to explain "this patch depends on "cgroup: implement cgroup_add_cftypes() and friends" patch via cgroup development tree. Anyway, Acked-by: KAMEZAWA Hiroyuki > --- > include/linux/hugetlb.h | 5 +++++ > include/linux/memcontrol.h | 7 ++++++ > mm/hugetlb.c | 2 +- > mm/memcontrol.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 64 insertions(+), 1 deletion(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index 995c238..d008342 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; > @@ -203,6 +204,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_MEM_RES_CTLR_HUGETLB > + /* mem cgroup control files */ > + struct cftype mem_cgroup_files[4]; > +#endif > char name[HSTATE_NAME_LEN]; > }; > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 1d07e14..4f17574 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -459,6 +459,7 @@ extern void mem_cgroup_hugetlb_uncharge_page(int idx, unsigned long nr_pages, > struct page *page); > extern void mem_cgroup_hugetlb_uncharge_memcg(int idx, unsigned long nr_pages, > struct mem_cgroup *memcg); > +extern int mem_cgroup_hugetlb_file_init(int idx) __init; > > #else > static inline int > @@ -489,6 +490,12 @@ mem_cgroup_hugetlb_uncharge_memcg(int idx, unsigned long nr_pages, > { > return; > } > + > +static inline int mem_cgroup_hugetlb_file_init(int idx) > +{ > + return 0; > +} > + > #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ > #endif /* _LINUX_MEMCONTROL_H */ > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index dd00087..340e575 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1931,7 +1931,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); > - > + mem_cgroup_hugetlb_file_init(hugetlb_max_hstate - 1); > parsed_hstate = h; > } > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 3bb3b42..7d3330e 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -5191,6 +5191,57 @@ static void mem_cgroup_destroy(struct cgroup *cont) > mem_cgroup_put(memcg); > } > > +#ifdef CONFIG_MEM_RES_CTLR_HUGETLB > +static char *mem_fmt(char *buf, unsigned long n) > +{ > + if (n >= (1UL << 30)) > + sprintf(buf, "%luGB", n >> 30); > + else if (n >= (1UL << 20)) > + sprintf(buf, "%luMB", n >> 20); > + else > + sprintf(buf, "%luKB", n >> 10); > + return buf; > +} > + > +int __init mem_cgroup_hugetlb_file_init(int idx) > +{ > + char buf[32]; > + struct cftype *cft; > + struct hstate *h = &hstates[idx]; > + > + /* format the size */ > + mem_fmt(buf, huge_page_size(h)); > + > + /* Add the limit file */ > + cft = &h->mem_cgroup_files[0]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "hugetlb.%s.limit_in_bytes", buf); > + cft->private = __MEMFILE_PRIVATE(idx, _MEMHUGETLB, RES_LIMIT); > + cft->read = mem_cgroup_read; > + cft->write_string = mem_cgroup_write; > + > + /* Add the usage file */ > + cft = &h->mem_cgroup_files[1]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "hugetlb.%s.usage_in_bytes", buf); > + cft->private = __MEMFILE_PRIVATE(idx, _MEMHUGETLB, RES_USAGE); > + cft->read = mem_cgroup_read; > + > + /* Add the MAX usage file */ > + cft = &h->mem_cgroup_files[2]; > + snprintf(cft->name, MAX_CFTYPE_NAME, "hugetlb.%s.max_usage_in_bytes", buf); > + cft->private = __MEMFILE_PRIVATE(idx, _MEMHUGETLB, RES_MAX_USAGE); > + cft->trigger = mem_cgroup_reset; > + cft->read = mem_cgroup_read; > + > + /* NULL terminate the last cft */ > + cft = &h->mem_cgroup_files[3]; > + memset(cft, 0, sizeof(*cft)); > + > + WARN_ON(cgroup_add_cftypes(&mem_cgroup_subsys, h->mem_cgroup_files)); > + > + return 0; > +} > +#endif > + > static int mem_cgroup_populate(struct cgroup_subsys *ss, > struct cgroup *cont) > {