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

Groups > linux.kernel > #1290229

Re: [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness

Show all headers | View raw

On Fri, Dec 11, 2015 at 02:54:11PM -0500, Johannes Weiner wrote:
> What CONFIG_INET and CONFIG_LEGACY_KMEM guard inside the memory
> controller code is insignificant, having these conditionals is not
> worth the complication and fragility that comes with them.
> 
> Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>

Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>

> @@ -4374,17 +4342,11 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
>  {
>  	struct mem_cgroup *memcg = mem_cgroup_from_css(css);
>  
> -#ifdef CONFIG_INET
>  	if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket)
>  		static_branch_dec(&memcg_sockets_enabled_key);
> -#endif
> -
> -	memcg_free_kmem(memcg);

I wonder where the second call to memcg_free_kmem comes from. Luckily,
it couldn't result in a breakage. And now it's removed.

>  
> -#if defined(CONFIG_MEMCG_LEGACY_KMEM) && defined(CONFIG_INET)
>  	if (memcg->tcp_mem.active)
>  		static_branch_dec(&memcg_sockets_enabled_key);
> -#endif
>  
>  	memcg_free_kmem(memcg);
>  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/4] net: tcp_memcontrol: simplify linkage between socket and page counter fix Johannes Weiner <hannes@cmpxchg.org> - 2015-12-11 21:00 +0100
  [PATCH 4/4] mm: memcontrol: clean up alloc, online, offline, free functions Johannes Weiner <hannes@cmpxchg.org> - 2015-12-11 21:00 +0100
    Re: [PATCH 4/4] mm: memcontrol: clean up alloc, online, offline,  free functions Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-14 18:20 +0100
      Re: [PATCH 4/4] mm: memcontrol: clean up alloc, online, offline,  free functions Johannes Weiner <hannes@cmpxchg.org> - 2015-12-15 20:40 +0100
        Re: [PATCH 4/4] mm: memcontrol: clean up alloc, online, offline,  free functions Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-16 13:20 +0100
          Re: [PATCH 4/4] mm: memcontrol: clean up alloc, online, offline,  free functions Johannes Weiner <hannes@cmpxchg.org> - 2015-12-17 01:50 +0100
  [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness Johannes Weiner <hannes@cmpxchg.org> - 2015-12-11 21:00 +0100
    Re: [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-12 17:40 +0100
      Re: [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness Johannes Weiner <hannes@cmpxchg.org> - 2015-12-12 18:30 +0100
        Re: [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness Andrew Morton <akpm@linux-foundation.org> - 2015-12-23 00:20 +0100
          Re: [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness Andrew Morton <akpm@linux-foundation.org> - 2015-12-23 00:20 +0100
            Re: [PATCH 2/4] mm: memcontrol: reign in the CONFIG space madness Johannes Weiner <hannes@cmpxchg.org> - 2015-12-23 00:40 +0100
  [PATCH 3/4] mm: memcontrol: flatten struct cg_proto Johannes Weiner <hannes@cmpxchg.org> - 2015-12-11 21:00 +0100
    Re: [PATCH 3/4] mm: memcontrol: flatten struct cg_proto Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-12 17:40 +0100

csiph-web