Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932765Ab2EOAG3 (ORCPT ); Mon, 14 May 2012 20:06:29 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:32815 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932723Ab2EOAG1 (ORCPT ); Mon, 14 May 2012 20:06:27 -0400 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <4FB19D8D.9060803@jp.fujitsu.com> Date: Tue, 15 May 2012 09:04:29 +0900 From: KAMEZAWA Hiroyuki User-Agent: Mozilla/5.0 (Windows NT 6.0; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Tejun Heo CC: "linux-mm@kvack.org" , "cgroups@vger.kernel.org" , Michal Hocko , Johannes Weiner , Frederic Weisbecker , Han Ying , Glauber Costa , "Aneesh Kumar K.V" , Andrew Morton , Hiroyuki Kamezawa , Linux Kernel Subject: Re: [PATCH v3 4/6] memcg: move charges to root cgroup if use_hierarchy=0. References: <4FACDED0.3020400@jp.fujitsu.com> <4FACE0A2.30608@jp.fujitsu.com> <20120514201438.GI2366@google.com> In-Reply-To: <20120514201438.GI2366@google.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1756 Lines: 52 (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 -- 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/