From mboxrd@z Thu Jan 1 00:00:00 1970 From: Frederic Weisbecker Subject: [PATCH 04/10] cgroups: add res counter common ancestor searching Date: Wed, 1 Feb 2012 04:37:44 +0100 Message-ID: <1328067470-5980-5-git-send-email-fweisbec@gmail.com> References: <1328067470-5980-1-git-send-email-fweisbec@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=RvHrxYM8b8SBW8iZYXOqpGBJh22SdXm498HBHVaXBiQ=; b=C5AmDhNEeKhbu5JGpFhF5hODlaNWbHFscpceaEin2uunLBmcubLjxZi9K/rD+JwR6V KhA0X4A/hQQ9Ho2ZUhHggL8lfBAr0wSSzOzCb10NZciMAs91yLrPPC7S8wZ0752+fSLV Ol6N7MztLW9iy2IvtantUMiCTiKSEJHI5QajQ= In-Reply-To: <1328067470-5980-1-git-send-email-fweisbec-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Andrew Morton , Tejun Heo , Li Zefan Cc: Aditya Kali , Glauber Costa , Tejun Heo , "Daniel P. Berrange" , Max Kellermann , Tim Hockin , Frederic Weisbecker , Paul Menage , Daniel J Walsh , LKML , Oleg Nesterov , Mandeep Singh Baines , Johannes Weiner , Cgroups , Containers From: "Kirill A. Shutemov" Add a new API to find the common ancestor between two resource counters. This includes the passed resource counter themselves. Signed-off-by: Kirill A. Shutemov Signed-off-by: Frederic Weisbecker Cc: Li Zefan Cc: Paul Menage Cc: Johannes Weiner Cc: Aditya Kali Cc: Oleg Nesterov Cc: Tim Hockin Cc: Tejun Heo Cc: Containers Cc: Glauber Costa Cc: Cgroups Cc: Daniel J Walsh Cc: "Daniel P. Berrange" Cc: KAMEZAWA Hiroyuki Cc: Max Kellermann Cc: Mandeep Singh Baines Signed-off-by: Andrew Morton --- include/linux/res_counter.h | 3 +++ kernel/res_counter.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index de4ba29..558f39b 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@ -147,6 +147,9 @@ static inline void res_counter_uncharge(struct res_counter *counter, res_counter_uncharge_until(counter, NULL, val); } +struct res_counter *res_counter_common_ancestor(struct res_counter *l, + struct res_counter *r); + /** * 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 40f15aa..6dc6164 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c @@ -91,6 +91,39 @@ void res_counter_uncharge_until(struct res_counter *counter, local_irq_restore(flags); } +/* + * Walk through r1 and r2 parents and try to find the closest common one + * between both. If none is found, it returns NULL. + */ +struct res_counter * +res_counter_common_ancestor(struct res_counter *r1, struct res_counter *r2) +{ + struct res_counter *iter; + int r1_depth = 0, r2_depth = 0; + + for (iter = r1; iter; iter = iter->parent) + r1_depth++; + + for (iter = r2; iter; iter = iter->parent) + r2_depth++; + + while (r1_depth > r2_depth) { + r1 = r1->parent; + r1_depth--; + } + + while (r2_depth > r1_depth) { + r2 = r2->parent; + r2_depth--; + } + + while (r1 != r2) { + r1 = r1->parent; + r2 = r2->parent; + } + + return r1; +} static inline unsigned long long * res_counter_member(struct res_counter *counter, int member) -- 1.7.5.4