#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)
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);
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();
}
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:
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: