The patch titled Subject: mm: add vma_assert_locked() for !CONFIG_PER_VMA_LOCK has been added to the -mm mm-unstable branch. Its filename is mm-add-vma_assert_locked-for-config_per_vma_lock.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-add-vma_assert_locked-for-config_per_vma_lock.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Lokesh Gidra <lokeshgidra@xxxxxxxxxx> Subject: mm: add vma_assert_locked() for !CONFIG_PER_VMA_LOCK Date: Thu, 15 Feb 2024 10:27:55 -0800 vma_assert_locked() is needed to replace mmap_assert_locked() once we start using per-vma locks in userfaultfd operations. In !CONFIG_PER_VMA_LOCK case when mm is locked, it implies that the given VMA is locked. Link: https://lkml.kernel.org/r/20240215182756.3448972-4-lokeshgidra@xxxxxxxxxx Signed-off-by: Lokesh Gidra <lokeshgidra@xxxxxxxxxx> Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: Axel Rasmussen <axelrasmussen@xxxxxxxxxx> Cc: Brian Geffon <bgeffon@xxxxxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Jann Horn <jannh@xxxxxxxxxx> Cc: Kalesh Singh <kaleshsingh@xxxxxxxxxx> Cc: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx> Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Cc: Mike Rapoport (IBM) <rppt@xxxxxxxxxx> Cc: Nicolas Geoffray <ngeoffray@xxxxxxxxxx> Cc: Peter Xu <peterx@xxxxxxxxxx> Cc: Ryan Roberts <ryan.roberts@xxxxxxx> Cc: Suren Baghdasaryan <surenb@xxxxxxxxxx> Cc: Tim Murray <timmurray@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/mm.h | 5 +++++ 1 file changed, 5 insertions(+) --- a/include/linux/mm.h~mm-add-vma_assert_locked-for-config_per_vma_lock +++ a/include/linux/mm.h @@ -781,6 +781,11 @@ static inline struct vm_area_struct *loc return NULL; } +static inline void vma_assert_locked(struct vm_area_struct *vma) +{ + mmap_assert_locked(vma->vm_mm); +} + static inline void release_fault_lock(struct vm_fault *vmf) { mmap_read_unlock(vmf->vma->vm_mm); _ Patches currently in -mm which might be from lokeshgidra@xxxxxxxxxx are userfaultfd-fix-return-error-if-mmap_changing-is-non-zero-in-move-ioctl.patch userfaultfd-move-userfaultfd_ctx-struct-to-header-file.patch userfaultfd-protect-mmap_changing-with-rw_sem-in-userfaulfd_ctx.patch mm-add-vma_assert_locked-for-config_per_vma_lock.patch userfaultfd-use-per-vma-locks-in-userfaultfd-operations.patch