From: Alice Ryhl <aliceryhl@google.com>
To: Andrew Morton <akpm@linux-foundation.org>,
"Liam R. Howlett" <Liam.Howlett@oracle.com>,
Lorenzo Stoakes <lorenzo.stoakes@oracle.com>,
Miguel Ojeda <ojeda@kernel.org>,
Andrew Ballance <andrewjballance@gmail.com>
Cc: "Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <lossin@kernel.org>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org,
rust-for-linux@vger.kernel.org, linux-mm@kvack.org,
"Alice Ryhl" <aliceryhl@google.com>
Subject: [PATCH 2/3] rust: maple_tree: add MapleTree::lock() and load()
Date: Sat, 26 Jul 2025 13:23:23 +0000 [thread overview]
Message-ID: <20250726-maple-tree-v1-2-27a3da7cb8e5@google.com> (raw)
In-Reply-To: <20250726-maple-tree-v1-0-27a3da7cb8e5@google.com>
To load a value, one must be careful to hold the lock while accessing
it. To enable this, we add a lock() method so that you can perform
operations on the value before the spinlock is released.
Co-developed-by: Andrew Ballance <andrewjballance@gmail.com>
Signed-off-by: Andrew Ballance <andrewjballance@gmail.com>
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
---
rust/kernel/maple_tree.rs | 94 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/rust/kernel/maple_tree.rs b/rust/kernel/maple_tree.rs
index 0f26c173eedc7c79bb8e2b56fe85e8a266b3ae0c..c7ef504a9c78065b3d5752b4f5337fb6277182d1 100644
--- a/rust/kernel/maple_tree.rs
+++ b/rust/kernel/maple_tree.rs
@@ -206,6 +206,23 @@ pub fn erase(&self, index: usize) -> Option<T> {
unsafe { T::try_from_foreign(ret) }
}
+ /// Lock the internal spinlock.
+ #[inline]
+ pub fn lock(&self) -> MapleLock<'_, T> {
+ // SAFETY: It's safe to lock the spinlock in a maple tree.
+ unsafe { bindings::spin_lock(self.ma_lock()) };
+
+ // INVARIANT: We just took the spinlock.
+ MapleLock(self)
+ }
+
+ #[inline]
+ fn ma_lock(&self) -> *mut bindings::spinlock_t {
+ // SAFETY: This pointer offset operation stays in-bounds.
+ let lock = unsafe { &raw mut (*self.tree.get()).__bindgen_anon_1.ma_lock };
+ lock.cast()
+ }
+
/// Free all `T` instances in this tree.
///
/// # Safety
@@ -248,6 +265,83 @@ fn drop(mut self: Pin<&mut Self>) {
}
}
+/// A reference to a [`MapleTree`] that owns the inner lock.
+///
+/// # Invariants
+///
+/// This guard owns the inner spinlock.
+pub struct MapleLock<'tree, T: ForeignOwnable>(&'tree MapleTree<T>);
+
+impl<'tree, T: ForeignOwnable> Drop for MapleLock<'tree, T> {
+ #[inline]
+ fn drop(&mut self) {
+ // SAFETY: By the type invariants, we hold this spinlock.
+ unsafe { bindings::spin_unlock(self.0.ma_lock()) };
+ }
+}
+
+impl<'tree, T: ForeignOwnable> MapleLock<'tree, T> {
+ /// Load the value at the given index.
+ ///
+ /// # Examples
+ ///
+ /// Read the value while holding the spinlock.
+ ///
+ /// ```
+ /// use kernel::maple_tree::{MapleTree, InsertErrorKind};
+ ///
+ /// let tree = KBox::pin_init(MapleTree::<KBox<i32>>::new(), GFP_KERNEL)?;
+ ///
+ /// let ten = KBox::new(10, GFP_KERNEL)?;
+ /// let twenty = KBox::new(20, GFP_KERNEL)?;
+ /// tree.insert(100, ten, GFP_KERNEL)?;
+ /// tree.insert(200, twenty, GFP_KERNEL)?;
+ ///
+ /// let mut lock = tree.lock();
+ /// assert_eq!(lock.load(100), Some(&mut 10));
+ /// assert_eq!(lock.load(200), Some(&mut 20));
+ /// assert_eq!(lock.load(300), None);
+ /// # Ok::<_, Error>(())
+ /// ```
+ ///
+ /// Increment refcount while holding spinlock and read afterwards.
+ ///
+ /// ```
+ /// use kernel::maple_tree::{MapleTree, InsertErrorKind};
+ /// use kernel::sync::Arc;
+ ///
+ /// let tree = KBox::pin_init(MapleTree::<Arc<i32>>::new(), GFP_KERNEL)?;
+ ///
+ /// let ten = Arc::new(10, GFP_KERNEL)?;
+ /// let twenty = Arc::new(20, GFP_KERNEL)?;
+ /// tree.insert(100, ten, GFP_KERNEL)?;
+ /// tree.insert(200, twenty, GFP_KERNEL)?;
+ ///
+ /// // Briefly take the lock to increment the refcount.
+ /// let value = Arc::from(tree.lock().load(100).unwrap());
+ ///
+ /// // At this point, another thread might remove the value.
+ /// tree.erase(100);
+ ///
+ /// // But we can still access it because we took a refcount.
+ /// assert_eq!(*value, 10);
+ /// # Ok::<_, Error>(())
+ /// ```
+ #[inline]
+ pub fn load(&mut self, index: usize) -> Option<T::BorrowedMut<'_>> {
+ // SAFETY: `self.tree` contains a valid maple tree.
+ let ret = unsafe { bindings::mtree_load(self.0.tree.get(), index) };
+ if ret.is_null() {
+ return None;
+ }
+
+ // SAFETY: If the pointer is not null, then it references a valid instance of `T`. It is
+ // safe to borrow the instance mutably because the signature of this function enforces that
+ // the mutable borrow is not used after the spinlock is dropped.
+ Some(unsafe { T::borrow_mut(ret) })
+ }
+}
+
/// Error type for failure to insert a new value.
pub struct InsertError<T> {
/// The value that could not be inserted.
--
2.50.1.470.g6ba607880d-goog
next prev parent reply other threads:[~2025-07-26 13:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-26 13:23 [PATCH 0/3] Add Rust abstraction for Maple Trees Alice Ryhl
2025-07-26 13:23 ` [PATCH 1/3] rust: maple_tree: add MapleTree Alice Ryhl
2025-07-26 15:45 ` Gary Guo
2025-08-19 9:09 ` Alice Ryhl
2025-07-26 16:23 ` Matthew Wilcox
2025-07-26 16:41 ` Alice Ryhl
2025-07-28 16:04 ` Boqun Feng
2025-07-28 16:39 ` Danilo Krummrich
2025-08-07 16:12 ` Liam R. Howlett
2025-08-08 8:37 ` Alice Ryhl
2025-07-26 13:23 ` Alice Ryhl [this message]
2025-07-26 15:50 ` [PATCH 2/3] rust: maple_tree: add MapleTree::lock() and load() Gary Guo
2025-07-26 16:15 ` Alice Ryhl
2025-07-26 16:18 ` Alice Ryhl
2025-07-27 12:02 ` Gary Guo
2025-08-07 16:15 ` Liam R. Howlett
2025-08-07 18:30 ` Danilo Krummrich
2025-07-28 11:11 ` Andrew Ballance
2025-07-28 11:19 ` Alice Ryhl
2025-07-28 11:52 ` Danilo Krummrich
2025-07-28 15:19 ` Boqun Feng
2025-07-26 13:23 ` [PATCH 3/3] rust: maple_tree: add MapleTreeAlloc Alice Ryhl
2025-07-26 15:54 ` Gary Guo
2025-07-26 16:13 ` Alice Ryhl
2025-08-07 16:29 ` Liam R. Howlett
2025-08-08 8:35 ` Alice Ryhl
2025-08-06 19:24 ` [PATCH 0/3] Add Rust abstraction for Maple Trees Liam R. Howlett
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=20250726-maple-tree-v1-2-27a3da7cb8e5@google.com \
--to=aliceryhl@google.com \
--cc=Liam.Howlett@oracle.com \
--cc=a.hindborg@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=andrewjballance@gmail.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=dakr@kernel.org \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=lossin@kernel.org \
--cc=maple-tree@lists.infradead.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tmgross@umich.edu \
/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;
as well as URLs for NNTP newsgroup(s).