[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1328067470-5980-5-git-send-email-fweisbec@gmail.com>
Date: Wed, 1 Feb 2012 04:37:44 +0100
From: Frederic Weisbecker <fweisbec@...il.com>
To: Andrew Morton <akpm@...ux-foundation.org>,
Tejun Heo <tj@...nel.org>, Li Zefan <lizf@...fujitsu.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
"Kirill A. Shutemov" <kirill@...temov.name>,
Frederic Weisbecker <fweisbec@...il.com>,
Paul Menage <paul@...lmenage.org>,
Johannes Weiner <hannes@...xchg.org>,
Aditya Kali <adityakali@...gle.com>,
Oleg Nesterov <oleg@...hat.com>,
Tim Hockin <thockin@...kin.org>, Tejun Heo <htejun@...il.com>,
Containers <containers@...ts.linux-foundation.org>,
Glauber Costa <glommer@...il.com>,
Cgroups <cgroups@...r.kernel.org>,
Daniel J Walsh <dwalsh@...hat.com>,
"Daniel P. Berrange" <berrange@...hat.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
Max Kellermann <mk@...all.com>,
Mandeep Singh Baines <msb@...omium.org>
Subject: [PATCH 04/10] cgroups: add res counter common ancestor searching
From: "Kirill A. Shutemov" <kirill@...temov.name>
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 <kirill@...temov.name>
Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>
Cc: Li Zefan <lizf@...fujitsu.com>
Cc: Paul Menage <paul@...lmenage.org>
Cc: Johannes Weiner <hannes@...xchg.org>
Cc: Aditya Kali <adityakali@...gle.com>
Cc: Oleg Nesterov <oleg@...hat.com>
Cc: Tim Hockin <thockin@...kin.org>
Cc: Tejun Heo <htejun@...il.com>
Cc: Containers <containers@...ts.linux-foundation.org>
Cc: Glauber Costa <glommer@...il.com>
Cc: Cgroups <cgroups@...r.kernel.org>
Cc: Daniel J Walsh <dwalsh@...hat.com>
Cc: "Daniel P. Berrange" <berrange@...hat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
Cc: Max Kellermann <mk@...all.com>
Cc: Mandeep Singh Baines <msb@...omium.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists