From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx117.postini.com [74.125.245.117]) by kanga.kvack.org (Postfix) with SMTP id D9E4B6B00F9 for ; Thu, 12 Apr 2012 07:21:58 -0400 (EDT) Received: from m1.gw.fujitsu.co.jp (unknown [10.0.50.71]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 7D2973EE0B5 for ; Thu, 12 Apr 2012 20:21:57 +0900 (JST) Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id F387C45DE61 for ; Thu, 12 Apr 2012 20:21:53 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id DB12045DE5A for ; Thu, 12 Apr 2012 20:21:53 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id CBD411DB8051 for ; Thu, 12 Apr 2012 20:21:53 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.240.81.133]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 7962F1DB804B for ; Thu, 12 Apr 2012 20:21:53 +0900 (JST) Message-ID: <4F86BA66.2010503@jp.fujitsu.com> Date: Thu, 12 Apr 2012 20:20:06 +0900 From: KAMEZAWA Hiroyuki MIME-Version: 1.0 Subject: [PATCH 1/7] res_counter: add a function res_counter_move_parent(). References: <4F86B9BE.8000105@jp.fujitsu.com> In-Reply-To: <4F86B9BE.8000105@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: KAMEZAWA Hiroyuki Cc: "linux-mm@kvack.org" , "cgroups@vger.kernel.org" , Michal Hocko , Johannes Weiner , Tejun Heo , Glauber Costa , Hugh Dickins , Andrew Morton This function is used for moving accounting information to its parent in the hierarchy of res_counter. Signed-off-by: KAMEZAWA Hiroyuki --- include/linux/res_counter.h | 3 +++ kernel/res_counter.c | 13 +++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index da81af0..8919d3c 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@ -135,6 +135,9 @@ int __must_check res_counter_charge_nofail(struct res_counter *counter, void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val); void res_counter_uncharge(struct res_counter *counter, unsigned long val); +/* move resource to parent counter...i.e. just forget accounting in a child */ +void res_counter_move_parent(struct res_counter *counter, unsigned long val); + /** * res_counter_margin - calculate chargeable space of a counter * @cnt: the counter diff --git a/kernel/res_counter.c b/kernel/res_counter.c index d508363..fafebf0 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c @@ -113,6 +113,19 @@ void res_counter_uncharge(struct res_counter *counter, unsigned long val) local_irq_restore(flags); } +/* + * In hierarchical accounting, child's usage is accounted into ancestors. + * To move local usage to its parent, just forget current level usage. + */ +void res_counter_move_parent(struct res_counter *counter, unsigned long val) +{ + unsigned long flags; + + BUG_ON(!counter->parent); + spin_lock_irqsave(&counter->lock, flags); + res_counter_uncharge_locked(counter, val); + spin_unlock_irqrestore(&counter->lock, flags); +} static inline unsigned long long * res_counter_member(struct res_counter *counter, int member) -- 1.7.4.1 -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 From: KAMEZAWA Hiroyuki Subject: [PATCH 1/7] res_counter: add a function res_counter_move_parent(). Date: Thu, 12 Apr 2012 20:20:06 +0900 Message-ID: <4F86BA66.2010503@jp.fujitsu.com> References: <4F86B9BE.8000105@jp.fujitsu.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4F86B9BE.8000105-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii" To: KAMEZAWA Hiroyuki Cc: "linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org" , "cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Michal Hocko , Johannes Weiner , Tejun Heo , Glauber Costa , Hugh Dickins , Andrew Morton This function is used for moving accounting information to its parent in the hierarchy of res_counter. Signed-off-by: KAMEZAWA Hiroyuki --- include/linux/res_counter.h | 3 +++ kernel/res_counter.c | 13 +++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index da81af0..8919d3c 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@ -135,6 +135,9 @@ int __must_check res_counter_charge_nofail(struct res_counter *counter, void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val); void res_counter_uncharge(struct res_counter *counter, unsigned long val); +/* move resource to parent counter...i.e. just forget accounting in a child */ +void res_counter_move_parent(struct res_counter *counter, unsigned long val); + /** * res_counter_margin - calculate chargeable space of a counter * @cnt: the counter diff --git a/kernel/res_counter.c b/kernel/res_counter.c index d508363..fafebf0 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c @@ -113,6 +113,19 @@ void res_counter_uncharge(struct res_counter *counter, unsigned long val) local_irq_restore(flags); } +/* + * In hierarchical accounting, child's usage is accounted into ancestors. + * To move local usage to its parent, just forget current level usage. + */ +void res_counter_move_parent(struct res_counter *counter, unsigned long val) +{ + unsigned long flags; + + BUG_ON(!counter->parent); + spin_lock_irqsave(&counter->lock, flags); + res_counter_uncharge_locked(counter, val); + spin_unlock_irqrestore(&counter->lock, flags); +} static inline unsigned long long * res_counter_member(struct res_counter *counter, int member) -- 1.7.4.1