From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574Ab3FFEjA (ORCPT ); Thu, 6 Jun 2013 00:39:00 -0400 Received: from mail-pb0-f49.google.com ([209.85.160.49]:59975 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751594Ab3FFEi6 (ORCPT ); Thu, 6 Jun 2013 00:38:58 -0400 Date: Wed, 5 Jun 2013 21:38:56 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Johannes Weiner cc: Andrew Morton , Glauber Costa , Michal Hocko , KAMEZAWA Hiroyuki , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [patch] memcg: clean up memcg->nodeinfo In-Reply-To: <1370487934-4547-1-git-send-email-hannes@cmpxchg.org> Message-ID: References: <1370487934-4547-1-git-send-email-hannes@cmpxchg.org> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 5 Jun 2013, Johannes Weiner wrote: > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index ff7b40d..d169a8d 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -187,10 +187,6 @@ struct mem_cgroup_per_node { > struct mem_cgroup_per_zone zoneinfo[MAX_NR_ZONES]; > }; > > -struct mem_cgroup_lru_info { > - struct mem_cgroup_per_node *nodeinfo[0]; > -}; > - > /* > * Cgroups above their limits are maintained in a RB-Tree, independent of > * their hierarchy representation > @@ -384,14 +380,9 @@ struct mem_cgroup { > #endif > /* when kmem shrinkers can sleep but can't proceed due to context */ > struct work_struct kmemcg_shrink_work; > - /* > - * Per cgroup active and inactive list, similar to the > - * per zone LRU lists. > - * > - * WARNING: This has to be the last element of the struct. Don't > - * add new fields after this point. > - */ > - struct mem_cgroup_lru_info info; > + > + struct mem_cgroup_per_node *nodeinfo[0]; > + /* WARNING: nodeinfo has to be the last member here */ Nice cleanup, but would this be better as a flexible array member? It would have an incomplete type like it should have instead of sizeof returning 0. > }; > > static size_t memcg_size(void) > @@ -777,7 +768,7 @@ static struct mem_cgroup_per_zone * > mem_cgroup_zoneinfo(struct mem_cgroup *memcg, int nid, int zid) > { > VM_BUG_ON((unsigned)nid >= nr_node_ids); > - return &memcg->info.nodeinfo[nid]->zoneinfo[zid]; > + return &memcg->nodeinfo[nid]->zoneinfo[zid]; > } > > struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *memcg) > @@ -6595,13 +6586,13 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node) > mz->on_tree = false; > mz->memcg = memcg; > } > - memcg->info.nodeinfo[node] = pn; > + memcg->nodeinfo[node] = pn; > return 0; > } > > static void free_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node) > { > - kfree(memcg->info.nodeinfo[node]); > + kfree(memcg->nodeinfo[node]); > } > > static struct mem_cgroup *mem_cgroup_alloc(void)