From: Alice Ryhl <aliceryhl@google.com>
To: Miguel Ojeda <ojeda@kernel.org>,
Matthew Wilcox <willy@infradead.org>,
Lorenzo Stoakes <lorenzo.stoakes@oracle.com>,
Vlastimil Babka <vbabka@suse.cz>,
John Hubbard <jhubbard@nvidia.com>,
"Liam R. Howlett" <Liam.Howlett@oracle.com>,
Andrew Morton <akpm@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Christian Brauner <brauner@kernel.org>
Cc: "Alex Gaynor" <alex.gaynor@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <benno.lossin@proton.me>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
rust-for-linux@vger.kernel.org,
"Alice Ryhl" <aliceryhl@google.com>,
"Andreas Hindborg" <a.hindborg@kernel.org>
Subject: [PATCH v8 4/7] mm: rust: add lock_vma_under_rcu
Date: Wed, 20 Nov 2024 14:49:58 +0000 [thread overview]
Message-ID: <20241120-vma-v8-4-eb31425da66b@google.com> (raw)
In-Reply-To: <20241120-vma-v8-0-eb31425da66b@google.com>
All of Rust Binder's existing calls to `vm_insert_page` could be
optimized to first attempt to use `lock_vma_under_rcu`. This patch
provides an abstraction to enable that.
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
---
rust/helpers/mm.c | 5 +++++
rust/kernel/mm.rs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/rust/helpers/mm.c b/rust/helpers/mm.c
index 7b72eb065a3e..81b510c96fd2 100644
--- a/rust/helpers/mm.c
+++ b/rust/helpers/mm.c
@@ -43,3 +43,8 @@ struct vm_area_struct *rust_helper_vma_lookup(struct mm_struct *mm,
{
return vma_lookup(mm, addr);
}
+
+void rust_helper_vma_end_read(struct vm_area_struct *vma)
+{
+ vma_end_read(vma);
+}
diff --git a/rust/kernel/mm.rs b/rust/kernel/mm.rs
index ace8e7d57afe..a15acb546f68 100644
--- a/rust/kernel/mm.rs
+++ b/rust/kernel/mm.rs
@@ -13,6 +13,7 @@
use core::{ops::Deref, ptr::NonNull};
pub mod virt;
+use virt::VmAreaRef;
/// A wrapper for the kernel's `struct mm_struct`.
///
@@ -170,6 +171,32 @@ pub unsafe fn from_raw<'a>(ptr: *const bindings::mm_struct) -> &'a MmWithUser {
unsafe { &*ptr.cast() }
}
+ /// Try to lock the vma read lock under rcu.
+ ///
+ /// If this operation fails, the vma may still exist. In that case, you should take the mmap
+ /// read lock and try to use `vma_lookup` instead.
+ ///
+ /// When per-vma locks are disabled, this always returns `None`.
+ #[inline]
+ pub fn lock_vma_under_rcu(&self, vma_addr: usize) -> Option<VmaReadGuard<'_>> {
+ #[cfg(CONFIG_PER_VMA_LOCK)]
+ {
+ // SAFETY: Calling `bindings::lock_vma_under_rcu` is always okay given an mm where
+ // `mm_users` is non-zero.
+ let vma = unsafe { bindings::lock_vma_under_rcu(self.as_raw(), vma_addr as _) };
+ if !vma.is_null() {
+ return Some(VmaReadGuard {
+ // SAFETY: If `lock_vma_under_rcu` returns a non-null ptr, then it points at a
+ // valid vma. The vma is stable for as long as the vma read lock is held.
+ vma: unsafe { VmAreaRef::from_raw(vma) },
+ _nts: NotThreadSafe,
+ });
+ }
+ }
+
+ None
+ }
+
/// Lock the mmap read lock.
#[inline]
pub fn mmap_read_lock(&self) -> MmapReadGuard<'_> {
@@ -238,3 +265,32 @@ fn drop(&mut self) {
unsafe { bindings::mmap_read_unlock(self.mm.as_raw()) };
}
}
+
+/// A guard for the vma read lock.
+///
+/// # Invariants
+///
+/// This `VmaReadGuard` guard owns the vma read lock.
+pub struct VmaReadGuard<'a> {
+ vma: &'a VmAreaRef,
+ // `vma_end_read` must be called on the same thread as where the lock was taken
+ _nts: NotThreadSafe,
+}
+
+// Make all `VmAreaRef` methods available on `VmaReadGuard`.
+impl Deref for VmaReadGuard<'_> {
+ type Target = VmAreaRef;
+
+ #[inline]
+ fn deref(&self) -> &VmAreaRef {
+ self.vma
+ }
+}
+
+impl Drop for VmaReadGuard<'_> {
+ #[inline]
+ fn drop(&mut self) {
+ // SAFETY: We hold the read lock by the type invariants.
+ unsafe { bindings::vma_end_read(self.vma.as_ptr()) };
+ }
+}
--
2.47.0.371.ga323438b13-goog
next prev parent reply other threads:[~2024-11-20 14:56 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-20 14:49 [PATCH v8 0/7] Rust support for mm_struct, vm_area_struct, and mmap Alice Ryhl
2024-11-20 14:49 ` [PATCH v8 1/7] mm: rust: add abstraction for struct mm_struct Alice Ryhl
2024-11-20 18:13 ` Lorenzo Stoakes
2024-11-21 9:52 ` Alice Ryhl
2024-11-21 12:37 ` Lorenzo Stoakes
2024-11-21 14:35 ` Alice Ryhl
2024-11-22 7:42 ` Paolo Bonzini
2024-11-22 17:41 ` Lorenzo Stoakes
2024-11-20 14:49 ` [PATCH v8 2/7] mm: rust: add vm_area_struct methods that require read access Alice Ryhl
2024-11-20 19:07 ` Lorenzo Stoakes
2024-11-21 10:23 ` Alice Ryhl
2024-11-21 12:50 ` Lorenzo Stoakes
2024-11-21 14:39 ` Alice Ryhl
2024-11-20 14:49 ` [PATCH v8 3/7] mm: rust: add vm_insert_page Alice Ryhl
2024-11-20 19:20 ` Lorenzo Stoakes
2024-11-21 10:38 ` Alice Ryhl
2024-11-21 12:55 ` Lorenzo Stoakes
2024-11-20 14:49 ` Alice Ryhl [this message]
2024-11-20 19:29 ` [PATCH v8 4/7] mm: rust: add lock_vma_under_rcu Lorenzo Stoakes
2024-11-21 10:44 ` Alice Ryhl
2024-11-21 12:59 ` Lorenzo Stoakes
2024-11-20 14:49 ` [PATCH v8 5/7] mm: rust: add mmput_async support Alice Ryhl
2024-11-20 19:46 ` Lorenzo Stoakes
2024-11-21 11:39 ` Alice Ryhl
2024-11-21 13:04 ` Lorenzo Stoakes
2024-11-21 13:04 ` Lorenzo Stoakes
2024-11-20 14:50 ` [PATCH v8 6/7] mm: rust: add VmAreaNew Alice Ryhl
2024-11-20 20:02 ` Lorenzo Stoakes
2024-11-21 11:47 ` Alice Ryhl
2024-11-21 13:08 ` Lorenzo Stoakes
2024-11-20 14:50 ` [PATCH v8 7/7] rust: miscdevice: add mmap support Alice Ryhl
2024-11-20 20:07 ` Lorenzo Stoakes
2024-11-21 10:08 ` Alice Ryhl
2024-11-21 13:11 ` Lorenzo Stoakes
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=20241120-vma-v8-4-eb31425da66b@google.com \
--to=aliceryhl@google.com \
--cc=Liam.Howlett@oracle.com \
--cc=a.hindborg@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=alex.gaynor@gmail.com \
--cc=arnd@arndb.de \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=brauner@kernel.org \
--cc=gary@garyguo.net \
--cc=gregkh@linuxfoundation.org \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--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
all inboxes | Powered by JetHome®