Hi all, On Tue, 4 Jun 2019 00:31:53 +1000 Stephen Rothwell <[email protected]> wrote: > > Hi Krzysztof, > > On Mon, 3 Jun 2019 16:10:40 +0200 Krzysztof Kozlowski <[email protected]> wrote: > > > > Indeed it looks like effect of merge conflict resolution or applying. > > When I look at MMOTS, it is the same as yours: > > http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/commit/?id=b77b8cce67f246109f9d87417a32cd38f0398f2f > > > > However in linux-next it is different. > > > > Stephen, any thoughts? > > Have you had a look at today's linux-next? It looks correct in > there. Andrew updated his patch series over the weekend.
Actually, this is the patch from mmotm (note 'm'): From: "Uladzislau Rezki (Sony)" <[email protected]> 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/[email protected] Signed-off-by: Uladzislau Rezki (Sony) <[email protected]> Acked-by: Hillf Danton <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Joel Fernandes <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Oleksiy Avramchenko <[email protected]> Cc: Roman Gushchin <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Thomas Garnier <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> --- mm/vmalloc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) --- a/mm/vmalloc.c~mm-vmap-get-rid-of-one-single-unlink_va-when-merge +++ a/mm/vmalloc.c @@ -719,8 +719,8 @@ 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); @@ -746,9 +746,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); _ Do I need to replace that for tomorrow? -- Cheers, Stephen Rothwell
pgpXnuAKqVf7s.pgp
Description: OpenPGP digital signature
