All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andreas Hindborg <a.hindborg@kernel.org>
To: "Tamir Duberstein" <tamird@gmail.com>,
	"Miguel Ojeda" <ojeda@kernel.org>,
	"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" <lossin@kernel.org>,
	"Alice Ryhl" <aliceryhl@google.com>,
	"Trevor Gross" <tmgross@umich.edu>,
	"Danilo Krummrich" <dakr@kernel.org>,
	"Lorenzo Stoakes" <lorenzo.stoakes@oracle.com>,
	"Liam R. Howlett" <Liam.Howlett@oracle.com>,
	"Vlastimil Babka" <vbabka@suse.cz>,
	"Andrew Morton" <akpm@linux-foundation.org>,
	"Christoph Lameter" <cl@gentwo.org>,
	"David Rientjes" <rientjes@google.com>,
	"Roman Gushchin" <roman.gushchin@linux.dev>,
	"Harry Yoo" <harry.yoo@oracle.com>
Cc: Daniel Gomez <da.gomez@kernel.org>,
	rust-for-linux@vger.kernel.org,  linux-kernel@vger.kernel.org,
	linux-mm@kvack.org,  Andreas Hindborg <a.hindborg@kernel.org>
Subject: [PATCH v3 07/12] rust: xarray: add `find_next` and `find_next_mut`
Date: Mon, 09 Feb 2026 15:38:12 +0100	[thread overview]
Message-ID: <20260209-xarray-entry-send-v3-7-f777c65b8ae2@kernel.org> (raw)
In-Reply-To: <20260209-xarray-entry-send-v3-0-f777c65b8ae2@kernel.org>

Add methods to find the next element in an XArray starting from a
given index. The methods return a tuple containing the index where the
element was found and a reference to the element.

The implementation uses the XArray state API via `xas_find` to avoid taking
the rcu lock as an exclusive lock is already held by `Guard`.

Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
---
 rust/kernel/xarray.rs | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/rust/kernel/xarray.rs b/rust/kernel/xarray.rs
index e654bf56dc97c..656ec897a0c41 100644
--- a/rust/kernel/xarray.rs
+++ b/rust/kernel/xarray.rs
@@ -251,6 +251,67 @@ pub fn get_mut(&mut self, index: usize) -> Option<T::BorrowedMut<'_>> {
         Some(unsafe { T::borrow_mut(ptr.as_ptr()) })
     }
 
+    fn load_next(&self, index: usize) -> Option<(usize, NonNull<c_void>)> {
+        XArrayState::new(self, index).load_next()
+    }
+
+    /// Finds the next element starting from the given index.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use kernel::{prelude::*, xarray::{AllocKind, XArray}};
+    /// let mut xa = KBox::pin_init(XArray::<KBox<u32>>::new(AllocKind::Alloc), GFP_KERNEL)?;
+    /// let mut guard = xa.lock();
+    ///
+    /// guard.store(10, KBox::new(10u32, GFP_KERNEL)?, GFP_KERNEL)?;
+    /// guard.store(20, KBox::new(20u32, GFP_KERNEL)?, GFP_KERNEL)?;
+    ///
+    /// if let Some((found_index, value)) = guard.find_next(11) {
+    ///     assert_eq!(found_index, 20);
+    ///     assert_eq!(*value, 20);
+    /// }
+    ///
+    /// if let Some((found_index, value)) = guard.find_next(5) {
+    ///     assert_eq!(found_index, 10);
+    ///     assert_eq!(*value, 10);
+    /// }
+    ///
+    /// # Ok::<(), kernel::error::Error>(())
+    /// ```
+    pub fn find_next(&self, index: usize) -> Option<(usize, T::Borrowed<'_>)> {
+        self.load_next(index)
+            // SAFETY: `ptr` came from `T::into_foreign`.
+            .map(|(index, ptr)| (index, unsafe { T::borrow(ptr.as_ptr()) }))
+    }
+
+    /// Finds the next element starting from the given index, returning a mutable reference.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use kernel::{prelude::*, xarray::{AllocKind, XArray}};
+    /// let mut xa = KBox::pin_init(XArray::<KBox<u32>>::new(AllocKind::Alloc), GFP_KERNEL)?;
+    /// let mut guard = xa.lock();
+    ///
+    /// guard.store(10, KBox::new(10u32, GFP_KERNEL)?, GFP_KERNEL)?;
+    /// guard.store(20, KBox::new(20u32, GFP_KERNEL)?, GFP_KERNEL)?;
+    ///
+    /// if let Some((found_index, mut_value)) = guard.find_next_mut(5) {
+    ///     assert_eq!(found_index, 10);
+    ///     *mut_value = 0x99;
+    /// }
+    ///
+    /// assert_eq!(guard.get(10).copied(), Some(0x99));
+    ///
+    /// # Ok::<(), kernel::error::Error>(())
+    /// ```
+    pub fn find_next_mut(&mut self, index: usize) -> Option<(usize, T::BorrowedMut<'_>)> {
+        self.load_next(index)
+            // SAFETY: `ptr` came from `T::into_foreign`.
+            .map(move |(index, ptr)| (index, unsafe { T::borrow_mut(ptr.as_ptr()) }))
+    }
+
     /// Removes and returns the element at the given index.
     pub fn remove(&mut self, index: usize) -> Option<T> {
         // SAFETY:
@@ -354,6 +415,13 @@ fn load(&mut self) -> Option<NonNull<c_void>> {
         let ptr = unsafe { bindings::xas_load(&raw mut self.state) };
         NonNull::new(ptr.cast())
     }
+
+    fn load_next(&mut self) -> Option<(usize, NonNull<c_void>)> {
+        // SAFETY: `self.state` is always valid by the type invariant of
+        // `XArrayState` and the we hold the xarray lock.
+        let ptr = unsafe { bindings::xas_find(&raw mut self.state, usize::MAX) };
+        NonNull::new(ptr).map(|ptr| (self.state.xa_index, ptr))
+    }
 }
 
 // SAFETY: `XArray<T>` has no shared mutable state so it is `Send` iff `T` is `Send`.

-- 
2.51.2




  parent reply	other threads:[~2026-02-09 14:39 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-09 14:38 [PATCH v3 00/12] rust: xarray: add entry API with preloading Andreas Hindborg
2026-02-09 14:38 ` [PATCH v3 01/12] rust: xarray: minor formatting fixes Andreas Hindborg
2026-02-10 16:44   ` Daniel Gomez
2026-02-10 17:44   ` Liam R. Howlett
2026-02-11 18:30   ` Mukesh Kumar Chaurasiya
2026-02-09 14:38 ` [PATCH v3 02/12] rust: xarray: add debug format for `StoreError` Andreas Hindborg
2026-02-10 16:45   ` Daniel Gomez
2026-02-10 16:55     ` Tamir Duberstein
2026-02-24 13:40       ` Andreas Hindborg
2026-02-10 17:44   ` Liam R. Howlett
2026-02-09 14:38 ` [PATCH v3 03/12] rust: xarray: add `contains_index` method Andreas Hindborg
2026-02-10 16:46   ` Daniel Gomez
2026-02-24 13:45     ` Andreas Hindborg
2026-02-10 16:56   ` Tamir Duberstein
2026-02-11  7:31     ` Andreas Hindborg
2026-02-11 18:24       ` Tamir Duberstein
2026-02-10 17:52   ` Liam R. Howlett
2026-02-11  7:41     ` Andreas Hindborg
2026-02-11 18:21       ` Liam R. Howlett
2026-02-12 10:15         ` Andreas Hindborg
2026-02-12 10:52           ` Andreas Hindborg
2026-02-12 11:19             ` Alice Ryhl
2026-02-12 12:39               ` Andreas Hindborg
2026-02-12 17:49                 ` Liam R. Howlett
2026-02-13  8:15                   ` Alice Ryhl
2026-02-13  8:17                 ` Alice Ryhl
2026-02-24 14:20                   ` Andreas Hindborg
2026-02-12 11:27             ` Miguel Ojeda
2026-02-12 12:47               ` Andreas Hindborg
2026-02-12 13:34                 ` Miguel Ojeda
2026-02-09 14:38 ` [PATCH v3 04/12] rust: xarray: add `XArrayState` Andreas Hindborg
2026-02-10 16:48   ` Daniel Gomez
2026-02-11  7:42     ` Andreas Hindborg
2026-02-10 16:57   ` Tamir Duberstein
2026-02-24 14:26     ` Andreas Hindborg
2026-02-24 14:52       ` Tamir Duberstein
2026-02-24 15:43         ` Andreas Hindborg
2026-02-24 15:52           ` Tamir Duberstein
2026-02-25 14:08             ` Andreas Hindborg
2026-02-09 14:38 ` [PATCH v3 05/12] rust: xarray: use `xas_load` instead of `xa_load` in `Guard::load` Andreas Hindborg
2026-02-10 18:16   ` Liam R. Howlett
2026-02-10 19:53     ` Tamir Duberstein
2026-02-10 20:59       ` Liam R. Howlett
2026-02-10 21:22         ` Tamir Duberstein
2026-02-10 21:34           ` Alice Ryhl
2026-02-11 14:32             ` Liam R. Howlett
2026-02-11 18:00               ` Boqun Feng
2026-02-11 18:19                 ` Tamir Duberstein
2026-02-11 18:24                   ` Boqun Feng
2026-02-11 18:55                 ` Liam R. Howlett
2026-02-11 19:45                   ` Boqun Feng
2026-02-09 14:38 ` [PATCH v3 06/12] rust: xarray: simplify `Guard::load` Andreas Hindborg
2026-02-09 14:38 ` Andreas Hindborg [this message]
2026-02-09 14:38 ` [PATCH v3 08/12] rust: xarray: add entry API Andreas Hindborg
2026-02-09 14:38 ` [PATCH v3 09/12] rust: mm: add abstractions for allocating from a `sheaf` Andreas Hindborg
2026-02-09 14:38 ` [PATCH v3 10/12] rust: mm: sheaf: allow use of C initialized static caches Andreas Hindborg
2026-02-09 14:38 ` [PATCH v3 11/12] xarray, radix-tree: enable sheaf support for kmem_cache Andreas Hindborg
2026-02-10 16:49   ` Daniel Gomez
2026-02-11  7:45     ` Andreas Hindborg
2026-02-09 14:38 ` [PATCH v3 12/12] rust: xarray: add preload API Andreas Hindborg

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=20260209-xarray-entry-send-v3-7-f777c65b8ae2@kernel.org \
    --to=a.hindborg@kernel.org \
    --cc=Liam.Howlett@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=alex.gaynor@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun.feng@gmail.com \
    --cc=cl@gentwo.org \
    --cc=da.gomez@kernel.org \
    --cc=dakr@kernel.org \
    --cc=gary@garyguo.net \
    --cc=harry.yoo@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=lorenzo.stoakes@oracle.com \
    --cc=lossin@kernel.org \
    --cc=ojeda@kernel.org \
    --cc=rientjes@google.com \
    --cc=roman.gushchin@linux.dev \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=tamird@gmail.com \
    --cc=tmgross@umich.edu \
    --cc=vbabka@suse.cz \
    /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 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.