Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965396Ab3DHO5F (ORCPT ); Mon, 8 Apr 2013 10:57:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35370 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965382Ab3DHO5D (ORCPT ); Mon, 8 Apr 2013 10:57:03 -0400 Date: Mon, 8 Apr 2013 16:57:02 +0200 From: Michal Hocko To: Li Zefan Cc: Andrew Morton , Tejun Heo , Glauber Costa , KAMEZAWA Hiroyuki , Johannes Weiner , LKML , Cgroups , linux-mm@kvack.org Subject: Re: [PATCH 5/8] memcg: convert to use cgroup->id Message-ID: <20130408145702.GM17178@dhcp22.suse.cz> References: <51627DA9.7020507@huawei.com> <51627E33.4090107@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <51627E33.4090107@huawei.com> 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 Content-Length: 2591 Lines: 78 On Mon 08-04-13 16:22:11, Li Zefan wrote: > This is a preparation to kill css_id. > > Signed-off-by: Li Zefan This patch depends on the following patch, doesn't it? There is no guarantee that id fits into short right now. Not such a big deal but would be nicer to have that guarantee for bisectability. The patch on its own looks good. Acked-by: Michal Hocko > --- > mm/memcontrol.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 3561d0b..c4e0173 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -492,6 +492,11 @@ static inline bool mem_cgroup_is_root(struct mem_cgroup *memcg) > return (memcg == root_mem_cgroup); > } > > +static inline unsigned short mem_cgroup_id(struct mem_cgroup *memcg) > +{ > + return memcg->css.cgroup->id; > +} > + > /* Writing them here to avoid exposing memcg's inner layout */ > #if defined(CONFIG_INET) && defined(CONFIG_MEMCG_KMEM) > > @@ -4234,7 +4239,7 @@ mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout) > * css_get() was called in uncharge(). > */ > if (do_swap_account && swapout && memcg) > - swap_cgroup_record(ent, css_id(&memcg->css)); > + swap_cgroup_record(ent, mem_cgroup_id(memcg)); > } > #endif > > @@ -4286,8 +4291,8 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry, > { > unsigned short old_id, new_id; > > - old_id = css_id(&from->css); > - new_id = css_id(&to->css); > + old_id = mem_cgroup_id(from); > + new_id = mem_cgroup_id(to); > > if (swap_cgroup_cmpxchg(entry, old_id, new_id) == old_id) { > mem_cgroup_swap_statistics(from, false); > @@ -6428,7 +6433,7 @@ static enum mc_target_type get_mctgt_type(struct vm_area_struct *vma, > } > /* There is a swap entry and a page doesn't exist or isn't charged */ > if (ent.val && !ret && > - css_id(&mc.from->css) == lookup_swap_cgroup_id(ent)) { > + mem_cgroup_id(mc.from) == lookup_swap_cgroup_id(ent)) { > ret = MC_TARGET_SWAP; > if (target) > target->ent = ent; > -- > 1.8.0.2 > > -- > To unsubscribe from this list: send the line "unsubscribe cgroups" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Michal Hocko SUSE Labs -- 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/