[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <878qqqkva2.fsf@kernel.org>
Date: Sat, 01 Feb 2025 07:56:37 +0100
From: Andreas Hindborg <a.hindborg@...nel.org>
To: "Charalampos Mitrodimas" <charmitro@...teo.net>
Cc: "Danilo Krummrich" <dakr@...nel.org>, "Miguel Ojeda"
<ojeda@...nel.org>, "Alex Gaynor" <alex.gaynor@...il.com>, "Boqun Feng"
<boqun.feng@...il.com>, "Gary Guo" <gary@...yguo.net>, Björn Roy Baron
<bjorn3_gh@...tonmail.com>, "Benno Lossin" <benno.lossin@...ton.me>,
"Alice Ryhl" <aliceryhl@...gle.com>, "Trevor Gross" <tmgross@...ch.edu>,
"Joel Becker" <jlbec@...lplan.org>, "Christoph Hellwig" <hch@....de>,
<rust-for-linux@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 3/4] rust: configfs: introduce rust support for configfs
"Charalampos Mitrodimas" <charmitro@...teo.net> writes:
> Andreas Hindborg <a.hindborg@...nel.org> writes:
>
>> This patch adds a rust API for configfs, thus allowing rust modules to use
>> configfs for configuration. The implementation is a shim on top of the C
>> configfs implementation allowing safe use of the C infrastructure from
>> rust.
>>
>> The patch enables the `const_mut_refs` feature on compilers before rustc
>> 1.83. The feature was stabilized in rustc 1.83 and is not required to be
>> explicitly enabled on later versions.
>>
>> Signed-off-by: Andreas Hindborg <a.hindborg@...nel.org>
>>
>> ---
>>
[cut]
>> +
>> + /// # Safety
>> + ///
>> + /// `item` must be embedded in a `bindings::config_group`.
>> + ///
>> + /// If `item` does not represent the root group of a `configfs` subsystem,
>> + /// the group must be embedded in a `Group<PAR>`.
>> + ///
>> + /// Otherwise, the group must be a embedded in a
>> + /// `bindings::configfs_subsystem` that is embedded in a `Subsystem<PAR>`.
>> + ///
>> + /// `page` must point to a readable buffer of size at least `size`.
>> + unsafe extern "C" fn store(
>> + item: *mut bindings::config_item,
>> + page: *const kernel::ffi::c_char,
>> + size: usize,
>> + ) -> isize {
>> + let c_group: *mut bindings::config_group =
>> + // SAFETY: By function safety requirements, `item` is embedded in a
>> + // `config_group`.
>> + unsafe { container_of!(item, bindings::config_group, cg_item) }.cast_mut();
>> +
>> + // SAFETY: The function safety requirements for this function satisfy
>> + // the conditions for this call.
>> + let data: &DATA = unsafe { get_group_data(c_group) };
>> +
>> + let ret = AO::store(
>> + data,
>> + // SAFETY: By function safety requirements, `page` is readable
>> + // for at least `size`.
>> + unsafe { core::slice::from_raw_parts(page.cast(), size) },
>> + );
>> +
>> + match ret {
>> + Ok(()) => size as isize,
>> + Err(err) => err.to_errno() as isize,
>
> Do we reach the Err arm here?
Yes, when `AO::store` returns `Err(_)`, the error arm should evaluate.
>
>> + }
>> + }
>> +
>> + /// Create a new attribute.
>> + ///
>> + /// The attribute will appear as a file with name given by `name`.
>> + pub const fn new(name: &'static CStr) -> Self {
>> + Self {
>> + attribute: Opaque::new(bindings::configfs_attribute {
>> + ca_name: name as *const _ as _,
>> + ca_owner: core::ptr::null_mut(),
>> + ca_mode: 0o660,
>> + show: Some(Self::show),
>> + store: if AO::HAS_STORE {
>> + Some(Self::store)
>> + } else {
>> + None
>> + },
>> + }),
>> + _p: PhantomData,
>> + }
>> + }
>> +}
>> +
>> +/// Operations supported by an attribute.
>> +///
>> +/// Implement this trait on type and pass that type as generic parameter when
>> +/// creating an [`Attribute`]. The type carrying the implementation serve no
>> +/// purpose other than specifying the attribute operations.
>> +#[vtable]
>> +pub trait AttributeOperations<const ID: u64 = 0> {
>> + /// The type of the object that contains the field that is backing the
>> + /// attribute for this operation.
>> + type Data;
>> +
>> + /// This function is called by the kernel to read the value of an attribute.
>> + ///
>> + /// Implementations should write the rendering of the attribute to `page`
>> + /// and return the number of bytes written.
>> + fn show(data: &Self::Data, page: &mut [u8; PAGE_SIZE]) -> Result<usize>;
>> +
>> + /// This function is called by the kernel to update the value of an attribute.
>> + ///
>> + /// Implementations should parse the value from `page` and update internal
>> + /// state to reflect the parsed value. Partial writes are not supported and
>> + /// implementations should expect the full page to arrive in one write
>> + /// operation.
>> + fn store(_data: &Self::Data, _page: &[u8]) -> Result {
>> + kernel::build_error!(kernel::error::VTABLE_DEFAULT_ERROR)
>> + }
>> +}
>> +
>> +/// A list of attributes.
>> +///
>> +/// This type is used to construct a new [`ItemType`]. It represents a list of
>> +/// [`Attribute`] that will appear in the directory representing a [`Group`].
>> +/// Users should not directly instantiate this type, rather they should use the
>> +/// [`kernel::configfs_attrs`] macro to declare a static set of attributes for a
>> +/// group.
>> +#[repr(transparent)]
>> +pub struct AttributeList<const N: usize, DATA>(
>> + UnsafeCell<[*mut kernel::ffi::c_void; N]>,
>> + PhantomData<DATA>,
>> +);
>> +
>> +// SAFETY: Ownership of `AttributeList` can safely be transferred to other threads.
>> +unsafe impl<const N: usize, DATA> Send for AttributeList<N, DATA> {}
>> +
>> +// SAFETY: We do not provide any operations on `AttributeList` that need synchronization.
>> +unsafe impl<const N: usize, DATA> Sync for AttributeList<N, DATA> {}
>> +
>> +impl<const N: usize, DATA> AttributeList<N, DATA> {
>> + #[doc(hidden)]
>> + /// # Safety
>> + ///
>> + /// This function can only be called by expanding the `configfs_attrs`
>> + /// macro.
>> + pub const unsafe fn new() -> Self {
>> + Self(UnsafeCell::new([core::ptr::null_mut(); N]), PhantomData)
>> + }
>> +
>> + #[doc(hidden)]
>> + /// # Safety
>> + ///
>> + /// This function can only be called by expanding the `configfs_attrs`
>> + /// macro.
>> + pub const unsafe fn add<
>> + const I: usize,
>> + const ID: u64,
>> + O: AttributeOperations<ID, Data = DATA>,
>> + >(
>> + &'static self,
>> + attribute: &'static Attribute<ID, O, DATA>,
>> + ) {
>> + if I >= N - 1 {
>> + kernel::build_error!("Invalid attribute index");
>> + }
>> +
>> + // SAFETY: This function is only called through `configfs_attrs`. This
>> + // ensures that we are evaluating the function in const context when
>> + // initializing a static. As such, the reference created below will be
>> + // exclusive.
>> + unsafe {
>> + (&mut *self.0.get())[I] = (attribute as *const Attribute<ID, O, DATA>)
>> + .cast_mut()
>> + .cast()
>> + };
>> + }
>> +}
>> +
>> +/// A representation of the attributes that will appear in a [`Group`].
>> +///
>> +/// Users should not directly instantiate objects of this type. Rather, they
>> +/// should use the [`kernel::configfs_attrs`] macro to statically declare the
>> +/// shape of a [`Group`].
>> +#[pin_data]
>> +pub struct ItemType<DATA> {
>> + #[pin]
>> + item_type: Opaque<bindings::config_item_type>,
>> + _p: PhantomData<DATA>,
>> +}
>> +
>> +// SAFETY: We do not provide any operations on `ItemType` that need synchronization.
>> +unsafe impl<DATA> Sync for ItemType<DATA> {}
>> +
>> +// SAFETY: Ownership of `ItemType` can safely be transferred to other threads.
>> +unsafe impl<DATA> Send for ItemType<DATA> {}
>> +
>> +impl<DATA> ItemType<DATA> {
>> + #[doc(hidden)]
>> + pub const fn new_with_child_ctor<const N: usize, PAR, CHLD, CPTR, PCPTR>(
>> + owner: &'static ThisModule,
>> + attributes: &'static AttributeList<N, DATA>,
>> + ) -> Self
>> + where
>> + PAR: GroupOperations<Child = CHLD, ChildPointer = CPTR, PinChildPointer = PCPTR>,
>> + CPTR: InPlaceInit<Group<CHLD>, PinnedSelf = PCPTR>,
>> + PCPTR: ForeignOwnable<PointedTo = Group<CHLD>>,
>> + {
>> + Self {
>> + item_type: Opaque::new(bindings::config_item_type {
>> + ct_owner: owner.as_ptr(),
>> + ct_group_ops: (&GroupOperationsVTable::<PAR, CHLD, CPTR, PCPTR>::VTABLE as *const _)
>> + as *mut _,
>> + ct_item_ops: core::ptr::null_mut(),
>> + ct_attrs: attributes as *const _ as _,
>> + ct_bin_attrs: core::ptr::null_mut(),
>> + }),
>> + _p: PhantomData,
>> + }
>> + }
>> +
>> + #[doc(hidden)]
>> + pub const fn new<const N: usize>(
>> + owner: &'static ThisModule,
>> + attributes: &'static AttributeList<N, DATA>,
>> + ) -> Self {
>> + Self {
>> + item_type: Opaque::new(bindings::config_item_type {
>> + ct_owner: owner.as_ptr(),
>> + ct_group_ops: core::ptr::null_mut(),
>> + ct_item_ops: core::ptr::null_mut(),
>> + ct_attrs: attributes as *const _ as _,
>> + ct_bin_attrs: core::ptr::null_mut(),
>> + }),
>> + _p: PhantomData,
>> + }
>> + }
>> +}
>> +
>> +impl<DATA> ItemType<DATA> {
>> + fn as_ptr(&self) -> *const bindings::config_item_type {
>> + self.item_type.get()
>> + }
>> +}
>> +
>> +/// Define a list of configfs attributes statically.
>> +#[macro_export]
>> +macro_rules! configfs_attrs {
>> + (
>> + container: $container:ty,
>> + attributes: [
>> + $($name:ident: $attr:literal,)*
>> + ],
>> + ) => {
>> + $crate::configfs_attrs!(
>> + count:
>> + @container($container),
>> + @child(),
>> + @no_child(x),
>> + @attrs($($name $attr)*),
>> + @eat($($name $attr,)*),
>> + @assign(),
>> + @cnt(0usize),
>> + )
>> + };
>> + (
>> + container: $container:ty,
>> + child: $child:ty,
>> + pointer: $pointer:ty,
>> + pinned: $pinned:ty,
>> + attributes: [
>> + $($name:ident: $attr:literal,)*
>> + ],
>> + ) => {
>> + $crate::configfs_attrs!(
>> + count:
>> + @container($container),
>> + @child($child, $pointer, $pinned),
>> + @no_child(),
>> + @attrs($($name $attr)*),
>> + @eat($($name $attr,)*),
>> + @assign(),
>> + @cnt(0usize),
>> + )
>> + };
>> + (count:
>> + @container($container:ty),
>> + @child($($child:ty, $pointer:ty, $pinned:ty)?),
>> + @no_child($($no_child:ident)?),
>> + @attrs($($aname:ident $aattr:literal)*),
>> + @eat($name:ident $attr:literal, $($rname:ident $rattr:literal,)*),
>> + @assign($($assign:block)*),
>> + @cnt($cnt:expr),
>> + ) => {
>> + $crate::configfs_attrs!(
>> + count:
>> + @container($container),
>> + @child($($child, $pointer, $pinned)?),
>> + @no_child($($no_child)?),
>> + @attrs($($aname $aattr)*),
>> + @eat($($rname $rattr,)*),
>> + @assign($($assign)* {
>> + const N: usize = $cnt;
>> + // SAFETY: We are expanding `configfs_attrs`.
>> + unsafe {
>> + $crate::macros::paste!( [< $container:upper _ATTRS >])
>> + .add::<N, $attr, _>(
>> + & $crate::macros::paste!( [< $container:upper _ $name:upper _ATTR >])
>> + )
>> + };
>> + }),
>> + @cnt(1usize + $cnt),
>> + )
>> + };
>> + (count:
>> + @container($container:ty),
>> + @child($($child:ty, $pointer:ty, $pinned:ty)?),
>> + @no_child($($no_child:ident)?),
>> + @attrs($($aname:ident $aattr:literal)*),
>> + @eat(),
>> + @assign($($assign:block)*),
>> + @cnt($cnt:expr),
>> + ) =>
>> + {
>> + $crate::configfs_attrs!(final:
>> + @container($container),
>> + @child($($child, $pointer, $pinned)?),
>> + @no_child($($no_child)?),
>> + @attrs($($aname $aattr)*),
>> + @assign($($assign)*),
>> + @cnt($cnt),
>> + )
>> + };
>> + (final:
>> + @container($container:ty),
>> + @child($($child:ty, $pointer:ty, $pinned:ty)?),
>> + @no_child($($no_child:ident)?),
>> + @attrs($($name:ident $attr:literal)*),
>> + @assign($($assign:block)*),
>> + @cnt($cnt:expr),
>> + ) =>
>> + {
>> + {
>> + $(
>> + $crate::macros::paste!{
>> + // SAFETY: We are expanding `configfs_attrs`.
>> + static [< $container:upper _ $name:upper _ATTR >]:
>> + $crate::configfs::Attribute<$attr, $container, $container> =
>> + unsafe {
>> + $crate::configfs::Attribute::new(c_str!(::core::stringify!($name)))
>> + };
>> + }
>> + )*
>> +
>> +
>> + const N: usize = $cnt + 1usize;
>> + $crate::macros::paste!{
>> + // SAFETY: We are expanding `configfs_attrs`.
>> + static [< $container:upper _ATTRS >]:
>> + $crate::configfs::AttributeList<N, $container> =
>> + unsafe { $crate::configfs::AttributeList::new() };
>> + }
>> +
>> + $($assign)*
>> +
>> + $(
>> + $crate::macros::paste!{
>> + const [<$no_child:upper>]: bool = true;
>> + };
>> +
>> + $crate::macros::paste!{
>> + static [< $container:upper _TPE >] : $crate::configfs::ItemType<$container> =
>> + $crate::configfs::ItemType::new::<N>(
>> + &THIS_MODULE, &[<$ container:upper _ATTRS >]
>> + );
>> + }
>> + )?
>> +
>> + $(
>> + $crate::macros::paste!{
>> + static [< $container:upper _TPE >]:
>> + $crate::configfs::ItemType<$container> =
>> + $crate::configfs::ItemType::new_with_child_ctor::
>> + <N, $container, $child, $pointer, $pinned>(
>> + &THIS_MODULE, &[<$ container:upper _ATTRS >]
>> + );
>> + }
>> + )?
>> +
>> + &$crate::macros::paste!( [< $container:upper _TPE >] )
>> + }
>> + };
>> +
>> +}
>> diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
>> index 545d1170ee6358e185b48ce10493fc61c646155c..91f05cf54db0ea83f27837c4c3a80cf48c5158da 100644
>> --- a/rust/kernel/lib.rs
>> +++ b/rust/kernel/lib.rs
>> @@ -19,6 +19,7 @@
>> #![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(unsize))]
>> #![feature(inline_const)]
>> #![feature(lint_reasons)]
>> +#![cfg_attr(not(CONFIG_RUSTC_HAS_CONST_MUT_REFS_MERGED), feature(const_mut_refs))]
>>
>> // Ensure conditional compilation based on the kernel configuration works;
>> // otherwise we may silently break things like initcall handling.
>> @@ -35,6 +36,8 @@
>> pub mod block;
>> #[doc(hidden)]
>> pub mod build_assert;
>> +#[cfg(CONFIG_CONFIGFS_FS)]
>> +pub mod configfs;
>> pub mod cred;
>> pub mod device;
>> pub mod error;
>> diff --git a/samples/rust/Kconfig b/samples/rust/Kconfig
>> index b0f74a81c8f9ad24c9dc1ca057f83531156084aa..ba540a167ebf49853f377f09374bba0c6facee8c 100644
>> --- a/samples/rust/Kconfig
>> +++ b/samples/rust/Kconfig
>> @@ -30,6 +30,17 @@ config SAMPLE_RUST_PRINT
>>
>> If unsure, say N.
>>
>> +config SAMPLE_RUST_CONFIGFS
>> + tristate "Configfs sample"
>> + depends on CONFIGFS_FS
>> + help
>> + This option builds the Rust configfs sample.
>> +
>> + To compile this as a module, choose M here:
>> + the module will be called rust_configfs.
>> +
>> + If unsure, say N.
>> +
>> config SAMPLE_RUST_HOSTPROGS
>> bool "Host programs"
>> help
>> diff --git a/samples/rust/Makefile b/samples/rust/Makefile
>> index c1a5c16553955b1cfc59d77e85e1d60b06242967..2b2621046f10609321b76cad3c7f327bafc802c0 100644
>> --- a/samples/rust/Makefile
>> +++ b/samples/rust/Makefile
>> @@ -3,6 +3,7 @@ ccflags-y += -I$(src) # needed for trace events
>>
>> obj-$(CONFIG_SAMPLE_RUST_MINIMAL) += rust_minimal.o
>> obj-$(CONFIG_SAMPLE_RUST_PRINT) += rust_print.o
>> +obj-$(CONFIG_SAMPLE_RUST_CONFIGFS) += rust_configfs.o
>>
>> rust_print-y := rust_print_main.o rust_print_events.o
>>
>> diff --git a/samples/rust/rust_configfs.rs b/samples/rust/rust_configfs.rs
>> new file mode 100644
>> index 0000000000000000000000000000000000000000..a77fe292d1b6c775210abb31d706519de2ab125a
>> --- /dev/null
>> +++ b/samples/rust/rust_configfs.rs
>> @@ -0,0 +1,192 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +
>> +//! Rust configfs sample.
>> +
>> +use kernel::alloc::flags;
>> +use kernel::c_str;
>> +use kernel::configfs;
>> +use kernel::configfs_attrs;
>> +use kernel::new_mutex;
>> +use kernel::prelude::*;
>> +use kernel::sync::Arc;
>> +use kernel::sync::Mutex;
>> +
>> +module! {
>> + type: RustConfigfs,
>> + name: "rust_configfs",
>> + author: "Rust for Linux Contributors",
>> + description: "Rust configfs sample",
>> + license: "GPL",
>> +}
>> +
>> +#[pin_data]
>> +struct RustConfigfs {
>> + #[pin]
>> + config: configfs::Subsystem<Configuration>,
>> +}
>> +
>> +#[pin_data]
>> +struct Configuration {
>> + message: &'static CStr,
>> + #[pin]
>> + bar: Mutex<(KBox<[u8; 4096]>, usize)>,
>> +}
>> +
>> +impl Configuration {
>> + fn new() -> impl PinInit<Self, Error> {
>> + try_pin_init!(Self {
>> + message: c_str!("Hello World\n"),
>> + bar <- new_mutex!((KBox::new([0;4096], flags::GFP_KERNEL)?,0)),
>> + })
>> + }
>> +}
>> +
>> +impl kernel::InPlaceModule for RustConfigfs {
>> + fn init(_module: &'static ThisModule) -> impl PinInit<Self, Error> {
>> + pr_info!("Rust configfs sample (init)\n");
>> +
>> + let item_type = configfs_attrs! {
>> + container: Configuration,
>> + child: Child,
>> + pointer: Arc<configfs::Group<Child>>,
>> + pinned: Arc<configfs::Group<Child>>,
>> + attributes: [
>> + message: 0,
>> + bar: 1,
>> + ],
>> + };
>> +
>> + try_pin_init!(Self {
>> + config <- configfs::Subsystem::new(
>> + kernel::c_str!("rust_configfs"), item_type, Configuration::new()
>> + ),
>> + })
>> + }
>> +}
>> +
>> +#[vtable]
>> +impl configfs::GroupOperations for Configuration {
>> + type Parent = Self;
>> + type Child = Child;
>> + type ChildPointer = Arc<configfs::Group<Child>>;
>> + type PinChildPointer = Arc<configfs::Group<Child>>;
>> +
>> + fn make_group(
>> + _this: &Self,
>> + name: &CStr,
>> + ) -> Result<impl PinInit<configfs::Group<Child>, Error>> {
>> + let tpe = configfs_attrs! {
>> + container: Child,
>> + child: GrandChild,
>> + pointer: Arc<configfs::Group<GrandChild>>,
>> + pinned: Arc<configfs::Group<GrandChild>>,
>> + attributes: [
>> + baz: 0,
>> + ],
>> + };
>> +
>> + Ok(configfs::Group::new(name.try_into()?, tpe, Child::new()))
>> + }
>> +}
>> +
>> +#[vtable]
>> +impl configfs::AttributeOperations<0> for Configuration {
>> + type Data = Configuration;
>> +
>> + fn show(container: &Configuration, page: &mut [u8; 4096]) -> Result<usize> {
>> + pr_info!("Show message\n");
>> + let data = container.message;
>> + page[0..data.len()].copy_from_slice(data);
>> + Ok(data.len())
>> + }
>> +}
>> +
>> +#[vtable]
>> +impl configfs::AttributeOperations<1> for Configuration {
>> + type Data = Configuration;
>> +
>> + fn show(container: &Configuration, page: &mut [u8; 4096]) -> Result<usize> {
>> + pr_info!("Show bar\n");
>> + let guard = container.bar.lock();
>> + let data = guard.0.as_slice();
>> + let len = guard.1;
>> + page[0..len].copy_from_slice(&data[0..len]);
>> + Ok(len)
>> + }
>> +
>> + fn store(container: &Configuration, page: &[u8]) -> Result {
>> + pr_info!("Store bar\n");
>> + let mut guard = container.bar.lock();
>> + guard.0[0..page.len()].copy_from_slice(page);
>> + guard.1 = page.len();
>> + Ok(())
>
> Do we return Err() here? It seems to me that this will either return
> Ok(()) or panic at,
> guard.0[0..page.len()].copy_from_slice(page);
configfs guarantees that the attribute buffer is never more than
`PAGE_SIZE`, so this particular code will not panic on systems where
`PAGE_SIZE` is 4k. I should probably use the constant for the buffer
size though.
Also, I will add this info about the buffer size to the
`configfs::AttributeOperatiosn` trait documentation.
Thanks!
Best regards,
Andreas Hindborg
Powered by blists - more mailing lists