From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gavin Shan Subject: Re: [PATCH] mm/memcg: wrap mem_cgroup_from_css function Date: Thu, 19 Jul 2012 17:38:35 +0800 Message-ID: <3334.03526242382$1342690731@news.gmane.org> References: <1342580730-25703-1-git-send-email-liwanp@linux.vnet.ibm.com> <20120719091420.GA2549@shutemov.name> <20120719092309.GA12409@kernel> Reply-To: Gavin Shan Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from kanga.kvack.org ([205.233.56.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SrnC4-0001xr-BS for glkm-linux-mm-2@m.gmane.org; Thu, 19 Jul 2012 11:38:48 +0200 Received: from psmtp.com (na3sys010amx158.postini.com [74.125.245.158]) by kanga.kvack.org (Postfix) with SMTP id DF2C46B005C for ; Thu, 19 Jul 2012 05:38:45 -0400 (EDT) Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 19 Jul 2012 03:38:44 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id A62111FF001A for ; Thu, 19 Jul 2012 09:38:40 +0000 (WET) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6J9cgYh169936 for ; Thu, 19 Jul 2012 03:38:42 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6J9cebD029151 for ; Thu, 19 Jul 2012 03:38:41 -0600 Content-Disposition: inline In-Reply-To: <20120719092309.GA12409@kernel> Sender: owner-linux-mm@kvack.org List-ID: To: Wanpeng Li Cc: "Kirill A. Shutemov" , linux-mm@kvack.org, Michal Hocko , Johannes Weiner , KAMEZAWAHiroyuki , Andrew Morton , Gavin Shan , linux-kernel@vger.kernel.org On Thu, Jul 19, 2012 at 05:23:09PM +0800, Wanpeng Li wrote: >On Thu, Jul 19, 2012 at 12:14:20PM +0300, Kirill A. Shutemov wrote: >>On Wed, Jul 18, 2012 at 11:05:30AM +0800, Wanpeng Li wrote: >>> wrap mem_cgroup_from_css function to clarify get mem cgroup >>> from cgroup_subsys_state. >>> >>> Signed-off-by: Wanpeng Li >>> Cc: Michal Hocko >>> Cc: Johannes Weiner >>> Cc: KAMEZAWA Hiroyuki >>> Cc: Andrew Morton >>> Cc: Gavin Shan >>> Cc: Wanpeng Li >>> Cc: linux-kernel@vger.kernel.org >>> --- >>> mm/memcontrol.c | 14 ++++++++++---- >>> 1 files changed, 10 insertions(+), 4 deletions(-) >>> >>> diff --git a/mm/memcontrol.c b/mm/memcontrol.c >>> index 58a08fc..20f6a15 100644 >>> --- a/mm/memcontrol.c >>> +++ b/mm/memcontrol.c >>> @@ -396,6 +396,12 @@ static void mem_cgroup_put(struct mem_cgroup *memcg); >>> #include >>> #include >>> >>> +static inline >>> +struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) >>> +{ >>> + return container_of(s, struct mem_cgroup, css); >>> +} >>> + >>> static bool mem_cgroup_is_root(struct mem_cgroup *memcg); >>> void sock_update_memcg(struct sock *sk) >>> { >>> @@ -820,7 +826,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page) >>> >>> struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont) >>> { >>> - return container_of(cgroup_subsys_state(cont, >>> + return mem_cgroup_from_css(cgroup_subsys_state(cont, >>> mem_cgroup_subsys_id), struct mem_cgroup, >>> css); >> >>Hm?.. Here and below too many args to mem_cgroup_from_css(). >>Have you tested the code? > >Hi, what's the meaning of "two many"? > It might be the typo for "two" here. I think it would be "too". However, it seems that you had pass "two" more arguments here to mem_cgroup_from_css() since the function only takes "one" parameter as you implemented before. +struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) + return mem_cgroup_from_css(cgroup_subsys_state(cont, + mem_cgroup_subsys_id), struct mem_cgroup, + css); Thanks, Gavin >cgroup_subsys_state(cont, mem_cgroup_subsys_id) and >task_subsys_state(p, mem_cgroup_subsys_id) both are >just one arg in mem_cgroup_from_css. :-) > >> >>> } >>> @@ -835,7 +841,7 @@ struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p) >>> if (unlikely(!p)) >>> return NULL; >>> >>> - return container_of(task_subsys_state(p, mem_cgroup_subsys_id), >>> + return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id), >>> struct mem_cgroup, css); >>> } >>> >>> @@ -922,7 +928,7 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root, >>> css = css_get_next(&mem_cgroup_subsys, id + 1, &root->css, &id); >>> if (css) { >>> if (css == &root->css || css_tryget(css)) >>> - memcg = container_of(css, >>> + memcg = mem_cgroup_from_css(css, >>> struct mem_cgroup, css); >>> } else >>> id = 0; >>> @@ -2406,7 +2412,7 @@ static struct mem_cgroup *mem_cgroup_lookup(unsigned short id) >>> css = css_lookup(&mem_cgroup_subsys, id); >>> if (!css) >>> return NULL; >>> - return container_of(css, struct mem_cgroup, css); >>> + return mem_cgroup_from_css(css, struct mem_cgroup, css); >>> } >>> >>> struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page) >>> -- >>> 1.7.5.4 >>> >>> -- >>> To unsubscribe, send a message with 'unsubscribe linux-mm' in >>> the body to majordomo@kvack.org. For more info on Linux MM, >>> see: http://www.linux-mm.org/ . >>> Don't email: email@kvack.org >> >>-- >> Kirill A. Shutemov -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org