From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752995Ab3IXBwR (ORCPT ); Mon, 23 Sep 2013 21:52:17 -0400 Received: from mail-qe0-f46.google.com ([209.85.128.46]:56486 "EHLO mail-qe0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751571Ab3IXBwP (ORCPT ); Mon, 23 Sep 2013 21:52:15 -0400 Date: Mon, 23 Sep 2013 21:52:11 -0400 From: Tejun Heo To: Andrew Morton Cc: Li Zefan , Michal Hocko , KAMEZAWA Hiroyuki , Johannes Weiner , LKML , cgroups , "linux-mm@kvack.org" , Stephen Rothwell Subject: Re: [PATCH v6 0/5] memcg, cgroup: kill css id Message-ID: <20130924015211.GD3482@htj.dyndns.org> References: <524001F8.6070205@huawei.com> <20130923130816.GH30946@htj.dyndns.org> <20130923131215.GI30946@htj.dyndns.org> <5240DD83.1070509@huawei.com> <20130923175247.ea5156de.akpm@linux-foundation.org> <20130924013058.GB3482@htj.dyndns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130924013058.GB3482@htj.dyndns.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (cc'ing Stephen, hi!) On Mon, Sep 23, 2013 at 09:30:58PM -0400, Tejun Heo wrote: > Hello, Andrew. > > On Mon, Sep 23, 2013 at 05:52:47PM -0700, Andrew Morton wrote: > > > I would love to see this patchset go through cgroup tree. The changes to > > > memcg is quite small, > > > > It seems logical to put this in the cgroup tree as that's where most of > > the impact occurs. > > Cool, applying the changes to cgroup/for-3.13. Stephen, Andrew, cgroup/for-3.13 will cause a minor conflict in mm/memcontrol.c with the patch which reverts Michal's reclaim changes. static void __mem_cgroup_free(struct mem_cgroup *memcg) { int node; size_t size = memcg_size(); <<<<<<< HEAD ======= mem_cgroup_remove_from_trees(memcg); free_css_id(&mem_cgroup_subsys, &memcg->css); >>>>>>> 1fa8f71dfa6e28c89afad7ac71dcb19b8c8da8b7 for_each_node(node) free_mem_cgroup_per_zone_info(memcg, node); It's a context conflict and just removing free_css_id() call resolves it. static void __mem_cgroup_free(struct mem_cgroup *memcg) { int node; size_t size = memcg_size(); mem_cgroup_remove_from_trees(memcg); for_each_node(node) free_mem_cgroup_per_zone_info(memcg, node); Thanks. -- tejun