From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752292AbbLIQcX (ORCPT ); Wed, 9 Dec 2015 11:32:23 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:49520 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbbLIQcV (ORCPT ); Wed, 9 Dec 2015 11:32:21 -0500 From: Arnd Bergmann To: Johannes Weiner Cc: Andrew Morton , linux-mm@kvack.org, netdev@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: memcontrol: only manage socket pressure for CONFIG_INET Date: Wed, 09 Dec 2015 17:32:16 +0100 Message-ID: <7343206.sFybcLLUN2@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <2564892.qO1q7YJ6Nb@wuerfel> References: <1449588624-9220-1-git-send-email-hannes@cmpxchg.org> <2564892.qO1q7YJ6Nb@wuerfel> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:eQs/zoH+3JNcTdye5Y7cnL5rXYYDQ9p8TCwGfB7yEY8/1xUu66v Ate00ypMwK2PgQeQ9lSedvsVbAyhhj4tcwvU2cGNFe2gQgC8En+PkHMdtgp3qrvUDg3H+0F JXfhawIUEun/rFXuzLBuKIWtoS+le0kGis5G6dyzBvMfJbIRTY4dmw91a6key/FZivu0yhE 9PmDeBY6pKBwW+uFRI+3w== X-UI-Out-Filterresults: notjunk:1;V01:K0:/W4Cv9ycAdw=:EzLEHA8ZLOMntR/WVUYFVr EGBHsgbY5yNiIfG+Hd7k/BEzHdGZ84tVy9TY5O4W5gJMtdGXACSO6QtUayRq0PECjeqP1H6kR uXmBoVXSDTyqqQ2+eXJ0SnVvlA+iLT0Uw96MAA4+0VV+Ql8/gPFh/SzubXyO0Zb4su5S98xt9 1tB2se9w71J0FIDwTGQtlkYwGh0GxDxygdY3TioCd91b/FlTeBMUWAK5iUTaVlkzKJV+MMfHA WmOhNJDYxvVrS7siWNEcgosj0ZxHRRoACiziZpV/f7+VPw2zcMyLKtaGUeEFG6pt+cha+CsHc Z8tzWrWLNvOHHPfGKElfF/UQLkqVrMbvFytFo+KfviP2prj77ytmEIVvNXroYY0XyR82n2T9V WcAPYqOckprGj3nSsI6R/P+S42oCnfBf6iUKiwI4e6AcqATTMdQJBTOSKfEY6nnHlAepSyS3K 11yOGvaOTQNZWIqQC2ixdzzJSI1zYJ5EFu7cf+krM04iq8QdPlwy83h40FOvgf0PkzMVE1ltu 3ZC5kLhqCqumGNYnckEeBW9D9L6m1KJymOPAc5XvSOwzU04nd4eKtlO0Mvo1si60oIrPN+U45 2nOIjFsrwaGOSTTdszYtdm9qyLLCYkk3K7NVTscbs7CIrRRPBQ760y1TXScza+DYxYrQn48e9 DCE+b+RjUdS6fYbtgWcCz1hBMBAkArl1WiaiwjrZvvW9LbXGz9r2UUTbVx/ExDaXaTrK21FEy u7j7EYoSr/k8/jb+ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: 20cc40e66c42 ("mm: memcontrol: hook up vmpressure to socket pressure") 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 -#ifdef CONFIG_INET if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket) static_branch_inc(&memcg_sockets_enabled_key); #endif @@ -4276,7 +4276,7 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) memcg_free_kmem(memcg); -#ifdef CONFIG_MEMCG_LEGACY_KMEM +#if defined(CONFIG_MEMCG_LEGACY_KMEM) && defined(CONFIG_INET) tcp_destroy_cgroup(memcg); #endif diff --git a/mm/vmpressure.c b/mm/vmpressure.c index 506f03e4be47..8cdeebe48848 100644 --- a/mm/vmpressure.c +++ b/mm/vmpressure.c @@ -275,6 +275,7 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree, level = vmpressure_calc_level(scanned, reclaimed); +#ifdef CONFIG_INET if (level > VMPRESSURE_LOW) { /* * Let the socket buffer allocator know that @@ -286,6 +287,7 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree, */ memcg->socket_pressure = jiffies + HZ; } +#endif } }