mmap: use vmi version of vma_merge()

Use the vma iterator so that the iterator can be invalidated or updated to
avoid each caller doing so.

Link: https://lkml.kernel.org/r/20230120162650.984577-26-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/mmap.c b/mm/mmap.c
index 2b588b831ead611c869aac353610282ab395114b..8806bfbaa5055c2d4e05a175f2b7ca86f53b60f5 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2690,8 +2690,9 @@ cannot_expand:
                 * vma again as we may succeed this time.
                 */
                if (unlikely(vm_flags != vma->vm_flags && prev)) {
-                       merge = vma_merge(mm, prev, vma->vm_start, vma->vm_end, vma->vm_flags,
-                               NULL, vma->vm_file, vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX, NULL);
+                       merge = vmi_vma_merge(&vmi, mm, prev, vma->vm_start,
+                               vma->vm_end, vma->vm_flags, NULL, vma->vm_file,
+                               vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX, NULL);
                        if (merge) {
                                /*
                                 * ->mmap() can change vma->vm_file and fput
@@ -3232,6 +3233,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
        struct mm_struct *mm = vma->vm_mm;
        struct vm_area_struct *new_vma, *prev;
        bool faulted_in_anon_vma = true;
+       VMA_ITERATOR(vmi, mm, addr);
 
        validate_mm_mt(mm);
        /*
@@ -3247,7 +3249,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
        if (new_vma && new_vma->vm_start < addr + len)
                return NULL;    /* should never get here */
 
-       new_vma = vma_merge(mm, prev, addr, addr + len, vma->vm_flags,
+       new_vma = vmi_vma_merge(&vmi, mm, prev, addr, addr + len, vma->vm_flags,
                            vma->anon_vma, vma->vm_file, pgoff, vma_policy(vma),
                            vma->vm_userfaultfd_ctx, anon_vma_name(vma));
        if (new_vma) {