Commit 89b2d2a5 authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton

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.comSigned-off-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Reviewed-by: default avatarLorenzo 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 17f1ae9b
...@@ -1796,6 +1796,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma, ...@@ -1796,6 +1796,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
vma_iter_store(vmi, vma); vma_iter_store(vmi, vma);
vma_complete(&vp, vmi, mm); vma_complete(&vp, vmi, mm);
validate_mm(mm);
khugepaged_enter_vma(vma, flags); khugepaged_enter_vma(vma, flags);
goto out; goto out;
} }
......
...@@ -269,6 +269,7 @@ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, ...@@ -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 stores the new vma */
vma_complete(&vp, vmi, vma->vm_mm); vma_complete(&vp, vmi, vma->vm_mm);
validate_mm(vma->vm_mm);
/* Success. */ /* Success. */
if (new_below) if (new_below)
...@@ -548,6 +549,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma, ...@@ -548,6 +549,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
vma_iter_store(vmi, vma); vma_iter_store(vmi, vma);
vma_complete(&vp, vmi, vma->vm_mm); vma_complete(&vp, vmi, vma->vm_mm);
validate_mm(vma->vm_mm);
return 0; return 0;
nomem: nomem:
...@@ -589,6 +591,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma, ...@@ -589,6 +591,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,
vma_iter_clear(vmi); vma_iter_clear(vmi);
vma_set_range(vma, start, end, pgoff); vma_set_range(vma, start, end, pgoff);
vma_complete(&vp, vmi, vma->vm_mm); vma_complete(&vp, vmi, vma->vm_mm);
validate_mm(vma->vm_mm);
return 0; return 0;
} }
...@@ -668,7 +671,6 @@ void vma_complete(struct vma_prepare *vp, ...@@ -668,7 +671,6 @@ void vma_complete(struct vma_prepare *vp,
} }
if (vp->insert && vp->file) if (vp->insert && vp->file)
uprobe_mmap(vp->insert); uprobe_mmap(vp->insert);
validate_mm(mm);
} }
/* /*
...@@ -1197,6 +1199,7 @@ static struct vm_area_struct ...@@ -1197,6 +1199,7 @@ static struct vm_area_struct
} }
vma_complete(&vp, vmi, mm); vma_complete(&vp, vmi, mm);
validate_mm(mm);
khugepaged_enter_vma(res, vm_flags); khugepaged_enter_vma(res, vm_flags);
return res; return res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment