Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752509AbbLHSfB (ORCPT ); Tue, 8 Dec 2015 13:35:01 -0500 Received: from gum.cmpxchg.org ([85.214.110.215]:48470 "EHLO gum.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751783AbbLHSe6 (ORCPT ); Tue, 8 Dec 2015 13:34:58 -0500 From: Johannes Weiner To: Andrew Morton Cc: Michal Hocko , Vladimir Davydov , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 5/8] mm: memcontrol: separate kmem code from legacy tcp accounting code Date: Tue, 8 Dec 2015 13:34:22 -0500 Message-Id: <1449599665-18047-6-git-send-email-hannes@cmpxchg.org> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1449599665-18047-1-git-send-email-hannes@cmpxchg.org> References: <1449599665-18047-1-git-send-email-hannes@cmpxchg.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2659 Lines: 101 The cgroup2 memory controller will include important in-kernel memory consumers per default, including socket memory, but it will no longer carry the historic tcp control interface. Separate the kmem state init from the tcp control interface init in preparation for that. Signed-off-by: Johannes Weiner --- mm/memcontrol.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5118618..55a3f07 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2925,17 +2925,6 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg) return ret; } -static int memcg_init_kmem(struct mem_cgroup *memcg) -{ - int ret; - - ret = memcg_propagate_kmem(memcg); - if (ret) - return ret; - - return tcp_init_cgroup(memcg); -} - static void memcg_offline_kmem(struct mem_cgroup *memcg) { struct cgroup_subsys_state *css; @@ -2988,7 +2977,6 @@ static void memcg_free_kmem(struct mem_cgroup *memcg) static_branch_dec(&memcg_kmem_enabled_key); WARN_ON(page_counter_read(&memcg->kmem)); } - tcp_destroy_cgroup(memcg); } #else static int memcg_update_kmem_limit(struct mem_cgroup *memcg, @@ -2996,16 +2984,9 @@ static int memcg_update_kmem_limit(struct mem_cgroup *memcg, { return -EINVAL; } -static int memcg_init_kmem(struct mem_cgroup *memcg) -{ - return 0; -} static void memcg_offline_kmem(struct mem_cgroup *memcg) { } -static void memcg_free_kmem(struct mem_cgroup *memcg) -{ -} #endif /* CONFIG_MEMCG_KMEM */ /* @@ -4241,9 +4222,14 @@ mem_cgroup_css_online(struct cgroup_subsys_state *css) } mutex_unlock(&memcg_create_mutex); - ret = memcg_init_kmem(memcg); +#ifdef CONFIG_MEMCG_KMEM + ret = memcg_propagate_kmem(memcg); if (ret) return ret; + ret = tcp_init_cgroup(memcg); + if (ret) + return ret; +#endif #ifdef CONFIG_INET if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket) @@ -4288,11 +4274,16 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) { struct mem_cgroup *memcg = mem_cgroup_from_css(css); - memcg_free_kmem(memcg); #ifdef CONFIG_INET if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket) static_branch_dec(&memcg_sockets_enabled_key); #endif + +#ifdef CONFIG_MEMCG_KMEM + memcg_free_kmem(memcg); + tcp_destroy_cgroup(memcg); +#endif + __mem_cgroup_free(memcg); } -- 2.6.3 -- 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/