Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1346536 > unrolled thread

[PATCH 1/2] mm: memcontrol: cleanup css_reset callback

Started byVladimir Davydov <vdavydov@virtuozzo.com>
First post2016-03-01 12:20 +0100
Last post2016-03-01 21:00 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/2] mm: memcontrol: cleanup css_reset callback Vladimir Davydov <vdavydov@virtuozzo.com> - 2016-03-01 12:20 +0100
    Re: [PATCH 1/2] mm: memcontrol: cleanup css_reset callback Michal Hocko <mhocko@kernel.org> - 2016-03-01 17:10 +0100
    Re: [PATCH 1/2] mm: memcontrol: cleanup css_reset callback Johannes Weiner <hannes@cmpxchg.org> - 2016-03-01 21:00 +0100

#1346536 — [PATCH 1/2] mm: memcontrol: cleanup css_reset callback

FromVladimir Davydov <vdavydov@virtuozzo.com>
Date2016-03-01 12:20 +0100
Subject[PATCH 1/2] mm: memcontrol: cleanup css_reset callback
Message-ID<r7Qvo-8px-3@gated-at.bofh.it>
 - Do not take memcg_limit_mutex for resetting limits - the cgroup
   cannot be altered from userspace anymore, so no need to protect them.

 - Use plain page_counter_limit() for resetting ->memory and ->memsw
   limits instead of mem_cgrouop_resize_* helpers - we enlarge the
   limits, so no need in special handling.

 - Reset ->swap and ->tcpmem limits as well.

Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com>
---
 mm/memcontrol.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index ae8b81c55685..8615b066b642 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4257,9 +4257,11 @@ static void mem_cgroup_css_reset(struct cgroup_subsys_state *css)
 {
 	struct mem_cgroup *memcg = mem_cgroup_from_css(css);
 
-	mem_cgroup_resize_limit(memcg, PAGE_COUNTER_MAX);
-	mem_cgroup_resize_memsw_limit(memcg, PAGE_COUNTER_MAX);
-	memcg_update_kmem_limit(memcg, PAGE_COUNTER_MAX);
+	page_counter_limit(&memcg->memory, PAGE_COUNTER_MAX);
+	page_counter_limit(&memcg->swap, PAGE_COUNTER_MAX);
+	page_counter_limit(&memcg->memsw, PAGE_COUNTER_MAX);
+	page_counter_limit(&memcg->kmem, PAGE_COUNTER_MAX);
+	page_counter_limit(&memcg->tcpmem, PAGE_COUNTER_MAX);
 	memcg->low = 0;
 	memcg->high = PAGE_COUNTER_MAX;
 	memcg->soft_limit = PAGE_COUNTER_MAX;
-- 
2.1.4

[toc] | [next] | [standalone]

#1346725

FromMichal Hocko <mhocko@kernel.org>
Date2016-03-01 17:10 +0100
Message-ID<r7V23-2XK-39@gated-at.bofh.it>
In reply to#1346536
On Tue 01-03-16 14:13:12, Vladimir Davydov wrote:
>  - Do not take memcg_limit_mutex for resetting limits - the cgroup
>    cannot be altered from userspace anymore, so no need to protect them.
> 
>  - Use plain page_counter_limit() for resetting ->memory and ->memsw
>    limits instead of mem_cgrouop_resize_* helpers - we enlarge the
>    limits, so no need in special handling.
> 
>  - Reset ->swap and ->tcpmem limits as well.
> 
> Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com>

Acked-by: Michal Hocko <mhocko@suse.com>

> ---
>  mm/memcontrol.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index ae8b81c55685..8615b066b642 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -4257,9 +4257,11 @@ static void mem_cgroup_css_reset(struct cgroup_subsys_state *css)
>  {
>  	struct mem_cgroup *memcg = mem_cgroup_from_css(css);
>  
> -	mem_cgroup_resize_limit(memcg, PAGE_COUNTER_MAX);
> -	mem_cgroup_resize_memsw_limit(memcg, PAGE_COUNTER_MAX);
> -	memcg_update_kmem_limit(memcg, PAGE_COUNTER_MAX);
> +	page_counter_limit(&memcg->memory, PAGE_COUNTER_MAX);
> +	page_counter_limit(&memcg->swap, PAGE_COUNTER_MAX);
> +	page_counter_limit(&memcg->memsw, PAGE_COUNTER_MAX);
> +	page_counter_limit(&memcg->kmem, PAGE_COUNTER_MAX);
> +	page_counter_limit(&memcg->tcpmem, PAGE_COUNTER_MAX);
>  	memcg->low = 0;
>  	memcg->high = PAGE_COUNTER_MAX;
>  	memcg->soft_limit = PAGE_COUNTER_MAX;
> -- 
> 2.1.4

-- 
Michal Hocko
SUSE Labs

[toc] | [prev] | [next] | [standalone]

#1346979

FromJohannes Weiner <hannes@cmpxchg.org>
Date2016-03-01 21:00 +0100
Message-ID<r7YCD-5hG-27@gated-at.bofh.it>
In reply to#1346536
On Tue, Mar 01, 2016 at 02:13:12PM +0300, Vladimir Davydov wrote:
>  - Do not take memcg_limit_mutex for resetting limits - the cgroup
>    cannot be altered from userspace anymore, so no need to protect them.
> 
>  - Use plain page_counter_limit() for resetting ->memory and ->memsw
>    limits instead of mem_cgrouop_resize_* helpers - we enlarge the
>    limits, so no need in special handling.
> 
>  - Reset ->swap and ->tcpmem limits as well.
> 
> Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com>

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web