mm-allow-vma_start_read_locked-vma_start_read_locked_nested-to-fail.patch removed from -mm tree
The quilt patch titled
Subject: mm: allow vma_start_read_locked/vma_start_read_locked_nested to fail
has been removed from the -mm tree. Its filename was
mm-allow-vma_start_read_locked-vma_start_read_locked_nested-to-fail.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: Suren Baghdasaryan <[email protected]>
Subject: mm: allow vma_start_read_locked/vma_start_read_locked_nested to fail
Date: Thu, 13 Feb 2025 14:46:44 -0800
With upcoming replacement of vm_lock with vm_refcnt, we need to handle a possibility of vma_start_read_locked/vma_start_read_locked_nested failing due to refcount overflow. Prepare for such possibility by changing these APIs and adjusting their users.
---
include/linux/mm.h | 6 ++++-- mm/userfaultfd.c | 30 +++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 9 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-allow-vma_start_read_locked-vma_start_read_locked_nested-to-fail +4 -2
@@ -747,10 +747,11 @@ static inline bool vma_start_read(struct* not be used in such cases because it might fail due to mm_lock_seq overflow. * This functionality is used to obtain vma read lock and drop the mmap read lock. */ -static inline void vma_start_read_locked_nested (struct vm_area_struct *vma,int subclass) +static inline bool vma_start_read_locked_nested (struct vm_area_struct *vma,int subclass) {mmap_assert_locked (vma->vm_mm);down_read_nested (&vma->vm_lock.lock, subclass); +return true; }/*
@@ -759,10 +760,11 @@ static inline void vma_start_read_locked* not be used in such cases because it might fail due to mm_lock_seq overflow. * This functionality is used to obtain vma read lock and drop the mmap read lock. */ -static inline void vma_start_read_locked (struct vm_area_struct *vma) +static inline bool vma_start_read_locked (struct vm_area_struct *vma) {mmap_assert_locked (vma->vm_mm);down_read (&vma->vm_lock.lock); +return true; }static inline void vma_end_read (struct vm_area_struct *vma)
mm/userfaultfd.c renamed from mm/userfaultfd.c~mm-allow-vma_start_read_locked-vma_start_read_locked_nested-to-fail +23 -7
@@ -85,8 +85,12 @@ static struct vm_area_struct *uffd_lock_mmap_read_lock (mm); vma =find_vma_and_prepare_anon (mm, address); -if (!IS_ERR (vma)) -vma_start_read_locked (vma); +if (!IS_ERR (vma)) { +bool locked =vma_start_read_locked (vma); + +if (!locked) + vma =ERR_PTR (-EAGAIN ); + }mmap_read_unlock (mm);return vma;
@@ -1555,12 +1559,24 @@ static int uffd_move_lock(struct mm_strummap_read_lock (mm); err =find_vmas_mm_locked (mm, dst_start, src_start, dst_vmap, src_vmap); -if (!err) { -vma_start_read_locked (*dst_vmap); -if (*dst_vmap != *src_vmap) -vma_start_read_locked_nested (*src_vmap, -SINGLE_DEPTH_NESTING ); +if (err) + goto out; + +if (!vma_start_read_locked (*dst_vmap)) { + err = -EAGAIN ; + goto out; } + +/* Nothing further to do if both vmas are locked. */ +if (*dst_vmap == *src_vmap) + goto out; + +if (!vma_start_read_locked_nested (*src_vmap,SINGLE_DEPTH_NESTING )) { +/* Undo dst_vmap locking if src_vmap failed to lock */ +vma_end_read (*dst_vmap); + err = -EAGAIN ; + } +out:mmap_read_unlock (mm);return err; }
_
Patches currently in -mm which might be from [email protected] are