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

Groups > linux.kernel > #1287737

Re: [PATCH] mm: memcontrol: only manage socket pressure for CONFIG_INET

Show all headers | View raw

On Wed, Dec 09, 2015 at 05:32:16PM +0100, Arnd Bergmann wrote:
> When IPV4 support is disabled, the memcg->socket_pressure field is
> not defined and we get a build error from the vmpressure code:
> 
> mm/vmpressure.c: In function 'vmpressure':
> mm/vmpressure.c:287:9: error: 'struct mem_cgroup' has no member named 'socket_pressure'
>     memcg->socket_pressure = jiffies + HZ;
> mm/built-in.o: In function `mem_cgroup_css_free':
> :(.text+0x1c03a): undefined reference to `tcp_destroy_cgroup'
> mm/built-in.o: In function `mem_cgroup_css_online':
> :(.text+0x1c20e): undefined reference to `tcp_init_cgroup'
> 
> This puts the code causing this in the same #ifdef that guards the
> struct member and the TCP implementation.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 20cc40e66c42 ("mm: memcontrol: hook up vmpressure to socket pressure")

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

> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 6faea81e66d7..73cd572167bb 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -4220,13 +4220,13 @@ mem_cgroup_css_online(struct cgroup_subsys_state *css)
>  	if (ret)
>  		return ret;
>  
> +#ifdef CONFIG_INET
>  #ifdef CONFIG_MEMCG_LEGACY_KMEM
>  	ret = tcp_init_cgroup(memcg);
>  	if (ret)
>  		return ret;
>  #endif

The calls to tcp_init_cgroup() appear earlier in the series than "mm:
memcontrol: hook up vmpressure to socket pressure". However, they get
moved around a few times so fixing it earlier means respinning the
series. Andrew, it's up to you whether we take the bisectability hit
for !CONFIG_INET && CONFIG_MEMCG (how common is this?) or whether you
want me to resend the series.

Sorry about the trouble. I don't have a git tree on kernel.org because
we don't really use git in -mm, but the downside is that we don't get
the benefits of the automatic build testing for all kinds of configs.
I'll try to set up a git tree to expose series to full build coverage
before they hit -mm and -next.
--
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 00/14] mm: memcontrol: account socket memory in unified hierarchy v4-RESEND Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 01/14] mm: memcontrol: export root_mem_cgroup Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 06/14] net: tcp_memcontrol: simplify the per-memcg limit access Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 09/14] mm: memcontrol: generalize the socket accounting jump label Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 05/14] net: tcp_memcontrol: remove dead per-memcg count of allocated sockets Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 02/14] net: tcp_memcontrol: properly detect ancestor socket pressure Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 08/14] net: tcp_memcontrol: simplify linkage between socket and page counter Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 04/14] net: tcp_memcontrol: protect all tcp_memcontrol calls by jump-label Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 11/14] mm: memcontrol: move socket code for unified hierarchy accounting Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  [PATCH 13/14] mm: memcontrol: hook up vmpressure to socket pressure Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 16:40 +0100
  Re: [PATCH 00/14] mm: memcontrol: account socket memory in unified  hierarchy v4-RESEND David Miller <davem@davemloft.net> - 2015-12-08 17:30 +0100
  [PATCH] mm: memcontrol: only manage socket pressure for CONFIG_INET Arnd Bergmann <arnd@arndb.de> - 2015-12-09 17:40 +0100
    Re: [PATCH] mm: memcontrol: only manage socket pressure for  CONFIG_INET Johannes Weiner <hannes@cmpxchg.org> - 2015-12-09 20:00 +0100
      Re: [PATCH] mm: memcontrol: only manage socket pressure for  CONFIG_INET Andrew Morton <akpm@linux-foundation.org> - 2015-12-09 23:30 +0100
        Re: [PATCH] mm: memcontrol: only manage socket pressure for  CONFIG_INET Johannes Weiner <hannes@cmpxchg.org> - 2015-12-10 00:10 +0100
          Re: [PATCH] mm: memcontrol: only manage socket pressure for  CONFIG_INET Andrew Morton <akpm@linux-foundation.org> - 2015-12-10 00:20 +0100
  [PATCH] mm: memcontrol: MEMCG no longer works with SLOB Arnd Bergmann <arnd@arndb.de> - 2015-12-09 17:40 +0100
    Re: [PATCH] mm: memcontrol: MEMCG no longer works with SLOB Johannes Weiner <hannes@cmpxchg.org> - 2015-12-09 21:10 +0100
      Re: [PATCH] mm: memcontrol: MEMCG no longer works with SLOB Arnd Bergmann <arnd@arndb.de> - 2015-12-09 22:10 +0100
      Re: [PATCH] mm: memcontrol: MEMCG no longer works with SLOB Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-10 12:30 +0100
  Re: [PATCH 00/14] mm: memcontrol: account socket memory in unified hierarchy v4-RESEND Arnd Bergmann <arnd@arndb.de> - 2015-12-09 17:40 +0100
    Re: [PATCH 00/14] mm: memcontrol: account socket memory in unified  hierarchy v4-RESEND Johannes Weiner <hannes@cmpxchg.org> - 2015-12-09 19:20 +0100

csiph-web