From: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Paul Menage <paul@xxxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Aditya Kali <adityakali@xxxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Tim Hockin <thockin@xxxxxxxxxx>
Cc: Tejun Heo <htejun@xxxxxxxxx>
Cc: Containers <containers@xxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Glauber Costa <glommer@xxxxxxxxx>
Cc: Cgroups <cgroups@xxxxxxxxxxxxxxx>
Cc: Daniel J Walsh <dwalsh@xxxxxxxxxx>
Cc: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Max Kellermann <mk@xxxxxxxxxx>
Cc: Mandeep Singh Baines <msb@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/res_counter.h | 4 ++++
kernel/res_counter.c | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index 9721fde..4addc7a 100644
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -144,6 +144,10 @@ u64 res_counter_uncharge(struct res_counter *counter, unsigned long val);
u64 res_counter_uncharge_until(struct res_counter *counter,
struct res_counter *top,
unsigned long 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 dadb16e..8c16224 100644
--- a/kernel/res_counter.c
+++ b/kernel/res_counter.c
@@ -132,6 +132,40 @@ u64 res_counter_uncharge(struct res_counter *counter, unsigned long val)
return res_counter_uncharge_until(counter, NULL, val);
}
+/*
+ * 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.8.3.1
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/containers
