From: KAMEZAWA Hiroyuki Subject: Re: [PATCH v3 4/6] memcg: move charges to root cgroup if use_hierarchy=0. Date: Tue, 15 May 2012 09:04:29 +0900 Message-ID: <4FB19D8D.9060803@jp.fujitsu.com> References: <4FACDED0.3020400@jp.fujitsu.com> <4FACE0A2.30608@jp.fujitsu.com> <20120514201438.GI2366@google.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120514201438.GI2366-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Tejun Heo Cc: "linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org" , "cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Michal Hocko , Johannes Weiner , Frederic Weisbecker , Han Ying , Glauber Costa , "Aneesh Kumar K.V" , Andrew Morton , Hiroyuki Kamezawa , Linux Kernel (2012/05/15 5:14), Tejun Heo wrote: > On Fri, May 11, 2012 at 06:49:22PM +0900, KAMEZAWA Hiroyuki wrote: >> @@ -3351,9 +3339,8 @@ int mem_cgroup_move_hugetlb_parent(int idx, struct cgroup *cgroup, >> struct page_cgroup *pc; >> int csize, ret = 0; >> struct res_counter *fail_res; >> - struct cgroup *pcgrp = cgroup->parent; >> - struct mem_cgroup *parent = mem_cgroup_from_cont(pcgrp); >> struct mem_cgroup *memcg = mem_cgroup_from_cont(cgroup); >> + struct mem_cgroup *parent = parent_mem_cgroup(memcg); >> struct res_counter *counter; >> >> if (!get_page_unless_zero(page)) >> @@ -3366,13 +3353,11 @@ int mem_cgroup_move_hugetlb_parent(int idx, struct cgroup *cgroup, >> >> csize = PAGE_SIZE << compound_order(page); >> /* If parent->use_hierarchy == 0, we need to charge parent */ >> - if (!parent->use_hierarchy) { >> - ret = res_counter_charge(&parent->hugepage[idx], >> - csize, &fail_res); >> - if (ret) { >> - ret = -EBUSY; >> - goto err_out; >> - } >> + if (!parent) { >> + parent = root_mem_cgroup; >> + /* root has no limit */ >> + res_counter_charge_nofail(&parent->hugepage[idx], >> + csize, &fail_res); >> } >> counter = &memcg->hugepage[idx]; >> res_counter_uncharge_until(counter, counter->parent, csize); > > This function can simply return 0 now, so no point in having int > return. Make it return void? > > Also, follow-up patches to cleanup -ENOMEM failure handling in the > callers would be nice. > Sure, I'll check it. Thanks, -Kame