The patch titled Subject: mm/vmalloc.c: get rid of one single unlink_va() when merge has been added to the -mm tree. Its filename is mm-vmap-get-rid-of-one-single-unlink_va-when-merge.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-vmap-get-rid-of-one-single-unlink_va-when-merge.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-vmap-get-rid-of-one-single-unlink_va-when-merge.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: "Uladzislau Rezki (Sony)" <urezki@xxxxxxxxx> Subject: mm/vmalloc.c: get rid of one single unlink_va() when merge It does not make sense to try to "unlink" the node that is definitely not linked with a list nor tree. On the first merge step VA just points to the previously disconnected busy area. On the second step, check if the node has been merged and do "unlink" if so, because now it points to an object that must be linked. Link: http://lkml.kernel.org/r/20190527151843.27416-4-urezki@xxxxxxxxx Signed-off-by: Uladzislau Rezki (Sony) <urezki@xxxxxxxxx> Acked-by: Hillf Danton <hdanton@xxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Joel Fernandes <joelaf@xxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Oleksiy Avramchenko <oleksiy.avramchenko@xxxxxxxxxxxxxx> Cc: Roman Gushchin <guro@xxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Thomas Garnier <thgarnie@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmalloc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) --- a/mm/vmalloc.c~mm-vmap-get-rid-of-one-single-unlink_va-when-merge +++ a/mm/vmalloc.c @@ -958,9 +958,6 @@ merge_or_add_vmap_area(struct vmap_area /* Check and update the tree if needed. */ augment_tree_propagate_from(sibling); - /* Remove this VA, it has been merged. */ - unlink_va(va, root); - /* Free vmap_area object. */ kmem_cache_free(vmap_area_cachep, va); @@ -985,12 +982,11 @@ merge_or_add_vmap_area(struct vmap_area /* Check and update the tree if needed. */ augment_tree_propagate_from(sibling); - /* Remove this VA, it has been merged. */ - unlink_va(va, root); + if (merged) + unlink_va(va, root); /* Free vmap_area object. */ kmem_cache_free(vmap_area_cachep, va); - return; } } _ Patches currently in -mm which might be from urezki@xxxxxxxxx are mm-vmap-remove-node-argument.patch mm-vmap-preload-a-cpu-with-one-object-for-split-purpose.patch mm-vmap-get-rid-of-one-single-unlink_va-when-merge.patch mm-vmap-switch-to-warn_on-and-move-it-under-unlink_va.patch