mm/vma: extract validate_mm() from vma_complete()

vma_complete() will need to be called during an unsafe time to call
validate_mm().  Extract the call in all places now so that only one
location can be modified in the next change.

Link: https://lkml.kernel.org/r/20240830040101.822209-8-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Bert Karwatzki <spasswolf@web.de>
Cc: Jeff Xu <jeffxu@chromium.org>
Cc: Jiri Olsa <olsajiri@gmail.com>
Cc: Kees Cook <kees@kernel.org>
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: "Paul E. McKenney" <paulmck@kernel.org>
Cc: Paul Moore <paul@paul-moore.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/mmap.c b/mm/mmap.c
index 548bc45a27bf82194445a67a3027b9e4c6c4aee3..dce1cc74ecdbe6c33f846cf5315e6b189ec2baf9 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1796,6 +1796,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
                vma_iter_store(vmi, vma);
 
                vma_complete(&vp, vmi, mm);
+               validate_mm(mm);
                khugepaged_enter_vma(vma, flags);
                goto out;
        }

diff --git a/mm/vma.c b/mm/vma.c
index 6d042cd46cdbf516c4f39def594e74499b736938..4e08c1654bdd05a39eff3445f606c9e750a28d68 100644 (file)
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -269,6 +269,7 @@ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
 
        /* vma_complete stores the new vma */
        vma_complete(&vp, vmi, vma->vm_mm);
+       validate_mm(vma->vm_mm);
 
        /* Success. */
        if (new_below)
@@ -548,6 +549,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
        vma_iter_store(vmi, vma);
 
        vma_complete(&vp, vmi, vma->vm_mm);
+       validate_mm(vma->vm_mm);
        return 0;
 
 nomem:
@@ -589,6 +591,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,
        vma_iter_clear(vmi);
        vma_set_range(vma, start, end, pgoff);
        vma_complete(&vp, vmi, vma->vm_mm);
+       validate_mm(vma->vm_mm);
        return 0;
 }
 
@@ -668,7 +671,6 @@ again:
        }
        if (vp->insert && vp->file)
                uprobe_mmap(vp->insert);
-       validate_mm(mm);
 }
 
 /*
@@ -1197,6 +1199,7 @@ static struct vm_area_struct
        }
 
        vma_complete(&vp, vmi, mm);
+       validate_mm(mm);
        khugepaged_enter_vma(res, vm_flags);
        return res;