mirror of
https://github.com/torvalds/linux.git
synced 2025-08-16 06:31:34 +02:00

Toolchain and infrastructure: - KUnit '#[test]'s: - Support KUnit-mapped 'assert!' macros. The support that landed last cycle was very basic, and the 'assert!' macros panicked since they were the standard library ones. Now, they are mapped to the KUnit ones in a similar way to how is done for doctests, reusing the infrastructure there. With this, a failing test like: #[test] fn my_first_test() { assert_eq!(42, 43); } will report: # my_first_test: ASSERTION FAILED at rust/kernel/lib.rs:251 Expected 42 == 43 to be true, but is false # my_first_test.speed: normal not ok 1 my_first_test - Support tests with checked 'Result' return types. The return value of test functions that return a 'Result' will be checked, thus one can now easily catch errors when e.g. using the '?' operator in tests. With this, a failing test like: #[test] fn my_test() -> Result { f()?; Ok(()) } will report: # my_test: ASSERTION FAILED at rust/kernel/lib.rs:321 Expected is_test_result_ok(my_test()) to be true, but is false # my_test.speed: normal not ok 1 my_test - Add 'kunit_tests' to the prelude. - Clarify the remaining language unstable features in use. - Compile 'core' with edition 2024 for Rust >= 1.87. - Workaround 'bindgen' issue with forward references to 'enum' types. - objtool: relax slice condition to cover more 'noreturn' functions. - Use absolute paths in macros referencing 'core' and 'kernel' crates. - Skip '-mno-fdpic' flag for bindgen in GCC 32-bit arm builds. - Clean some 'doc_markdown' lint hits -- we may enable it later on. 'kernel' crate: - 'alloc' module: - 'Box': support for type coercion, e.g. 'Box<T>' to 'Box<dyn U>' if 'T' implements 'U'. - 'Vec': implement new methods (prerequisites for nova-core and binder): 'truncate', 'resize', 'clear', 'pop', 'push_within_capacity' (with new error type 'PushError'), 'drain_all', 'retain', 'remove' (with new error type 'RemoveError'), insert_within_capacity' (with new error type 'InsertError'). In addition, simplify 'push' using 'spare_capacity_mut', split 'set_len' into 'inc_len' and 'dec_len', add type invariant 'len <= capacity' and simplify 'truncate' using 'dec_len'. - 'time' module: - Morph the Rust hrtimer subsystem into the Rust timekeeping subsystem, covering delay, sleep, timekeeping, timers. This new subsystem has all the relevant timekeeping C maintainers listed in the entry. - Replace 'Ktime' with 'Delta' and 'Instant' types to represent a duration of time and a point in time. - Temporarily add 'Ktime' to 'hrtimer' module to allow 'hrtimer' to delay converting to 'Instant' and 'Delta'. - 'xarray' module: - Add a Rust abstraction for the 'xarray' data structure. This abstraction allows Rust code to leverage the 'xarray' to store types that implement 'ForeignOwnable'. This support is a dependency for memory backing feature of the Rust null block driver, which is waiting to be merged. - Set up an entry in 'MAINTAINERS' for the XArray Rust support. Patches will go to the new Rust XArray tree and then via the Rust subsystem tree for now. - Allow 'ForeignOwnable' to carry information about the pointed-to type. This helps asserting alignment requirements for the pointer passed to the foreign language. - 'container_of!': retain pointer mut-ness and add a compile-time check of the type of the first parameter ('$field_ptr'). - Support optional message in 'static_assert!'. - Add C FFI types (e.g. 'c_int') to the prelude. - 'str' module: simplify KUnit tests 'format!' macro, convert 'rusttest' tests into KUnit, take advantage of the '-> Result' support in KUnit '#[test]'s. - 'list' module: add examples for 'List', fix path of 'assert_pinned!' (so far unused macro rule). - 'workqueue' module: remove 'HasWork::OFFSET'. - 'page' module: add 'inline' attribute. 'macros' crate: - 'module' macro: place 'cleanup_module()' in '.exit.text' section. 'pin-init' crate: - Add 'Wrapper<T>' trait for creating pin-initializers for wrapper structs with a structurally pinned value such as 'UnsafeCell<T>' or 'MaybeUninit<T>'. - Add 'MaybeZeroable' derive macro to try to derive 'Zeroable', but not error if not all fields implement it. This is needed to derive 'Zeroable' for all bindgen-generated structs. - Add 'unsafe fn cast_[pin_]init()' functions to unsafely change the initialized type of an initializer. These are utilized by the 'Wrapper<T>' implementations. - Add support for visibility in 'Zeroable' derive macro. - Add support for 'union's in 'Zeroable' derive macro. - Upstream dev news: streamline CI, fix some bugs. Add new workflows to check if the user-space version and the one in the kernel tree have diverged. Use the issues tab [1] to track them, which should help folks report and diagnose issues w.r.t. 'pin-init' better. [1] https://github.com/rust-for-linux/pin-init/issues Documentation: - Testing: add docs on the new KUnit '#[test]' tests. - Coding guidelines: explain that '///' vs. '//' applies to private items too. Add section on C FFI types. - Quick Start guide: update Ubuntu instructions and split them into "25.04" and "24.04 LTS and older". And a few other cleanups and improvements. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPjU5OPd5QIZ9jqqOGXyLc2htIW0FAmhBAvYACgkQGXyLc2ht IW3qvA/+KRTCYKcI6JyUT9TdhRmaaMsQ0/5j6Kx4CfRQPZTSWsXyBEU75yEIZUQD SUGQFwmMAYeAKQD1SumFCRy973VzUO45DyKM+7vuVhKN1ZjnAtv63+31C3UFATlA 8Tm3GCqQEGKl4IER7xI3D/vpZA5FOv+GotjNieF3O9FpHDCvV/JQScq9I2oXQPCt 17kRLww/DTfpf4qiLmxmxHn6nCsbecdfEce1kfjk3nNuE6B2tPf+ddYOwunLEvkB LA4Cr6T1Cy1ovRQgxg9Pdkl/0Rta0tFcsKt1LqPgjR+n95stsHgAzbyMGuUKoeZx u2R2pwlrJt6Xe4CEZgTIRfYWgF81qUzdcPuflcSMDCpH0nTep74A2lIiWUHWZSh4 LbPh7r90Q8YwGKVJiWqLfHUmQBnmTEm3D2gydSExPKJXSzB4Rbv4w4fPF3dhzMtC 4+KvmHKIojFkAdTLt+5rkKipJGo/rghvQvaQr9JOu+QO4vfhkesB4pUWC4sZd9A9 GJBP97ynWAsXGGaeaaSli0b851X+VE/WIDOmPMselbA3rVADChE6HsJnY/wVVeWK jupvAhUExSczDPCluGv8T9EVXvv6+fg3bB5pD6R01NNJe6iE/LIDQ5Gj5rg4qahM EFzMgPj6hMt5McvWI8q1/ym0bzdeC2/cmaV6E14hvphAZoORUKI= =JRqL -----END PGP SIGNATURE----- Merge tag 'rust-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux Pull Rust updates from Miguel Ojeda: "Toolchain and infrastructure: - KUnit '#[test]'s: - Support KUnit-mapped 'assert!' macros. The support that landed last cycle was very basic, and the 'assert!' macros panicked since they were the standard library ones. Now, they are mapped to the KUnit ones in a similar way to how is done for doctests, reusing the infrastructure there. With this, a failing test like: #[test] fn my_first_test() { assert_eq!(42, 43); } will report: # my_first_test: ASSERTION FAILED at rust/kernel/lib.rs:251 Expected 42 == 43 to be true, but is false # my_first_test.speed: normal not ok 1 my_first_test - Support tests with checked 'Result' return types. The return value of test functions that return a 'Result' will be checked, thus one can now easily catch errors when e.g. using the '?' operator in tests. With this, a failing test like: #[test] fn my_test() -> Result { f()?; Ok(()) } will report: # my_test: ASSERTION FAILED at rust/kernel/lib.rs:321 Expected is_test_result_ok(my_test()) to be true, but is false # my_test.speed: normal not ok 1 my_test - Add 'kunit_tests' to the prelude. - Clarify the remaining language unstable features in use. - Compile 'core' with edition 2024 for Rust >= 1.87. - Workaround 'bindgen' issue with forward references to 'enum' types. - objtool: relax slice condition to cover more 'noreturn' functions. - Use absolute paths in macros referencing 'core' and 'kernel' crates. - Skip '-mno-fdpic' flag for bindgen in GCC 32-bit arm builds. - Clean some 'doc_markdown' lint hits -- we may enable it later on. 'kernel' crate: - 'alloc' module: - 'Box': support for type coercion, e.g. 'Box<T>' to 'Box<dyn U>' if 'T' implements 'U'. - 'Vec': implement new methods (prerequisites for nova-core and binder): 'truncate', 'resize', 'clear', 'pop', 'push_within_capacity' (with new error type 'PushError'), 'drain_all', 'retain', 'remove' (with new error type 'RemoveError'), insert_within_capacity' (with new error type 'InsertError'). In addition, simplify 'push' using 'spare_capacity_mut', split 'set_len' into 'inc_len' and 'dec_len', add type invariant 'len <= capacity' and simplify 'truncate' using 'dec_len'. - 'time' module: - Morph the Rust hrtimer subsystem into the Rust timekeeping subsystem, covering delay, sleep, timekeeping, timers. This new subsystem has all the relevant timekeeping C maintainers listed in the entry. - Replace 'Ktime' with 'Delta' and 'Instant' types to represent a duration of time and a point in time. - Temporarily add 'Ktime' to 'hrtimer' module to allow 'hrtimer' to delay converting to 'Instant' and 'Delta'. - 'xarray' module: - Add a Rust abstraction for the 'xarray' data structure. This abstraction allows Rust code to leverage the 'xarray' to store types that implement 'ForeignOwnable'. This support is a dependency for memory backing feature of the Rust null block driver, which is waiting to be merged. - Set up an entry in 'MAINTAINERS' for the XArray Rust support. Patches will go to the new Rust XArray tree and then via the Rust subsystem tree for now. - Allow 'ForeignOwnable' to carry information about the pointed-to type. This helps asserting alignment requirements for the pointer passed to the foreign language. - 'container_of!': retain pointer mut-ness and add a compile-time check of the type of the first parameter ('$field_ptr'). - Support optional message in 'static_assert!'. - Add C FFI types (e.g. 'c_int') to the prelude. - 'str' module: simplify KUnit tests 'format!' macro, convert 'rusttest' tests into KUnit, take advantage of the '-> Result' support in KUnit '#[test]'s. - 'list' module: add examples for 'List', fix path of 'assert_pinned!' (so far unused macro rule). - 'workqueue' module: remove 'HasWork::OFFSET'. - 'page' module: add 'inline' attribute. 'macros' crate: - 'module' macro: place 'cleanup_module()' in '.exit.text' section. 'pin-init' crate: - Add 'Wrapper<T>' trait for creating pin-initializers for wrapper structs with a structurally pinned value such as 'UnsafeCell<T>' or 'MaybeUninit<T>'. - Add 'MaybeZeroable' derive macro to try to derive 'Zeroable', but not error if not all fields implement it. This is needed to derive 'Zeroable' for all bindgen-generated structs. - Add 'unsafe fn cast_[pin_]init()' functions to unsafely change the initialized type of an initializer. These are utilized by the 'Wrapper<T>' implementations. - Add support for visibility in 'Zeroable' derive macro. - Add support for 'union's in 'Zeroable' derive macro. - Upstream dev news: streamline CI, fix some bugs. Add new workflows to check if the user-space version and the one in the kernel tree have diverged. Use the issues tab [1] to track them, which should help folks report and diagnose issues w.r.t. 'pin-init' better. [1] https://github.com/rust-for-linux/pin-init/issues Documentation: - Testing: add docs on the new KUnit '#[test]' tests. - Coding guidelines: explain that '///' vs. '//' applies to private items too. Add section on C FFI types. - Quick Start guide: update Ubuntu instructions and split them into "25.04" and "24.04 LTS and older". And a few other cleanups and improvements" * tag 'rust-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux: (78 commits) rust: list: Fix typo `much` in arc.rs rust: check type of `$ptr` in `container_of!` rust: workqueue: remove HasWork::OFFSET rust: retain pointer mut-ness in `container_of!` Documentation: rust: testing: add docs on the new KUnit `#[test]` tests Documentation: rust: rename `#[test]`s to "`rusttest` host tests" rust: str: take advantage of the `-> Result` support in KUnit `#[test]`'s rust: str: simplify KUnit tests `format!` macro rust: str: convert `rusttest` tests into KUnit rust: add `kunit_tests` to the prelude rust: kunit: support checked `-> Result`s in KUnit `#[test]`s rust: kunit: support KUnit-mapped `assert!` macros in `#[test]`s rust: make section names plural rust: list: fix path of `assert_pinned!` rust: compile libcore with edition 2024 for 1.87+ rust: dma: add missing Markdown code span rust: task: add missing Markdown code spans and intra-doc links rust: pci: fix docs related to missing Markdown code spans rust: alloc: add missing Markdown code span rust: alloc: add missing Markdown code spans ...
247 lines
8.3 KiB
Rust
247 lines
8.3 KiB
Rust
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
//! Abstractions for the platform bus.
|
|
//!
|
|
//! C header: [`include/linux/platform_device.h`](srctree/include/linux/platform_device.h)
|
|
|
|
use crate::{
|
|
bindings, container_of, device, driver,
|
|
error::{to_result, Result},
|
|
of,
|
|
prelude::*,
|
|
str::CStr,
|
|
types::{ForeignOwnable, Opaque},
|
|
ThisModule,
|
|
};
|
|
|
|
use core::{
|
|
marker::PhantomData,
|
|
ptr::{addr_of_mut, NonNull},
|
|
};
|
|
|
|
/// An adapter for the registration of platform drivers.
|
|
pub struct Adapter<T: Driver>(T);
|
|
|
|
// SAFETY: A call to `unregister` for a given instance of `RegType` is guaranteed to be valid if
|
|
// a preceding call to `register` has been successful.
|
|
unsafe impl<T: Driver + 'static> driver::RegistrationOps for Adapter<T> {
|
|
type RegType = bindings::platform_driver;
|
|
|
|
unsafe fn register(
|
|
pdrv: &Opaque<Self::RegType>,
|
|
name: &'static CStr,
|
|
module: &'static ThisModule,
|
|
) -> Result {
|
|
let of_table = match T::OF_ID_TABLE {
|
|
Some(table) => table.as_ptr(),
|
|
None => core::ptr::null(),
|
|
};
|
|
|
|
// SAFETY: It's safe to set the fields of `struct platform_driver` on initialization.
|
|
unsafe {
|
|
(*pdrv.get()).driver.name = name.as_char_ptr();
|
|
(*pdrv.get()).probe = Some(Self::probe_callback);
|
|
(*pdrv.get()).remove = Some(Self::remove_callback);
|
|
(*pdrv.get()).driver.of_match_table = of_table;
|
|
}
|
|
|
|
// SAFETY: `pdrv` is guaranteed to be a valid `RegType`.
|
|
to_result(unsafe { bindings::__platform_driver_register(pdrv.get(), module.0) })
|
|
}
|
|
|
|
unsafe fn unregister(pdrv: &Opaque<Self::RegType>) {
|
|
// SAFETY: `pdrv` is guaranteed to be a valid `RegType`.
|
|
unsafe { bindings::platform_driver_unregister(pdrv.get()) };
|
|
}
|
|
}
|
|
|
|
impl<T: Driver + 'static> Adapter<T> {
|
|
extern "C" fn probe_callback(pdev: *mut bindings::platform_device) -> kernel::ffi::c_int {
|
|
// SAFETY: The platform bus only ever calls the probe callback with a valid pointer to a
|
|
// `struct platform_device`.
|
|
//
|
|
// INVARIANT: `pdev` is valid for the duration of `probe_callback()`.
|
|
let pdev = unsafe { &*pdev.cast::<Device<device::Core>>() };
|
|
|
|
let info = <Self as driver::Adapter>::id_info(pdev.as_ref());
|
|
match T::probe(pdev, info) {
|
|
Ok(data) => {
|
|
// Let the `struct platform_device` own a reference of the driver's private data.
|
|
// SAFETY: By the type invariant `pdev.as_raw` returns a valid pointer to a
|
|
// `struct platform_device`.
|
|
unsafe { bindings::platform_set_drvdata(pdev.as_raw(), data.into_foreign() as _) };
|
|
}
|
|
Err(err) => return Error::to_errno(err),
|
|
}
|
|
|
|
0
|
|
}
|
|
|
|
extern "C" fn remove_callback(pdev: *mut bindings::platform_device) {
|
|
// SAFETY: `pdev` is a valid pointer to a `struct platform_device`.
|
|
let ptr = unsafe { bindings::platform_get_drvdata(pdev) }.cast();
|
|
|
|
// SAFETY: `remove_callback` is only ever called after a successful call to
|
|
// `probe_callback`, hence it's guaranteed that `ptr` points to a valid and initialized
|
|
// `KBox<T>` pointer created through `KBox::into_foreign`.
|
|
let _ = unsafe { KBox::<T>::from_foreign(ptr) };
|
|
}
|
|
}
|
|
|
|
impl<T: Driver + 'static> driver::Adapter for Adapter<T> {
|
|
type IdInfo = T::IdInfo;
|
|
|
|
fn of_id_table() -> Option<of::IdTable<Self::IdInfo>> {
|
|
T::OF_ID_TABLE
|
|
}
|
|
}
|
|
|
|
/// Declares a kernel module that exposes a single platform driver.
|
|
///
|
|
/// # Examples
|
|
///
|
|
/// ```ignore
|
|
/// kernel::module_platform_driver! {
|
|
/// type: MyDriver,
|
|
/// name: "Module name",
|
|
/// authors: ["Author name"],
|
|
/// description: "Description",
|
|
/// license: "GPL v2",
|
|
/// }
|
|
/// ```
|
|
#[macro_export]
|
|
macro_rules! module_platform_driver {
|
|
($($f:tt)*) => {
|
|
$crate::module_driver!(<T>, $crate::platform::Adapter<T>, { $($f)* });
|
|
};
|
|
}
|
|
|
|
/// The platform driver trait.
|
|
///
|
|
/// Drivers must implement this trait in order to get a platform driver registered.
|
|
///
|
|
/// # Example
|
|
///
|
|
///```
|
|
/// # use kernel::{bindings, c_str, device::Core, of, platform};
|
|
///
|
|
/// struct MyDriver;
|
|
///
|
|
/// kernel::of_device_table!(
|
|
/// OF_TABLE,
|
|
/// MODULE_OF_TABLE,
|
|
/// <MyDriver as platform::Driver>::IdInfo,
|
|
/// [
|
|
/// (of::DeviceId::new(c_str!("test,device")), ())
|
|
/// ]
|
|
/// );
|
|
///
|
|
/// impl platform::Driver for MyDriver {
|
|
/// type IdInfo = ();
|
|
/// const OF_ID_TABLE: Option<of::IdTable<Self::IdInfo>> = Some(&OF_TABLE);
|
|
///
|
|
/// fn probe(
|
|
/// _pdev: &platform::Device<Core>,
|
|
/// _id_info: Option<&Self::IdInfo>,
|
|
/// ) -> Result<Pin<KBox<Self>>> {
|
|
/// Err(ENODEV)
|
|
/// }
|
|
/// }
|
|
///```
|
|
pub trait Driver: Send {
|
|
/// The type holding driver private data about each device id supported by the driver.
|
|
// TODO: Use associated_type_defaults once stabilized:
|
|
//
|
|
// ```
|
|
// type IdInfo: 'static = ();
|
|
// ```
|
|
type IdInfo: 'static;
|
|
|
|
/// The table of OF device ids supported by the driver.
|
|
const OF_ID_TABLE: Option<of::IdTable<Self::IdInfo>>;
|
|
|
|
/// Platform driver probe.
|
|
///
|
|
/// Called when a new platform device is added or discovered.
|
|
/// Implementers should attempt to initialize the device here.
|
|
fn probe(dev: &Device<device::Core>, id_info: Option<&Self::IdInfo>)
|
|
-> Result<Pin<KBox<Self>>>;
|
|
}
|
|
|
|
/// The platform device representation.
|
|
///
|
|
/// This structure represents the Rust abstraction for a C `struct platform_device`. The
|
|
/// implementation abstracts the usage of an already existing C `struct platform_device` within Rust
|
|
/// code that we get passed from the C side.
|
|
///
|
|
/// # Invariants
|
|
///
|
|
/// A [`Device`] instance represents a valid `struct platform_device` created by the C portion of
|
|
/// the kernel.
|
|
#[repr(transparent)]
|
|
pub struct Device<Ctx: device::DeviceContext = device::Normal>(
|
|
Opaque<bindings::platform_device>,
|
|
PhantomData<Ctx>,
|
|
);
|
|
|
|
impl<Ctx: device::DeviceContext> Device<Ctx> {
|
|
fn as_raw(&self) -> *mut bindings::platform_device {
|
|
self.0.get()
|
|
}
|
|
}
|
|
|
|
// SAFETY: `Device` is a transparent wrapper of a type that doesn't depend on `Device`'s generic
|
|
// argument.
|
|
kernel::impl_device_context_deref!(unsafe { Device });
|
|
kernel::impl_device_context_into_aref!(Device);
|
|
|
|
// SAFETY: Instances of `Device` are always reference-counted.
|
|
unsafe impl crate::types::AlwaysRefCounted for Device {
|
|
fn inc_ref(&self) {
|
|
// SAFETY: The existence of a shared reference guarantees that the refcount is non-zero.
|
|
unsafe { bindings::get_device(self.as_ref().as_raw()) };
|
|
}
|
|
|
|
unsafe fn dec_ref(obj: NonNull<Self>) {
|
|
// SAFETY: The safety requirements guarantee that the refcount is non-zero.
|
|
unsafe { bindings::platform_device_put(obj.cast().as_ptr()) }
|
|
}
|
|
}
|
|
|
|
impl<Ctx: device::DeviceContext> AsRef<device::Device<Ctx>> for Device<Ctx> {
|
|
fn as_ref(&self) -> &device::Device<Ctx> {
|
|
// SAFETY: By the type invariant of `Self`, `self.as_raw()` is a pointer to a valid
|
|
// `struct platform_device`.
|
|
let dev = unsafe { addr_of_mut!((*self.as_raw()).dev) };
|
|
|
|
// SAFETY: `dev` points to a valid `struct device`.
|
|
unsafe { device::Device::as_ref(dev) }
|
|
}
|
|
}
|
|
|
|
impl<Ctx: device::DeviceContext> TryFrom<&device::Device<Ctx>> for &Device<Ctx> {
|
|
type Error = kernel::error::Error;
|
|
|
|
fn try_from(dev: &device::Device<Ctx>) -> Result<Self, Self::Error> {
|
|
// SAFETY: By the type invariant of `Device`, `dev.as_raw()` is a valid pointer to a
|
|
// `struct device`.
|
|
if !unsafe { bindings::dev_is_platform(dev.as_raw()) } {
|
|
return Err(EINVAL);
|
|
}
|
|
|
|
// SAFETY: We've just verified that the bus type of `dev` equals
|
|
// `bindings::platform_bus_type`, hence `dev` must be embedded in a valid
|
|
// `struct platform_device` as guaranteed by the corresponding C code.
|
|
let pdev = unsafe { container_of!(dev.as_raw(), bindings::platform_device, dev) };
|
|
|
|
// SAFETY: `pdev` is a valid pointer to a `struct platform_device`.
|
|
Ok(unsafe { &*pdev.cast() })
|
|
}
|
|
}
|
|
|
|
// SAFETY: A `Device` is always reference-counted and can be released from any thread.
|
|
unsafe impl Send for Device {}
|
|
|
|
// SAFETY: `Device` can be shared among threads because all methods of `Device`
|
|
// (i.e. `Device<Normal>) are thread safe.
|
|
unsafe impl Sync for Device {}
|