* [PATCH v5] rust: xarray: Add an abstraction for XArray @ 2023-12-01 19:50 ` Maíra Canal 2023-12-06 11:31 ` Benno Lossin ` (2 more replies) 0 siblings, 3 replies; 5+ messages in thread From: Maíra Canal @ 2023-12-01 19:50 UTC (permalink / raw) To: Asahi Lina, Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng, Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg, Alice Ryhl, Matthew Wilcox Cc: rust-for-linux, kernel-dev, Maíra Canal From: Asahi Lina <lina@asahilina.net> The XArray is an abstract data type which behaves like a very large array of pointers. Add a Rust abstraction for this data type. The initial implementation uses explicit locking on get operations and returns a guard which blocks mutation, ensuring that the referenced object remains alive. To avoid excessive serialization, users are expected to use an inner type that can be efficiently cloned (such as Arc<T>), and eagerly clone and drop the guard to unblock other users after a lookup. Future variants may support using RCU instead to avoid mutex locking. This abstraction also introduces a reservation mechanism, which can be used by alloc-capable XArrays to reserve a free slot without immediately filling it, and then do so at a later time. If the reservation is dropped without being filled, the slot is freed again for other users, which eliminates the need for explicit cleanup code. Signed-off-by: Asahi Lina <lina@asahilina.net> Co-developed-by: Maíra Canal <mcanal@igalia.com> Signed-off-by: Maíra Canal <mcanal@igalia.com> --- This abstraction is part of the set of dependencies I need to upstream rustgem, a virtual GEM provider driver in the DRM [1]. Also, this abstraction will be useful for the upstreaming process of the drm/asahi driver. This patch was authored by Asahi Lina and I rebased on top of rust-next, fixing small conflicts. I'll try to take care of possible iterations that this patch might have and I'll try to address the feedback. Best Regards, - Maíra Changelog ========= v1 -> v2: https://lore.kernel.org/r/20230224-rust-xarray-v1-1-80f0904ce5d3@asahilina.net - Added Pin requirement for all XArray operations, to close a soundness hole due to the lock in the XArray (locks are not safe to move while locked). Creation does not require pinning in place, since the lock cannot be acquired at that point. - Added safety note to Drop impl about why we don't need to do the lock unlock dance to ensure soundness in case of a dropped lock guard. - Downstream drm/asahi driver was also rebased on this version to prove it works (previously it was still on a pre-v1 version). - This still depends on the Error series (v1). v2 of that will need a trivial rename of Error::from_kernel_errno -> Error::from_errno. If this version of XArray ends up looking good, I'll send a trivial v4 of XArray with the rename, after sending the v2 of the Error series. v2 -> v3: https://lore.kernel.org/r/20230224-rust-xarray-v2-1-4eeb0134944c@asahilina.net - Updated to the error v2/v3 series API. - Renamed `err` to `ret` for consistency with the other instance. v3 -> v4: https://lore.kernel.org/rust-for-linux/20230224-rust-xarray-v3-1-04305b1173a5@asahilina.net/ - Rebase on top of rust-next. v4 -> v5: https://lore.kernel.org/rust-for-linux/20231126131210.1384490-1-mcanal@igalia.com/T/ - Use Gary's suggestion for the Deref trait - no unsafe code! (Benno Lossin) - Use NonNull (Benno Lossin) - Not spelling out the lifetimes (Benno Lossin) - Change XArray invariants (Benno Lossin) - Add all SAFETY comments (Benno Lossin) - Use `kernel::error::to_result` (Benno Lossin) - s/alloc_limits/alloc_limits_opt (Benno Lossin) - Split unsafe block (Benno Lossin) - Make error handling of the function `alloc_limits_opt` through `ScopeGuard` (Benno Lossin) - Use `ScopeGuard` in the function `get` (Benno Lossin) [1] https://github.com/mairacanal/linux/pull/11 rust/bindings/bindings_helper.h | 17 ++ rust/helpers.c | 37 ++++ rust/kernel/lib.rs | 1 + rust/kernel/xarray.rs | 340 ++++++++++++++++++++++++++++++++ 4 files changed, 395 insertions(+) create mode 100644 rust/kernel/xarray.rs diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index c91a3c24f607..41b488f73dd3 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -12,8 +12,25 @@ #include <linux/refcount.h> #include <linux/wait.h> #include <linux/sched.h> +#include <linux/xarray.h> /* `bindgen` gets confused at certain things. */ const size_t BINDINGS_ARCH_SLAB_MINALIGN = ARCH_SLAB_MINALIGN; const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; const gfp_t BINDINGS___GFP_ZERO = __GFP_ZERO; + +const gfp_t BINDINGS_XA_FLAGS_LOCK_IRQ = XA_FLAGS_LOCK_IRQ; +const gfp_t BINDINGS_XA_FLAGS_LOCK_BH = XA_FLAGS_LOCK_BH; +const gfp_t BINDINGS_XA_FLAGS_TRACK_FREE = XA_FLAGS_TRACK_FREE; +const gfp_t BINDINGS_XA_FLAGS_ZERO_BUSY = XA_FLAGS_ZERO_BUSY; +const gfp_t BINDINGS_XA_FLAGS_ALLOC_WRAPPED = XA_FLAGS_ALLOC_WRAPPED; +const gfp_t BINDINGS_XA_FLAGS_ACCOUNT = XA_FLAGS_ACCOUNT; +const gfp_t BINDINGS_XA_FLAGS_ALLOC = XA_FLAGS_ALLOC; +const gfp_t BINDINGS_XA_FLAGS_ALLOC1 = XA_FLAGS_ALLOC1; + +const xa_mark_t BINDINGS_XA_MARK_0 = XA_MARK_0; +const xa_mark_t BINDINGS_XA_MARK_1 = XA_MARK_1; +const xa_mark_t BINDINGS_XA_MARK_2 = XA_MARK_2; +const xa_mark_t BINDINGS_XA_PRESENT = XA_PRESENT; +const xa_mark_t BINDINGS_XA_MARK_MAX = XA_MARK_MAX; +const xa_mark_t BINDINGS_XA_FREE_MARK = XA_FREE_MARK; diff --git a/rust/helpers.c b/rust/helpers.c index 4c86fe4a7e05..e5706e666f1c 100644 --- a/rust/helpers.c +++ b/rust/helpers.c @@ -30,6 +30,7 @@ #include <linux/sched/signal.h> #include <linux/spinlock.h> #include <linux/wait.h> +#include <linux/xarray.h> __noreturn void rust_helper_BUG(void) { @@ -144,6 +145,42 @@ struct kunit *rust_helper_kunit_get_current_test(void) } EXPORT_SYMBOL_GPL(rust_helper_kunit_get_current_test); +void rust_helper_xa_init_flags(struct xarray *xa, gfp_t flags) +{ + xa_init_flags(xa, flags); +} +EXPORT_SYMBOL_GPL(rust_helper_xa_init_flags); + +bool rust_helper_xa_empty(struct xarray *xa) +{ + return xa_empty(xa); +} +EXPORT_SYMBOL_GPL(rust_helper_xa_empty); + +int rust_helper_xa_alloc(struct xarray *xa, u32 *id, void *entry, struct xa_limit limit, gfp_t gfp) +{ + return xa_alloc(xa, id, entry, limit, gfp); +} +EXPORT_SYMBOL_GPL(rust_helper_xa_alloc); + +void rust_helper_xa_lock(struct xarray *xa) +{ + xa_lock(xa); +} +EXPORT_SYMBOL_GPL(rust_helper_xa_lock); + +void rust_helper_xa_unlock(struct xarray *xa) +{ + xa_unlock(xa); +} +EXPORT_SYMBOL_GPL(rust_helper_xa_unlock); + +int rust_helper_xa_err(void *entry) +{ + return xa_err(entry); +} +EXPORT_SYMBOL_GPL(rust_helper_xa_err); + /* * `bindgen` binds the C `size_t` type as the Rust `usize` type, so we can * use it in contexts where Rust expects a `usize` like slice (array) indices. diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index e8811700239a..5127555ff5ec 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -45,6 +45,7 @@ pub mod sync; pub mod task; pub mod types; +pub mod xarray; #[doc(hidden)] pub use bindings; diff --git a/rust/kernel/xarray.rs b/rust/kernel/xarray.rs new file mode 100644 index 000000000000..1aa77e6abfd4 --- /dev/null +++ b/rust/kernel/xarray.rs @@ -0,0 +1,340 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! XArray abstraction. +//! +//! C header: [`include/linux/xarray.h`](../../include/linux/xarray.h) + +use crate::{ + bindings, + error::{to_result, Error, Result}, + types::{ForeignOwnable, Opaque, ScopeGuard}, +}; +use core::{ + marker::{PhantomData, PhantomPinned}, + ops::Deref, + pin::Pin, + ptr::NonNull, +}; + +/// Flags passed to `XArray::new` to configure the `XArray`. +type Flags = bindings::gfp_t; + +/// Flag values passed to `XArray::new` to configure the `XArray`. +pub mod flags { + /// Use IRQ-safe locking. + pub const LOCK_IRQ: super::Flags = bindings::BINDINGS_XA_FLAGS_LOCK_IRQ; + /// Use softirq-safe locking. + pub const LOCK_BH: super::Flags = bindings::BINDINGS_XA_FLAGS_LOCK_BH; + /// Track which entries are free (distinct from None). + pub const TRACK_FREE: super::Flags = bindings::BINDINGS_XA_FLAGS_TRACK_FREE; + /// Initialize array index 0 as busy. + pub const ZERO_BUSY: super::Flags = bindings::BINDINGS_XA_FLAGS_ZERO_BUSY; + /// Use GFP_ACCOUNT for internal memory allocations. + pub const ACCOUNT: super::Flags = bindings::BINDINGS_XA_FLAGS_ACCOUNT; + /// Create an allocating `XArray` starting at index 0. + pub const ALLOC: super::Flags = bindings::BINDINGS_XA_FLAGS_ALLOC; + /// Create an allocating `XArray` starting at index 1. + pub const ALLOC1: super::Flags = bindings::BINDINGS_XA_FLAGS_ALLOC1; +} + +/// Wrapper for a value owned by the `XArray` which holds the `XArray` lock until dropped. +pub struct Guard<'a, T: ForeignOwnable>(NonNull<T>, Pin<&'a XArray<T>>); + +// INVARIANTS: The lock held by the Guard prevents concurrent access to the XArray. +// The Guard's Drop implementation releases the lock only when the Guard is +// dropped, ensuring exclusive access during its existence. Therefore, within +// the Guard's lifetime, no other operation (including the XArray +// calling `T::from_foreign`) can access or modify the underlying value. +// +// The Guard holds a reference (`self.0`) to the underlying value owned by +// XArray. You can use the `into_foreign` method to obtain a pointer to the +// foreign representation of the owned value, which is valid for the lifetime +// of the Guard. +impl<'a, T: ForeignOwnable> Guard<'a, T> { + /// Borrow the underlying value wrapped by the `Guard`. + /// + /// Returns a `T::Borrowed` type for the owned `ForeignOwnable` type. + pub fn borrow(&self) -> T::Borrowed<'_> { + // SAFETY: The value is owned by the `XArray`, the lifetime it is borrowed for must not + // outlive the `XArray` itself, nor the Guard that holds the lock ensuring the value + // remains in the `XArray`. + unsafe { T::borrow(self.0.as_ptr() as _) } + } +} + +// Convenience impl for `ForeignOwnable` types whose `Borrowed` +// form implements Deref. +impl<'a, T: ForeignOwnable> Deref for Guard<'a, T> +where + T::Borrowed<'a>: Deref, + for<'b> T::Borrowed<'b>: Into<&'b <T::Borrowed<'a> as Deref>::Target>, +{ + type Target = <T::Borrowed<'a> as Deref>::Target; + + fn deref(&self) -> &Self::Target { + self.borrow().into() + } +} + +impl<'a, T: ForeignOwnable> Drop for Guard<'a, T> { + fn drop(&mut self) { + // SAFETY: The XArray we have a reference to owns the C xarray object. + unsafe { bindings::xa_unlock(self.1.xa.get()) }; + } +} + +/// Represents a reserved slot in an `XArray`, which does not yet have a value but has an assigned +/// index and may not be allocated by any other user. If the Reservation is dropped without +/// being filled, the entry is marked as available again. +/// +/// Users must ensure that reserved slots are not filled by other mechanisms, or otherwise their +/// contents may be dropped and replaced (which will print a warning). +pub struct Reservation<'a, T: ForeignOwnable>(Pin<&'a XArray<T>>, usize, PhantomData<T>); + +impl<'a, T: ForeignOwnable> Reservation<'a, T> { + /// Stores a value into the reserved slot. + pub fn store(self, value: T) -> Result<usize> { + if self.0.replace(self.1, value)?.is_some() { + crate::pr_err!("XArray: Reservation stored but the entry already had data!\n"); + // Consider it a success anyway, not much we can do + } + let index = self.1; + // The reservation is now fulfilled, so do not run our destructor. + core::mem::forget(self); + Ok(index) + } + + /// Returns the index of this reservation. + pub fn index(&self) -> usize { + self.1 + } +} + +impl<'a, T: ForeignOwnable> Drop for Reservation<'a, T> { + fn drop(&mut self) { + if self.0.remove(self.1).is_some() { + crate::pr_err!("XArray: Reservation dropped but the entry was not empty!\n"); + } + } +} + +/// An array which efficiently maps sparse integer indices to owned objects. +/// +/// This is similar to a `Vec<Option<T>>`, but more efficient when there are holes in the +/// index space, and can be efficiently grown. +/// +/// This structure is expected to often be used with an inner type that +/// can be efficiently cloned, such as an `Arc<T>`. +pub struct XArray<T: ForeignOwnable> { + xa: Opaque<bindings::xarray>, + _p: PhantomData<T>, + _q: PhantomPinned, +} + +impl<T: ForeignOwnable> XArray<T> { + /// Creates a new `XArray` with the given flags. + pub fn new(flags: Flags) -> XArray<T> { + let xa = Opaque::uninit(); + + // SAFETY: We have just created `xa`. This data structure does not require + // pinning. + unsafe { bindings::xa_init_flags(xa.get(), flags) }; + + // INVARIANT: All pointers stored in the array are pointers obtained by + // calling `T::into_foreign`. + XArray { + xa, + _p: PhantomData, + _q: PhantomPinned, + } + } + + /// Replaces an entry with a new value, returning the old value (if any). + pub fn replace(self: Pin<&Self>, index: usize, value: T) -> Result<Option<T>> { + let new = value.into_foreign(); + // SAFETY: `new` just came from into_foreign(), and we dismiss this guard if + // the xa_store operation succeeds and takes ownership of the pointer. + let guard = ScopeGuard::new(|| unsafe { + T::from_foreign(new); + }); + + // SAFETY: `self.xa` is always valid by the type invariant, and we are storing + // a `T::into_foreign()` result which upholds the later invariants. + let old = unsafe { + bindings::xa_store( + self.xa.get(), + index.try_into()?, + new as *mut _, + bindings::GFP_KERNEL, + ) + }; + + // SAFETY: `xa_store` returns the old entry at this index on success or + // a XArray result, which can be turn into an errno through `xa_err`. + to_result(unsafe { bindings::xa_err(old) })?; + guard.dismiss(); + + Ok(if old.is_null() { + None + } else { + // SAFETY: The old value must have been stored by either this function or + // `alloc_limits_opt`, both of which ensure non-NULL entries are valid + // ForeignOwnable pointers. + Some(unsafe { T::from_foreign(old) }) + }) + } + + /// Replaces an entry with a new value, dropping the old value (if any). + pub fn set(self: Pin<&Self>, index: usize, value: T) -> Result { + self.replace(index, value)?; + Ok(()) + } + + /// Looks up and returns a reference to an entry in the array, returning a `Guard` if it + /// exists. + /// + /// This guard blocks all other actions on the `XArray`. Callers are expected to drop the + /// `Guard` eagerly to avoid blocking other users, such as by taking a clone of the value. + pub fn get(self: Pin<&Self>, index: usize) -> Option<Guard<'_, T>> { + // SAFETY: `self.xa` is always valid by the type invariant. + unsafe { bindings::xa_lock(self.xa.get()) }; + + // SAFETY: `self.xa` is always valid by the type invariant. + let guard = ScopeGuard::new(|| unsafe { bindings::xa_unlock(self.xa.get()) }); + + // SAFETY: `self.xa` is always valid by the type invariant. + let p = unsafe { bindings::xa_load(self.xa.get(), index.try_into().ok()?) }; + + NonNull::new(p as *mut T).map(|p| { + guard.dismiss(); + Guard(p, self) + }) + } + + /// Removes and returns an entry, returning it if it existed. + pub fn remove(self: Pin<&Self>, index: usize) -> Option<T> { + // SAFETY: `self.xa` is always valid by the type invariant. + let p = unsafe { bindings::xa_erase(self.xa.get(), index.try_into().ok()?) }; + if p.is_null() { + None + } else { + // SAFETY: All pointers stored in the array are pointers obtained by + // calling `T::into_foreign`. + Some(unsafe { T::from_foreign(p) }) + } + } + + /// Allocates a new index in the array, optionally storing a new value into it, with + /// configurable bounds for the index range to allocate from. + /// + /// If `value` is `None`, then the index is reserved from further allocation but remains + /// free for storing a value into it. + fn alloc_limits_opt(self: Pin<&Self>, value: Option<T>, min: u32, max: u32) -> Result<usize> { + let new = value.map_or(core::ptr::null(), |a| a.into_foreign()); + let mut id: u32 = 0; + + let guard = ScopeGuard::new(|| { + if !new.is_null() { + // SAFETY: If `new` is not NULL, it came from the `ForeignOwnable` we got + // from the caller. + unsafe { T::from_foreign(new) }; + } + }); + + // SAFETY: `self.xa` is always valid by the type invariant. If this succeeds, it + // takes ownership of the passed `T` (if any). If it fails, we must drop the + // `T` again. + let ret = unsafe { + bindings::xa_alloc( + self.xa.get(), + &mut id, + new as *mut _, + bindings::xa_limit { min, max }, + bindings::GFP_KERNEL, + ) + }; + + if ret < 0 { + Err(Error::from_errno(ret)) + } else { + guard.dismiss(); + Ok(id as usize) + } + } + + /// Allocates a new index in the array, storing a new value into it, with configurable + /// bounds for the index range to allocate from. + pub fn alloc_limits(self: Pin<&Self>, value: T, min: u32, max: u32) -> Result<usize> { + self.alloc_limits_opt(Some(value), min, max) + } + + /// Allocates a new index in the array, storing a new value into it. + pub fn alloc(self: Pin<&Self>, value: T) -> Result<usize> { + self.alloc_limits(value, 0, u32::MAX) + } + + /// Reserves a new index in the array within configurable bounds for the index. + /// + /// Returns a `Reservation` object, which can then be used to store a value at this index or + /// otherwise free it for reuse. + pub fn reserve_limits(self: Pin<&Self>, min: u32, max: u32) -> Result<Reservation<'_, T>> { + Ok(Reservation( + self, + self.alloc_limits_opt(None, min, max)?, + PhantomData, + )) + } + + /// Reserves a new index in the array. + /// + /// Returns a `Reservation` object, which can then be used to store a value at this index or + /// otherwise free it for reuse. + pub fn reserve(self: Pin<&Self>) -> Result<Reservation<'_, T>> { + Ok(Reservation( + self, + self.alloc_limits_opt(None, 0, u32::MAX)?, + PhantomData, + )) + } +} + +impl<T: ForeignOwnable> Drop for XArray<T> { + fn drop(&mut self) { + let mut index: core::ffi::c_ulong = 0; + + // SAFETY: `self.xa` is valid by the type invariant, and as we have + // the only reference to the `XArray` we can safely iterate its contents + // and drop everything. + unsafe { + let mut entry = bindings::xa_find( + self.xa.get(), + &mut index, + core::ffi::c_ulong::MAX, + bindings::BINDINGS_XA_PRESENT, + ); + + while !entry.is_null() { + T::from_foreign(entry); + entry = bindings::xa_find_after( + self.xa.get(), + &mut index, + core::ffi::c_ulong::MAX, + bindings::BINDINGS_XA_PRESENT, + ); + } + } + + // SAFETY: Locked locks are not safe to drop. Normally we would want to + // try_lock()/unlock() here for safety or something similar, but in this + // case xa_destroy() is guaranteed to acquire the lock anyway. This will + // deadlock if a lock guard was improperly dropped, but that is not UB, + // so it's sufficient for soundness purposes. + unsafe { + bindings::xa_destroy(self.xa.get()); + } + } +} + +// SAFETY: XArray is thread-safe and all mutation operations are internally locked. +unsafe impl<T: Send + ForeignOwnable> Send for XArray<T> {} +unsafe impl<T: Sync + ForeignOwnable> Sync for XArray<T> {} -- 2.42.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v5] rust: xarray: Add an abstraction for XArray 2023-12-01 19:50 ` [PATCH v5] rust: xarray: Add an abstraction for XArray Maíra Canal @ 2023-12-06 11:31 ` Benno Lossin 2023-12-06 14:10 ` Andreas Hindborg 2023-12-08 5:21 ` Trevor Gross 2 siblings, 0 replies; 5+ messages in thread From: Benno Lossin @ 2023-12-06 11:31 UTC (permalink / raw) To: Maíra Canal, Asahi Lina, Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng, Gary Guo, Björn Roy Baron, Andreas Hindborg, Alice Ryhl, Matthew Wilcox Cc: rust-for-linux, kernel-dev On 12/1/23 20:50, Maíra Canal wrote: > +/// Wrapper for a value owned by the `XArray` which holds the `XArray` lock until dropped. > +pub struct Guard<'a, T: ForeignOwnable>(NonNull<T>, Pin<&'a XArray<T>>); No invariant for `self.0` being a pointer derived from `T::into_foreign`? > +// INVARIANTS: The lock held by the Guard prevents concurrent access to the XArray. > +// The Guard's Drop implementation releases the lock only when the Guard is > +// dropped, ensuring exclusive access during its existence. Therefore, within > +// the Guard's lifetime, no other operation (including the XArray > +// calling `T::from_foreign`) can access or modify the underlying value. Why is this invariants comment on the `impl`? > +// The Guard holds a reference (`self.0`) to the underlying value owned by > +// XArray. You can use the `into_foreign` method to obtain a pointer to the > +// foreign representation of the owned value, which is valid for the lifetime > +// of the Guard. > +impl<'a, T: ForeignOwnable> Guard<'a, T> { > + /// Borrow the underlying value wrapped by the `Guard`. > + /// > + /// Returns a `T::Borrowed` type for the owned `ForeignOwnable` type. > + pub fn borrow(&self) -> T::Borrowed<'_> { > + // SAFETY: The value is owned by the `XArray`, the lifetime it is borrowed for must not > + // outlive the `XArray` itself, nor the Guard that holds the lock ensuring the value > + // remains in the `XArray`. Here would be the right place to mention the `Guard` invariant, but not using an `INVARIANT` comment, instead use "by the type invariant of `Guard`...". > + unsafe { T::borrow(self.0.as_ptr() as _) } > + } > +} > + > +// Convenience impl for `ForeignOwnable` types whose `Borrowed` > +// form implements Deref. > +impl<'a, T: ForeignOwnable> Deref for Guard<'a, T> > +where > + T::Borrowed<'a>: Deref, > + for<'b> T::Borrowed<'b>: Into<&'b <T::Borrowed<'a> as Deref>::Target>, > +{ > + type Target = <T::Borrowed<'a> as Deref>::Target; > + > + fn deref(&self) -> &Self::Target { > + self.borrow().into() > + } > +} > + > +impl<'a, T: ForeignOwnable> Drop for Guard<'a, T> { > + fn drop(&mut self) { > + // SAFETY: The XArray we have a reference to owns the C xarray object. This must also be justified by the type invariant. > + unsafe { bindings::xa_unlock(self.1.xa.get()) }; > + } > +} > + > +/// Represents a reserved slot in an `XArray`, which does not yet have a value but has an assigned > +/// index and may not be allocated by any other user. If the Reservation is dropped without > +/// being filled, the entry is marked as available again. > +/// > +/// Users must ensure that reserved slots are not filled by other mechanisms, or otherwise their > +/// contents may be dropped and replaced (which will print a warning). > +pub struct Reservation<'a, T: ForeignOwnable>(Pin<&'a XArray<T>>, usize, PhantomData<T>); When using pin-init (see below for what I mean by this), the `Pin<&'a ..>` is not needed (instead just use `&'a ..`). [...] > +/// An array which efficiently maps sparse integer indices to owned objects. > +/// > +/// This is similar to a `Vec<Option<T>>`, but more efficient when there are holes in the > +/// index space, and can be efficiently grown. > +/// > +/// This structure is expected to often be used with an inner type that > +/// can be efficiently cloned, such as an `Arc<T>`. No invariants? > +pub struct XArray<T: ForeignOwnable> { > + xa: Opaque<bindings::xarray>, > + _p: PhantomData<T>, > + _q: PhantomPinned, You do not need this, recently we changed `Opaque<T>` to have the same functionality. > +} > + > +impl<T: ForeignOwnable> XArray<T> { > + /// Creates a new `XArray` with the given flags. > + pub fn new(flags: Flags) -> XArray<T> { Sorry, it seems I forgot to tell you about the pin-init API. See the documentation at [1]. You should change the return type of `new` to be `impl PinInit<Self>`. Then the pin-init API ensures that an `XArray` can only be created in a pinned state. The body of `new` should then just use `pin_init!` and `Opaque::ffi_init`. Doing this allows you to use `&self` as the receiver type. [1]: https://rust-for-linux.github.io/docs/v6.6-rc2/kernel/init/index.html > + let xa = Opaque::uninit(); > + > + // SAFETY: We have just created `xa`. This data structure does not require > + // pinning. > + unsafe { bindings::xa_init_flags(xa.get(), flags) }; > + > + // INVARIANT: All pointers stored in the array are pointers obtained by > + // calling `T::into_foreign`. This invariant is not recorded on the type itself? > + XArray { > + xa, > + _p: PhantomData, > + _q: PhantomPinned, > + } > + } > + > + /// Replaces an entry with a new value, returning the old value (if any). > + pub fn replace(self: Pin<&Self>, index: usize, value: T) -> Result<Option<T>> { As I said above, if you use the `pin-init` API, you can use `&self` here. [...] > + /// Looks up and returns a reference to an entry in the array, returning a `Guard` if it > + /// exists. > + /// > + /// This guard blocks all other actions on the `XArray`. Callers are expected to drop the > + /// `Guard` eagerly to avoid blocking other users, such as by taking a clone of the value. > + pub fn get(self: Pin<&Self>, index: usize) -> Option<Guard<'_, T>> { > + // SAFETY: `self.xa` is always valid by the type invariant. > + unsafe { bindings::xa_lock(self.xa.get()) }; > + > + // SAFETY: `self.xa` is always valid by the type invariant. > + let guard = ScopeGuard::new(|| unsafe { bindings::xa_unlock(self.xa.get()) }); Is that really the only requirement for calling `xa_unlock`? > + > + // SAFETY: `self.xa` is always valid by the type invariant. > + let p = unsafe { bindings::xa_load(self.xa.get(), index.try_into().ok()?) }; Are you required to hold the lock for this operation? Then you need to state so in the SAFETY comment. > + > + NonNull::new(p as *mut T).map(|p| { > + guard.dismiss(); > + Guard(p, self) > + }) > + } > + > + /// Removes and returns an entry, returning it if it existed. > + pub fn remove(self: Pin<&Self>, index: usize) -> Option<T> { > + // SAFETY: `self.xa` is always valid by the type invariant. > + let p = unsafe { bindings::xa_erase(self.xa.get(), index.try_into().ok()?) }; > + if p.is_null() { > + None > + } else { > + // SAFETY: All pointers stored in the array are pointers obtained by > + // calling `T::into_foreign`. > + Some(unsafe { T::from_foreign(p) }) > + } > + } > + > + /// Allocates a new index in the array, optionally storing a new value into it, with > + /// configurable bounds for the index range to allocate from. > + /// > + /// If `value` is `None`, then the index is reserved from further allocation but remains > + /// free for storing a value into it. > + fn alloc_limits_opt(self: Pin<&Self>, value: Option<T>, min: u32, max: u32) -> Result<usize> { In my last mail I wrote: I find it a bit weird to have both the reservation mechanism *and* this function taking an `Option<T>`. Is this really needed? I think the name could be changed to `insert_between`, since that would better reflect the "datastructure"-nature of this type. But it would also be reasonable to keep the name `alloc`, since in C the function is called `xa_alloc`. I have no idea what your rationale for the current choice is, could you please explain? [...] > +impl<T: ForeignOwnable> Drop for XArray<T> { > + fn drop(&mut self) { > + let mut index: core::ffi::c_ulong = 0; > + > + // SAFETY: `self.xa` is valid by the type invariant, and as we have > + // the only reference to the `XArray` we can safely iterate its contents > + // and drop everything. > + unsafe { > + let mut entry = bindings::xa_find( > + self.xa.get(), > + &mut index, > + core::ffi::c_ulong::MAX, > + bindings::BINDINGS_XA_PRESENT, > + ); > + > + while !entry.is_null() { > + T::from_foreign(entry); > + entry = bindings::xa_find_after( > + self.xa.get(), > + &mut index, > + core::ffi::c_ulong::MAX, > + bindings::BINDINGS_XA_PRESENT, > + ); > + } > + } This block needs to be split such that it is clear which operations are unsafe and which operations are safe. Additionally there is the `T::from_foreign` call inside for which the SAFETY comment has no justification. > + > + // SAFETY: Locked locks are not safe to drop. Normally we would want to > + // try_lock()/unlock() here for safety or something similar, but in this > + // case xa_destroy() is guaranteed to acquire the lock anyway. This will > + // deadlock if a lock guard was improperly dropped, but that is not UB, > + // so it's sufficient for soundness purposes. This SAFETY comment is unclear, please try to reduce it to the satisfied requirements of `xa_destroy`. If you want to state something else, you can still have a comment above. -- Cheers, Benno > + unsafe { > + bindings::xa_destroy(self.xa.get()); > + } > + } > +} > + > +// SAFETY: XArray is thread-safe and all mutation operations are internally locked. > +unsafe impl<T: Send + ForeignOwnable> Send for XArray<T> {} > +unsafe impl<T: Sync + ForeignOwnable> Sync for XArray<T> {} > -- > 2.42.0 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v5] rust: xarray: Add an abstraction for XArray 2023-12-01 19:50 ` [PATCH v5] rust: xarray: Add an abstraction for XArray Maíra Canal 2023-12-06 11:31 ` Benno Lossin @ 2023-12-06 14:10 ` Andreas Hindborg 2023-12-07 19:05 ` Benno Lossin 2023-12-08 5:21 ` Trevor Gross 2 siblings, 1 reply; 5+ messages in thread From: Andreas Hindborg @ 2023-12-06 14:10 UTC (permalink / raw) To: Maíra Canal Cc: Asahi Lina, Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng, Gary Guo, Björn Roy Baron, Benno Lossin, Alice Ryhl, Matthew Wilcox, rust-for-linux@vger.kernel.org, kernel-dev@igalia.com Hi Maira, Thanks for working on this! I have a few comments. I think most have been brought up in earlier revisions, but since they are not resolved, I put them again below. Maíra Canal <mcanal@igalia.com> writes: > diff --git a/rust/kernel/xarray.rs b/rust/kernel/xarray.rs > new file mode 100644 > index 000000000000..1aa77e6abfd4 > --- /dev/null > +++ b/rust/kernel/xarray.rs > @@ -0,0 +1,340 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! XArray abstraction. > +//! > +//! C header: [`include/linux/xarray.h`](../../include/linux/xarray.h) > + > +use crate::{ > + bindings, > + error::{to_result, Error, Result}, > + types::{ForeignOwnable, Opaque, ScopeGuard}, > +}; > +use core::{ > + marker::{PhantomData, PhantomPinned}, > + ops::Deref, > + pin::Pin, > + ptr::NonNull, > +}; > + > +/// Flags passed to `XArray::new` to configure the `XArray`. > +type Flags = bindings::gfp_t; > + > +/// Flag values passed to `XArray::new` to configure the `XArray`. > +pub mod flags { > + /// Use IRQ-safe locking. > + pub const LOCK_IRQ: super::Flags = bindings::BINDINGS_XA_FLAGS_LOCK_IRQ; > + /// Use softirq-safe locking. > + pub const LOCK_BH: super::Flags = bindings::BINDINGS_XA_FLAGS_LOCK_BH; > + /// Track which entries are free (distinct from None). > + pub const TRACK_FREE: super::Flags = bindings::BINDINGS_XA_FLAGS_TRACK_FREE; > + /// Initialize array index 0 as busy. > + pub const ZERO_BUSY: super::Flags = bindings::BINDINGS_XA_FLAGS_ZERO_BUSY; > + /// Use GFP_ACCOUNT for internal memory allocations. > + pub const ACCOUNT: super::Flags = bindings::BINDINGS_XA_FLAGS_ACCOUNT; > + /// Create an allocating `XArray` starting at index 0. > + pub const ALLOC: super::Flags = bindings::BINDINGS_XA_FLAGS_ALLOC; > + /// Create an allocating `XArray` starting at index 1. > + pub const ALLOC1: super::Flags = bindings::BINDINGS_XA_FLAGS_ALLOC1; > +} > + > +/// Wrapper for a value owned by the `XArray` which holds the `XArray` lock until dropped. > +pub struct Guard<'a, T: ForeignOwnable>(NonNull<T>, Pin<&'a XArray<T>>); > + > +// INVARIANTS: The lock held by the Guard prevents concurrent access to the XArray. > +// The Guard's Drop implementation releases the lock only when the Guard is > +// dropped, ensuring exclusive access during its existence. Therefore, within > +// the Guard's lifetime, no other operation (including the XArray > +// calling `T::from_foreign`) can access or modify the underlying value. > +// > +// The Guard holds a reference (`self.0`) to the underlying value owned by > +// XArray. You can use the `into_foreign` method to obtain a pointer to the > +// foreign representation of the owned value, which is valid for the lifetime > +// of the Guard. > +impl<'a, T: ForeignOwnable> Guard<'a, T> { > + /// Borrow the underlying value wrapped by the `Guard`. > + /// > + /// Returns a `T::Borrowed` type for the owned `ForeignOwnable` type. > + pub fn borrow(&self) -> T::Borrowed<'_> { > + // SAFETY: The value is owned by the `XArray`, the lifetime it is borrowed for must not > + // outlive the `XArray` itself, nor the Guard that holds the lock ensuring the value > + // remains in the `XArray`. > + unsafe { T::borrow(self.0.as_ptr() as _) } I think specifying the target type of the cast here is preferable. Then the code will not break silently if something should change. > + } > +} > + > +// Convenience impl for `ForeignOwnable` types whose `Borrowed` > +// form implements Deref. > +impl<'a, T: ForeignOwnable> Deref for Guard<'a, T> > +where > + T::Borrowed<'a>: Deref, > + for<'b> T::Borrowed<'b>: Into<&'b <T::Borrowed<'a> as Deref>::Target>, > +{ > + type Target = <T::Borrowed<'a> as Deref>::Target; > + > + fn deref(&self) -> &Self::Target { > + self.borrow().into() > + } > +} > + > +impl<'a, T: ForeignOwnable> Drop for Guard<'a, T> { > + fn drop(&mut self) { > + // SAFETY: The XArray we have a reference to owns the C xarray object. > + unsafe { bindings::xa_unlock(self.1.xa.get()) }; > + } > +} > + > +/// Represents a reserved slot in an `XArray`, which does not yet have a value but has an assigned > +/// index and may not be allocated by any other user. If the Reservation is dropped without > +/// being filled, the entry is marked as available again. > +/// > +/// Users must ensure that reserved slots are not filled by other mechanisms, or otherwise their > +/// contents may be dropped and replaced (which will print a warning). > +pub struct Reservation<'a, T: ForeignOwnable>(Pin<&'a XArray<T>>, usize, PhantomData<T>); > + > +impl<'a, T: ForeignOwnable> Reservation<'a, T> { > + /// Stores a value into the reserved slot. > + pub fn store(self, value: T) -> Result<usize> { > + if self.0.replace(self.1, value)?.is_some() { > + crate::pr_err!("XArray: Reservation stored but the entry already had data!\n"); > + // Consider it a success anyway, not much we can do > + } > + let index = self.1; > + // The reservation is now fulfilled, so do not run our destructor. > + core::mem::forget(self); > + Ok(index) > + } > + > + /// Returns the index of this reservation. > + pub fn index(&self) -> usize { > + self.1 > + } > +} > + > +impl<'a, T: ForeignOwnable> Drop for Reservation<'a, T> { > + fn drop(&mut self) { > + if self.0.remove(self.1).is_some() { > + crate::pr_err!("XArray: Reservation dropped but the entry was not empty!\n"); > + } > + } > +} > + > +/// An array which efficiently maps sparse integer indices to owned objects. > +/// > +/// This is similar to a `Vec<Option<T>>`, but more efficient when there are holes in the > +/// index space, and can be efficiently grown. > +/// > +/// This structure is expected to often be used with an inner type that > +/// can be efficiently cloned, such as an `Arc<T>`. > +pub struct XArray<T: ForeignOwnable> { > + xa: Opaque<bindings::xarray>, > + _p: PhantomData<T>, > + _q: PhantomPinned, > +} > + > +impl<T: ForeignOwnable> XArray<T> { > + /// Creates a new `XArray` with the given flags. > + pub fn new(flags: Flags) -> XArray<T> { > + let xa = Opaque::uninit(); > + > + // SAFETY: We have just created `xa`. This data structure does not require > + // pinning. > + unsafe { bindings::xa_init_flags(xa.get(), flags) }; > + > + // INVARIANT: All pointers stored in the array are pointers obtained by > + // calling `T::into_foreign`. > + XArray { > + xa, > + _p: PhantomData, > + _q: PhantomPinned, > + } > + } Since `xarray` holds a lock, I think it should be pinned. I think we discussed that for x86 it does not need to be pinned when it is not locked, but we are not sure if that holds for all architectures. Also ergonomics might be better if the constructor returns an initialization rather than the caller having to pin after initialization. > + > + /// Replaces an entry with a new value, returning the old value (if any). > + pub fn replace(self: Pin<&Self>, index: usize, value: T) -> Result<Option<T>> { > + let new = value.into_foreign(); > + // SAFETY: `new` just came from into_foreign(), and we dismiss this guard if > + // the xa_store operation succeeds and takes ownership of the pointer. > + let guard = ScopeGuard::new(|| unsafe { > + T::from_foreign(new); > + }); > + > + // SAFETY: `self.xa` is always valid by the type invariant, and we are storing > + // a `T::into_foreign()` result which upholds the later invariants. T has to be 4-byte aligned according to xarray docs. All types that we implement `ForeignOwnable` for is aligned such, because `KernelAllocator` is producing allocations of alignment `ARCH_SLAB_MINALIGN`, which is `__alignof__(unsigned long long)`. But it should probably be in a safety requirement somewhere. Perhaps on `ForeignOwnable` and then make that an unsafe trait? > + let old = unsafe { > + bindings::xa_store( > + self.xa.get(), > + index.try_into()?, > + new as *mut _, Same here, I would prefer full type. > + bindings::GFP_KERNEL, > + ) > + }; > + > + // SAFETY: `xa_store` returns the old entry at this index on success or > + // a XArray result, which can be turn into an errno through `xa_err`. > + to_result(unsafe { bindings::xa_err(old) })?; > + guard.dismiss(); > + > + Ok(if old.is_null() { > + None > + } else { > + // SAFETY: The old value must have been stored by either this function or > + // `alloc_limits_opt`, both of which ensure non-NULL entries are valid > + // ForeignOwnable pointers. > + Some(unsafe { T::from_foreign(old) }) > + }) > + } > + > + /// Replaces an entry with a new value, dropping the old value (if any). > + pub fn set(self: Pin<&Self>, index: usize, value: T) -> Result { > + self.replace(index, value)?; > + Ok(()) > + } > + > + /// Looks up and returns a reference to an entry in the array, returning a `Guard` if it > + /// exists. > + /// > + /// This guard blocks all other actions on the `XArray`. Callers are expected to drop the > + /// `Guard` eagerly to avoid blocking other users, such as by taking a clone of the value. > + pub fn get(self: Pin<&Self>, index: usize) -> Option<Guard<'_, T>> { > + // SAFETY: `self.xa` is always valid by the type invariant. > + unsafe { bindings::xa_lock(self.xa.get()) }; > + > + // SAFETY: `self.xa` is always valid by the type invariant. > + let guard = ScopeGuard::new(|| unsafe { bindings::xa_unlock(self.xa.get()) }); > + > + // SAFETY: `self.xa` is always valid by the type invariant. > + let p = unsafe { bindings::xa_load(self.xa.get(), index.try_into().ok()?) }; > + > + NonNull::new(p as *mut T).map(|p| { > + guard.dismiss(); > + Guard(p, self) > + }) > + } > + > + /// Removes and returns an entry, returning it if it existed. > + pub fn remove(self: Pin<&Self>, index: usize) -> Option<T> { > + // SAFETY: `self.xa` is always valid by the type invariant. > + let p = unsafe { bindings::xa_erase(self.xa.get(), index.try_into().ok()?) }; > + if p.is_null() { > + None > + } else { > + // SAFETY: All pointers stored in the array are pointers obtained by > + // calling `T::into_foreign`. > + Some(unsafe { T::from_foreign(p) }) > + } > + } > + > + /// Allocates a new index in the array, optionally storing a new value into it, with > + /// configurable bounds for the index range to allocate from. > + /// > + /// If `value` is `None`, then the index is reserved from further allocation but remains > + /// free for storing a value into it. > + fn alloc_limits_opt(self: Pin<&Self>, value: Option<T>, min: u32, max: u32) -> Result<usize> { > + let new = value.map_or(core::ptr::null(), |a| a.into_foreign()); > + let mut id: u32 = 0; > + > + let guard = ScopeGuard::new(|| { > + if !new.is_null() { > + // SAFETY: If `new` is not NULL, it came from the `ForeignOwnable` we got > + // from the caller. > + unsafe { T::from_foreign(new) }; > + } > + }); > + > + // SAFETY: `self.xa` is always valid by the type invariant. If this succeeds, it > + // takes ownership of the passed `T` (if any). If it fails, we must drop the > + // `T` again. > + let ret = unsafe { > + bindings::xa_alloc( > + self.xa.get(), > + &mut id, > + new as *mut _, Again, I prefer the full type here. > + bindings::xa_limit { min, max }, > + bindings::GFP_KERNEL, > + ) > + }; > + > + if ret < 0 { > + Err(Error::from_errno(ret)) > + } else { > + guard.dismiss(); > + Ok(id as usize) > + } > + } > + > + /// Allocates a new index in the array, storing a new value into it, with configurable > + /// bounds for the index range to allocate from. > + pub fn alloc_limits(self: Pin<&Self>, value: T, min: u32, max: u32) -> Result<usize> { > + self.alloc_limits_opt(Some(value), min, max) > + } > + > + /// Allocates a new index in the array, storing a new value into it. > + pub fn alloc(self: Pin<&Self>, value: T) -> Result<usize> { > + self.alloc_limits(value, 0, u32::MAX) > + } > + > + /// Reserves a new index in the array within configurable bounds for the index. > + /// > + /// Returns a `Reservation` object, which can then be used to store a value at this index or > + /// otherwise free it for reuse. > + pub fn reserve_limits(self: Pin<&Self>, min: u32, max: u32) -> Result<Reservation<'_, T>> { > + Ok(Reservation( > + self, > + self.alloc_limits_opt(None, min, max)?, > + PhantomData, > + )) > + } > + > + /// Reserves a new index in the array. > + /// > + /// Returns a `Reservation` object, which can then be used to store a value at this index or > + /// otherwise free it for reuse. > + pub fn reserve(self: Pin<&Self>) -> Result<Reservation<'_, T>> { > + Ok(Reservation( > + self, > + self.alloc_limits_opt(None, 0, u32::MAX)?, > + PhantomData, > + )) > + } > +} > + > +impl<T: ForeignOwnable> Drop for XArray<T> { > + fn drop(&mut self) { > + let mut index: core::ffi::c_ulong = 0; > + > + // SAFETY: `self.xa` is valid by the type invariant, and as we have > + // the only reference to the `XArray` we can safely iterate its contents > + // and drop everything. > + unsafe { > + let mut entry = bindings::xa_find( > + self.xa.get(), > + &mut index, > + core::ffi::c_ulong::MAX, > + bindings::BINDINGS_XA_PRESENT, > + ); > + > + while !entry.is_null() { > + T::from_foreign(entry); > + entry = bindings::xa_find_after( > + self.xa.get(), > + &mut index, > + core::ffi::c_ulong::MAX, > + bindings::BINDINGS_XA_PRESENT, > + ); > + } > + } > + > + // SAFETY: Locked locks are not safe to drop. Normally we would want to > + // try_lock()/unlock() here for safety or something similar, but in this > + // case xa_destroy() is guaranteed to acquire the lock anyway. This will > + // deadlock if a lock guard was improperly dropped, but that is not UB, > + // so it's sufficient for soundness purposes. > + unsafe { > + bindings::xa_destroy(self.xa.get()); > + } > + } > +} > + > +// SAFETY: XArray is thread-safe and all mutation operations are internally locked. > +unsafe impl<T: Send + ForeignOwnable> Send for XArray<T> {} > +unsafe impl<T: Sync + ForeignOwnable> Sync for XArray<T> {} Do we actually need to specify `ForeignOwnable` here? Best regards, Andreas Hindborg ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v5] rust: xarray: Add an abstraction for XArray 2023-12-06 14:10 ` Andreas Hindborg @ 2023-12-07 19:05 ` Benno Lossin 0 siblings, 0 replies; 5+ messages in thread From: Benno Lossin @ 2023-12-07 19:05 UTC (permalink / raw) To: Andreas Hindborg, Maíra Canal Cc: Asahi Lina, Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng, Gary Guo, Björn Roy Baron, Alice Ryhl, Matthew Wilcox, rust-for-linux@vger.kernel.org, kernel-dev@igalia.com On 12/6/23 15:10, Andreas Hindborg wrote: > Maíra Canal <mcanal@igalia.com> writes: >> + /// Borrow the underlying value wrapped by the `Guard`. >> + /// >> + /// Returns a `T::Borrowed` type for the owned `ForeignOwnable` type. >> + pub fn borrow(&self) -> T::Borrowed<'_> { >> + // SAFETY: The value is owned by the `XArray`, the lifetime it is borrowed for must not >> + // outlive the `XArray` itself, nor the Guard that holds the lock ensuring the value >> + // remains in the `XArray`. >> + unsafe { T::borrow(self.0.as_ptr() as _) } > > I think specifying the target type of the cast here is preferable. Then > the code will not break silently if something should change. I agree. [...] >> + /// Replaces an entry with a new value, returning the old value (if any). >> + pub fn replace(self: Pin<&Self>, index: usize, value: T) -> Result<Option<T>> { >> + let new = value.into_foreign(); >> + // SAFETY: `new` just came from into_foreign(), and we dismiss this guard if >> + // the xa_store operation succeeds and takes ownership of the pointer. >> + let guard = ScopeGuard::new(|| unsafe { >> + T::from_foreign(new); >> + }); >> + >> + // SAFETY: `self.xa` is always valid by the type invariant, and we are storing >> + // a `T::into_foreign()` result which upholds the later invariants. > > T has to be 4-byte aligned according to xarray docs. All types that we > implement `ForeignOwnable` for is aligned such, because > `KernelAllocator` is producing allocations of alignment > `ARCH_SLAB_MINALIGN`, which is `__alignof__(unsigned long long)`. But it > should probably be in a safety requirement somewhere. Perhaps on > `ForeignOwnable` and then make that an unsafe trait? I am not sure if we want to enforce that for every `ForeignOwnable` type, could there be anything that wants to implement `ForeignOwnable` that does not have that alignment? If we do not want to tag it onto `ForeignOwnable`, we should put this not only in some safety requirement, but also just check it at compile time. You can do this using: build_assert!(mem::align_of::<T>() <= 4); At some point Rust might have an `Aligned` trait [1] and then we could use that. [1]: https://github.com/rust-lang/rfcs/pull/3319 [...] >> +// SAFETY: XArray is thread-safe and all mutation operations are internally locked. >> +unsafe impl<T: Send + ForeignOwnable> Send for XArray<T> {} >> +unsafe impl<T: Sync + ForeignOwnable> Sync for XArray<T> {} > > Do we actually need to specify `ForeignOwnable` here? Yes, this is needed, since `XArray<T>` is declared with `T: ForeignOwnable`, since that is needed for dropping an `XArray<T>`. -- Cheers, Benno ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v5] rust: xarray: Add an abstraction for XArray 2023-12-01 19:50 ` [PATCH v5] rust: xarray: Add an abstraction for XArray Maíra Canal 2023-12-06 11:31 ` Benno Lossin 2023-12-06 14:10 ` Andreas Hindborg @ 2023-12-08 5:21 ` Trevor Gross 2 siblings, 0 replies; 5+ messages in thread From: Trevor Gross @ 2023-12-08 5:21 UTC (permalink / raw) To: Maíra Canal Cc: Asahi Lina, Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng, Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg, Alice Ryhl, Matthew Wilcox, rust-for-linux, kernel-dev On Fri, Dec 1, 2023 at 2:54 PM Maíra Canal <mcanal@igalia.com> wrote: > +impl<'a, T: ForeignOwnable> Guard<'a, T> { > + /// Borrow the underlying value wrapped by the `Guard`. > + /// > + /// Returns a `T::Borrowed` type for the owned `ForeignOwnable` type. > + pub fn borrow(&self) -> T::Borrowed<'_> { > + // SAFETY: The value is owned by the `XArray`, the lifetime it is borrowed for must not > + // outlive the `XArray` itself, nor the Guard that holds the lock ensuring the value > + // remains in the `XArray`. > + unsafe { T::borrow(self.0.as_ptr() as _) } > + } > +} Prefer `.cast::<...>()` or at least `.cast()` wherever possible since you can't accidentally change mutability (the others mentioned this area too) > +// Convenience impl for `ForeignOwnable` types whose `Borrowed` > +// form implements Deref. > +impl<'a, T: ForeignOwnable> Deref for Guard<'a, T> > +where > + T::Borrowed<'a>: Deref, > + for<'b> T::Borrowed<'b>: Into<&'b <T::Borrowed<'a> as Deref>::Target>, You can make these doc comments if there is any value to a user seeing them > +/// Represents a reserved slot in an `XArray`, which does not yet have a value but has an assigned > +/// index and may not be allocated by any other user. If the Reservation is dropped without > +/// being filled, the entry is marked as available again. > +/// > +/// Users must ensure that reserved slots are not filled by other mechanisms, or otherwise their > +/// contents may be dropped and replaced (which will print a warning). > +pub struct Reservation<'a, T: ForeignOwnable>(Pin<&'a XArray<T>>, usize, PhantomData<T>); Can you clarify who users are here, and give an example of what other mechanisms would be? Docs nits: - s/Represents a/A/ (noun form for object docs) - Split "If the Reservation..." to a new paragraph so there isn't a long summary - s/or otherwise/otherwise/ > +impl<'a, T: ForeignOwnable> Reservation<'a, T> { > + /// Stores a value into the reserved slot. > + pub fn store(self, value: T) -> Result<usize> { Add to the docs what this return value is > + if self.0.replace(self.1, value)?.is_some() { > + crate::pr_err!("XArray: Reservation stored but the entry already had data!\n"); > + // Consider it a success anyway, not much we can do > + } > + let index = self.1; > + // The reservation is now fulfilled, so do not run our destructor. > + core::mem::forget(self); Add a note about when the destructor does get run > + Ok(index) > + } > + /// Replaces an entry with a new value, returning the old value (if any). > + pub fn replace(self: Pin<&Self>, index: usize, value: T) -> Result<Option<T>> { > + let new = value.into_foreign(); > + // SAFETY: `new` just came from into_foreign(), and we dismiss this guard if > + // the xa_store operation succeeds and takes ownership of the pointer. > + let guard = ScopeGuard::new(|| unsafe { > + T::from_foreign(new); > + }); > + > + // SAFETY: `self.xa` is always valid by the type invariant, and we are storing > + // a `T::into_foreign()` result which upholds the later invariants. What type invariant, I don't see one on the type itself :) > + let guard = ScopeGuard::new(|| unsafe { > + T::from_foreign(new); > + }); > + > + // SAFETY: `self.xa` is always valid by the type invariant, and we are storing > + // a `T::into_foreign()` result which upholds the later invariants. > + let old = unsafe { > + bindings::xa_store( > + self.xa.get(), > + index.try_into()?, > + new as *mut _, > + bindings::GFP_KERNEL, > + ) > + }; `as` -> `.cast::<...>()` > + Ok(if old.is_null() { > + None > + } else { > + // SAFETY: The old value must have been stored by either this function or > + // `alloc_limits_opt`, both of which ensure non-NULL entries are valid > + // ForeignOwnable pointers. > + Some(unsafe { T::from_foreign(old) }) It's obviously done right there, but it doesn't hurt to clarify in the comment that you checked for null (part of the `from_foreign` invariant). There are a few cases like this. Nit: it looks cleaner to `let ret = if ...` .. `Ok(ret)` than it does to wrap a larger `if` block in `Ok`. > + /// Looks up and returns a reference to an entry in the array, returning a `Guard` if it > + /// exists. > + /// > + /// This guard blocks all other actions on the `XArray`. Callers are expected to drop the > + /// `Guard` eagerly to avoid blocking other users, such as by taking a clone of the value. > + pub fn get(self: Pin<&Self>, index: usize) -> Option<Guard<'_, T>> { > + // SAFETY: `self.xa` is always valid by the type invariant. > + unsafe { bindings::xa_lock(self.xa.get()) }; > + > + // SAFETY: `self.xa` is always valid by the type invariant. > + let guard = ScopeGuard::new(|| unsafe { bindings::xa_unlock(self.xa.get()) }); > + > + // SAFETY: `self.xa` is always valid by the type invariant. > + let p = unsafe { bindings::xa_load(self.xa.get(), index.try_into().ok()?) }; Is it worth any sort of > + NonNull::new(p as *mut T).map(|p| { > + guard.dismiss(); > + Guard(p, self) > + }) > + } `as` -> `.cast::<...>()` > + /// Removes and returns an entry, returning it if it existed. > + pub fn remove(self: Pin<&Self>, index: usize) -> Option<T> { Docs wording is redundant > + /// Allocates a new index in the array, optionally storing a new value into it, with > + /// configurable bounds for the index range to allocate from. > + /// > + /// If `value` is `None`, then the index is reserved from further allocation but remains > + /// free for storing a value into it. > + fn alloc_limits_opt(self: Pin<&Self>, value: Option<T>, min: u32, max: u32) -> Result<usize> { Should min and max be usize to be cohesive with indices? And then return an error if they don't fit. Same questions for below. > + let new = value.map_or(core::ptr::null(), |a| a.into_foreign()); > + let mut id: u32 = 0; > + > + let guard = ScopeGuard::new(|| { > + if !new.is_null() { > + // SAFETY: If `new` is not NULL, it came from the `ForeignOwnable` we got > + // from the caller. > + unsafe { T::from_foreign(new) }; > + } > + }); > + > + // SAFETY: `self.xa` is always valid by the type invariant. If this succeeds, it > + // takes ownership of the passed `T` (if any). If it fails, we must drop the > + // `T` again. > + let ret = unsafe { > + bindings::xa_alloc( > + self.xa.get(), > + &mut id, > + new as *mut _, > + bindings::xa_limit { min, max }, > + bindings::GFP_KERNEL, > + ) > + }; `as` -> `.cast::<...>()` > + if ret < 0 { > + Err(Error::from_errno(ret)) > + } else { > + guard.dismiss(); > + Ok(id as usize) > + } > + } > +impl<T: ForeignOwnable> Drop for XArray<T> { > + fn drop(&mut self) { > + let mut index: core::ffi::c_ulong = 0; > + > + // SAFETY: `self.xa` is valid by the type invariant, and as we have > + // the only reference to the `XArray` we can safely iterate its contents > + // and drop everything. > + unsafe { > + let mut entry = bindings::xa_find( > + self.xa.get(), > + &mut index, > + core::ffi::c_ulong::MAX, > + bindings::BINDINGS_XA_PRESENT, > + ); > + > + while !entry.is_null() { > + T::from_foreign(entry); > + entry = bindings::xa_find_after( > + self.xa.get(), > + &mut index, > + core::ffi::c_ulong::MAX, > + bindings::BINDINGS_XA_PRESENT, > + ); > + } > + } This may be better split into two safety blocks (as Benno mentioned) > + // SAFETY: Locked locks are not safe to drop. Normally we would want to > + // try_lock()/unlock() here for safety or something similar, but in this > + // case xa_destroy() is guaranteed to acquire the lock anyway. This will > + // deadlock if a lock guard was improperly dropped, but that is not UB, > + // so it's sufficient for soundness purposes. > + unsafe { > + bindings::xa_destroy(self.xa.get()); > + } > + } > +} Nit: put the semicolon outside the {...} so it goes on one line. Looks great so far! - Trevor ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-08 5:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20231206141047eucas1p1b6c2b022717a6b3a2e24e37b6a6d5d23@eucas1p1.samsung.com>
2023-12-01 19:50 ` [PATCH v5] rust: xarray: Add an abstraction for XArray Maíra Canal
2023-12-06 11:31 ` Benno Lossin
2023-12-06 14:10 ` Andreas Hindborg
2023-12-07 19:05 ` Benno Lossin
2023-12-08 5:21 ` Trevor Gross
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.