From patchwork Wed Jul 3 12:51:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zefan Li X-Patchwork-Id: 256623 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8FB9C2C008F for ; Wed, 3 Jul 2013 22:51:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756027Ab3GCMvf (ORCPT ); Wed, 3 Jul 2013 08:51:35 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:29820 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753569Ab3GCMve (ORCPT ); Wed, 3 Jul 2013 08:51:34 -0400 Received: from 172.24.2.119 (EHLO szxeml209-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id BEQ94849; Wed, 03 Jul 2013 20:51:05 +0800 (CST) Received: from SZXEML448-HUB.china.huawei.com (10.82.67.191) by szxeml209-edg.china.huawei.com (172.24.2.184) with Microsoft SMTP Server (TLS) id 14.1.323.7; Wed, 3 Jul 2013 20:51:01 +0800 Received: from [10.135.68.215] (10.135.68.215) by smtpscn.huawei.com (10.82.67.191) with Microsoft SMTP Server (TLS) id 14.1.323.7; Wed, 3 Jul 2013 20:51:01 +0800 Message-ID: <51D41E34.5010802@huawei.com> Date: Wed, 3 Jul 2013 20:51:00 +0800 From: Li Zefan User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: Sedat Dilek , CC: , , , , , Subject: Re: [PATCH next-20130703] net: sock: Add ifdef CONFIG_MEMCG_KMEM for mem_cgroup_sockets_{init,destroy} References: <1372853998-15353-1-git-send-email-sedat.dilek@gmail.com> In-Reply-To: <1372853998-15353-1-git-send-email-sedat.dilek@gmail.com> X-Originating-IP: [10.135.68.215] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 2013/7/3 20:19, Sedat Dilek wrote: > When "CONFIG_MEMCG_KMEM=n" I see this in my build-log: > > LD init/built-in.o > mm/built-in.o: In function `mem_cgroup_css_free': > memcontrol.c:(.text+0x5caa6): undefined reference to `mem_cgroup_sockets_destroy' > make[2]: *** [vmlinux] Error 1 > > Inspired by the ifdef for mem_cgroup_sockets_{init,destroy} here... > > [ net/core/sock.c ] > > #ifdef CONFIG_MEMCG_KMEM > int mem_cgroup_sockets_init() > ... > void mem_cgroup_sockets_destroy() > ... > #endif > > ...I did the the same for both in "include/net/sock.h". > > This fixes the issue for me in next-20130703. > > Signed-off-by: Sedat Dilek Maybe it's better to add memcg_destroy_kmem(), to pair with memcg_init_kmem(). This patch can be folded into "memcg: use css_get/put when charging/uncharging kmem" Reported-by: Sedat Dilek Tested-by: Sedat Dilek Acked-by: Michal Hocko ======================= [PATCH] memcg: fix build error if CONFIG_MEMCG_KMEM=n Fix this build error: mm/built-in.o: In function `mem_cgroup_css_free': memcontrol.c:(.text+0x5caa6): undefined reference to 'mem_cgroup_sockets_destroy' Reported-by: Fengguang Wu Reported-by: Stephen Rothwell Signed-off-by: Li Zefan --- mm/memcontrol.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 234f311..59ea6f9 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5876,6 +5876,11 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) return mem_cgroup_sockets_init(memcg, ss); } +static void memcg_destroy_kmem(struct mem_cgroup *memcg) +{ + mem_cgroup_sockets_destroy(memcg); +} + static void kmem_cgroup_css_offline(struct mem_cgroup *memcg) { if (!memcg_kmem_is_active(memcg)) @@ -5915,6 +5920,10 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) return 0; } +static void memcg_destroy_kmem(struct mem_cgroup *memcg) +{ +} + static void kmem_cgroup_css_offline(struct mem_cgroup *memcg) { } @@ -6312,8 +6321,7 @@ static void mem_cgroup_css_free(struct cgroup *cont) { struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); - mem_cgroup_sockets_destroy(memcg); - + memcg_destroy_kmem(memcg); __mem_cgroup_free(memcg); }