rbtree: add RB_DECLARE_CALLBACKS() macro

As proposed by Peter Zijlstra, this makes it easier to define the augmented rbtree callbacks. Signed-off-by: Michel Lespinasse <walken@google.com> Cc: Rik van Riel <riel@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
author: Michel Lespinasse <walken@google.com> 2012-10-08 19:31:21 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-10-09 03:22:38 -0400
commit: 3908836aa77e3621aaf2101f2920e01d7c8460d6 (patch)
tree: 3e8f5b619f9e093d9d53180bb6f496319ddeb946
parent: 9d9e6f9703bbd642f3f2f807e6aaa642a4cbcec9 (diff)
3 files changed, 34 insertions, 67 deletions
diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
index 7e1515bd477..4d116959075 100644
--- a/arch/x86/mm/pat_rbtree.c
+++ b/arch/x86/mm/pat_rbtree.c
@@ -69,41 +69,8 @@ static u64 compute_subtree_max_end(struct memtype *data)
        return max_end;
 }
-/* Update 'subtree_max_end' for node and its parents */
+RB_DECLARE_CALLBACKS(static, memtype_rb_augment_cb, struct memtype, rb,
-static void memtype_rb_propagate_cb(struct rb_node *node, struct rb_node *stop)
+                     u64, subtree_max_end, compute_subtree_max_end)
-{
-        while (node != stop) {
-                struct memtype *data = container_of(node, struct memtype, rb);
-                u64 subtree_max_end = compute_subtree_max_end(data);
-                if (data->subtree_max_end == subtree_max_end)
-                        break;
-                data->subtree_max_end = subtree_max_end;
-                node = rb_parent(&data->rb);
-        }
-}
-static void memtype_rb_copy_cb(struct rb_node *old, struct rb_node *new)
-{
-        struct memtype *old_data = container_of(old, struct memtype, rb);
-        struct memtype *new_data = container_of(new, struct memtype, rb);
-        new_data->subtree_max_end = old_data->subtree_max_end;
-}
-/* Update 'subtree_max_end' after tree rotation. old and new are the
- * former and current subtree roots */
-static void memtype_rb_rotate_cb(struct rb_node *old, struct rb_node *new)
-{
-        struct memtype *old_data = container_of(old, struct memtype, rb);
-        struct memtype *new_data = container_of(new, struct memtype, rb);
-        new_data->subtree_max_end = old_data->subtree_max_end;
-        old_data->subtree_max_end = compute_subtree_max_end(old_data);
-}
-static const struct rb_augment_callbacks memtype_rb_augment_cb = {
-        memtype_rb_propagate_cb, memtype_rb_copy_cb, memtype_rb_rotate_cb
-};
 /* Find the first (lowest start addr) overlapping range from rb tree */
 static struct memtype *memtype_rb_lowest_match(struct rb_root *root,
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 4ace31b3338..8d1e83b1c87 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -79,6 +79,36 @@ rb_insert_augmented(struct rb_node *node, struct rb_root *root,
        __rb_insert_augmented(node, root, augment->rotate);
 }
+#define RB_DECLARE_CALLBACKS(rbstatic, rbname, rbstruct, rbfield,             \
+                             rbtype, rbaugmented, rbcompute)                  \
+static void rbname ## _propagate(struct rb_node *rb, struct rb_node *stop)    \
+{                                                                             \
+        while (rb != stop) {                                                  \
+                rbstruct *node = rb_entry(rb, rbstruct, rbfield);             \
+                rbtype augmented = rbcompute(node);                           \
+                if (node->rbaugmented == augmented)                           \
+                        break;                                                \
+                node->rbaugmented = augmented;                                \
+                rb = rb_parent(&node->rbfield);                               \
+        }                                                                     \
+}                                                                             \
+static void rbname ## _copy(struct rb_node *rb_old, struct rb_node *rb_new)   \
+{                                                                             \
+        rbstruct *old = rb_entry(rb_old, rbstruct, rbfield);                  \
+        rbstruct *new = rb_entry(rb_new, rbstruct, rbfield);                  \
+        new->rbaugmented = old->rbaugmented;                                  \
+}                                                                             \
+static void rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
+{                                                                             \
+        rbstruct *old = rb_entry(rb_old, rbstruct, rbfield);                  \
+        rbstruct *new = rb_entry(rb_new, rbstruct, rbfield);                  \
+        new->rbaugmented = old->rbaugmented;                                  \
+        old->rbaugmented = rbcompute(old);                                    \
+}                                                                             \
+rbstatic const struct rb_augment_callbacks rbname = {                         \
+        rbname ## _propagate, rbname ## _copy, rbname ## _rotate              \
+};
 /* Find logical next and previous nodes in a tree */
 extern struct rb_node *rb_next(const struct rb_node *);
diff --git a/lib/rbtree_test.c b/lib/rbtree_test.c
index e28345df09b..b20e99969b0 100644
--- a/lib/rbtree_test.c
+++ b/lib/rbtree_test.c
@@ -61,38 +61,8 @@ static inline u32 augment_recompute(struct test_node *node)
        return max;
 }
-static void augment_propagate(struct rb_node *rb, struct rb_node *stop)
+RB_DECLARE_CALLBACKS(static, augment_callbacks, struct test_node, rb,
-{
+                     u32, augmented, augment_recompute)
-        while (rb != stop) {
-                struct test_node *node = rb_entry(rb, struct test_node, rb);
-                u32 augmented = augment_recompute(node);
-                if (node->augmented == augmented)
-                        break;
-                node->augmented = augmented;
-                rb = rb_parent(&node->rb);
-        }
-}
-static void augment_copy(struct rb_node *rb_old, struct rb_node *rb_new)
-{
-        struct test_node *old = rb_entry(rb_old, struct test_node, rb);
-        struct test_node *new = rb_entry(rb_new, struct test_node, rb);
-        new->augmented = old->augmented;
-}
-static void augment_rotate(struct rb_node *rb_old, struct rb_node *rb_new)
-{
-        struct test_node *old = rb_entry(rb_old, struct test_node, rb);
-        struct test_node *new = rb_entry(rb_new, struct test_node, rb);
-        /* Rotation doesn't change subtree's augmented value */
-        new->augmented = old->augmented;
-        old->augmented = augment_recompute(old);
-}
-static const struct rb_augment_callbacks augment_callbacks = {
-        augment_propagate, augment_copy, augment_rotate
-};
 static void insert_augmented(struct test_node *node, struct rb_root *root)
 {
author	Michel Lespinasse <walken@google.com>	2012-10-08 19:31:21 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2012-10-09 03:22:38 -0400
commit	3908836aa77e3621aaf2101f2920e01d7c8460d6 (patch)
tree	3e8f5b619f9e093d9d53180bb6f496319ddeb946
parent	9d9e6f9703bbd642f3f2f807e6aaa642a4cbcec9 (diff)

diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c index 7e1515bd477..4d116959075 100644 --- a/arch/x86/mm/pat_rbtree.c +++ b/arch/x86/mm/pat_rbtree.c
@@ -69,41 +69,8 @@ static u64 compute_subtree_max_end(struct memtype *data)
69	return max_end;	69	return max_end;
70	}	70	}
71		71
72	/* Update 'subtree_max_end' for node and its parents */	72	RB_DECLARE_CALLBACKS(static, memtype_rb_augment_cb, struct memtype, rb,
73	static void memtype_rb_propagate_cb(struct rb_node node, struct rb_node stop)	73	u64, subtree_max_end, compute_subtree_max_end)
74	{
75	while (node != stop) {
76	struct memtype *data = container_of(node, struct memtype, rb);
77	u64 subtree_max_end = compute_subtree_max_end(data);
78	if (data->subtree_max_end == subtree_max_end)
79	break;
80	data->subtree_max_end = subtree_max_end;
81	node = rb_parent(&data->rb);
82	}
83	}
84
85	static void memtype_rb_copy_cb(struct rb_node old, struct rb_node new)
86	{
87	struct memtype *old_data = container_of(old, struct memtype, rb);
88	struct memtype *new_data = container_of(new, struct memtype, rb);
89
90	new_data->subtree_max_end = old_data->subtree_max_end;
91	}
92
93	/* Update 'subtree_max_end' after tree rotation. old and new are the
94	* former and current subtree roots */
95	static void memtype_rb_rotate_cb(struct rb_node old, struct rb_node new)
96	{
97	struct memtype *old_data = container_of(old, struct memtype, rb);
98	struct memtype *new_data = container_of(new, struct memtype, rb);
99
100	new_data->subtree_max_end = old_data->subtree_max_end;
101	old_data->subtree_max_end = compute_subtree_max_end(old_data);
102	}
103
104	static const struct rb_augment_callbacks memtype_rb_augment_cb = {
105	memtype_rb_propagate_cb, memtype_rb_copy_cb, memtype_rb_rotate_cb
106	};
107		74
108	/* Find the first (lowest start addr) overlapping range from rb tree */	75	/* Find the first (lowest start addr) overlapping range from rb tree */
109	static struct memtype memtype_rb_lowest_match(struct rb_root root,	76	static struct memtype memtype_rb_lowest_match(struct rb_root root,


diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h index 4ace31b3338..8d1e83b1c87 100644 --- a/include/linux/rbtree.h +++ b/include/linux/rbtree.h
@@ -79,6 +79,36 @@ rb_insert_augmented(struct rb_node node, struct rb_root root,
79	__rb_insert_augmented(node, root, augment->rotate);	79	__rb_insert_augmented(node, root, augment->rotate);
80	}	80	}
81		81
		82	#define RB_DECLARE_CALLBACKS(rbstatic, rbname, rbstruct, rbfield, \
		83	rbtype, rbaugmented, rbcompute) \
		84	static void rbname ## _propagate(struct rb_node rb, struct rb_node stop) \
		85	{ \
		86	while (rb != stop) { \
		87	rbstruct *node = rb_entry(rb, rbstruct, rbfield); \
		88	rbtype augmented = rbcompute(node); \
		89	if (node->rbaugmented == augmented) \
		90	break; \
		91	node->rbaugmented = augmented; \
		92	rb = rb_parent(&node->rbfield); \
		93	} \
		94	} \
		95	static void rbname ## _copy(struct rb_node rb_old, struct rb_node rb_new) \
		96	{ \
		97	rbstruct *old = rb_entry(rb_old, rbstruct, rbfield); \
		98	rbstruct *new = rb_entry(rb_new, rbstruct, rbfield); \
		99	new->rbaugmented = old->rbaugmented; \
		100	} \
		101	static void rbname ## _rotate(struct rb_node rb_old, struct rb_node rb_new) \
		102	{ \
		103	rbstruct *old = rb_entry(rb_old, rbstruct, rbfield); \
		104	rbstruct *new = rb_entry(rb_new, rbstruct, rbfield); \
		105	new->rbaugmented = old->rbaugmented; \
		106	old->rbaugmented = rbcompute(old); \
		107	} \
		108	rbstatic const struct rb_augment_callbacks rbname = { \
		109	rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
		110	};
		111
82		112
83	/* Find logical next and previous nodes in a tree */	113	/* Find logical next and previous nodes in a tree */
84	extern struct rb_node rb_next(const struct rb_node );	114	extern struct rb_node rb_next(const struct rb_node );


diff --git a/lib/rbtree_test.c b/lib/rbtree_test.c index e28345df09b..b20e99969b0 100644 --- a/lib/rbtree_test.c +++ b/lib/rbtree_test.c
@@ -61,38 +61,8 @@ static inline u32 augment_recompute(struct test_node *node)
61	return max;	61	return max;
62	}	62	}
63		63
64	static void augment_propagate(struct rb_node rb, struct rb_node stop)	64	RB_DECLARE_CALLBACKS(static, augment_callbacks, struct test_node, rb,
65	{	65	u32, augmented, augment_recompute)
66	while (rb != stop) {
67	struct test_node *node = rb_entry(rb, struct test_node, rb);
68	u32 augmented = augment_recompute(node);
69	if (node->augmented == augmented)
70	break;
71	node->augmented = augmented;
72	rb = rb_parent(&node->rb);
73	}
74	}
75
76	static void augment_copy(struct rb_node rb_old, struct rb_node rb_new)
77	{
78	struct test_node *old = rb_entry(rb_old, struct test_node, rb);
79	struct test_node *new = rb_entry(rb_new, struct test_node, rb);
80	new->augmented = old->augmented;
81	}
82
83	static void augment_rotate(struct rb_node rb_old, struct rb_node rb_new)
84	{
85	struct test_node *old = rb_entry(rb_old, struct test_node, rb);
86	struct test_node *new = rb_entry(rb_new, struct test_node, rb);
87
88	/* Rotation doesn't change subtree's augmented value */
89	new->augmented = old->augmented;
90	old->augmented = augment_recompute(old);
91	}
92
93	static const struct rb_augment_callbacks augment_callbacks = {
94	augment_propagate, augment_copy, augment_rotate
95	};
96		66
97	static void insert_augmented(struct test_node node, struct rb_root root)	67	static void insert_augmented(struct test_node node, struct rb_root root)
98	{	68	{