| Message ID | 20190522150939.24605-3-urezki@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] mm/vmap: remove "node" argument | expand |
On Wed, 22 May 2019 17:09:38 +0200 "Uladzislau Rezki (Sony)" <urezki@gmail.com> wrote: > 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. Again, what is the motivation for this change? Seems to be a bit of a code/logic cleanup, no significant runtime effect?
On Wed, May 22, 2019 at 11:19:11AM -0700, Andrew Morton wrote: > On Wed, 22 May 2019 17:09:38 +0200 "Uladzislau Rezki (Sony)" <urezki@gmail.com> wrote: > > > 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. > > Again, what is the motivation for this change? Seems to be a bit of a > code/logic cleanup, no significant runtime effect? > It is just about some cleanups. Nothing related to design change and it behaviors as before. -- Vlad Rezki
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 5302e1b79c7b..89b8f44e8837 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -718,9 +718,6 @@ merge_or_add_vmap_area(struct vmap_area *va, /* 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); @@ -745,12 +742,12 @@ merge_or_add_vmap_area(struct vmap_area *va, /* Check and update the tree if needed. */ augment_tree_propagate_from(sibling); - /* Remove this VA, it has been merged. */ - unlink_va(va, root); + /* Remove this VA, if it has been merged. */ + if (merged) + unlink_va(va, root); /* Free vmap_area object. */ kmem_cache_free(vmap_area_cachep, va); - return; } }
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. Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com> --- mm/vmalloc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)