memcg: track resource index in cftype private

This patch adds a new charge type _MEMHUGETLB for tracking hugetlb
resources.  We also use cftype to encode the hugetlb resource index.  This
helps in using same memcg callbacks for hugetlb control files.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 9cb175d3c1b1acef6d9e5524c61d510a723f3fb9..da0bc847713a0855ba4710fe99d93a2ab9adb2ff 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -381,9 +381,14 @@ enum charge_type {
 #define _MEM                   (0)
 #define _MEMSWAP               (1)
 #define _OOM_TYPE              (2)
-#define MEMFILE_PRIVATE(x, val)        (((x) << 16) | (val))
-#define MEMFILE_TYPE(val)      (((val) >> 16) & 0xffff)
-#define MEMFILE_ATTR(val)      ((val) & 0xffff)
+#define _MEMHUGETLB            (3)
+
+/*  0 ... val ...16.... x...24...idx...32*/
+#define __MEMFILE_PRIVATE(idx, x, val) (((idx) << 24) | ((x) << 16) | (val))
+#define MEMFILE_PRIVATE(x, val)                __MEMFILE_PRIVATE(0, x, val)
+#define MEMFILE_TYPE(val)              (((val) >> 16) & 0xff)
+#define MEMFILE_IDX(val)               (((val) >> 24) & 0xff)
+#define MEMFILE_ATTR(val)              ((val) & 0xffff)
 /* Used for OOM nofiier */
 #define OOM_CONTROL            (0)
 
@@ -3997,7 +4002,7 @@ static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft,
        struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
        char str[64];
        u64 val;
-       int type, name, len;
+       int type, name, len, idx;
 
        type = MEMFILE_TYPE(cft->private);
        name = MEMFILE_ATTR(cft->private);
@@ -4018,6 +4023,10 @@ static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft,
                else
                        val = res_counter_read_u64(&memcg->memsw, name);
                break;
+       case _MEMHUGETLB:
+               idx = MEMFILE_IDX(cft->private);
+               val = res_counter_read_u64(&memcg->hugepage[idx], name);
+               break;
        default:
                BUG();
        }
@@ -4055,7 +4064,10 @@ static int mem_cgroup_write(struct cgroup *cont, struct cftype *cft,
                        break;
                if (type == _MEM)
                        ret = mem_cgroup_resize_limit(memcg, val);
-               else
+               else if (type == _MEMHUGETLB) {
+                       int idx = MEMFILE_IDX(cft->private);
+                       ret = res_counter_set_limit(&memcg->hugepage[idx], val);
+               } else
                        ret = mem_cgroup_resize_memsw_limit(memcg, val);
                break;
        case RES_SOFT_LIMIT:
@@ -4121,7 +4133,10 @@ static int mem_cgroup_reset(struct cgroup *cont, unsigned int event)
        case RES_MAX_USAGE:
                if (type == _MEM)
                        res_counter_reset_max(&memcg->res);
-               else
+               else if (type == _MEMHUGETLB) {
+                       int idx = MEMFILE_IDX(event);
+                       res_counter_reset_max(&memcg->hugepage[idx]);
+               } else
                        res_counter_reset_max(&memcg->memsw);
                break;
        case RES_FAILCNT: