From: Andreas Hindborg <nmi@metaspace.dk>
To: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
Keith Busch <kbusch@kernel.org>,
Damien Le Moal <Damien.LeMoal@wdc.com>,
Hannes Reinecke <hare@suse.de>,
lsf-pc@lists.linux-foundation.org,
rust-for-linux@vger.kernel.org, linux-block@vger.kernel.org
Cc: "Andreas Hindborg" <a.hindborg@samsung.com>,
"Matthew Wilcox" <willy@infradead.org>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Wedson Almeida Filho" <wedsonaf@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>,
"Andreas Hindborg" <nmi@metaspace.dk>,
linux-kernel@vger.kernel.org (open list),
gost.dev@samsung.com
Subject: [RFC PATCH 01/11] rust: add radix tree abstraction
Date: Wed, 3 May 2023 11:06:58 +0200 [thread overview]
Message-ID: <20230503090708.2524310-2-nmi@metaspace.dk> (raw)
In-Reply-To: <20230503090708.2524310-1-nmi@metaspace.dk>
From: Andreas Hindborg <a.hindborg@samsung.com>
Add abstractions for the C radix_tree. This abstraction allows Rust code to use
the radix_tree as a map from `u64` keys to `ForeignOwnable` values.
Signed-off-by: Andreas Hindborg <a.hindborg@samsung.com>
---
rust/bindings/bindings_helper.h | 2 +
rust/bindings/lib.rs | 1 +
rust/helpers.c | 22 +++++
rust/kernel/lib.rs | 1 +
rust/kernel/radix_tree.rs | 156 ++++++++++++++++++++++++++++++++
5 files changed, 182 insertions(+)
create mode 100644 rust/kernel/radix_tree.rs
diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index 50e7a76d5455..52834962b94d 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -10,7 +10,9 @@
#include <linux/refcount.h>
#include <linux/wait.h>
#include <linux/sched.h>
+#include <linux/radix-tree.h>
/* `bindgen` gets confused at certain things. */
const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL;
+const gfp_t BINDINGS_GFP_ATOMIC = GFP_ATOMIC;
const gfp_t BINDINGS___GFP_ZERO = __GFP_ZERO;
diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs
index 7b246454e009..62f36a9eb1f4 100644
--- a/rust/bindings/lib.rs
+++ b/rust/bindings/lib.rs
@@ -51,4 +51,5 @@ mod bindings_helper {
pub use bindings_raw::*;
pub const GFP_KERNEL: gfp_t = BINDINGS_GFP_KERNEL;
+pub const GFP_ATOMIC: gfp_t = BINDINGS_GFP_ATOMIC;
pub const __GFP_ZERO: gfp_t = BINDINGS___GFP_ZERO;
diff --git a/rust/helpers.c b/rust/helpers.c
index 81e80261d597..5dd5e325b7cc 100644
--- a/rust/helpers.c
+++ b/rust/helpers.c
@@ -26,6 +26,7 @@
#include <linux/spinlock.h>
#include <linux/sched/signal.h>
#include <linux/wait.h>
+#include <linux/radix-tree.h>
__noreturn void rust_helper_BUG(void)
{
@@ -128,6 +129,27 @@ void rust_helper_put_task_struct(struct task_struct *t)
}
EXPORT_SYMBOL_GPL(rust_helper_put_task_struct);
+void rust_helper_init_radix_tree(struct xarray *tree, gfp_t gfp_mask)
+{
+ INIT_RADIX_TREE(tree, gfp_mask);
+}
+EXPORT_SYMBOL_GPL(rust_helper_init_radix_tree);
+
+void **rust_helper_radix_tree_iter_init(struct radix_tree_iter *iter,
+ unsigned long start)
+{
+ return radix_tree_iter_init(iter, start);
+}
+EXPORT_SYMBOL_GPL(rust_helper_radix_tree_iter_init);
+
+void **rust_helper_radix_tree_next_slot(void **slot,
+ struct radix_tree_iter *iter,
+ unsigned flags)
+{
+ return radix_tree_next_slot(slot, iter, flags);
+}
+EXPORT_SYMBOL_GPL(rust_helper_radix_tree_next_slot);
+
/*
* We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type
* as the Rust `usize` type, so we can use it in contexts where Rust
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 676995d4e460..a85cb6aae8d6 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -40,6 +40,7 @@ pub mod init;
pub mod ioctl;
pub mod prelude;
pub mod print;
+pub mod radix_tree;
mod static_assert;
#[doc(hidden)]
pub mod std_vendor;
diff --git a/rust/kernel/radix_tree.rs b/rust/kernel/radix_tree.rs
new file mode 100644
index 000000000000..f659ab8b017c
--- /dev/null
+++ b/rust/kernel/radix_tree.rs
@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: GPL-2.0
+
+//! RadixTree abstraction.
+//!
+//! C header: [`include/linux/radix_tree.h`](../../include/linux/radix_tree.h)
+
+use crate::error::to_result;
+use crate::error::Result;
+use crate::types::ForeignOwnable;
+use crate::types::Opaque;
+use crate::types::ScopeGuard;
+use alloc::boxed::Box;
+use core::marker::PhantomData;
+use core::pin::Pin;
+
+type Key = u64;
+
+/// A map of `u64` to `ForeignOwnable`
+///
+/// # Invariants
+///
+/// - `tree` always points to a valid and initialized `struct radix_tree`.
+/// - Pointers stored in the tree are created by a call to `ForignOwnable::into_foreign()`
+pub struct RadixTree<V: ForeignOwnable> {
+ tree: Pin<Box<Opaque<bindings::xarray>>>,
+ _marker: PhantomData<V>,
+}
+
+impl<V: ForeignOwnable> RadixTree<V> {
+ /// Create a new radix tree
+ ///
+ /// Note: This function allocates memory with `GFP_ATOMIC`.
+ pub fn new() -> Result<Self> {
+ let tree = Pin::from(Box::try_new(Opaque::uninit())?);
+
+ // SAFETY: `tree` points to allocated but not initialized memory. This
+ // call will initialize the memory.
+ unsafe { bindings::init_radix_tree(tree.get(), bindings::GFP_ATOMIC) };
+
+ Ok(Self {
+ tree,
+ _marker: PhantomData,
+ })
+ }
+
+ /// Try to insert a value into the tree
+ pub fn try_insert(&mut self, key: Key, value: V) -> Result<()> {
+ // SAFETY: `self.tree` points to a valid and initialized `struct radix_tree`
+ let ret =
+ unsafe { bindings::radix_tree_insert(self.tree.get(), key, value.into_foreign() as _) };
+ to_result(ret)
+ }
+
+ /// Search for `key` in the map. Returns a reference to the associated
+ /// value if found.
+ pub fn get(&self, key: Key) -> Option<V::Borrowed<'_>> {
+ // SAFETY: `self.tree` points to a valid and initialized `struct radix_tree`
+ let item =
+ core::ptr::NonNull::new(unsafe { bindings::radix_tree_lookup(self.tree.get(), key) })?;
+
+ // SAFETY: `item` was created by a call to
+ // `ForeignOwnable::into_foreign()`. As `get_mut()` and `remove()` takes
+ // a `&mut self`, no mutable borrows for `item` can exist and
+ // `ForeignOwnable::from_foreign()` cannot be called until this borrow
+ // is dropped.
+ Some(unsafe { V::borrow(item.as_ptr()) })
+ }
+
+ /// Search for `key` in the map. Return a mutable reference to the
+ /// associated value if found.
+ pub fn get_mut(&mut self, key: Key) -> Option<MutBorrow<'_, V>> {
+ let item =
+ core::ptr::NonNull::new(unsafe { bindings::radix_tree_lookup(self.tree.get(), key) })?;
+
+ // SAFETY: `item` was created by a call to
+ // `ForeignOwnable::into_foreign()`. As `get()` takes a `&self` and
+ // `remove()` takes a `&mut self`, no borrows for `item` can exist and
+ // `ForeignOwnable::from_foreign()` cannot be called until this borrow
+ // is dropped.
+ Some(MutBorrow {
+ guard: unsafe { V::borrow_mut(item.as_ptr()) },
+ _marker: core::marker::PhantomData,
+ })
+ }
+
+ /// Search for `key` in the map. If `key` is found, the key and value is
+ /// removed from the map and the value is returned.
+ pub fn remove(&mut self, key: Key) -> Option<V> {
+ // SAFETY: `self.tree` points to a valid and initialized `struct radix_tree`
+ let item =
+ core::ptr::NonNull::new(unsafe { bindings::radix_tree_delete(self.tree.get(), key) })?;
+
+ // SAFETY: `item` was created by a call to
+ // `ForeignOwnable::into_foreign()` and no borrows to `item` can exist
+ // because this function takes a `&mut self`.
+ Some(unsafe { ForeignOwnable::from_foreign(item.as_ptr()) })
+ }
+}
+
+impl<V: ForeignOwnable> Drop for RadixTree<V> {
+ fn drop(&mut self) {
+ let mut iter = bindings::radix_tree_iter {
+ index: 0,
+ next_index: 0,
+ tags: 0,
+ node: core::ptr::null_mut(),
+ };
+
+ // SAFETY: Iter is valid as we allocated it on the stack above
+ let mut slot = unsafe { bindings::radix_tree_iter_init(&mut iter, 0) };
+ loop {
+ if slot.is_null() {
+ // SAFETY: Both `self.tree` and `iter` are valid
+ slot = unsafe { bindings::radix_tree_next_chunk(self.tree.get(), &mut iter, 0) };
+ }
+
+ if slot.is_null() {
+ break;
+ }
+
+ // SAFETY: `self.tree` is valid and iter is managed by
+ // `radix_tree_next_chunk()` and `radix_tree_next_slot()`
+ let item = unsafe { bindings::radix_tree_delete(self.tree.get(), iter.index) };
+ assert!(!item.is_null());
+
+ // SAFETY: All items in the tree are created by a call to
+ // `ForeignOwnable::into_foreign()`.
+ let _ = unsafe { V::from_foreign(item) };
+
+ // SAFETY: `self.tree` is valid and iter is managed by
+ // `radix_tree_next_chunk()` and `radix_tree_next_slot()`. Slot is
+ // not null.
+ slot = unsafe { bindings::radix_tree_next_slot(slot, &mut iter, 0) };
+ }
+ }
+}
+
+/// A mutable borrow of an object owned by a `RadixTree`
+pub struct MutBorrow<'a, V: ForeignOwnable> {
+ guard: ScopeGuard<V, fn(V)>,
+ _marker: core::marker::PhantomData<&'a mut V>,
+}
+
+impl<'a, V: ForeignOwnable> core::ops::Deref for MutBorrow<'a, V> {
+ type Target = ScopeGuard<V, fn(V)>;
+
+ fn deref(&self) -> &Self::Target {
+ &self.guard
+ }
+}
+
+impl<'a, V: ForeignOwnable> core::ops::DerefMut for MutBorrow<'a, V> {
+ fn deref_mut(&mut self) -> &mut Self::Target {
+ &mut self.guard
+ }
+}
--
2.40.0
next prev parent reply other threads:[~2023-05-03 9:07 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-03 9:06 [RFC PATCH 00/11] Rust null block driver Andreas Hindborg
2023-05-03 9:06 ` Andreas Hindborg [this message]
2023-05-03 10:34 ` [RFC PATCH 01/11] rust: add radix tree abstraction Benno Lossin
2023-05-05 4:04 ` Matthew Wilcox
2023-05-05 4:49 ` Andreas Hindborg
2023-05-05 5:28 ` Matthew Wilcox
2023-05-05 6:09 ` Christoph Hellwig
2023-05-05 8:33 ` Chaitanya Kulkarni
2023-05-03 9:06 ` [RFC PATCH 02/11] rust: add `pages` module for handling page allocation Andreas Hindborg
2023-05-03 12:31 ` Benno Lossin
2023-05-03 12:38 ` Benno Lossin
2023-05-05 4:09 ` Matthew Wilcox
2023-05-05 4:42 ` Andreas Hindborg
2023-05-05 5:29 ` Matthew Wilcox
2023-05-03 9:07 ` [RFC PATCH 03/11] rust: block: introduce `kernel::block::mq` module Andreas Hindborg
2023-05-08 12:29 ` Benno Lossin
2023-05-11 6:52 ` Sergio González Collado
2024-01-23 14:03 ` Andreas Hindborg (Samsung)
2024-01-12 9:18 ` Andreas Hindborg (Samsung)
2024-01-23 16:14 ` Benno Lossin
2024-01-23 18:39 ` Andreas Hindborg (Samsung)
2024-01-25 9:26 ` Benno Lossin
2024-01-29 14:14 ` Andreas Hindborg (Samsung)
2023-05-03 9:07 ` [RFC PATCH 04/11] rust: block: introduce `kernel::block::bio` module Andreas Hindborg
2023-05-08 12:58 ` Benno Lossin
2024-01-11 12:49 ` Andreas Hindborg (Samsung)
2024-02-28 14:31 ` Andreas Hindborg
2024-03-09 12:30 ` Benno Lossin
2023-05-03 9:07 ` [RFC PATCH 05/11] RUST: add `module_params` macro Andreas Hindborg
2023-05-03 9:07 ` [RFC PATCH 06/11] rust: apply cache line padding for `SpinLock` Andreas Hindborg
2023-05-03 12:03 ` Alice Ryhl
2024-02-23 11:29 ` Andreas Hindborg (Samsung)
2024-02-26 9:15 ` Alice Ryhl
2023-05-03 9:07 ` [RFC PATCH 07/11] rust: lock: add support for `Lock::lock_irqsave` Andreas Hindborg
2023-05-03 9:07 ` [RFC PATCH 08/11] rust: lock: implement `IrqSaveBackend` for `SpinLock` Andreas Hindborg
2023-05-03 9:07 ` [RFC PATCH 09/11] RUST: implement `ForeignOwnable` for `Pin` Andreas Hindborg
2023-05-03 9:07 ` [RFC PATCH 10/11] rust: add null block driver Andreas Hindborg
2023-05-03 9:07 ` [RFC PATCH 11/11] rust: inline a number of short functions Andreas Hindborg
2023-05-03 11:32 ` [RFC PATCH 00/11] Rust null block driver Niklas Cassel
2023-05-03 12:29 ` Andreas Hindborg
2023-05-03 13:54 ` Niklas Cassel
2023-05-03 16:47 ` Bart Van Assche
2023-05-04 18:15 ` Andreas Hindborg
2023-05-04 18:36 ` Bart Van Assche
2023-05-04 18:46 ` Andreas Hindborg
2023-05-04 18:52 ` Keith Busch
2023-05-04 19:02 ` Jens Axboe
2023-05-04 19:59 ` Andreas Hindborg
2023-05-04 20:55 ` Jens Axboe
2023-05-05 5:06 ` Andreas Hindborg
2023-05-05 11:14 ` Miguel Ojeda
2023-05-04 20:11 ` Miguel Ojeda
2023-05-04 20:22 ` Jens Axboe
2023-05-05 10:53 ` Miguel Ojeda
2023-05-05 12:24 ` Boqun Feng
2023-05-05 13:52 ` Boqun Feng
2023-05-05 19:42 ` Keith Busch
2023-05-05 21:46 ` Boqun Feng
2023-05-05 19:38 ` Bart Van Assche
2023-05-05 3:52 ` Christoph Hellwig
2023-06-06 13:33 ` Andreas Hindborg (Samsung)
2023-06-06 14:46 ` Miguel Ojeda
2023-05-05 5:28 ` Hannes Reinecke
2023-05-07 23:31 ` Luis Chamberlain
2023-05-07 23:37 ` Andreas Hindborg
[not found] ` <2B3CA5F1CCCFEAB2+20230727034517.GB126117@1182282462>
2023-07-28 6:49 ` Andreas Hindborg (Samsung)
2023-07-31 14:14 ` Andreas Hindborg (Samsung)
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=20230503090708.2524310-2-nmi@metaspace.dk \
--to=nmi@metaspace.dk \
--cc=Damien.LeMoal@wdc.com \
--cc=a.hindborg@samsung.com \
--cc=alex.gaynor@gmail.com \
--cc=axboe@kernel.dk \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=gost.dev@samsung.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lsf-pc@lists.linux-foundation.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=wedsonaf@gmail.com \
--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®