mm-vma-move-__vm_munmap-to-mm-vmac.patch removed from -mm tree
The quilt patch titled
Subject: mm/vma: move __vm_munmap() to mm/vma.c
has been removed from the -mm tree. Its filename was
mm-vma-move-__vm_munmap-to-mm-vmac.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: mm/vma: move __vm_munmap() to mm/vma.c
Date: Tue, 3 Dec 2024 18:05:12 +0000
This was arbitrarily left in mmap.c it makes no sense being there, move it to vma.c to render it testable.
Link https://lkml.kernel.org/r/5e5e81807c54dfbe363edb2d431eb3d7a37fcdba.1733248985.git.lorenzo.stoakes@oracle.com open here
Signed-off-by Lorenzo Stoakes <[email protected]>
Cc Al Viro <[email protected]>
Cc Christian Brauner <[email protected]>
Cc Eric W. Biederman <[email protected]>
Cc Jan Kara <[email protected]>
Cc Jann Horn <[email protected]>
Cc Kees Cook <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Vlastimil Babka <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/mmap.c | 18 ------------------ mm/vma.c | 18 ++++++++++++++++++ mm/vma.h | 2 ++ tools/testing/vma/vma_internal.h | 9 +++++++++ 4 files changed, 29 insertions(+), 18 deletions(-)
mm/mmap.c renamed from mm/mmap.c~mm-vma-move-__vm_munmap-to-mm-vmac +0 -18
@@ -1044,24 +1044,6 @@ unsigned long mmap_region(struct file *freturn ret; } -static int __vm_munmap (unsigned long start,size_t len,bool unlock) -{ -int ret; -struct mm_struct *mm = current->mm; -LIST_HEAD (uf); -VMA_ITERATOR (vmi, mm, start); - -if (mmap_write_lock_killable (mm)) -return -EINTR ; - - ret =do_vmi_munmap (&vmi, mm, start, len, &uf, unlock); -if (ret || !unlock) -mmap_write_unlock (mm); - -userfaultfd_unmap_complete (mm, &uf); -return ret; -} -int vm_munmap (unsigned long start,size_t len) {return __vm_munmap (start, len, false);
mm/vma.c renamed from mm/vma.c~mm-vma-move-__vm_munmap-to-mm-vmac +18 -0
@@ -2877,3 +2877,21 @@ int expand_downwards(struct vm_area_struvalidate_mm (mm);return error; } + +int __vm_munmap (unsigned long start,size_t len,bool unlock) +{ +int ret; +struct mm_struct *mm = current->mm; +LIST_HEAD (uf); +VMA_ITERATOR (vmi, mm, start); + +if (mmap_write_lock_killable (mm)) +return -EINTR ; + + ret =do_vmi_munmap (&vmi, mm, start, len, &uf, unlock); +if (ret || !unlock) +mmap_write_unlock (mm); + +userfaultfd_unmap_complete (mm, &uf); +return ret; +}
mm/vma.h renamed from mm/vma.h~mm-vma-move-__vm_munmap-to-mm-vmac +2 -0
@@ -478,4 +478,6 @@ int expand_upwards(struct vm_area_structint expand_downwards (struct vm_area_struct *vma,unsigned long address); +int __vm_munmap (unsigned long start,size_t len,bool unlock); +#endif /* __MM_VMA_H */
tools/testing/vma/vma_internal.h renamed from tools/testing/vma/vma_internal.h~mm-vma-move-__vm_munmap-to-mm-vmac +9 -0
@@ -906,6 +906,11 @@ static inline void mmap_write_unlock(str { } +static inline int mmap_write_lock_killable (struct mm_struct *) +{ +return 0 ; +} +static inline bool can_modify_mm (struct mm_struct *mm,unsigned long start,unsigned long end)
@@ -1175,5 +1180,9 @@ static inline int anon_vma_prepare(struc return __anon_vma_prepare(vma); } +static inline void userfaultfd_unmap_complete (struct mm_struct *mm, +struct list_head *uf) +{ +}#endif /* __MM_VMA_INTERNAL_H */
_
Patches currently in -mm which might be from [email protected] are
mips-vdso-prefer-do_mmap-to-mmap_region.patch
mm-make-mmap_region-internal.patch