rust: DebugFS Bindings
Subsystems (2)
v2 cover rust: DebugFS Bindings
This series provides safe DebugFS bindings for Rust, with a sample driver using them.
This series currently only supports referencing 'static lifetime objects, because we need to know the objects outlive the DebugFS files. A subsequent series may be able to relax this.
A few points that might be worth discussing on the API here:
1. The handles returned by directory and file creation currently remove themselves when they go out of scope. This behavior can be suppressed via .keep(). We could flip it to the other sense, and require that a returned handle be *explicitly* upconverted to get removed on drop. If we did this, we could consider making a different default for subdir vs Dir::new. The downside of doing this would be more complex types in the interface.
2. File creation currently returns a handle to preserve expressiveness (the ability to delete a file without deleting the directory it's in). I see (e.g. in ceph) explicit deletion of files, but this appears to be legacy code from before recursive_remove as opposed to wanting manual deletion. We could choose not to provide a handle here.
---
Changes in v2:
- Drop support for builder / pinned bindings in initial series
- Remove ARef usage to abstract the dentry nature of handles
- Remove error handling to discourage users from caring whether DebugFS
is enabled.
- Support CONFIG_DEBUG_FS=n while leaving the API available
- Fixed mistaken decimal/octal mixup
- Doc/comment cleanup
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Matthew Maurer (4):
rust: debugfs: Bind DebugFS directory creation
rust: debugfs: Bind file creation for long-lived Display
rust: debugfs: Support format hooks
rust: samples: Add debugfs sample
MAINTAINERS | 2 + rust/bindings/bindings_helper.h | 1 + rust/kernel/debugfs.rs | 345 ++++++++++++++++++++++++++++++++++++++++ rust/kernel/lib.rs | 1 + samples/rust/Kconfig | 11 ++ samples/rust/Makefile | 1 + samples/rust/rust_debugfs.rs | 37 +++++ 7 files changed, 398 insertions(+)
---
base-commit: b6a7783d306baf3150ac54cd5124f6e85dd375b0
change-id: 20250428-debugfs-rust-3cd5c97eb7d1
Best regards,
Signature · 1 line
Matthew Maurer <[email protected]>
PATCH v2 1/4 rust: debugfs: Bind DebugFS directory creation
Support creating DebugFS directories and subdirectories. Similar to the original DebugFS API, errors are hidden.
By default, when a directory handle leaves scope, it will be cleaned up. This can be suppressed by calling .keep() on it.
--- MAINTAINERS | 1 + rust/bindings/bindings_helper.h | 1 + rust/kernel/debugfs.rs | 135 ++++++++++++++++++++++++++++++++++++++++ rust/kernel/lib.rs | 1 + 4 files changed, 138 insertions(+)
MAINTAINERS +1 -0
@@ -7271,6 +7271,7 @@ F: include/linux/kobj* F: include/linux/property.h F: include/linux/sysfs.h F: lib/kobj* +F: rust/kernel/debugfs.rs F: rust/kernel/device.rs F: rust/kernel/device_id.rs F: rust/kernel/devres.rs
rust/bindings/bindings_helper.h +1 -0
@@ -13,6 +13,7 @@#include <linux/blkdev.h> #include <linux/cpumask.h> #include <linux/cred.h> +#include <linux/debugfs.h> #include <linux/device/faux.h> #include <linux/dma-mapping.h> #include <linux/errname.h>
rust/kernel/debugfs.rs new file +135 -0
135 lines not on this page · raw message
rust/kernel/lib.rs +1 -0
@@ -45,6 +45,7 @@#[doc(hidden)] pub mod build_assert;pub mod cred; +pub mod debugfs;pub mod device;pub mod device_id;pub mod devres;
Signature · 1 line
2.49.0.906.g1f30a19c02-goog
Re: [PATCH v2 1/4] rust: debugfs: Bind DebugFS directory creation
Quoted 2 lines · Matthew Maurer
+// INVARIANT: The wrapped pointer will always be NULL, an error, or an owned DebugFS
dentry
We do it the other way around, i.e. # Invariants section for the type, and // INVARIANT: ... comments for the places that ensure the type invariant.
+ /// // parent exists in DebugFS here.
Parent ...
rust/kernel/debugfs.rs line 71
Quoted 2 lines
rust/kernel/debugfs.rs new file +2
-0+// * If parent is None, parent accepts null pointers to mean create at root +// * If parent is Some, parent accepts live dentry debugfs pointers
None, Some (also please end sentences with periods)
rust/kernel/debugfs.rs line 97
Quoted 5 lines
rust/kernel/debugfs.rs new file +5
-0+/// Returns the pointer representation of the DebugFS directory. +/// +/// # Invariant +/// +/// The value returned from this function will always be an error code, NUL, or a live DebugFS
Hmm... so far we use # Invariants only for types. Perhaps you could say something like "Thanks to the type invariant, the return value will always be ..."
NULL?
Thanks!
Cheers,
Miguel
Danilo Krummrich
maintainerRe: [PATCH v2 1/4] rust: debugfs: Bind DebugFS directory creation
In reply to Matthew MaurerQuoted 9 lines · Matthew Maurer
rust/kernel/debugfs.rs new file +8
-0+/// Create a DebugFS subdirectory. +/// +/// # Examples +/// +/// ``` +/// # use kernel::c_str; +/// # use kernel::debugfs::Dir; +/// {
rust/kernel/debugfs.rs line 58
Quoted 10 lines
rust/kernel/debugfs.rs new file +10
-0+/// let parent = Dir::new(c_str!("parent")); +/// // parent exists in DebugFS here. +/// let child = parent.subdir(c_str!("child")); +/// // parent/child exists in DebugFS here. +/// } +/// // Neither exist here. +/// ``` +pub fn subdir (&self, name: &CStr ) ->Self { +Self ::create (name,Some (self)) + }
I think this should return a new type (SubDir), which is a transparent wrapper of Dir and dereferences to Dir.
Subsequently, we can remove Dir::keep() implement SubDir::keep() instead. This ensures that we can never call keep() on the root directory, which would always be a bug.
As an alternative to the Deref impl, you can also implement From<SubDir> for Dir, such that a SubDir can either be "kept" or converted to a Dir. Probably, that's even better.
Re: [PATCH v2 1/4] rust: debugfs: Bind DebugFS directory creation
Quoted 22 lines · Danilo Krummrich
Quoted 9 lines · Matthew Maurer
rust/kernel/debugfs.rs new file +8
-0+/// Create a DebugFS subdirectory. +/// +/// # Examples +/// +/// ``` +/// # use kernel::c_str; +/// # use kernel::debugfs::Dir; +/// { rust/kernel/debugfs.rs line 58
Quoted 10 lines
rust/kernel/debugfs.rs new file +10
-0+/// let parent = Dir::new(c_str!("parent")); +/// // parent exists in DebugFS here. +/// let child = parent.subdir(c_str!("child")); +/// // parent/child exists in DebugFS here. +/// } +/// // Neither exist here. +/// ``` +pub fn subdir (&self, name: &CStr ) ->Self { +Self ::create (name,Some (self)) + }
Quoted 6 lines
I think this should return a new type (SubDir), which is a transparent wrapper of Dir and dereferences to Dir.
Subsequently, we can remove
Dir::keep()implementSubDir::keep()instead. This ensures that we can never callkeep()on the root directory, which would always be a bug.
1. If the code in question is builtin rather than a module, discarding this without tearing it down may not be a bug.
2. Users could always write core::mem::forget(), so this will always be reachable (even if we decide to remove ::keep to make it harder to choose).
Quoted 4 lines
As an alternative to the Deref impl, you can also implement
From<SubDir> for Dir, such that a SubDir can either be "kept" or converted to a Dir. Probably, that's even better.
Yes, this was the "extra type complexity" I referenced in the cover letter that I was considering doing. I think that probably what I'll do for v3 is to have both the Deref *and* From implementation, so that SubDir still automatically gets all of Dirs stuff, since your later File comment convinces me we can't just have everything be Dir.
Danilo Krummrich
maintainerRe: [PATCH v2 1/4] rust: debugfs: Bind DebugFS directory creation
Quoted 23 lines · Matthew Maurer
Quoted 22 lines · Danilo Krummrich
Quoted 19 lines · Matthew Maurer
rust/kernel/debugfs.rs new file +18
-0+/// Create a DebugFS subdirectory. +/// +/// # Examples +/// +/// ``` +/// # use kernel::c_str; +/// # use kernel::debugfs::Dir; +/// { +/// let parent = Dir::new(c_str!("parent")); +/// // parent exists in DebugFS here. +/// let child = parent.subdir(c_str!("child")); +/// // parent/child exists in DebugFS here. +/// } +/// // Neither exist here. +/// ``` +pub fn subdir (&self, name: &CStr ) ->Self { +Self ::create (name,Some (self)) + }
Quoted 8 lines
Quoted 6 lines
I think this should return a new type (SubDir), which is a transparent wrapper of Dir and dereferences to Dir.
Subsequently, we can remove
Dir::keep()implementSubDir::keep()instead. This ensures that we can never callkeep()on the root directory, which would always be a bug.1. If the code in question is builtin rather than a module, discarding this without tearing it down may not be a bug.
True, if builtin *and* never intended to remove, it's indeed not a bug, but arguably not very useful either.
Quoted 3 lines
2. Users could always write
core::mem::forget(), so this will always be reachable (even if we decide to remove::keepto make it harder to choose).
Yet I wouldn't encourage users to create bugs by offering them a convenient way to do so, without any benefit. :)
Quoted 10 lines
Quoted 3 lines
As an alternative to the Deref impl, you can also implement
From<SubDir> for Dir, such that a SubDir can either be "kept" or converted to a Dir. Probably, that's even better.Yes, this was the "extra type complexity" I referenced in the cover letter that I was considering doing. I think that probably what I'll do for v3 is to have both the
Deref*and*Fromimplementation, so thatSubDirstill automatically gets all ofDirs stuff, since your laterFilecomment convinces me we can't just have everything beDir.
Sounds good to me, thanks!
PATCH v2 2/4 rust: debugfs: Bind file creation for long-lived Display
In reply to Matthew MaurerAllows creation of files for references that live forever and lack metadata through the Display implementation.
The reference must live forever because we do not have a maximum lifetime for the file we are creating.
The Display implementation is used because seq_printf needs to route through %pA, which in turn routes through Arguments. A more generic API is provided later in the series, implemented in terms of this one.
--- rust/kernel/debugfs.rs | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)
rust/kernel/debugfs.rs +102 -0
@@ -7,6 +7,7 @@//! C header: [`include/linux/debugfs.h`](srctree/include/linux/debugfs.h) use crate ::str::CStr ; +use core::fmt::Display ;/// Handle to a DebugFS directory. // INVARIANT: The wrapped pointer will always be NULL, an error, or an owned DebugFS `dentry`
@@ -121,6 +122,47 @@ fn as_ptr(&self) -> *mut bindings::dentry {pub fn keep (self) { core::mem::forget (self) } + +/// Create a file in a DebugFS directory with the provided name, and contents from invoking +/// [`Display::fmt`] on the provided reference. +/// +/// # Examples +/// +/// ``` +/// # use kernel::c_str; +/// # use kernel::debugfs::Dir; +/// let dir = Dir::new(c_str!("my_debugfs_dir")); +/// dir.display_file(c_str!("foo"), &200).keep(); +/// // "my_debugfs_dir/foo" now contains the number 200. +/// ``` +pub fn display_file <T :Display +Sized >(&self, name: &CStr , data: &'staticT ) ->Self { +// SAFETY: +// * `name` is a NUL-terminated C string, living across the call, by CStr invariant +// * `parent` is a live dentry since we have a reference to it +// * `vtable` is all stock `seq_file` implementations except for `open`. +// `open`'s only requirement beyond what is provided to all open functions is that the +// inode's data pointer must point to a `T` that will outlive it, which we know because +// we have a static reference. +// * debugfs_create_file_full either returns an error code or a legal dentry pointer, so +// `Self::from_ptr` is safe to call here. +#[cfg( CONFIG_DEBUG_FS )] +unsafe { +Self ::from_ptr (bindings::debugfs_create_file_full ( + name.as_char_ptr (), +0o444 , + self.as_ptr (), + dataas *const _ as *mut _ , + core::ptr::null (), + &<T as DisplayFile >::VTABLE , + )) + } +#[cfg(not( CONFIG_DEBUG_FS ))] + { +// Mark parameters used +let (_, _) = (name, data); +Self () + } + } }impl Drop for Dir {
@@ -133,3 +175,63 @@ fn drop(&mut self) { } } } + +#[cfg( CONFIG_DEBUG_FS )] +mod helpers { +use crate ::seq_file::SeqFile ; +use crate ::seq_print; +use core::fmt::Display ; + +/// Implements `open` for `file_operations` via `single_open` to fill out a `seq_file` +/// +/// # Safety +/// * inode's private pointer must point to a value of type T which will outlive the inode and +/// will not be mutated during this call +/// * file must point to a live, not-yet-initialized file object +pub (crate )unsafe extern "C" fn display_open <T :Display >( + inode: *mut bindings::inode , + file: *mut bindings::file , + ) ->i32 { +// SAFETY: +// * file is acceptable by caller precondition +// * print_act will be called on a seq_file with private data set to the third argument, +// so we meet its safety requirements +// * The data pointer passed in the third argument is a valid T pointer that outlives this +// call by caller preconditions +unsafe { bindings::single_open (file,Some (display_act ::<T >), (*inode).i_private) } + } + +/// Prints private data stashed in a seq_file to that seq file +/// # Safety +/// `seq` must point to a live `seq_file` whose private data is a live pointer to a `T` which is +/// not being mutated. +pub (crate )unsafe extern "C" fn display_act <T :Display >( + seq: *mut bindings::seq_file , + _: *mut core::ffi::c_void , + ) ->i32 { +// SAFETY: By caller precondition, this pointer is live, points to a value of type T, and is +// not being mutated. +let data =unsafe { &*((*seq).privateas *mut T ) }; +// SAFETY: By caller precondition, seq_file points to a live seq_file, so we can lift it +let seq_file =unsafe {SeqFile ::from_raw (seq) }; +seq_print! (seq_file,"{}" , data); +0 + } + +// Work around lack of generic const items +pub (crate )trait DisplayFile :Display +Sized { +const VTABLE : bindings::file_operations = bindings::file_operations { + read:Some (bindings::seq_read), + llseek:Some (bindings::seq_lseek), + release:Some (bindings::single_release), + open:Some (display_open ::<Self >as _ ), +// SAFETY: file_operations supports zeroes in all fields + ..unsafe { core::mem::zeroed () } + }; + } + +impl <T :Display +Sized >DisplayFile for T {} +} + +#[cfg( CONFIG_DEBUG_FS )] +use helpers::*;
Signature · 1 line
2.49.0.906.g1f30a19c02-goog
Danilo Krummrich
maintainerRe: [PATCH v2 2/4] rust: debugfs: Bind file creation for long-lived Display
Quoted 62 lines · Matthew Maurer
Allows creation of files for references that live forever and lack metadata through the
Displayimplementation.The reference must live forever because we do not have a maximum lifetime for the file we are creating.
The
Displayimplementation is used becauseseq_printfneeds to route through%pA, which in turn routes through Arguments. A more generic API is provided later in the series, implemented in terms of this one.Signed-off-by Matthew Maurer <[email protected]>--- rust/kernel/debugfs.rs | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)rust/kernel/debugfs.rs +32
-0@@ -7,6 +7,7 @@//! C header: [`include/linux/debugfs.h`](srctree/include/linux/debugfs.h) use crate ::str::CStr ; +use core::fmt::Display ;/// Handle to a DebugFS directory. // INVARIANT: The wrapped pointer will always be NULL, an error, or an owned DebugFS `dentry` @@ -121,6 +122,47 @@ fn as_ptr(&self) -> *mut bindings::dentry { pub fn keep(self) { core::mem::forget(self) } + + /// Create a file in a DebugFS directory with the provided name, and contents from invoking + /// [`Display::fmt`] on the provided reference. + /// + /// # Examples + /// + /// ``` + /// # use kernel::c_str; + /// # use kernel::debugfs::Dir; + /// let dir = Dir::new(c_str!("my_debugfs_dir")); + /// dir.display_file(c_str!("foo"), &200).keep(); + /// // "my_debugfs_dir/foo" now contains the number 200. + /// ``` + pub fn display_file<T: Display + Sized>(&self, name: &CStr, data: &'static T) -> Self { + // SAFETY: + // * `name` is a NUL-terminated C string, living across the call, by CStr invariant + // * `parent` is a live dentry since we have a reference to it + // * `vtable` is all stock `seq_file` implementations except for `open`. + // `open`'s only requirement beyond what is provided to all open functions is that the + // inode's data pointer must point to a `T` that will outlive it, which we know because + // we have a static reference. + // * debugfs_create_file_full either returns an error code or a legal dentry pointer, so + // `Self::from_ptr` is safe to call here. + #[cfg(CONFIG_DEBUG_FS)] + unsafe { + Self::from_ptr(bindings::debugfs_create_file_full( + name.as_char_ptr(), + 0o444, + self.as_ptr(), + data as *const _ as *mut _, + core::ptr::null(),
rust/kernel/debugfs.rs fn as_ptr(&self) -> *mut bindings::dentry { · line 165
Quoted 10 lines
rust/kernel/debugfs.rs +10
-0+ &<T as DisplayFile>::VTABLE, + )) + } +#[cfg(not( CONFIG_DEBUG_FS ))] + { +// Mark parameters used +let (_, _) = (name, data); +Self () + } + }
Analogous to SubDir, this should be a new type, such that we can't leak the root directory. Also, methods like subdir() don't really make sense for a file, no?
Besides that, don't we also need a separate type for a file to be able to attach non-static data anyways? I.e. something like:
#[cfg(CONFIG_DEBUG_FS)]
struct File<T> {
dentry: *mut bindings::dentry,
data: T,
}
#[cfg(not(CONFIG_DEBUG_FS))]
struct File<T> {
_p: PhantomData<T>,
}I'm not exactly sure how v1 did this; I haven't had time to look at v1 before v2 was posted. I seems like v1 relied on a separate structure storing the data, which also held a reference to the corresponding dentry or something along those lines?
Re: [PATCH v2 2/4] rust: debugfs: Bind file creation for long-lived Display
Quoted 69 lines · Danilo Krummrich
Quoted 67 lines · Matthew Maurer
Allows creation of files for references that live forever and lack metadata through the
Displayimplementation.The reference must live forever because we do not have a maximum lifetime for the file we are creating.
The
Displayimplementation is used becauseseq_printfneeds to route through%pA, which in turn routes through Arguments. A more generic API is provided later in the series, implemented in terms of this one.Signed-off-by Matthew Maurer <[email protected]>--- rust/kernel/debugfs.rs | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)rust/kernel/debugfs.rs +37
-0@@ -7,6 +7,7 @@//! C header: [`include/linux/debugfs.h`](srctree/include/linux/debugfs.h) use crate ::str::CStr ; +use core::fmt::Display ;/// Handle to a DebugFS directory. // INVARIANT: The wrapped pointer will always be NULL, an error, or an owned DebugFS `dentry` @@ -121,6 +122,47 @@ fn as_ptr(&self) -> *mut bindings::dentry {pub fn keep (self) { core::mem::forget (self) } + +/// Create a file in a DebugFS directory with the provided name, and contents from invoking +/// [`Display::fmt`] on the provided reference. +/// +/// # Examples +/// +/// ``` +/// # use kernel::c_str; +/// # use kernel::debugfs::Dir; +/// let dir = Dir::new(c_str!("my_debugfs_dir")); +/// dir.display_file(c_str!("foo"), &200).keep(); +/// // "my_debugfs_dir/foo" now contains the number 200. +/// ``` +pub fn display_file <T :Display +Sized >(&self, name: &CStr , data: &'staticT ) ->Self { +// SAFETY: +// * `name` is a NUL-terminated C string, living across the call, by CStr invariant +// * `parent` is a live dentry since we have a reference to it +// * `vtable` is all stock `seq_file` implementations except for `open`. +// `open`'s only requirement beyond what is provided to all open functions is that the +// inode's data pointer must point to a `T` that will outlive it, which we know because +// we have a static reference. +// * debugfs_create_file_full either returns an error code or a legal dentry pointer, so +// `Self::from_ptr` is safe to call here. +#[cfg( CONFIG_DEBUG_FS )] +unsafe { +Self ::from_ptr (bindings::debugfs_create_file_full ( + name.as_char_ptr (), +0o444 , + self.as_ptr (), + dataas *const _ as *mut _ , + core::ptr::null (), + &<T as DisplayFile >::VTABLE , + )) + } +#[cfg(not( CONFIG_DEBUG_FS ))] + {
Quoted 8 lines
rust/kernel/debugfs.rs fn as_ptr(&self) -> *mut bindings::dentry { · line 165
Quoted 5 lines
rust/kernel/debugfs.rs +5
-0+// Mark parameters used +let (_, _) = (name, data); +Self () + } + }Analogous to SubDir, this should be a new type, such that we can't leak the root directory. Also, methods like
subdir()don't really make sense for a file, no?
I agree, v3 will have a File type which:
1. Doesn't auto-discard the file, but provides a method to discard it.
2. Doesn't deref to Dir, so you can't call subdir.
Quoted 15 lines
Besides that, don't we also need a separate type for a file to be able to attach non-static data anyways? I.e. something like:
#[cfg(CONFIG_DEBUG_FS)] struct File<T> { dentry: *mut bindings::dentry, data: T, } #[cfg(not(CONFIG_DEBUG_FS))] struct File<T> { _p: PhantomData<T>, }
Quoted 4 lines
I'm not exactly sure how v1 did this; I haven't had time to look at v1 before v2 was posted. I seems like v1 relied on a separate structure storing the data, which also held a reference to the corresponding dentry or something along those lines?
In v1, this was done via
```
#[pin_data]
struct Values<T> {
dir: /* ignore this type */,
#[pin]
backing: T
}
```Then, there was an interface that let the user provide a building function which had to have a fully polymorphic lifetime, which would be passed a backing reference that it was allowed to attach to subdirectory files. Since the dir would be cleaned up before the backing went away, we could know that it successfully outlived it. It'll probably look a little different when I send the follow-up series on top of this one.
Attaching to the root directory rather than each individual file made sense to me because this meant that if you had
```
struct Foo {
prop_a: u32,
prop_b: u32
}
```it would not be as tricky to attach prop_a to one file and prop_b to another, because the directory would own Foo. This'll probably be clearer when I send up a dependent series on top of v3 later today.
Danilo Krummrich
maintainerRe: [PATCH v2 2/4] rust: debugfs: Bind file creation for long-lived Display
Quoted 39 lines · Matthew Maurer
Quoted 15 lines · Danilo Krummrich
On Wed, Apr 30, 2025 at 11:31:57PM +0000, Matthew Maurer wrote:
Besides that, don't we also need a separate type for a file to be able to attach non-static data anyways? I.e. something like:#[cfg(CONFIG_DEBUG_FS)] struct File<T> { dentry: *mut bindings::dentry, data: T, } #[cfg(not(CONFIG_DEBUG_FS))] struct File<T> { _p: PhantomData<T>, }Quoted 4 lines
I'm not exactly sure how v1 did this; I haven't had time to look at v1 before v2 was posted. I seems like v1 relied on a separate structure storing the data, which also held a reference to the corresponding dentry or something along those lines?
In v1, this was done via
``` #[pin_data] struct Values<T> { dir: /* ignore this type */, #[pin] backing: T } ```Then, there was an interface that let the user provide a building function which had to have a fully polymorphic lifetime, which would be passed a backing reference that it was allowed to attach to subdirectory files. Since the dir would be cleaned up before the backing went away, we could know that it successfully outlived it. It'll probably look a little different when I send the follow-up series on top of this one.
Attaching to the root directory rather than each individual file made sense to me because this meant that if you had
Quoted 8 lines
``` struct Foo { prop_a: u32, prop_b: u32 } ```it would not be as tricky to attach
prop_ato one file andprop_bto another, because the directory would ownFoo.
Thanks for the explanation! I need to think a bit more about this approach.
Quoted 2 lines
This'll probably be
clearer when I send up a dependent series on top of v3 later today.
At least from my side, no need to rush. :) I'll have quite limited bandwidth for the next ~10 days anyways.
PATCH v2 3/4 rust: debugfs: Support format hooks
In reply to Matthew MaurerRather than always using Display, allow hooking arbitrary functions to arbitrary files. Display technically has the expressiveness to do this, but requires a new type be declared for every different way to render things, which can be very clumsy.
--- rust/kernel/debugfs.rs | 110 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-)
rust/kernel/debugfs.rs +109 -1
@@ -7,6 +7,7 @@//! C header: [`include/linux/debugfs.h`](srctree/include/linux/debugfs.h) use crate ::str::CStr ; +use core::fmt;use core::fmt::Display ;/// Handle to a DebugFS directory.
@@ -136,6 +137,47 @@ pub fn keep(self) {/// // "my_debugfs_dir/foo" now contains the number 200. /// ``` pub fn display_file <T :Display +Sized >(&self, name: &CStr , data: &'staticT ) ->Self { +// SAFETY: As `data` lives for the static lifetime, it outlives the file. +unsafe { self.display_file_raw (name, data) } + } + +/// Create a file in a DebugFS directory with the provided name, and contents from invoking `f` +/// on the provided reference. +/// +/// `f` must be a function item or a non-capturing closure, or this will fail to compile. +/// +/// # Examples +/// +/// ``` +/// # use core::sync::atomic::{AtomicU32, Ordering}; +/// # use kernel::c_str; +/// # use kernel::debugfs::Dir; +/// let dir = Dir::new(c_str!("foo")); +/// static MY_ATOMIC: AtomicU32 = AtomicU32::new(3); +/// let file = dir.fmt_file(c_str!("bar"), &MY_ATOMIC, &|val, f| { +/// let out = val.load(Ordering::Relaxed); +/// writeln!(f, "{out:#010x}") +/// }); +/// MY_ATOMIC.store(10, Ordering::Relaxed); +/// ``` +pub fn fmt_file <T ,F :Fn (&T , &mut fmt::Formatter <'_>) -> fmt::Result >( + &self, + name: &CStr , + data: &'staticT , + f: &'staticF , + ) ->Self { +// SAFETY: As `data` lives for the static lifetime, it outlives the file +unsafe { self.fmt_file_raw (name, data, f) } + } + +/// Creates a DebugFS file backed by the display implementation of the provided pointer. +/// +/// # Safety +/// The pointee of `data` must outlive the accessibility of the `Dir` returned by this function. +/// This means that before `data` may become invalid, either: +/// * The refcount must go to zero +/// * The file must be rendered inaccessible, e.g. via `debugfs_remove` +unsafe fn display_file_raw <T :Display +Sized >(&self, name: &CStr , data: *const T ) ->Self {// SAFETY: // * `name` is a NUL-terminated C string, living across the call, by CStr invariant // * `parent` is a live dentry since we have a reference to it
@@ -163,6 +205,32 @@ pub fn display_file<T: Display + Sized>(&self, name: &CStr, data: &'static T) ->Self () } } + +/// Create a file in a DebugFS directory with the provided name, and contents from invoking the +/// fomatter on the attached data. +/// +/// The attached function must be a ZST, and will cause a compilation error if it is not. +/// +/// # Safety +/// +/// `data` must outlive the resulting file's accessibility +unsafe fn fmt_file_raw <T ,F :Fn (&T , &mut fmt::Formatter <'_>) -> fmt::Result >( + &self, + name: &CStr , + data: &T , + f: &'staticF , + ) ->Self { +#[cfg( CONFIG_DEBUG_FS )] +let data_adapted =FormatAdapter ::new (data, f); +#[cfg(not( CONFIG_DEBUG_FS ))] +let data_adapted = { +// Mark used +let (_, _) = (data, f); + &0 + }; +// SAFETY: data outlives the file's accessibility, so data_adapted does too +unsafe { self.display_file_raw (name, data_adapted) } + } }impl Drop for Dir {
@@ -180,7 +248,9 @@ fn drop(&mut self) {mod helpers {use crate ::seq_file::SeqFile ;use crate ::seq_print; -use core::fmt::Display ; +use core::fmt; +use core::fmt::{Display ,Formatter }; +use core::marker::PhantomData ;/// Implements `open` for `file_operations` via `single_open` to fill out a `seq_file` ///
@@ -231,6 +301,44 @@ pub(crate) trait DisplayFile: Display + Sized { }impl <T :Display +Sized >DisplayFile for T {} + +// INVARIANT: F is inhabited +#[repr(transparent)] +pub (crate )struct FormatAdapter <T ,F > { + inner:T , + _formatter:PhantomData <F >, + } + +impl <T ,F >FormatAdapter <T ,F > { +pub (crate )fn new <'a>(inner: &'aT , _f: &'staticF ) -> &'aSelf { +// SAFETY: FormatAdapater is a repr(transparent) wrapper around T, so +// casting a reference is legal +// INVARIANT: We were passed a reference to F, so it is inhabited. +unsafe { core::mem::transmute (inner) } + } + } + +impl <T ,F >Display for FormatAdapter <T ,F > +where +F :Fn (&T , &mut Formatter <'_>) -> fmt::Result + 'static, + { +fn fmt (&self, fmt: &mut Formatter <'_>) -> fmt::Result { +// SAFETY: FormatAdapter<_, F> can only be constructed if F is inhabited +let f: &F =unsafe {materialize_zst_fmt () }; +f (&self.inner, fmt) + } + } + +/// # Safety +/// The caller asserts that F is inhabited +unsafe fn materialize_zst_fmt <F >() -> &'staticF { +const {assert! (core::mem::size_of ::<F >() ==0 ) }; +let zst_dangle: core::ptr::NonNull <F > = core::ptr::NonNull ::dangling (); +// SAFETY: While the pointer is dangling, it is a dangling pointer to a ZST, based on the +// assertion above. The type is also inhabited, by the caller's assertion. This means +// we can materialize it. +unsafe { zst_dangle.as_ref () } + } }#[cfg( CONFIG_DEBUG_FS )]
Signature · 1 line
2.49.0.906.g1f30a19c02-goog
Re: [PATCH v2 3/4] rust: debugfs: Support format hooks
rust/kernel/debugfs.rs pub(crate) trait DisplayFile: Display + Sized { · line 306
Quoted 4 lines · Matthew Maurer
rust/kernel/debugfs.rs +3
-0+ +// INVARIANT: F is inhabited +#[repr(transparent)]
This and a few other bits didn't change?
Cheers,
Miguel
PATCH v2 4/4 rust: samples: Add debugfs sample
In reply to Matthew MaurerProvides an example of using the Rust DebugFS bindings.
--- MAINTAINERS | 1 + samples/rust/Kconfig | 11 +++++++++++ samples/rust/Makefile | 1 + samples/rust/rust_debugfs.rs | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+)
MAINTAINERS +1 -0
@@ -7278,6 +7278,7 @@ F: rust/kernel/devres.rs F: rust/kernel/driver.rs F: rust/kernel/faux.rs F: rust/kernel/platform.rs +F: samples/rust/rust_debugfs.rs F: samples/rust/rust_driver_platform.rs F: samples/rust/rust_driver_faux.rs
samples/rust/Kconfig +11 -0
@@ -51,6 +51,17 @@ config SAMPLE_RUST_DMA If unsure, say N. +config SAMPLE_RUST_DEBUGFS + tristate "DebugFS Test Driver" + depends on DEBUG_FS + help + This option builds the Rust DebugFS Test driver sample. + + To compile this as a module, choose M here: + the module will be called rust_debugfs. + + If unsure, say N. + config SAMPLE_RUST_DRIVER_PCI tristate "PCI Driver" depends on PCI
samples/rust/Makefile +1 -0
@@ -4,6 +4,7 @@ ccflags-y += -I$(src) # needed for trace events obj-$(CONFIG_SAMPLE_RUST_MINIMAL) += rust_minimal.o obj-$(CONFIG_SAMPLE_RUST_MISC_DEVICE) += rust_misc_device.o obj-$(CONFIG_SAMPLE_RUST_PRINT) += rust_print.o +obj-$(CONFIG_SAMPLE_RUST_DEBUGFS) += rust_debugfs.o obj-$(CONFIG_SAMPLE_RUST_DMA) += rust_dma.o obj-$(CONFIG_SAMPLE_RUST_DRIVER_PCI) += rust_driver_pci.o obj-$(CONFIG_SAMPLE_RUST_DRIVER_PLATFORM) += rust_driver_platform.o
samples/rust/rust_debugfs.rs new file +37 -0
@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 + +// Copyright (C) 2025 Google LLC. + +//! Sample DebugFS exporting module + +use core::sync::atomic::{AtomicU32 ,Ordering }; +use kernel::c_str; +use kernel::debugfs::Dir ; +use kernel::prelude::*; + +module! { +type :RustDebugFs , + name:"rust_debugfs" , + authors: ["Matthew Maurer" ], + description:"Rust DebugFS usage sample" , + license:"GPL" , +} + +struct RustDebugFs { + _debugfs:Dir , +} + +static EXAMPLE :AtomicU32 =AtomicU32 ::new (8 ); + +impl kernel::Module for RustDebugFs { +fn init (_this: &'staticThisModule ) ->Result <Self > { +let debugfs =Dir ::new (c_str! ("sample_debugfs" )); + debugfs + .fmt_file (c_str! ("example" ), &EXAMPLE , &|example, f| { +writeln! (f,"Reading atomic: {}" , example.load (Ordering ::Relaxed )) + }) + .keep (); +EXAMPLE .store (10 ,Ordering ::Relaxed ); +Ok (Self { _debugfs: debugfs }) + } +}
Signature · 1 line
2.49.0.906.g1f30a19c02-goog
Greg Kroah-Hartman
maintainerRe: [PATCH v2 4/4] rust: samples: Add debugfs sample
Quoted 3 lines · Matthew Maurer
Provides an example of using the Rust DebugFS bindings.
Signed-off-by Matthew Maurer <[email protected]>
Much nicer, many thanks for this!
Some minor comments on the sample code here. As someone coming from C with limited Rust experience, I think I do understand it, but I think it could use a bunch of comments to make it more "obvious" what is happening, see below.
Quoted 1 line
+static EXAMPLE: AtomicU32 =
AtomicU32::new(8);
Wait, why is this set to 8 and then you automatically set it to 10 after you create the file? No one is ever going to see 8 as a valid value unless they really race to read the file, right?
samples/rust/rust_debugfs.rs line 37
Quoted 12 lines
samples/rust/rust_debugfs.rs new file +12
-0+impl kernel::Module for RustDebugFs { +fn init (_this: &'staticThisModule ) ->Result <Self > { +let debugfs =Dir ::new (c_str! ("sample_debugfs" )); + debugfs + .fmt_file (c_str! ("example" ), &EXAMPLE , &|example, f| { +writeln! (f,"Reading atomic: {}" , example.load (Ordering ::Relaxed )) + }) + .keep (); +EXAMPLE .store (10 ,Ordering ::Relaxed ); +Ok (Self { _debugfs: debugfs }) + } +}
How about this rewrite with comments added to help make things more obvious:
impl kernel::Module for RustDebugFs {
fn init(_this: &'static ThisModule) -> Result<Self> {
// Create a debugfs directory in the root of the filesystem
// called "sample_debugfs"
let debugfs = Dir::new(c_str!("sample_debugfs"));
// Create a single file in the directory called "example" that
// allows to read from the EXAMPLE atomic variable, and make
// sure it lives past the scope of this function by calling
// .keep() on it.
debugfs
.fmt_file(c_str!("example"), &EXAMPLE, &|example, f| {
writeln!(f, "Reading atomic: {}", example.load(Ordering::Relaxed))
})
.keep();
// Change the value of EXAMPLE to be 10 so that will be the
// value read from the file. Note, the original value 8 will be
// read if the file is read right before this is called.
EXAMPLE.store(10, Ordering::Relaxed);
// Create our module object and save off the pointer to the
// debugfs directory we created. It will be automatically
// removed when the module is unloaded by virtue of the
// reference count to the structure being dropped at that point
// in time.
Ok(Self { _debugfs: debugfs })
}
}thanks,
greg k-h
Re: [PATCH v2 4/4] rust: samples: Add debugfs sample
Quoted 11 lines · Greg Kroah-Hartman
Quoted 3 lines · Matthew Maurer
Provides an example of using the Rust DebugFS bindings.
Signed-off-by Matthew Maurer <[email protected]>Much nicer, many thanks for this!
Some minor comments on the sample code here. As someone coming from C with limited Rust experience, I think I do understand it, but I think it could use a bunch of comments to make it more "obvious" what is happening, see below.
Agree 100%. I'm using this patch set to learn more about R4L.
Quoted 5 lines
Quoted 1 line
+static EXAMPLE: AtomicU32 =
AtomicU32::new(8);Wait, why is this set to 8 and then you automatically set it to 10 after you create the file? No one is ever going to see 8 as a valid value unless they really race to read the file, right?
Well, it does show that the driver still has the ability to write to EXAMPLE even after the debugfs entry is created. That demonstrates that the driver retains ownership, which is a useful test for any debugfs implementation.