Commit 5dd78640 authored by Uladzislau Rezki (Sony)'s avatar Uladzislau Rezki (Sony) Committed by Linus Torvalds

mm/vmalloc: simplify merge_or_add_vmap_area()

Currently when a VA is deallocated and is about to be placed back to the
tree, it can be either: merged with next/prev neighbors or inserted if not
coalesced.

On those steps the tree can be populated several times.  For example when
both neighbors are merged.  It can be avoided and simplified in fact.

Therefore do it only once when VA points to final merged area, after all
manipulations: merging/removing/inserting.
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-1-urezki@gmail.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0f14599c
...@@ -797,9 +797,6 @@ merge_or_add_vmap_area(struct vmap_area *va, ...@@ -797,9 +797,6 @@ merge_or_add_vmap_area(struct vmap_area *va,
if (sibling->va_start == va->va_end) { if (sibling->va_start == va->va_end) {
sibling->va_start = va->va_start; sibling->va_start = va->va_start;
/* Check and update the tree if needed. */
augment_tree_propagate_from(sibling);
/* Free vmap_area object. */ /* Free vmap_area object. */
kmem_cache_free(vmap_area_cachep, va); kmem_cache_free(vmap_area_cachep, va);
...@@ -819,14 +816,18 @@ merge_or_add_vmap_area(struct vmap_area *va, ...@@ -819,14 +816,18 @@ merge_or_add_vmap_area(struct vmap_area *va,
if (next->prev != head) { if (next->prev != head) {
sibling = list_entry(next->prev, struct vmap_area, list); sibling = list_entry(next->prev, struct vmap_area, list);
if (sibling->va_end == va->va_start) { if (sibling->va_end == va->va_start) {
sibling->va_end = va->va_end; /*
* If both neighbors are coalesced, it is important
/* Check and update the tree if needed. */ * to unlink the "next" node first, followed by merging
augment_tree_propagate_from(sibling); * with "previous" one. Otherwise the tree might not be
* fully populated if a sibling's augmented value is
* "normalized" because of rotation operations.
*/
if (merged) if (merged)
unlink_va(va, root); unlink_va(va, root);
sibling->va_end = va->va_end;
/* Free vmap_area object. */ /* Free vmap_area object. */
kmem_cache_free(vmap_area_cachep, va); kmem_cache_free(vmap_area_cachep, va);
...@@ -837,11 +838,13 @@ merge_or_add_vmap_area(struct vmap_area *va, ...@@ -837,11 +838,13 @@ merge_or_add_vmap_area(struct vmap_area *va,
} }
insert: insert:
if (!merged) { if (!merged)
link_va(va, root, parent, link, head); link_va(va, root, parent, link, head);
augment_tree_propagate_from(va);
}
/*
* Last step is to check and update the tree.
*/
augment_tree_propagate_from(va);
return va; return va;
} }
......
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