mm/vmalloc: switch to "propagate()" callback

An augment_tree_propagate_from() function uses its own implementation that
populates a tree from the specified node toward a root node.

On the other hand the RB_DECLARE_CALLBACKS_MAX macro provides the
"propagate()" callback that does exactly the same.  Having two similar
functions does not make sense and is redundant.

Reuse "built in" functionality to the macros.  So the code size gets
reduced.

Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200527205054.1696-3-urezki@gmail.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 740b7e4cac03e9efa9e345002681c3de83e6f336..ce17dbbd4bec9863d4d234158842ac99e667d8b6 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -677,25 +677,12 @@ augment_tree_propagate_check(void)
 static __always_inline void
 augment_tree_propagate_from(struct vmap_area *va)
 {
-       struct rb_node *node = &va->rb_node;
-       unsigned long new_va_sub_max_size;
-
-       while (node) {
-               va = rb_entry(node, struct vmap_area, rb_node);
-               new_va_sub_max_size = compute_subtree_max_size(va);
-
-               /*
-                * If the newly calculated maximum available size of the
-                * subtree is equal to the current one, then it means that
-                * the tree is propagated correctly. So we have to stop at
-                * this point to save cycles.
-                */
-               if (va->subtree_max_size == new_va_sub_max_size)
-                       break;
-
-               va->subtree_max_size = new_va_sub_max_size;
-               node = rb_parent(&va->rb_node);
-       }
+       /*
+        * Populate the tree from bottom towards the root until
+        * the calculated maximum available size of checked node
+        * is equal to its current one.
+        */
+       free_vmap_area_rb_augment_cb_propagate(&va->rb_node, NULL);
 
 #if DEBUG_AUGMENT_PROPAGATE_CHECK
        augment_tree_propagate_check();