From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx200.postini.com [74.125.245.200]) by kanga.kvack.org (Postfix) with SMTP id 7F2516B00F3 for ; Mon, 16 Apr 2012 06:45:15 -0400 (EDT) Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Apr 2012 16:15:09 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3GAj9KE4034738 for ; Mon, 16 Apr 2012 16:15:09 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3GGFgCF001184 for ; Tue, 17 Apr 2012 02:15:45 +1000 From: "Aneesh Kumar K.V" Subject: [PATCH -V6 10/14] hugetlbfs: Add memcg control files for hugetlbfs Date: Mon, 16 Apr 2012 16:14:47 +0530 Message-Id: <1334573091-18602-11-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1334573091-18602-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1334573091-18602-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org, mgorman@suse.de, kamezawa.hiroyu@jp.fujitsu.com, dhillf@gmail.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, "Aneesh Kumar K.V" From: "Aneesh Kumar K.V" This add control files for hugetlbfs in memcg Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Aneesh Kumar K.V --- 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 0f9ec34..93e077a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5195,6 +5195,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 + #ifdef CONFIG_MMU /* Handlers for move charge at task migration. */ #define PRECHARGE_COUNT_AT_ONCE 256 -- 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