Re: [PATCH] mm: memcontrol: only manage socket pressure for CONFIG_INET
From: Johannes Weiner <hannes@cmpxchg.org>
Date: 2015-12-09 18:59:12
Also in:
cgroups, linux-mm, lkml
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>
quoted hunk ↗ jump to hunk
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, 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/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>