Re: [PATCH -V3 5/8] hugetlbfs: Add memcg control files for hugetlbfs
From: Andrew Morton <hidden>
Date: 2012-03-13 21:42:36
Also in:
linux-mm, lkml
On Tue, 13 Mar 2012 12:37:09 +0530 "Aneesh Kumar K.V" [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: "Aneesh Kumar K.V" <redacted> This add control files for hugetlbfs in memcg ...--- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h@@ -220,6 +221,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]; + /* cgroup control files */ + struct cftype cgroup_limit_file; + struct cftype cgroup_usage_file; + struct cftype cgroup_max_usage_file; char name[HSTATE_NAME_LEN]; };
We don't need all these in here if, for example, cgroups is disabled?
quoted hunk ↗ jump to hunk
...--- a/mm/hugetlb.c +++ b/mm/hugetlb.c@@ -1817,6 +1817,36 @@ static int __init hugetlb_init(void) } module_init(hugetlb_init); +#ifdef CONFIG_MEM_RES_CTLR_HUGETLB +int register_hugetlb_memcg_files(struct cgroup *cgroup, + struct cgroup_subsys *ss) +{ + int ret = 0; + struct hstate *h; + + for_each_hstate(h) { + ret = cgroup_add_file(cgroup, ss, &h->cgroup_limit_file); + if (ret) + return ret; + ret = cgroup_add_file(cgroup, ss, &h->cgroup_usage_file); + if (ret) + return ret; + ret = cgroup_add_file(cgroup, ss, &h->cgroup_max_usage_file); + if (ret) + return ret; + + } + return ret; +} +/* mm/memcontrol.c because mem_cgroup_read/write is not availabel outside */
Comment has a spelling mistake.
+int mem_cgroup_hugetlb_file_init(struct hstate *h, int idx);
No, please put it in a header file. Always. Where both callers and the implementation see the same propotype.
+#else
+static int mem_cgroup_hugetlb_file_init(struct hstate *h, int idx)
+{
+ return 0;
+}
+#endifSo this will go into the same header file.