From: Suren Baghdasaryan <surenb@google.com>
To: akpm@linux-foundation.org
Cc: peterz@infradead.org, willy@infradead.org,
liam.howlett@oracle.com, lorenzo.stoakes@oracle.com,
david.laight.linux@gmail.com, mhocko@suse.com, vbabka@suse.cz,
hannes@cmpxchg.org, mjguzik@gmail.com, oliver.sang@intel.com,
mgorman@techsingularity.net, david@redhat.com,
peterx@redhat.com, oleg@redhat.com, dave@stgolabs.net,
paulmck@kernel.org, brauner@kernel.org, dhowells@redhat.com,
hdanton@sina.com, hughd@google.com, lokeshgidra@google.com,
minchan@google.com, jannh@google.com, shakeel.butt@linux.dev,
souravpanda@google.com, pasha.tatashin@soleen.com,
klarasmodin@gmail.com, richard.weiyang@gmail.com,
corbet@lwn.net, linux-doc@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, kernel-team@android.com,
surenb@google.com
Subject: [PATCH v10 07/18] mm: allow vma_start_read_locked/vma_start_read_locked_nested to fail
Date: Thu, 13 Feb 2025 14:46:44 -0800 [thread overview]
Message-ID: <20250213224655.1680278-8-surenb@google.com> (raw)
In-Reply-To: <20250213224655.1680278-1-surenb@google.com>
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.
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Cc: Lokesh Gidra <lokeshgidra@google.com>
---
Changes since v9 [1]:
- Refactor the code, per Lorenzo Stoakes
- Remove Vlastimil's Acked-by since code is changed
[1] https://lore.kernel.org/all/20250111042604.3230628-8-surenb@google.com/
include/linux/mm.h | 6 ++++--
mm/userfaultfd.c | 30 +++++++++++++++++++++++-------
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 1b8e72888124..7fa7c39162fd 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -747,10 +747,11 @@ static inline bool vma_start_read(struct vm_area_struct *vma)
* 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_nested(struct vm_area_struct *vma, int
* 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)
diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
index 4527c385935b..867898c4e30b 100644
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -84,8 +84,12 @@ static struct vm_area_struct *uffd_lock_vma(struct mm_struct *mm,
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;
@@ -1482,12 +1486,24 @@ static int uffd_move_lock(struct mm_struct *mm,
mmap_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;
}
--
2.48.1.601.g30ceb7b040-goog
next prev parent reply other threads:[~2025-02-13 22:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-13 22:46 [PATCH v10 00/18] reimplement per-vma lock as a refcount Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 01/18] mm: introduce vma_start_read_locked{_nested} helpers Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 02/18] mm: move per-vma lock into vm_area_struct Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 03/18] mm: mark vma as detached until it's added into vma tree Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 04/18] mm: introduce vma_iter_store_attached() to use with attached vmas Suren Baghdasaryan
2025-02-21 11:07 ` Vlastimil Babka
2025-02-21 16:11 ` Liam R. Howlett
2025-02-13 22:46 ` [PATCH v10 05/18] mm: mark vmas detached upon exit Suren Baghdasaryan
2025-02-21 16:14 ` Liam R. Howlett
2025-02-13 22:46 ` [PATCH v10 06/18] types: move struct rcuwait into types.h Suren Baghdasaryan
2025-02-13 22:46 ` Suren Baghdasaryan [this message]
2025-02-21 11:27 ` [PATCH v10 07/18] mm: allow vma_start_read_locked/vma_start_read_locked_nested to fail Vlastimil Babka
2025-02-13 22:46 ` [PATCH v10 08/18] mm: move mmap_init_lock() out of the header file Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 09/18] mm: uninline the main body of vma_start_write() Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 10/18] refcount: provide ops for cases when object's memory can be reused Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 11/18] refcount: introduce __refcount_{add|inc}_not_zero_limited_acquire Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 12/18] mm: replace vm_lock and detached flag with a reference count Suren Baghdasaryan
2025-02-20 18:53 ` Heiko Carstens
2025-02-20 19:03 ` Suren Baghdasaryan
2025-02-20 20:05 ` Suren Baghdasaryan
2025-02-21 15:18 ` Vlastimil Babka
2025-02-13 22:46 ` [PATCH v10 13/18] mm: move lesser used vma_area_struct members into the last cacheline Suren Baghdasaryan
2025-02-21 15:20 ` Vlastimil Babka
2025-02-13 22:46 ` [PATCH v10 14/18] mm/debug: print vm_refcnt state when dumping the vma Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 15/18] mm: remove extra vma_numab_state_init() call Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 16/18] mm: prepare lock_vma_under_rcu() for vma reuse possibility Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 17/18] mm: make vma cache SLAB_TYPESAFE_BY_RCU Suren Baghdasaryan
2025-02-13 22:46 ` [PATCH v10 18/18] docs/mm: document latest changes to vm_lock Suren Baghdasaryan
2025-02-21 15:44 ` Vlastimil Babka
2025-02-14 19:34 ` [PATCH v10 00/18] reimplement per-vma lock as a refcount Shivank Garg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250213224655.1680278-8-surenb@google.com \
--to=surenb@google.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=corbet@lwn.net \
--cc=dave@stgolabs.net \
--cc=david.laight.linux@gmail.com \
--cc=david@redhat.com \
--cc=dhowells@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=hdanton@sina.com \
--cc=hughd@google.com \
--cc=jannh@google.com \
--cc=kernel-team@android.com \
--cc=klarasmodin@gmail.com \
--cc=liam.howlett@oracle.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lokeshgidra@google.com \
--cc=lorenzo.stoakes@oracle.com \
--cc=mgorman@techsingularity.net \
--cc=mhocko@suse.com \
--cc=minchan@google.com \
--cc=mjguzik@gmail.com \
--cc=oleg@redhat.com \
--cc=oliver.sang@intel.com \
--cc=pasha.tatashin@soleen.com \
--cc=paulmck@kernel.org \
--cc=peterx@redhat.com \
--cc=peterz@infradead.org \
--cc=richard.weiyang@gmail.com \
--cc=shakeel.butt@linux.dev \
--cc=souravpanda@google.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox