(2012/03/17 2:39), Aneesh Kumar K.V wrote:
> From: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
>
> This add control files for hugetlbfs in memcg
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
I have a question. When a user does
1. create memory cgroup as
/cgroup/A
2. insmod hugetlb.ko
3. ls /cgroup/A
and then, files can be shown ? Don't we have any problem at rmdir A ?
I'm sorry if hugetlb never be used as module.
a comment below.
> ---
> include/linux/hugetlb.h | 17 +++++++++++++++
> include/linux/memcontrol.h | 7 ++++++
> mm/hugetlb.c | 25 ++++++++++++++++++++++-
> mm/memcontrol.c | 48 ++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 96 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index 1f70068..cbd8dc5 100644
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -4,6 +4,7 @@
> #include <linux/mm_types.h>
> #include <linux/fs.h>
> #include <linux/hugetlb_inline.h>
> +#include <linux/cgroup.h>
>
> struct ctl_table;
> struct user_struct;
> @@ -220,6 +221,12 @@ 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];
> + /* mem cgroup control files */
> +#ifdef CONFIG_MEM_RES_CTLR_HUGETLB
> + struct cftype cgroup_limit_file;
> + struct cftype cgroup_usage_file;
> + struct cftype cgroup_max_usage_file;
> +#endif
> char name[HSTATE_NAME_LEN];
> };
>
> @@ -338,4 +345,14 @@ static inline unsigned int pages_per_huge_page(struct hstate *h)
> #define hstate_index(h) 0
> #endif
>
> +#ifdef CONFIG_MEM_RES_CTLR_HUGETLB
> +extern int register_hugetlb_memcg_files(struct cgroup *cgroup,
> + struct cgroup_subsys *ss);
> +#else
> +static inline int register_hugetlb_memcg_files(struct cgroup *cgroup,
> + struct cgroup_subsys *ss)
> +{
> + return 0;
> +}
> +#endif
> #endif /* _LINUX_HUGETLB_H */
> diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
> index 320dbad..73900b9 100644
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -440,6 +440,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);
>
> #else
> static inline int
> @@ -470,6 +471,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 91361a0..684849a 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -1819,6 +1819,29 @@ 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;
> +}
> +#endif
> +
> /* Should be called on processing a hugepagesz=... option */
> void __init hugetlb_add_hstate(unsigned order)
> {
> @@ -1842,7 +1865,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 d8b3513..4900b72 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -5123,6 +5123,51 @@ static void mem_cgroup_destroy(struct cgroup_subsys *ss,
> 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 mem_cgroup_hugetlb_file_init(int idx)
> +{
__init ? And... do we have guarantee that this function is called before
creating root mem cgroup even if CONFIG_HUGETLBFS=y ?
Thanks,
-Kame
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. 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: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>