lkml.org 
[lkml]   [2012]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -V6 09/14] memcg: track resource index in cftype private
    Date
    From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

    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.

    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    ---
    mm/memcontrol.c | 27 +++++++++++++++++++++------
    1 file changed, 21 insertions(+), 6 deletions(-)

    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index e906b41..0f9ec34 100644
    --- 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)

    @@ -4003,7 +4008,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);
    @@ -4024,6 +4029,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();
    }
    @@ -4061,7 +4070,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:
    @@ -4127,7 +4139,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:
    --
    1.7.10


    \
     
     \ /
      Last update: 2012-04-16 12:51    [W:0.027 / U:0.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site