From: Glauber Costa <glommer@parallels.com>
To: Suleiman Souhlal <ssouhlal@FreeBSD.org>
Cc: cgroups@vger.kernel.org, suleiman@google.com,
kamezawa.hiroyu@jp.fujitsu.com, penberg@kernel.org, cl@linux.com,
yinghan@google.com, hughd@google.com, gthelen@google.com,
peterz@infradead.org, dan.magenheimer@oracle.com,
hannes@cmpxchg.org, mgorman@suse.de,
James.Bottomley@HansenPartnership.com, linux-mm@kvack.org,
devel@openvz.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 01/13] memcg: Consolidate various flags into a single flags field.
Date: Sun, 11 Mar 2012 11:50:03 +0400 [thread overview]
Message-ID: <4F5C592B.7000905@parallels.com> (raw)
In-Reply-To: <1331325556-16447-2-git-send-email-ssouhlal@FreeBSD.org>
On 03/10/2012 12:39 AM, Suleiman Souhlal wrote:
> Since there is an ever-increasing number of flags in the memcg
> struct, consolidate them into a single flags field.
> The flags that we consolidate are:
> - use_hierarchy
> - memsw_is_minimum
> - oom_kill_disable
>
> Signed-off-by: Suleiman Souhlal<suleiman@google.com>
> ---
> mm/memcontrol.c | 112 ++++++++++++++++++++++++++++++++++++++-----------------
> 1 files changed, 78 insertions(+), 34 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 5585dc3..37ad2cb 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -213,6 +213,15 @@ struct mem_cgroup_eventfd_list {
> static void mem_cgroup_threshold(struct mem_cgroup *memcg);
> static void mem_cgroup_oom_notify(struct mem_cgroup *memcg);
>
> +enum memcg_flags {
> + MEMCG_USE_HIERARCHY, /*
> + * Should the accounting and control be
> + * hierarchical, per subtree?
> + */
Perhaps we should use the opportunity to make this comment shorter, so
it can fit in a single line. How about:
/* per-subtree hierarchical accounting */ ?
>
> +static inline bool
> +mem_cgroup_test_flag(const struct mem_cgroup *memcg, enum memcg_flags flag)
> +{
> + return test_bit(flag,&memcg->flags);
> +}
> +
> +static inline void
> +mem_cgroup_set_flag(struct mem_cgroup *memcg, enum memcg_flags flag)
> +{
> + set_bit(flag,&memcg->flags);
> +}
> +
> +static inline void
> +mem_cgroup_clear_flag(struct mem_cgroup *memcg, enum memcg_flags flag)
> +{
> + clear_bit(flag,&memcg->flags);
> +}
> +
> /* Writing them here to avoid exposing memcg's inner layout */
> #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
> #include<net/sock.h>
> @@ -876,7 +895,8 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
> if (prev&& prev != root)
> css_put(&prev->css);
>
> - if (!root->use_hierarchy&& root != root_mem_cgroup) {
> + if (!mem_cgroup_test_flag(root, MEMCG_USE_HIERARCHY)&& root !=
> + root_mem_cgroup) {
> if (prev)
> return NULL;
> return root;
Although I like this change in principle, the end result is that many of
the lines we are touching, used to be single-lines and now span two
rows. I know not everybody cares about that, but maybe we could provide
functions specific to each flag?
For the record, that is what cgroup.c does:
static int notify_on_release(const struct cgroup *cgrp)
{
return test_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags);
}
static int clone_children(const struct cgroup *cgrp)
{
return test_bit(CGRP_CLONE_CHILDREN, &cgrp->flags);
}
> @@ -1126,8 +1146,8 @@ static bool mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
> struct mem_cgroup *memcg)
> {
> if (root_memcg != memcg) {
> - return (root_memcg->use_hierarchy&&
> - css_is_ancestor(&memcg->css,&root_memcg->css));
> + return mem_cgroup_test_flag(root_memcg, MEMCG_USE_HIERARCHY)&&
> + css_is_ancestor(&memcg->css,&root_memcg->css);
> }
>
> return true;
> @@ -1460,7 +1480,8 @@ static unsigned long mem_cgroup_reclaim(struct mem_cgroup *memcg,
>
> if (flags& MEM_CGROUP_RECLAIM_NOSWAP)
> noswap = true;
> - if (!(flags& MEM_CGROUP_RECLAIM_SHRINK)&& memcg->memsw_is_minimum)
> + if (!(flags& MEM_CGROUP_RECLAIM_SHRINK)&& mem_cgroup_test_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM))
> noswap = true;
>
> for (loop = 0; loop< MEM_CGROUP_MAX_RECLAIM_LOOPS; loop++) {
> @@ -1813,7 +1834,7 @@ bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask)
> * under OOM is always welcomed, use TASK_KILLABLE here.
> */
> prepare_to_wait(&memcg_oom_waitq,&owait.wait, TASK_KILLABLE);
> - if (!locked || memcg->oom_kill_disable)
> + if (!locked || mem_cgroup_test_flag(memcg, MEMCG_OOM_KILL_DISABLE))
> need_to_kill = false;
> if (locked)
> mem_cgroup_oom_notify(memcg);
> @@ -3416,9 +3437,11 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
> ret = res_counter_set_limit(&memcg->res, val);
> if (!ret) {
> if (memswlimit == val)
> - memcg->memsw_is_minimum = true;
> + mem_cgroup_set_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM);
> else
> - memcg->memsw_is_minimum = false;
> + mem_cgroup_clear_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM);
> }
> mutex_unlock(&set_limit_mutex);
>
> @@ -3475,9 +3498,11 @@ static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
> ret = res_counter_set_limit(&memcg->memsw, val);
> if (!ret) {
> if (memlimit == val)
> - memcg->memsw_is_minimum = true;
> + mem_cgroup_set_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM);
> else
> - memcg->memsw_is_minimum = false;
> + mem_cgroup_clear_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM);
> }
> mutex_unlock(&set_limit_mutex);
>
> @@ -3745,7 +3770,8 @@ int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event)
>
> static u64 mem_cgroup_hierarchy_read(struct cgroup *cont, struct cftype *cft)
> {
> - return mem_cgroup_from_cont(cont)->use_hierarchy;
> + return mem_cgroup_test_flag(mem_cgroup_from_cont(cont),
> + MEMCG_USE_HIERARCHY);
> }
>
> static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
> @@ -3768,10 +3794,14 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
> * For the root cgroup, parent_mem is NULL, we allow value to be
> * set if there are no children.
> */
> - if ((!parent_memcg || !parent_memcg->use_hierarchy)&&
> - (val == 1 || val == 0)) {
> + if ((!parent_memcg || !mem_cgroup_test_flag(parent_memcg,
> + MEMCG_USE_HIERARCHY))&& (val == 1 || val == 0)) {
> if (list_empty(&cont->children))
> - memcg->use_hierarchy = val;
> + if (val)
> + mem_cgroup_set_flag(memcg, MEMCG_USE_HIERARCHY);
> + else
> + mem_cgroup_clear_flag(memcg,
> + MEMCG_USE_HIERARCHY);
> else
> retval = -EBUSY;
> } else
> @@ -3903,13 +3933,13 @@ static void memcg_get_hierarchical_limit(struct mem_cgroup *memcg,
> min_limit = res_counter_read_u64(&memcg->res, RES_LIMIT);
> min_memsw_limit = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
> cgroup = memcg->css.cgroup;
> - if (!memcg->use_hierarchy)
> + if (!mem_cgroup_test_flag(memcg, MEMCG_USE_HIERARCHY))
> goto out;
>
> while (cgroup->parent) {
> cgroup = cgroup->parent;
> memcg = mem_cgroup_from_cont(cgroup);
> - if (!memcg->use_hierarchy)
> + if (!mem_cgroup_test_flag(memcg, MEMCG_USE_HIERARCHY))
> break;
> tmp = res_counter_read_u64(&memcg->res, RES_LIMIT);
> min_limit = min(min_limit, tmp);
> @@ -4206,8 +4236,9 @@ static int mem_cgroup_swappiness_write(struct cgroup *cgrp, struct cftype *cft,
> cgroup_lock();
>
> /* If under hierarchy, only empty-root can set this value */
> - if ((parent->use_hierarchy) ||
> - (memcg->use_hierarchy&& !list_empty(&cgrp->children))) {
> + if (mem_cgroup_test_flag(parent, MEMCG_USE_HIERARCHY) ||
> + (mem_cgroup_test_flag(memcg, MEMCG_USE_HIERARCHY)&&
> + !list_empty(&cgrp->children))) {
> cgroup_unlock();
> return -EINVAL;
> }
> @@ -4518,7 +4549,8 @@ static int mem_cgroup_oom_control_read(struct cgroup *cgrp,
> {
> struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
>
> - cb->fill(cb, "oom_kill_disable", memcg->oom_kill_disable);
> + cb->fill(cb, "oom_kill_disable", mem_cgroup_test_flag(memcg,
> + MEMCG_OOM_KILL_DISABLE));
>
> if (atomic_read(&memcg->under_oom))
> cb->fill(cb, "under_oom", 1);
> @@ -4541,14 +4573,18 @@ static int mem_cgroup_oom_control_write(struct cgroup *cgrp,
>
> cgroup_lock();
> /* oom-kill-disable is a flag for subhierarchy. */
> - if ((parent->use_hierarchy) ||
> - (memcg->use_hierarchy&& !list_empty(&cgrp->children))) {
> + if (mem_cgroup_test_flag(parent, MEMCG_USE_HIERARCHY) ||
> + (mem_cgroup_test_flag(memcg, MEMCG_USE_HIERARCHY)&&
> + !list_empty(&cgrp->children))) {
> cgroup_unlock();
> return -EINVAL;
> }
> - memcg->oom_kill_disable = val;
> - if (!val)
> + if (val)
> + mem_cgroup_set_flag(memcg, MEMCG_OOM_KILL_DISABLE);
> + else {
> + mem_cgroup_clear_flag(memcg, MEMCG_OOM_KILL_DISABLE);
> memcg_oom_recover(memcg);
> + }
> cgroup_unlock();
> return 0;
> }
> @@ -4916,11 +4952,19 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
> hotcpu_notifier(memcg_cpu_hotplug_callback, 0);
> } else {
> parent = mem_cgroup_from_cont(cont->parent);
> - memcg->use_hierarchy = parent->use_hierarchy;
> - memcg->oom_kill_disable = parent->oom_kill_disable;
> +
> + if (mem_cgroup_test_flag(parent, MEMCG_USE_HIERARCHY))
> + mem_cgroup_set_flag(memcg, MEMCG_USE_HIERARCHY);
> + else
> + mem_cgroup_clear_flag(memcg, MEMCG_USE_HIERARCHY);
> +
> + if (mem_cgroup_test_flag(parent, MEMCG_OOM_KILL_DISABLE))
> + mem_cgroup_set_flag(memcg, MEMCG_OOM_KILL_DISABLE);
> + else
> + mem_cgroup_clear_flag(memcg, MEMCG_OOM_KILL_DISABLE);
> }
>
> - if (parent&& parent->use_hierarchy) {
> + if (parent&& mem_cgroup_test_flag(parent, MEMCG_USE_HIERARCHY)) {
> res_counter_init(&memcg->res,&parent->res);
> res_counter_init(&memcg->memsw,&parent->memsw);
> /*
--
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>
WARNING: multiple messages have this Message-ID (diff)
From: Glauber Costa <glommer@parallels.com>
To: Suleiman Souhlal <ssouhlal@FreeBSD.org>
Cc: <cgroups@vger.kernel.org>, <suleiman@google.com>,
<kamezawa.hiroyu@jp.fujitsu.com>, <penberg@kernel.org>,
<cl@linux.com>, <yinghan@google.com>, <hughd@google.com>,
<gthelen@google.com>, <peterz@infradead.org>,
<dan.magenheimer@oracle.com>, <hannes@cmpxchg.org>,
<mgorman@suse.de>, <James.Bottomley@HansenPartnership.com>,
<linux-mm@kvack.org>, <devel@openvz.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 01/13] memcg: Consolidate various flags into a single flags field.
Date: Sun, 11 Mar 2012 11:50:03 +0400 [thread overview]
Message-ID: <4F5C592B.7000905@parallels.com> (raw)
In-Reply-To: <1331325556-16447-2-git-send-email-ssouhlal@FreeBSD.org>
On 03/10/2012 12:39 AM, Suleiman Souhlal wrote:
> Since there is an ever-increasing number of flags in the memcg
> struct, consolidate them into a single flags field.
> The flags that we consolidate are:
> - use_hierarchy
> - memsw_is_minimum
> - oom_kill_disable
>
> Signed-off-by: Suleiman Souhlal<suleiman@google.com>
> ---
> mm/memcontrol.c | 112 ++++++++++++++++++++++++++++++++++++++-----------------
> 1 files changed, 78 insertions(+), 34 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 5585dc3..37ad2cb 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -213,6 +213,15 @@ struct mem_cgroup_eventfd_list {
> static void mem_cgroup_threshold(struct mem_cgroup *memcg);
> static void mem_cgroup_oom_notify(struct mem_cgroup *memcg);
>
> +enum memcg_flags {
> + MEMCG_USE_HIERARCHY, /*
> + * Should the accounting and control be
> + * hierarchical, per subtree?
> + */
Perhaps we should use the opportunity to make this comment shorter, so
it can fit in a single line. How about:
/* per-subtree hierarchical accounting */ ?
>
> +static inline bool
> +mem_cgroup_test_flag(const struct mem_cgroup *memcg, enum memcg_flags flag)
> +{
> + return test_bit(flag,&memcg->flags);
> +}
> +
> +static inline void
> +mem_cgroup_set_flag(struct mem_cgroup *memcg, enum memcg_flags flag)
> +{
> + set_bit(flag,&memcg->flags);
> +}
> +
> +static inline void
> +mem_cgroup_clear_flag(struct mem_cgroup *memcg, enum memcg_flags flag)
> +{
> + clear_bit(flag,&memcg->flags);
> +}
> +
> /* Writing them here to avoid exposing memcg's inner layout */
> #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
> #include<net/sock.h>
> @@ -876,7 +895,8 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
> if (prev&& prev != root)
> css_put(&prev->css);
>
> - if (!root->use_hierarchy&& root != root_mem_cgroup) {
> + if (!mem_cgroup_test_flag(root, MEMCG_USE_HIERARCHY)&& root !=
> + root_mem_cgroup) {
> if (prev)
> return NULL;
> return root;
Although I like this change in principle, the end result is that many of
the lines we are touching, used to be single-lines and now span two
rows. I know not everybody cares about that, but maybe we could provide
functions specific to each flag?
For the record, that is what cgroup.c does:
static int notify_on_release(const struct cgroup *cgrp)
{
return test_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags);
}
static int clone_children(const struct cgroup *cgrp)
{
return test_bit(CGRP_CLONE_CHILDREN, &cgrp->flags);
}
> @@ -1126,8 +1146,8 @@ static bool mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
> struct mem_cgroup *memcg)
> {
> if (root_memcg != memcg) {
> - return (root_memcg->use_hierarchy&&
> - css_is_ancestor(&memcg->css,&root_memcg->css));
> + return mem_cgroup_test_flag(root_memcg, MEMCG_USE_HIERARCHY)&&
> + css_is_ancestor(&memcg->css,&root_memcg->css);
> }
>
> return true;
> @@ -1460,7 +1480,8 @@ static unsigned long mem_cgroup_reclaim(struct mem_cgroup *memcg,
>
> if (flags& MEM_CGROUP_RECLAIM_NOSWAP)
> noswap = true;
> - if (!(flags& MEM_CGROUP_RECLAIM_SHRINK)&& memcg->memsw_is_minimum)
> + if (!(flags& MEM_CGROUP_RECLAIM_SHRINK)&& mem_cgroup_test_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM))
> noswap = true;
>
> for (loop = 0; loop< MEM_CGROUP_MAX_RECLAIM_LOOPS; loop++) {
> @@ -1813,7 +1834,7 @@ bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask)
> * under OOM is always welcomed, use TASK_KILLABLE here.
> */
> prepare_to_wait(&memcg_oom_waitq,&owait.wait, TASK_KILLABLE);
> - if (!locked || memcg->oom_kill_disable)
> + if (!locked || mem_cgroup_test_flag(memcg, MEMCG_OOM_KILL_DISABLE))
> need_to_kill = false;
> if (locked)
> mem_cgroup_oom_notify(memcg);
> @@ -3416,9 +3437,11 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
> ret = res_counter_set_limit(&memcg->res, val);
> if (!ret) {
> if (memswlimit == val)
> - memcg->memsw_is_minimum = true;
> + mem_cgroup_set_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM);
> else
> - memcg->memsw_is_minimum = false;
> + mem_cgroup_clear_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM);
> }
> mutex_unlock(&set_limit_mutex);
>
> @@ -3475,9 +3498,11 @@ static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
> ret = res_counter_set_limit(&memcg->memsw, val);
> if (!ret) {
> if (memlimit == val)
> - memcg->memsw_is_minimum = true;
> + mem_cgroup_set_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM);
> else
> - memcg->memsw_is_minimum = false;
> + mem_cgroup_clear_flag(memcg,
> + MEMCG_MEMSW_IS_MINIMUM);
> }
> mutex_unlock(&set_limit_mutex);
>
> @@ -3745,7 +3770,8 @@ int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event)
>
> static u64 mem_cgroup_hierarchy_read(struct cgroup *cont, struct cftype *cft)
> {
> - return mem_cgroup_from_cont(cont)->use_hierarchy;
> + return mem_cgroup_test_flag(mem_cgroup_from_cont(cont),
> + MEMCG_USE_HIERARCHY);
> }
>
> static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
> @@ -3768,10 +3794,14 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
> * For the root cgroup, parent_mem is NULL, we allow value to be
> * set if there are no children.
> */
> - if ((!parent_memcg || !parent_memcg->use_hierarchy)&&
> - (val == 1 || val == 0)) {
> + if ((!parent_memcg || !mem_cgroup_test_flag(parent_memcg,
> + MEMCG_USE_HIERARCHY))&& (val == 1 || val == 0)) {
> if (list_empty(&cont->children))
> - memcg->use_hierarchy = val;
> + if (val)
> + mem_cgroup_set_flag(memcg, MEMCG_USE_HIERARCHY);
> + else
> + mem_cgroup_clear_flag(memcg,
> + MEMCG_USE_HIERARCHY);
> else
> retval = -EBUSY;
> } else
> @@ -3903,13 +3933,13 @@ static void memcg_get_hierarchical_limit(struct mem_cgroup *memcg,
> min_limit = res_counter_read_u64(&memcg->res, RES_LIMIT);
> min_memsw_limit = res_counter_read_u64(&memcg->memsw, RES_LIMIT);
> cgroup = memcg->css.cgroup;
> - if (!memcg->use_hierarchy)
> + if (!mem_cgroup_test_flag(memcg, MEMCG_USE_HIERARCHY))
> goto out;
>
> while (cgroup->parent) {
> cgroup = cgroup->parent;
> memcg = mem_cgroup_from_cont(cgroup);
> - if (!memcg->use_hierarchy)
> + if (!mem_cgroup_test_flag(memcg, MEMCG_USE_HIERARCHY))
> break;
> tmp = res_counter_read_u64(&memcg->res, RES_LIMIT);
> min_limit = min(min_limit, tmp);
> @@ -4206,8 +4236,9 @@ static int mem_cgroup_swappiness_write(struct cgroup *cgrp, struct cftype *cft,
> cgroup_lock();
>
> /* If under hierarchy, only empty-root can set this value */
> - if ((parent->use_hierarchy) ||
> - (memcg->use_hierarchy&& !list_empty(&cgrp->children))) {
> + if (mem_cgroup_test_flag(parent, MEMCG_USE_HIERARCHY) ||
> + (mem_cgroup_test_flag(memcg, MEMCG_USE_HIERARCHY)&&
> + !list_empty(&cgrp->children))) {
> cgroup_unlock();
> return -EINVAL;
> }
> @@ -4518,7 +4549,8 @@ static int mem_cgroup_oom_control_read(struct cgroup *cgrp,
> {
> struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
>
> - cb->fill(cb, "oom_kill_disable", memcg->oom_kill_disable);
> + cb->fill(cb, "oom_kill_disable", mem_cgroup_test_flag(memcg,
> + MEMCG_OOM_KILL_DISABLE));
>
> if (atomic_read(&memcg->under_oom))
> cb->fill(cb, "under_oom", 1);
> @@ -4541,14 +4573,18 @@ static int mem_cgroup_oom_control_write(struct cgroup *cgrp,
>
> cgroup_lock();
> /* oom-kill-disable is a flag for subhierarchy. */
> - if ((parent->use_hierarchy) ||
> - (memcg->use_hierarchy&& !list_empty(&cgrp->children))) {
> + if (mem_cgroup_test_flag(parent, MEMCG_USE_HIERARCHY) ||
> + (mem_cgroup_test_flag(memcg, MEMCG_USE_HIERARCHY)&&
> + !list_empty(&cgrp->children))) {
> cgroup_unlock();
> return -EINVAL;
> }
> - memcg->oom_kill_disable = val;
> - if (!val)
> + if (val)
> + mem_cgroup_set_flag(memcg, MEMCG_OOM_KILL_DISABLE);
> + else {
> + mem_cgroup_clear_flag(memcg, MEMCG_OOM_KILL_DISABLE);
> memcg_oom_recover(memcg);
> + }
> cgroup_unlock();
> return 0;
> }
> @@ -4916,11 +4952,19 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
> hotcpu_notifier(memcg_cpu_hotplug_callback, 0);
> } else {
> parent = mem_cgroup_from_cont(cont->parent);
> - memcg->use_hierarchy = parent->use_hierarchy;
> - memcg->oom_kill_disable = parent->oom_kill_disable;
> +
> + if (mem_cgroup_test_flag(parent, MEMCG_USE_HIERARCHY))
> + mem_cgroup_set_flag(memcg, MEMCG_USE_HIERARCHY);
> + else
> + mem_cgroup_clear_flag(memcg, MEMCG_USE_HIERARCHY);
> +
> + if (mem_cgroup_test_flag(parent, MEMCG_OOM_KILL_DISABLE))
> + mem_cgroup_set_flag(memcg, MEMCG_OOM_KILL_DISABLE);
> + else
> + mem_cgroup_clear_flag(memcg, MEMCG_OOM_KILL_DISABLE);
> }
>
> - if (parent&& parent->use_hierarchy) {
> + if (parent&& mem_cgroup_test_flag(parent, MEMCG_USE_HIERARCHY)) {
> res_counter_init(&memcg->res,&parent->res);
> res_counter_init(&memcg->memsw,&parent->memsw);
> /*
next prev parent reply other threads:[~2012-03-11 7:50 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 20:39 [PATCH v2 00/13] Memcg Kernel Memory Tracking Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-09 20:39 ` [PATCH v2 01/13] memcg: Consolidate various flags into a single flags field Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-11 7:50 ` Glauber Costa [this message]
2012-03-11 7:50 ` Glauber Costa
2012-03-09 20:39 ` [PATCH v2 02/13] memcg: Kernel memory accounting infrastructure Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
[not found] ` <1331325556-16447-3-git-send-email-ssouhlal-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org>
2012-03-11 8:12 ` Glauber Costa
2012-03-11 8:12 ` Glauber Costa
2012-03-11 8:12 ` Glauber Costa
2012-03-13 6:24 ` KAMEZAWA Hiroyuki
2012-03-13 6:24 ` KAMEZAWA Hiroyuki
2012-03-13 10:37 ` Glauber Costa
2012-03-13 10:37 ` Glauber Costa
2012-03-13 17:00 ` Greg Thelen
2012-03-13 17:00 ` Greg Thelen
[not found] ` <xr93d38g77w5.fsf-aSPv4SP+Du0KgorLzL7FmE7CuiCeIGUxQQ4Iyu8u01E@public.gmane.org>
2012-03-13 17:31 ` Glauber Costa
2012-03-13 17:31 ` Glauber Costa
2012-03-13 17:31 ` Glauber Costa
2012-03-14 0:15 ` KAMEZAWA Hiroyuki
2012-03-14 0:15 ` KAMEZAWA Hiroyuki
2012-03-14 12:29 ` Glauber Costa
2012-03-14 12:29 ` Glauber Costa
2012-03-15 0:48 ` KAMEZAWA Hiroyuki
2012-03-15 0:48 ` KAMEZAWA Hiroyuki
[not found] ` <4F613C5B.8030304-+CUm20s59erQFUHtdCDX3A@public.gmane.org>
2012-03-15 11:07 ` Glauber Costa
2012-03-15 11:07 ` Glauber Costa
2012-03-15 11:07 ` Glauber Costa
2012-03-15 11:13 ` Peter Zijlstra
2012-03-15 11:13 ` Peter Zijlstra
2012-03-15 11:21 ` Glauber Costa
2012-03-15 11:21 ` Glauber Costa
2012-03-12 12:38 ` Glauber Costa
2012-03-12 12:38 ` Glauber Costa
2012-03-12 12:38 ` Glauber Costa
2012-03-09 20:39 ` [PATCH v2 03/13] memcg: Uncharge all kmem when deleting a cgroup Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-11 8:19 ` Glauber Costa
2012-03-11 8:19 ` Glauber Costa
2012-03-13 23:16 ` Suleiman Souhlal
2012-03-13 23:16 ` Suleiman Souhlal
2012-03-14 11:59 ` Glauber Costa
2012-03-14 11:59 ` Glauber Costa
[not found] ` <1331325556-16447-4-git-send-email-ssouhlal-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org>
2012-03-13 6:27 ` KAMEZAWA Hiroyuki
2012-03-13 6:27 ` KAMEZAWA Hiroyuki
2012-03-13 6:27 ` KAMEZAWA Hiroyuki
2012-03-09 20:39 ` [PATCH v2 04/13] memcg: Make it possible to use the stock for more than one page Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
[not found] ` <1331325556-16447-5-git-send-email-ssouhlal-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org>
2012-03-11 10:49 ` Glauber Costa
2012-03-11 10:49 ` Glauber Costa
2012-03-11 10:49 ` Glauber Costa
2012-03-09 20:39 ` [PATCH v2 05/13] memcg: Reclaim when more than one page needed Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-09 20:39 ` [PATCH v2 06/13] slab: Add kmem_cache_gfp_flags() helper function Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-11 10:53 ` Glauber Costa
2012-03-11 10:53 ` Glauber Costa
[not found] ` <4F5C8414.5090800-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org>
2012-03-13 23:21 ` Suleiman Souhlal
2012-03-13 23:21 ` Suleiman Souhlal
2012-03-13 23:21 ` Suleiman Souhlal
[not found] ` <CABCjUKCioWO-F7k=hVs_18B3uyL4zG3-krPFDh++YAnmejKKdg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-03-14 11:48 ` Glauber Costa
2012-03-14 11:48 ` Glauber Costa
2012-03-14 11:48 ` Glauber Costa
[not found] ` <4F608579.5090109-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org>
2012-03-14 22:08 ` Suleiman Souhlal
2012-03-14 22:08 ` Suleiman Souhlal
2012-03-14 22:08 ` Suleiman Souhlal
2012-03-09 20:39 ` [PATCH v2 07/13] memcg: Slab accounting Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
[not found] ` <1331325556-16447-8-git-send-email-ssouhlal-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org>
2012-03-11 10:25 ` Glauber Costa
2012-03-11 10:25 ` Glauber Costa
2012-03-11 10:25 ` Glauber Costa
2012-03-13 22:50 ` Suleiman Souhlal
2012-03-13 22:50 ` Suleiman Souhlal
2012-03-14 10:47 ` Glauber Costa
2012-03-14 10:47 ` Glauber Costa
[not found] ` <4F60775F.20709-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org>
2012-03-14 22:04 ` Suleiman Souhlal
2012-03-14 22:04 ` Suleiman Souhlal
2012-03-14 22:04 ` Suleiman Souhlal
[not found] ` <CABCjUKCWaXTzsVaFHG57ELWV4Yk15vt=Ei8tvbsxpQKnxTmksg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-03-15 11:40 ` Glauber Costa
2012-03-15 11:40 ` Glauber Costa
2012-03-15 11:40 ` Glauber Costa
2012-03-09 20:39 ` [PATCH v2 08/13] memcg: Make dentry slab memory accounted in kernel memory accounting Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-09 20:39 ` [PATCH v2 09/13] memcg: Account for kmalloc " Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-11 12:21 ` Glauber Costa
2012-03-11 12:21 ` Glauber Costa
2012-03-09 20:39 ` [PATCH v2 10/13] memcg: Track all the memcg children of a kmem_cache Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-09 20:39 ` [PATCH v2 11/13] memcg: Handle bypassed kernel memory charges Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-09 20:39 ` [PATCH v2 12/13] memcg: Per-memcg memory.kmem.slabinfo file Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
2012-03-11 10:35 ` Glauber Costa
2012-03-11 10:35 ` Glauber Costa
2012-03-09 20:39 ` [PATCH v2 13/13] memcg: Document kernel memory accounting Suleiman Souhlal
2012-03-09 20:39 ` Suleiman Souhlal
[not found] ` <1331325556-16447-14-git-send-email-ssouhlal-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org>
2012-03-11 10:42 ` Glauber Costa
2012-03-11 10:42 ` Glauber Costa
2012-03-11 10:42 ` Glauber Costa
[not found] ` <1331325556-16447-1-git-send-email-ssouhlal-HZy0K5TPuP5AfugRpC6u6w@public.gmane.org>
2012-03-10 6:25 ` [PATCH v2 00/13] Memcg Kernel Memory Tracking Suleiman Souhlal
2012-03-10 6:25 ` Suleiman Souhlal
2012-03-10 6:25 ` Suleiman Souhlal
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=4F5C592B.7000905@parallels.com \
--to=glommer@parallels.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=cgroups@vger.kernel.org \
--cc=cl@linux.com \
--cc=dan.magenheimer@oracle.com \
--cc=devel@openvz.org \
--cc=gthelen@google.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=penberg@kernel.org \
--cc=peterz@infradead.org \
--cc=ssouhlal@FreeBSD.org \
--cc=suleiman@google.com \
--cc=yinghan@google.com \
/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: link
Be 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.