lkml.org 
[lkml]   [2012]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -V4 07/10] hugetlbfs: Add memcg control files for hugetlbfs
    Date
    From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

    This add control files for hugetlbfs in memcg

    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    ---
    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)
    +{
    + 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->cgroup_limit_file;
    + snprintf(cft->name, MAX_CFTYPE_NAME, "hugetlb.%s.limit_in_bytes", buf);
    + cft->private = __MEMFILE_PRIVATE(idx, _MEMHUGETLB, RES_LIMIT);
    + cft->read_u64 = mem_cgroup_read;
    + cft->write_string = mem_cgroup_write;
    +
    + /* Add the usage file */
    + cft = &h->cgroup_usage_file;
    + snprintf(cft->name, MAX_CFTYPE_NAME, "hugetlb.%s.usage_in_bytes", buf);
    + cft->private = __MEMFILE_PRIVATE(idx, _MEMHUGETLB, RES_USAGE);
    + cft->read_u64 = mem_cgroup_read;
    +
    + /* Add the MAX usage file */
    + cft = &h->cgroup_max_usage_file;
    + 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_u64 = mem_cgroup_read;
    +
    + return 0;
    +}
    +#endif
    +
    static int mem_cgroup_populate(struct cgroup_subsys *ss,
    struct cgroup *cont)
    {
    @@ -5137,6 +5182,9 @@ static int mem_cgroup_populate(struct cgroup_subsys *ss,
    if (!ret)
    ret = register_kmem_files(cont, ss);

    + if (!ret)
    + ret = register_hugetlb_memcg_files(cont, ss);
    +
    return ret;
    }

    --
    1.7.9


    \
     
     \ /
      Last update: 2012-03-16 18:45    [W:0.038 / U:0.172 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site