From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> To: linux-mm@kvack.org, mgorman@suse.de, kamezawa.hiroyu@jp.fujitsu.com, dhillf@gmail.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> Subject: [PATCH -V4 06/10] memcg: track resource index in cftype private Date: Fri, 16 Mar 2012 23:09:26 +0530 [thread overview] Message-ID: <1331919570-2264-7-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw) In-Reply-To: <1331919570-2264-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> This helps in using same memcg callbacks for non reclaim resource control files. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> --- mm/memcontrol.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7a9ea94..d8b3513 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -358,9 +358,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) @@ -3954,7 +3959,7 @@ static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft) { struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); u64 val; - int type, name; + int type, name, idx; type = MEMFILE_TYPE(cft->private); name = MEMFILE_ATTR(cft->private); @@ -3971,6 +3976,10 @@ static u64 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(); break; @@ -4003,7 +4012,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: @@ -4067,7 +4079,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.9
WARNING: multiple messages have this Message-ID (diff)
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> To: linux-mm@kvack.org, mgorman@suse.de, kamezawa.hiroyu@jp.fujitsu.com, dhillf@gmail.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> Subject: [PATCH -V4 06/10] memcg: track resource index in cftype private Date: Fri, 16 Mar 2012 23:09:26 +0530 [thread overview] Message-ID: <1331919570-2264-7-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw) In-Reply-To: <1331919570-2264-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> This helps in using same memcg callbacks for non reclaim resource control files. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> --- mm/memcontrol.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7a9ea94..d8b3513 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -358,9 +358,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) @@ -3954,7 +3959,7 @@ static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft) { struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); u64 val; - int type, name; + int type, name, idx; type = MEMFILE_TYPE(cft->private); name = MEMFILE_ATTR(cft->private); @@ -3971,6 +3976,10 @@ static u64 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(); break; @@ -4003,7 +4012,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: @@ -4067,7 +4079,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.9 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. 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@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-03-16 17:42 UTC|newest] Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-16 17:39 [PATCH -V4 00/10] memcg: Add memcg extension to control HugeTLB allocation Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-16 17:39 ` [PATCH -V4 01/10] hugetlb: rename max_hstate to hugetlb_max_hstate Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-19 2:07 ` KAMEZAWA Hiroyuki 2012-03-19 2:07 ` KAMEZAWA Hiroyuki 2012-03-28 9:18 ` Michal Hocko 2012-03-28 9:18 ` Michal Hocko 2012-03-28 9:18 ` Michal Hocko 2012-03-16 17:39 ` [PATCH -V4 02/10] hugetlbfs: don't use ERR_PTR with VM_FAULT* values Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-19 2:11 ` KAMEZAWA Hiroyuki 2012-03-19 2:11 ` KAMEZAWA Hiroyuki 2012-03-19 2:11 ` KAMEZAWA Hiroyuki 2012-03-19 6:37 ` Aneesh Kumar K.V 2012-03-19 6:37 ` Aneesh Kumar K.V 2012-03-28 9:25 ` Michal Hocko 2012-03-28 9:25 ` Michal Hocko 2012-03-28 11:35 ` Aneesh Kumar K.V 2012-03-28 11:35 ` Aneesh Kumar K.V 2012-03-28 11:35 ` Aneesh Kumar K.V 2012-03-16 17:39 ` [PATCH -V4 03/10] hugetlbfs: Add an inline helper for finding hstate index Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-19 2:15 ` KAMEZAWA Hiroyuki 2012-03-19 2:15 ` KAMEZAWA Hiroyuki 2012-03-28 9:41 ` Michal Hocko 2012-03-28 9:41 ` Michal Hocko 2012-03-16 17:39 ` [PATCH -V4 04/10] memcg: Add HugeTLB extension Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-19 2:38 ` KAMEZAWA Hiroyuki 2012-03-19 2:38 ` KAMEZAWA Hiroyuki 2012-03-19 2:38 ` KAMEZAWA Hiroyuki 2012-03-19 6:52 ` Aneesh Kumar K.V 2012-03-19 6:52 ` Aneesh Kumar K.V 2012-03-19 6:52 ` Aneesh Kumar K.V 2012-03-19 7:00 ` KAMEZAWA Hiroyuki 2012-03-19 7:00 ` KAMEZAWA Hiroyuki 2012-03-19 7:00 ` KAMEZAWA Hiroyuki 2012-03-19 11:39 ` Glauber Costa 2012-03-19 12:07 ` KAMEZAWA Hiroyuki 2012-03-19 12:07 ` KAMEZAWA Hiroyuki 2012-03-21 4:48 ` Aneesh Kumar K.V 2012-03-21 4:48 ` Aneesh Kumar K.V 2012-03-21 4:48 ` Aneesh Kumar K.V 2012-03-21 5:22 ` KAMEZAWA Hiroyuki 2012-03-21 5:22 ` KAMEZAWA Hiroyuki 2012-03-21 5:22 ` KAMEZAWA Hiroyuki 2012-03-28 11:33 ` Michal Hocko 2012-03-28 11:33 ` Michal Hocko 2012-03-28 11:33 ` Michal Hocko 2012-03-28 13:40 ` Aneesh Kumar K.V 2012-03-28 13:40 ` Aneesh Kumar K.V 2012-03-28 15:44 ` Michal Hocko 2012-03-28 15:44 ` Michal Hocko 2012-03-28 13:40 ` Michal Hocko 2012-03-28 13:40 ` Michal Hocko 2012-03-28 17:37 ` Aneesh Kumar K.V 2012-03-28 17:37 ` Aneesh Kumar K.V 2012-03-28 17:37 ` Aneesh Kumar K.V 2012-03-29 0:18 ` KAMEZAWA Hiroyuki 2012-03-29 0:18 ` KAMEZAWA Hiroyuki 2012-03-29 0:18 ` KAMEZAWA Hiroyuki 2012-03-29 7:57 ` Michal Hocko 2012-03-29 7:57 ` Michal Hocko 2012-03-29 7:57 ` Michal Hocko 2012-03-16 17:39 ` [PATCH -V4 05/10] hugetlb: add charge/uncharge calls for HugeTLB alloc/free Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-19 2:41 ` KAMEZAWA Hiroyuki 2012-03-19 2:41 ` KAMEZAWA Hiroyuki 2012-03-19 2:41 ` KAMEZAWA Hiroyuki 2012-03-19 7:01 ` Aneesh Kumar K.V 2012-03-19 7:01 ` Aneesh Kumar K.V 2012-03-28 13:17 ` Michal Hocko 2012-03-28 13:17 ` Michal Hocko 2012-03-28 13:17 ` Michal Hocko 2012-03-28 17:39 ` Aneesh Kumar K.V 2012-03-28 17:39 ` Aneesh Kumar K.V 2012-03-28 17:39 ` Aneesh Kumar K.V 2012-03-29 8:10 ` Michal Hocko 2012-03-29 8:10 ` Michal Hocko 2012-03-30 10:40 ` Aneesh Kumar K.V 2012-03-30 10:40 ` Aneesh Kumar K.V 2012-03-30 10:46 ` Michal Hocko 2012-03-30 10:46 ` Michal Hocko 2012-03-30 10:46 ` Michal Hocko 2012-03-16 17:39 ` Aneesh Kumar K.V [this message] 2012-03-16 17:39 ` [PATCH -V4 06/10] memcg: track resource index in cftype private Aneesh Kumar K.V 2012-03-19 2:43 ` KAMEZAWA Hiroyuki 2012-03-19 2:43 ` KAMEZAWA Hiroyuki 2012-03-19 2:43 ` KAMEZAWA Hiroyuki 2012-03-16 17:39 ` [PATCH -V4 07/10] hugetlbfs: Add memcg control files for hugetlbfs Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-19 2:56 ` KAMEZAWA Hiroyuki 2012-03-19 2:56 ` KAMEZAWA Hiroyuki 2012-03-19 7:14 ` Aneesh Kumar K.V 2012-03-19 7:14 ` Aneesh Kumar K.V 2012-03-19 7:14 ` Aneesh Kumar K.V 2012-03-19 7:34 ` KAMEZAWA Hiroyuki 2012-03-19 7:34 ` KAMEZAWA Hiroyuki 2012-03-19 7:34 ` KAMEZAWA Hiroyuki 2012-03-20 9:22 ` Aneesh Kumar K.V 2012-03-20 9:22 ` Aneesh Kumar K.V 2012-03-16 17:39 ` [PATCH -V4 08/10] hugetlbfs: Add a list for tracking in-use HugeTLB pages Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-19 3:00 ` KAMEZAWA Hiroyuki 2012-03-19 3:00 ` KAMEZAWA Hiroyuki 2012-03-19 3:00 ` KAMEZAWA Hiroyuki 2012-03-19 8:59 ` Aneesh Kumar K.V 2012-03-19 8:59 ` Aneesh Kumar K.V 2012-03-28 13:58 ` Michal Hocko 2012-03-28 13:58 ` Michal Hocko 2012-03-28 17:38 ` Aneesh Kumar K.V 2012-03-28 17:38 ` Aneesh Kumar K.V 2012-03-29 8:11 ` Michal Hocko 2012-03-29 8:11 ` Michal Hocko 2012-03-16 17:39 ` [PATCH -V4 09/10] memcg: move HugeTLB resource count to parent cgroup on memcg removal Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-19 3:04 ` KAMEZAWA Hiroyuki 2012-03-19 3:04 ` KAMEZAWA Hiroyuki 2012-03-19 3:04 ` KAMEZAWA Hiroyuki 2012-03-19 9:00 ` Aneesh Kumar K.V 2012-03-19 9:00 ` Aneesh Kumar K.V 2012-03-28 14:07 ` Michal Hocko 2012-03-28 14:07 ` Michal Hocko 2012-03-28 14:07 ` Michal Hocko 2012-03-16 17:39 ` [PATCH -V4 10/10] memcg: Add memory controller documentation for hugetlb management Aneesh Kumar K.V 2012-03-16 17:39 ` Aneesh Kumar K.V 2012-03-28 14:36 ` Michal Hocko 2012-03-28 14:36 ` Michal Hocko 2012-03-28 14:36 ` Michal Hocko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1331919570-2264-7-git-send-email-aneesh.kumar@linux.vnet.ibm.com \ --to=aneesh.kumar@linux.vnet.ibm.com \ --cc=aarcange@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=dhillf@gmail.com \ --cc=hannes@cmpxchg.org \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=mhocko@suse.cz \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.