From: Remo Senekowitsch <remo@buenzli.dev>
To: "Rob Herring" <robh@kernel.org>,
"Saravana Kannan" <saravanak@google.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" <benno.lossin@proton.me>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
"Remo Senekowitsch" <remo@buenzli.dev>
Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
rust-for-linux@vger.kernel.org
Subject: [PATCH v2 3/5] rust: property: Add child accessor and iterator
Date: Mon, 14 Apr 2025 17:26:28 +0200 [thread overview]
Message-ID: <20250414152630.1691179-4-remo@buenzli.dev> (raw)
In-Reply-To: <20250414152630.1691179-1-remo@buenzli.dev>
Allow Rust drivers to access children of a fwnode either by name or by
iterating over all of them.
In C, there is the function `fwnode_get_next_child_node` for iteration
and the macro `fwnode_for_each_child_node` that helps with handling the
pointers. Instead of a macro, a native iterator is used in Rust such
that regular for-loops can be used.
Signed-off-by: Remo Senekowitsch <remo@buenzli.dev>
---
rust/kernel/property.rs | 75 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 74 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/property.rs b/rust/kernel/property.rs
index 0d4ea3168..d9fb773b6 100644
--- a/rust/kernel/property.rs
+++ b/rust/kernel/property.rs
@@ -13,7 +13,7 @@
error::{to_result, Result},
prelude::*,
str::{BStr, CStr, CString},
- types::Opaque,
+ types::{ARef, Opaque},
};
impl Device {
@@ -68,6 +68,16 @@ pub fn property_read<'fwnode, 'name, T: Property>(
) -> PropertyGuard<'fwnode, 'name, T> {
self.fwnode().property_read(name)
}
+
+ /// Returns first matching named child node handle.
+ pub fn get_child_by_name(&self, name: &CStr) -> Option<ARef<FwNode>> {
+ self.fwnode().get_child_by_name(name)
+ }
+
+ /// Returns an iterator over a node's children.
+ pub fn children<'a>(&'a self) -> impl Iterator<Item = ARef<FwNode>> + 'a {
+ self.fwnode().children()
+ }
}
/// A reference-counted fwnode_handle.
@@ -89,6 +99,22 @@ pub fn property_read<'fwnode, 'name, T: Property>(
pub struct FwNode(Opaque<bindings::fwnode_handle>);
impl FwNode {
+ /// # Safety
+ ///
+ /// Callers must ensure that the reference count was incremented at least
+ /// once, and that they are properly relinquishing one increment. That is,
+ /// if there is only one increment, callers must not use the underlying
+ /// object anymore -- it is only safe to do so via the newly created
+ /// [`ARef`].
+ unsafe fn from_raw(raw: *mut bindings::fwnode_handle) -> ARef<Self> {
+ // SAFETY: As per the safety requirement, raw has an incremented
+ // refcount which won't be decremented elsewhere. It also it not null.
+ // It is safe to cast from a `*mut fwnode_handle` to `*mut FwNode`,
+ // because `FwNode` is defined as a `#[repr(transparent)]` wrapper
+ // around `fwnode_handle`.
+ unsafe { ARef::from_raw(ptr::NonNull::new_unchecked(raw.cast())) }
+ }
+
/// Obtain the raw `struct fwnode_handle *`.
pub(crate) fn as_raw(&self) -> *mut bindings::fwnode_handle {
self.0.get()
@@ -243,6 +269,53 @@ fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
FwNodeDisplayPath(self)
}
+
+ /// Returns first matching named child node handle.
+ pub fn get_child_by_name(&self, name: &CStr) -> Option<ARef<Self>> {
+ // SAFETY: `self` and `name` are valid.
+ let child =
+ unsafe { bindings::fwnode_get_named_child_node(self.as_raw(), name.as_char_ptr()) };
+ if child.is_null() {
+ return None;
+ }
+ // SAFETY: `fwnode_get_named_child_node` returns a pointer with refcount incremented.
+ Some(unsafe { Self::from_raw(child) })
+ }
+
+ /// Returns an iterator over a node's children.
+ pub fn children<'a>(&'a self) -> impl Iterator<Item = ARef<FwNode>> + 'a {
+ let mut prev: Option<ARef<FwNode>> = None;
+
+ core::iter::from_fn(move || {
+ let prev_ptr = match prev.take() {
+ None => ptr::null_mut(),
+ Some(prev) => {
+ // We will pass `prev` to `fwnode_get_next_child_node`,
+ // which decrements its refcount, so we use
+ // `ARef::into_raw` to avoid decrementing the refcount
+ // twice.
+ let prev = ARef::into_raw(prev);
+ prev.as_ptr().cast()
+ }
+ };
+ // SAFETY: `self.as_raw()` is valid. `prev_ptr` may be null,
+ // which is allowed and corresponds to getting the first child.
+ // Otherwise, `prev_ptr` is valid, as it is the stored return
+ // value from the previous invocation. `prev_ptr` has its refount
+ // incremented and it won't be decremented anymore on the Rust
+ // side. `fwnode_get_next_child_node` decrements the refcount of
+ // `prev_ptr`, so the refcount is handled correctly.
+ let next = unsafe { bindings::fwnode_get_next_child_node(self.as_raw(), prev_ptr) };
+ if next.is_null() {
+ return None;
+ }
+ // SAFETY: `fwnode_get_next_child_node` returns a pointer with
+ // refcount incremented.
+ let next = unsafe { FwNode::from_raw(next) };
+ prev = Some(next.clone());
+ Some(next)
+ })
+ }
}
// SAFETY: Instances of `FwNode` are always reference-counted.
--
2.49.0
next prev parent reply other threads:[~2025-04-14 15:26 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-26 17:13 [PATCH 0/10] More Rust bindings for device property reads Remo Senekowitsch
2025-03-26 17:13 ` [PATCH 01/10] rust: Move property_present to property.rs Remo Senekowitsch
2025-03-26 20:51 ` Rob Herring
2025-03-26 22:41 ` Rob Herring
2025-04-04 12:48 ` Remo Senekowitsch
2025-03-26 20:58 ` Andrew Ballance
2025-03-27 8:37 ` Andy Shevchenko
2025-03-27 13:55 ` Rob Herring
2025-03-27 17:49 ` Andy Shevchenko
2025-03-26 17:13 ` [PATCH 02/10] rust: Add an Integer trait Remo Senekowitsch
2025-03-26 20:00 ` Rob Herring
2025-03-26 17:13 ` [PATCH 03/10] device property: Add fwnode_property_read_int_array() Remo Senekowitsch
2025-03-27 8:41 ` Andy Shevchenko
2025-04-02 16:04 ` Remo Senekowitsch
2025-04-03 13:28 ` Andy Shevchenko
2025-04-03 16:08 ` Rob Herring
2025-04-03 16:15 ` Remo Senekowitsch
2025-04-03 17:04 ` Remo Senekowitsch
2025-04-03 17:22 ` Rob Herring
2025-04-04 12:29 ` Remo Senekowitsch
2025-04-03 16:04 ` Rob Herring
2025-04-03 16:15 ` Andy Shevchenko
2025-04-03 16:36 ` Rob Herring
2025-04-03 17:54 ` Andy Shevchenko
2025-04-03 18:48 ` Rob Herring
2025-04-03 20:36 ` Miguel Ojeda
2025-04-04 11:00 ` Andy Shevchenko
2025-04-04 14:12 ` Rob Herring
2025-04-04 16:35 ` Andy Shevchenko
2025-03-26 17:13 ` [PATCH 04/10] rust: Add bindings for reading device properties Remo Senekowitsch
2025-03-26 21:27 ` Rob Herring
2025-04-02 16:28 ` Remo Senekowitsch
2025-03-26 17:13 ` [PATCH 05/10] rust: Read properties via single generic method Remo Senekowitsch
2025-03-26 21:33 ` Rob Herring
2025-03-26 17:13 ` [PATCH 06/10] rust: property: Add child accessor and iterator Remo Senekowitsch
2025-03-26 21:04 ` Andrew Ballance
2025-03-26 21:40 ` Rob Herring
2025-03-26 17:13 ` [PATCH 07/10] rust: Add arrayvec Remo Senekowitsch
2025-03-26 21:06 ` Andrew Ballance
2025-03-27 14:40 ` Danilo Krummrich
2025-03-26 17:13 ` [PATCH 08/10] rust: property: Add property_get_reference_args Remo Senekowitsch
2025-03-26 21:07 ` Andrew Ballance
2025-03-26 21:25 ` Miguel Ojeda
2025-03-26 21:45 ` Remo Senekowitsch
2025-03-27 14:32 ` Danilo Krummrich
2025-03-26 17:13 ` [PATCH 09/10] rust: property: Add PropertyGuard Remo Senekowitsch
2025-03-26 21:10 ` Andrew Ballance
2025-03-26 22:25 ` Rob Herring
2025-03-26 17:13 ` [PATCH 10/10] samples: rust: platform: Add property read examples Remo Senekowitsch
2025-03-26 22:01 ` Rob Herring
2025-03-26 22:23 ` Remo Senekowitsch
2025-03-27 0:02 ` Rob Herring
2025-03-27 10:28 ` Danilo Krummrich
2025-03-26 20:54 ` [PATCH 0/10] More Rust bindings for device property reads Andrew Ballance
2025-03-27 8:42 ` Andy Shevchenko
2025-04-14 15:26 ` [PATCH v2 0/5] " Remo Senekowitsch
2025-04-14 15:26 ` [PATCH v2 1/5] rust: Move property_present to separate file Remo Senekowitsch
2025-04-14 16:00 ` Danilo Krummrich
2025-04-14 16:40 ` Remo Senekowitsch
2025-04-14 18:00 ` Danilo Krummrich
2025-04-15 11:17 ` Remo Senekowitsch
2025-04-14 15:26 ` [PATCH v2 2/5] rust: Add bindings for reading device properties Remo Senekowitsch
2025-04-14 17:44 ` Danilo Krummrich
2025-04-14 18:05 ` Danilo Krummrich
2025-04-14 23:55 ` Remo Senekowitsch
2025-04-15 9:48 ` Danilo Krummrich
2025-04-15 11:11 ` Remo Senekowitsch
2025-04-15 12:46 ` Rob Herring
2025-04-15 13:11 ` Danilo Krummrich
2025-04-15 14:47 ` Remo Senekowitsch
2025-04-16 18:28 ` Gary Guo
2025-04-23 12:29 ` Dirk Behme
2025-04-24 11:25 ` Remo Senekowitsch
2025-04-23 12:34 ` Dirk Behme
2025-04-14 15:26 ` Remo Senekowitsch [this message]
2025-04-14 16:09 ` [PATCH v2 3/5] rust: property: Add child accessor and iterator Danilo Krummrich
2025-04-14 15:26 ` [PATCH v2 4/5] rust: property: Add property_get_reference_args Remo Senekowitsch
2025-04-14 15:26 ` [PATCH v2 5/5] samples: rust: platform: Add property read examples Remo Senekowitsch
2025-04-23 12:39 ` Dirk Behme
2025-04-24 5:47 ` Dirk Behme
2025-04-14 15:38 ` [PATCH v2 0/5] More Rust bindings for device property reads Miguel Ojeda
2025-04-14 16:07 ` Remo Senekowitsch
2025-04-14 16:44 ` Miguel Ojeda
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=20250414152630.1691179-4-remo@buenzli.dev \
--to=remo@buenzli.dev \
--cc=a.hindborg@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=dakr@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gary@garyguo.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=saravanak@google.com \
--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).