From: Matthew Maurer <mmaurer@google.com>
To: "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>,
"Sami Tolvanen" <samitolvanen@google.com>
Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org,
Matthew Maurer <mmaurer@google.com>
Subject: [PATCH 4/8] rust: debugfs: Allow subdir creation in builder interface
Date: Tue, 29 Apr 2025 23:15:58 +0000 [thread overview]
Message-ID: <20250429-debugfs-rust-v1-4-6b6e7cb7929f@google.com> (raw)
In-Reply-To: <20250429-debugfs-rust-v1-0-6b6e7cb7929f@google.com>
Allows creating subdirectories in the builder intended to be cleaned up
by `debugfs_remove` at the same time as the root.
Signed-off-by: Matthew Maurer <mmaurer@google.com>
---
rust/kernel/debugfs.rs | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/rust/kernel/debugfs.rs b/rust/kernel/debugfs.rs
index f6240fd056f8598d5ef06bdaf61c5c33eab5b734..6c7cf7e97741b98d2c0654d01fca3de0d8047e97 100644
--- a/rust/kernel/debugfs.rs
+++ b/rust/kernel/debugfs.rs
@@ -347,6 +347,32 @@ pub fn display_file<T: Display + Sized>(&self, name: &CStr, data: &'a T) -> Resu
core::mem::forget(unsafe { self.inner.display_file_raw(name, data)? });
Ok(())
}
+
+ /// Creates a nested directory that may live as long as its parent
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// # use kernel::c_str;
+ /// # use kernel::debugfs::{Dir, Values};
+ /// let dir = Dir::new(c_str!("foo"), None)?;
+ /// let foo = KBox::pin_init(Values::attach(0, dir), GFP_KERNEL)?;
+ /// foo.as_ref().build(|_value, builder| {
+ /// builder.dir(c_str!("bar"))?;
+ /// Ok::<(), Error>(())
+ /// })?;
+ /// // foo/bar will still exist at this point in DebugFS
+ /// # Ok::<(), Error>(())
+ /// ```
+ pub fn dir(&self, name: &CStr) -> Result<Builder<'a>> {
+ let dir = Dir::new(name, Some(self))?;
+ // SAFETY: We're suppressing the drop of the ARef we received, so we know it will live
+ // until its parent is `debugfs_remove`'d. The lifetime of the parent is 'a, so we can
+ // convert it to a similarly lived reference.
+ let dir: &'a Dir = unsafe { ARef::into_raw(dir).as_ref() };
+ // SAFETY: Since 'a is a builder lifetime, we can propagate our invariants
+ Ok(unsafe { Builder::new(dir) })
+ }
}
impl<'a> Deref for Builder<'a> {
--
2.49.0.901.g37484f566f-goog
next prev parent reply other threads:[~2025-04-29 23:16 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-29 23:15 [PATCH 0/8] rust: DebugFS Bindings Matthew Maurer
2025-04-29 23:15 ` [PATCH 1/8] rust: debugfs: Bind DebugFS directory creation Matthew Maurer
2025-04-30 7:50 ` Greg Kroah-Hartman
2025-04-30 15:10 ` Matthew Maurer
2025-04-30 15:23 ` Greg Kroah-Hartman
2025-04-30 15:31 ` Matthew Maurer
2025-04-30 16:58 ` Greg Kroah-Hartman
2025-04-29 23:15 ` [PATCH 2/8] rust: debugfs: Bind file creation for long-lived Display Matthew Maurer
2025-04-30 3:27 ` Miguel Ojeda
2025-04-30 15:26 ` Matthew Maurer
2025-04-30 7:52 ` Greg Kroah-Hartman
2025-04-30 15:15 ` Matthew Maurer
2025-04-30 7:55 ` Greg Kroah-Hartman
2025-04-30 15:12 ` Matthew Maurer
2025-04-30 15:24 ` Greg Kroah-Hartman
2025-04-29 23:15 ` [PATCH 3/8] rust: debugfs: Add scoped builder interface Matthew Maurer
2025-04-30 7:57 ` Greg Kroah-Hartman
2025-04-29 23:15 ` Matthew Maurer [this message]
2025-04-30 7:58 ` [PATCH 4/8] rust: debugfs: Allow subdir creation in " Greg Kroah-Hartman
2025-04-29 23:15 ` [PATCH 5/8] rust: debugfs: Support format hooks Matthew Maurer
2025-04-30 3:17 ` Miguel Ojeda
2025-04-29 23:16 ` [PATCH 6/8] rust: debugfs: Implement display_file in terms of fmt_file Matthew Maurer
2025-04-29 23:16 ` [PATCH 7/8] rust: debugfs: Helper macro for common case implementations Matthew Maurer
2025-04-29 23:16 ` [PATCH 8/8] rust: samples: Add debugfs sample Matthew Maurer
2025-04-30 8:01 ` Greg Kroah-Hartman
2025-04-30 0:04 ` [PATCH 0/8] rust: DebugFS Bindings John Hubbard
2025-04-30 8:03 ` Greg Kroah-Hartman
2025-04-30 15:01 ` Matthew Maurer
2025-04-30 15:21 ` Greg Kroah-Hartman
2025-04-30 15:24 ` Matthew Maurer
2025-04-30 15:30 ` Greg Kroah-Hartman
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=20250429-debugfs-rust-v1-4-6b6e7cb7929f@google.com \
--to=mmaurer@google.com \
--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=gary@garyguo.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rafael@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=samitolvanen@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).