Commit 15ae144f authored by Uladzislau Rezki (Sony)'s avatar Uladzislau Rezki (Sony) Committed by Linus Torvalds

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: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200527205054.1696-3-urezki@gmail.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent da27c9ed
...@@ -677,25 +677,12 @@ augment_tree_propagate_check(void) ...@@ -677,25 +677,12 @@ augment_tree_propagate_check(void)
static __always_inline void static __always_inline void
augment_tree_propagate_from(struct vmap_area *va) 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 * Populate the tree from bottom towards the root until
* subtree is equal to the current one, then it means that * the calculated maximum available size of checked node
* the tree is propagated correctly. So we have to stop at * is equal to its current one.
* this point to save cycles.
*/ */
if (va->subtree_max_size == new_va_sub_max_size) free_vmap_area_rb_augment_cb_propagate(&va->rb_node, NULL);
break;
va->subtree_max_size = new_va_sub_max_size;
node = rb_parent(&va->rb_node);
}
#if DEBUG_AUGMENT_PROPAGATE_CHECK #if DEBUG_AUGMENT_PROPAGATE_CHECK
augment_tree_propagate_check(); augment_tree_propagate_check();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment