mirror of
https://github.com/torvalds/linux.git
synced 2025-11-01 00:58:39 +02:00
Toolchain and infrastructure:
- Enable a set of Clippy lints: 'ptr_as_ptr', 'ptr_cast_constness',
'as_ptr_cast_mut', 'as_underscore', 'cast_lossless' and 'ref_as_ptr'.
These are intended to avoid type casts with the 'as' operator, which
are quite powerful, into restricted variants that are less powerful
and thus should help to avoid mistakes.
- Remove the 'author' key now that most instances were moved to the
plural one in the previous cycle.
'kernel' crate:
- New 'bug' module: add 'warn_on!' macro which reuses the existing
'BUG'/'WARN' infrastructure, i.e. it respects the usual sysctls and
kernel parameters:
warn_on!(value == 42);
To avoid duplicating the assembly code, the same strategy is followed
as for the static branch code in order to share the assembly between
both C and Rust. This required a few rearrangements on C arch headers
-- the existing C macros should still generate the same outputs, thus
no functional change expected there.
- 'workqueue' module: add delayed work items, including a 'DelayedWork'
struct, a 'impl_has_delayed_work!' macro and an 'enqueue_delayed'
method, e.g.:
/// Enqueue the struct for execution on the system workqueue,
/// where its value will be printed 42 jiffies later.
fn print_later(value: Arc<MyStruct>) {
let _ = workqueue::system().enqueue_delayed(value, 42);
}
- New 'bits' module: add support for 'bit' and 'genmask' functions,
with runtime- and compile-time variants, e.g.:
static_assert!(0b00010000 == bit_u8(4));
static_assert!(0b00011110 == genmask_u8(1..=4));
assert!(checked_bit_u32(u32::BITS).is_none());
- 'uaccess' module: add 'UserSliceReader::strcpy_into_buf', which reads
NUL-terminated strings from userspace into a '&CStr'.
Introduce 'UserPtr' newtype, similar in purpose to '__user' in C, to
minimize mistakes handling userspace pointers, including mixing them
up with integers and leaking them via the 'Debug' trait. Add it to
the prelude, too.
- Start preparations for the replacement of our custom 'CStr' type
with the analogous type in the 'core' standard library. This will
take place across several cycles to make it easier. For this one,
it includes a new 'fmt' module, using upstream method names and some
other cleanups.
Replace 'fmt!' with a re-export, which helps Clippy lint properly,
and clean up the found 'uninlined-format-args' instances.
- 'dma' module:
- Clarify wording and be consistent in 'coherent' nomenclature.
- Convert the 'read!()' and 'write!()' macros to return a 'Result'.
- Add 'as_slice()', 'write()' methods in 'CoherentAllocation'.
- Expose 'count()' and 'size()' in 'CoherentAllocation' and add the
corresponding type invariants.
- Implement 'CoherentAllocation::dma_handle_with_offset()'.
- 'time' module:
- Make 'Instant' generic over clock source. This allows the compiler
to assert that arithmetic expressions involving the 'Instant' use
'Instants' based on the same clock source.
- Make 'HrTimer' generic over the timer mode. 'HrTimer' timers take a
'Duration' or an 'Instant' when setting the expiry time, depending
on the timer mode. With this change, the compiler can check the
type matches the timer mode.
- Add an abstraction for 'fsleep'. 'fsleep' is a flexible sleep
function that will select an appropriate sleep method depending on
the requested sleep time.
- Avoid 64-bit divisions on 32-bit hardware when calculating
timestamps.
- Seal the 'HrTimerMode' trait. This prevents users of the
'HrTimerMode' from implementing the trait on their own types.
- Pass the correct timer mode ID to 'hrtimer_start_range_ns()'.
- 'list' module: remove 'OFFSET' constants, allowing to remove pointer
arithmetic; now 'impl_list_item!' invokes 'impl_has_list_links!' or
'impl_has_list_links_self_ptr!'. Other simplifications too.
- 'types' module: remove 'ForeignOwnable::PointedTo' in favor of a
constant, which avoids exposing the type of the opaque pointer, and
require 'into_foreign' to return non-null.
Remove the 'Either<L, R>' type as well. It is unused, and we want to
encourage the use of custom enums for concrete use cases.
- 'sync' module: implement 'Borrow' and 'BorrowMut' for 'Arc' types
to allow them to be used in generic APIs.
- 'alloc' module: implement 'Borrow' and 'BorrowMut' for 'Box<T, A>';
and 'Borrow', 'BorrowMut' and 'Default' for 'Vec<T, A>'.
- 'Opaque' type: add 'cast_from' method to perform a restricted cast
that cannot change the inner type and use it in callers of
'container_of!'. Rename 'raw_get' to 'cast_into' to match it.
- 'rbtree' module: add 'is_empty' method.
- 'sync' module: new 'aref' submodule to hold 'AlwaysRefCounted' and
'ARef', which are moved from the too general 'types' module which we
want to reduce or eventually remove. Also fix a safety comment in
'static_lock_class'.
'pin-init' crate:
- Add 'impl<T, E> [Pin]Init<T, E> for Result<T, E>', so results are now
(pin-)initializers.
- Add 'Zeroable::init_zeroed()' that delegates to 'init_zeroed()'.
- New 'zeroed()', a safe version of 'mem::zeroed()' and also provide
it via 'Zeroable::zeroed()'.
- Implement 'Zeroable' for 'Option<&T>', 'Option<&mut T>' and for
'Option<[unsafe] [extern "abi"] fn(...args...) -> ret>' for '"Rust"'
and '"C"' ABIs and up to 20 arguments.
- Changed blanket impls of 'Init' and 'PinInit' from 'impl<T, E>
[Pin]Init<T, E> for T' to 'impl<T> [Pin]Init<T> for T'.
- Renamed 'zeroed()' to 'init_zeroed()'.
- Upstream dev news: improve CI more to deny warnings, use
'--all-targets'. Check the synchronization status of the two '-next'
branches in upstream and the kernel.
MAINTAINERS:
- Add Vlastimil Babka, Liam R. Howlett, Uladzislau Rezki and Lorenzo
Stoakes as reviewers (thanks everyone).
And a few other cleanups and improvements.
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEPjU5OPd5QIZ9jqqOGXyLc2htIW0FAmiOWREACgkQGXyLc2ht
IW39Ig/9E0ExSiBgNKdkCOaULMq31wAxnu3iWoVVisFndlh/Inv+JlaLrmA57BCi
xXgBwVZ1GoMsG8Fzt6gT+gyhGYi8waNd+5KXr/WJZVTaJ9v1KpdvxuCnSz0DjCbk
GaKfAfxvJ5GAOEwiIIX8X0TFu6kx911DCJY387/VrqZQ7Msh1QSM3tcZeir/EV4w
lPjUdlOh1FnLJLI9CGuW20d1IhQUP7K3pdoywgJPpCZV0I8QCyMlMqCEael8Tw2S
r/PzRaQtiIzk5HTx06V8paK+nEn0K2vQXqW2kV56Y6TNm1Zcv6dES/8hCITsISs2
nwney3vXEwvoZX+YkQRffZddY4i6YenWMrtLgVxZzdshBL3bn6eHqBL04Nfix+p7
pQe3qMH3G8UBtX1lugBE7RrWGWcz9ARN8sK12ClmpAUnKJOwTpo97kpqXP7pDme8
Buh/oV3voAMsqwooSbVBzuUUWnbGaQ5Oj6CiiosSadfNh6AxJLYLKHtRLKJHZEw3
0Ob/1HhoWS6JSvYKVjMyD19qcH7O8ThZE+83CfMAkI4KphXJarWhpSmN4cHkFn/v
0clQ7Y5m+up9v1XWTaEq0Biqa6CaxLQwm/qW5WU0Y/TiovmvxAFdCwsQqDkRoJNx
9kNfMJRvNl78KQxrjEDz9gl7/ajgqX1KkqP8CQbGjv29cGzFlVE=
=5Wt9
-----END PGP SIGNATURE-----
Merge tag 'rust-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull Rust updates from Miguel Ojeda:
"Toolchain and infrastructure:
- Enable a set of Clippy lints: 'ptr_as_ptr', 'ptr_cast_constness',
'as_ptr_cast_mut', 'as_underscore', 'cast_lossless' and
'ref_as_ptr'
These are intended to avoid type casts with the 'as' operator,
which are quite powerful, into restricted variants that are less
powerful and thus should help to avoid mistakes
- Remove the 'author' key now that most instances were moved to the
plural one in the previous cycle
'kernel' crate:
- New 'bug' module: add 'warn_on!' macro which reuses the existing
'BUG'/'WARN' infrastructure, i.e. it respects the usual sysctls and
kernel parameters:
warn_on!(value == 42);
To avoid duplicating the assembly code, the same strategy is
followed as for the static branch code in order to share the
assembly between both C and Rust
This required a few rearrangements on C arch headers -- the
existing C macros should still generate the same outputs, thus no
functional change expected there
- 'workqueue' module: add delayed work items, including a
'DelayedWork' struct, a 'impl_has_delayed_work!' macro and an
'enqueue_delayed' method, e.g.:
/// Enqueue the struct for execution on the system workqueue,
/// where its value will be printed 42 jiffies later.
fn print_later(value: Arc<MyStruct>) {
let _ = workqueue::system().enqueue_delayed(value, 42);
}
- New 'bits' module: add support for 'bit' and 'genmask' functions,
with runtime- and compile-time variants, e.g.:
static_assert!(0b00010000 == bit_u8(4));
static_assert!(0b00011110 == genmask_u8(1..=4));
assert!(checked_bit_u32(u32::BITS).is_none());
- 'uaccess' module: add 'UserSliceReader::strcpy_into_buf', which
reads NUL-terminated strings from userspace into a '&CStr'
Introduce 'UserPtr' newtype, similar in purpose to '__user' in C,
to minimize mistakes handling userspace pointers, including mixing
them up with integers and leaking them via the 'Debug' trait. Add
it to the prelude, too
- Start preparations for the replacement of our custom 'CStr' type
with the analogous type in the 'core' standard library. This will
take place across several cycles to make it easier. For this one,
it includes a new 'fmt' module, using upstream method names and
some other cleanups
Replace 'fmt!' with a re-export, which helps Clippy lint properly,
and clean up the found 'uninlined-format-args' instances
- 'dma' module:
- Clarify wording and be consistent in 'coherent' nomenclature
- Convert the 'read!()' and 'write!()' macros to return a 'Result'
- Add 'as_slice()', 'write()' methods in 'CoherentAllocation'
- Expose 'count()' and 'size()' in 'CoherentAllocation' and add
the corresponding type invariants
- Implement 'CoherentAllocation::dma_handle_with_offset()'
- 'time' module:
- Make 'Instant' generic over clock source. This allows the
compiler to assert that arithmetic expressions involving the
'Instant' use 'Instants' based on the same clock source
- Make 'HrTimer' generic over the timer mode. 'HrTimer' timers
take a 'Duration' or an 'Instant' when setting the expiry time,
depending on the timer mode. With this change, the compiler can
check the type matches the timer mode
- Add an abstraction for 'fsleep'. 'fsleep' is a flexible sleep
function that will select an appropriate sleep method depending
on the requested sleep time
- Avoid 64-bit divisions on 32-bit hardware when calculating
timestamps
- Seal the 'HrTimerMode' trait. This prevents users of the
'HrTimerMode' from implementing the trait on their own types
- Pass the correct timer mode ID to 'hrtimer_start_range_ns()'
- 'list' module: remove 'OFFSET' constants, allowing to remove
pointer arithmetic; now 'impl_list_item!' invokes
'impl_has_list_links!' or 'impl_has_list_links_self_ptr!'. Other
simplifications too
- 'types' module: remove 'ForeignOwnable::PointedTo' in favor of a
constant, which avoids exposing the type of the opaque pointer, and
require 'into_foreign' to return non-null
Remove the 'Either<L, R>' type as well. It is unused, and we want
to encourage the use of custom enums for concrete use cases
- 'sync' module: implement 'Borrow' and 'BorrowMut' for 'Arc' types
to allow them to be used in generic APIs
- 'alloc' module: implement 'Borrow' and 'BorrowMut' for 'Box<T, A>';
and 'Borrow', 'BorrowMut' and 'Default' for 'Vec<T, A>'
- 'Opaque' type: add 'cast_from' method to perform a restricted cast
that cannot change the inner type and use it in callers of
'container_of!'. Rename 'raw_get' to 'cast_into' to match it
- 'rbtree' module: add 'is_empty' method
- 'sync' module: new 'aref' submodule to hold 'AlwaysRefCounted' and
'ARef', which are moved from the too general 'types' module which
we want to reduce or eventually remove. Also fix a safety comment
in 'static_lock_class'
'pin-init' crate:
- Add 'impl<T, E> [Pin]Init<T, E> for Result<T, E>', so results are
now (pin-)initializers
- Add 'Zeroable::init_zeroed()' that delegates to 'init_zeroed()'
- New 'zeroed()', a safe version of 'mem::zeroed()' and also provide
it via 'Zeroable::zeroed()'
- Implement 'Zeroable' for 'Option<&T>', 'Option<&mut T>' and for
'Option<[unsafe] [extern "abi"] fn(...args...) -> ret>' for
'"Rust"' and '"C"' ABIs and up to 20 arguments
- Changed blanket impls of 'Init' and 'PinInit' from 'impl<T, E>
[Pin]Init<T, E> for T' to 'impl<T> [Pin]Init<T> for T'
- Renamed 'zeroed()' to 'init_zeroed()'
- Upstream dev news: improve CI more to deny warnings, use
'--all-targets'. Check the synchronization status of the two
'-next' branches in upstream and the kernel
MAINTAINERS:
- Add Vlastimil Babka, Liam R. Howlett, Uladzislau Rezki and Lorenzo
Stoakes as reviewers (thanks everyone)
And a few other cleanups and improvements"
* tag 'rust-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux: (76 commits)
rust: Add warn_on macro
arm64/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust
riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust
x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust
rust: kernel: move ARef and AlwaysRefCounted to sync::aref
rust: sync: fix safety comment for `static_lock_class`
rust: types: remove `Either<L, R>`
rust: kernel: use `core::ffi::CStr` method names
rust: str: add `CStr` methods matching `core::ffi::CStr`
rust: str: remove unnecessary qualification
rust: use `kernel::{fmt,prelude::fmt!}`
rust: kernel: add `fmt` module
rust: kernel: remove `fmt!`, fix clippy::uninlined-format-args
scripts: rust: emit path candidates in panic message
scripts: rust: replace length checks with match
rust: list: remove nonexistent generic parameter in link
rust: bits: add support for bits/genmask macros
rust: list: remove OFFSET constants
rust: list: add `impl_list_item!` examples
rust: list: use fully qualified path
...
206 lines
7.9 KiB
Rust
206 lines
7.9 KiB
Rust
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
//! Generic implementation of device IDs.
|
|
//!
|
|
//! Each bus / subsystem that matches device and driver through a bus / subsystem specific ID is
|
|
//! expected to implement [`RawDeviceId`].
|
|
|
|
use core::mem::MaybeUninit;
|
|
|
|
/// Marker trait to indicate a Rust device ID type represents a corresponding C device ID type.
|
|
///
|
|
/// This is meant to be implemented by buses/subsystems so that they can use [`IdTable`] to
|
|
/// guarantee (at compile-time) zero-termination of device id tables provided by drivers.
|
|
///
|
|
/// # Safety
|
|
///
|
|
/// Implementers must ensure that `Self` is layout-compatible with [`RawDeviceId::RawType`];
|
|
/// i.e. it's safe to transmute to `RawDeviceId`.
|
|
///
|
|
/// This requirement is needed so `IdArray::new` can convert `Self` to `RawType` when building
|
|
/// the ID table.
|
|
///
|
|
/// Ideally, this should be achieved using a const function that does conversion instead of
|
|
/// transmute; however, const trait functions relies on `const_trait_impl` unstable feature,
|
|
/// which is broken/gone in Rust 1.73.
|
|
pub unsafe trait RawDeviceId {
|
|
/// The raw type that holds the device id.
|
|
///
|
|
/// Id tables created from [`Self`] are going to hold this type in its zero-terminated array.
|
|
type RawType: Copy;
|
|
}
|
|
|
|
/// Extension trait for [`RawDeviceId`] for devices that embed an index or context value.
|
|
///
|
|
/// This is typically used when the device ID struct includes a field like `driver_data`
|
|
/// that is used to store a pointer-sized value (e.g., an index or context pointer).
|
|
///
|
|
/// # Safety
|
|
///
|
|
/// Implementers must ensure that `DRIVER_DATA_OFFSET` is the correct offset (in bytes) to
|
|
/// the context/data field (e.g., the `driver_data` field) within the raw device ID structure.
|
|
/// This field must be correctly sized to hold a `usize`.
|
|
///
|
|
/// Ideally, the data should be added during `Self` to `RawType` conversion,
|
|
/// but there's currently no way to do it when using traits in const.
|
|
pub unsafe trait RawDeviceIdIndex: RawDeviceId {
|
|
/// The offset (in bytes) to the context/data field in the raw device ID.
|
|
const DRIVER_DATA_OFFSET: usize;
|
|
|
|
/// The index stored at `DRIVER_DATA_OFFSET` of the implementor of the [`RawDeviceIdIndex`]
|
|
/// trait.
|
|
fn index(&self) -> usize;
|
|
}
|
|
|
|
/// A zero-terminated device id array.
|
|
#[repr(C)]
|
|
pub struct RawIdArray<T: RawDeviceId, const N: usize> {
|
|
ids: [T::RawType; N],
|
|
sentinel: MaybeUninit<T::RawType>,
|
|
}
|
|
|
|
impl<T: RawDeviceId, const N: usize> RawIdArray<T, N> {
|
|
#[doc(hidden)]
|
|
pub const fn size(&self) -> usize {
|
|
core::mem::size_of::<Self>()
|
|
}
|
|
}
|
|
|
|
/// A zero-terminated device id array, followed by context data.
|
|
#[repr(C)]
|
|
pub struct IdArray<T: RawDeviceId, U, const N: usize> {
|
|
raw_ids: RawIdArray<T, N>,
|
|
id_infos: [U; N],
|
|
}
|
|
|
|
impl<T: RawDeviceId, U, const N: usize> IdArray<T, U, N> {
|
|
/// Creates a new instance of the array.
|
|
///
|
|
/// The contents are derived from the given identifiers and context information.
|
|
///
|
|
/// # Safety
|
|
///
|
|
/// `data_offset` as `None` is always safe.
|
|
/// If `data_offset` is `Some(data_offset)`, then:
|
|
/// - `data_offset` must be the correct offset (in bytes) to the context/data field
|
|
/// (e.g., the `driver_data` field) within the raw device ID structure.
|
|
/// - The field at `data_offset` must be correctly sized to hold a `usize`.
|
|
const unsafe fn build(ids: [(T, U); N], data_offset: Option<usize>) -> Self {
|
|
let mut raw_ids = [const { MaybeUninit::<T::RawType>::uninit() }; N];
|
|
let mut infos = [const { MaybeUninit::uninit() }; N];
|
|
|
|
let mut i = 0usize;
|
|
while i < N {
|
|
// SAFETY: by the safety requirement of `RawDeviceId`, we're guaranteed that `T` is
|
|
// layout-wise compatible with `RawType`.
|
|
raw_ids[i] = unsafe { core::mem::transmute_copy(&ids[i].0) };
|
|
if let Some(data_offset) = data_offset {
|
|
// SAFETY: by the safety requirement of this function, this would be effectively
|
|
// `raw_ids[i].driver_data = i;`.
|
|
unsafe {
|
|
raw_ids[i]
|
|
.as_mut_ptr()
|
|
.byte_add(data_offset)
|
|
.cast::<usize>()
|
|
.write(i);
|
|
}
|
|
}
|
|
|
|
// SAFETY: this is effectively a move: `infos[i] = ids[i].1`. We make a copy here but
|
|
// later forget `ids`.
|
|
infos[i] = MaybeUninit::new(unsafe { core::ptr::read(&ids[i].1) });
|
|
i += 1;
|
|
}
|
|
|
|
core::mem::forget(ids);
|
|
|
|
Self {
|
|
raw_ids: RawIdArray {
|
|
// SAFETY: this is effectively `array_assume_init`, which is unstable, so we use
|
|
// `transmute_copy` instead. We have initialized all elements of `raw_ids` so this
|
|
// `array_assume_init` is safe.
|
|
ids: unsafe { core::mem::transmute_copy(&raw_ids) },
|
|
sentinel: MaybeUninit::zeroed(),
|
|
},
|
|
// SAFETY: We have initialized all elements of `infos` so this `array_assume_init` is
|
|
// safe.
|
|
id_infos: unsafe { core::mem::transmute_copy(&infos) },
|
|
}
|
|
}
|
|
|
|
/// Creates a new instance of the array without writing index values.
|
|
///
|
|
/// The contents are derived from the given identifiers and context information.
|
|
/// If the device implements [`RawDeviceIdIndex`], consider using [`IdArray::new`] instead.
|
|
pub const fn new_without_index(ids: [(T, U); N]) -> Self {
|
|
// SAFETY: Calling `Self::build` with `offset = None` is always safe,
|
|
// because no raw memory writes are performed in this case.
|
|
unsafe { Self::build(ids, None) }
|
|
}
|
|
|
|
/// Reference to the contained [`RawIdArray`].
|
|
pub const fn raw_ids(&self) -> &RawIdArray<T, N> {
|
|
&self.raw_ids
|
|
}
|
|
}
|
|
|
|
impl<T: RawDeviceId + RawDeviceIdIndex, U, const N: usize> IdArray<T, U, N> {
|
|
/// Creates a new instance of the array.
|
|
///
|
|
/// The contents are derived from the given identifiers and context information.
|
|
pub const fn new(ids: [(T, U); N]) -> Self {
|
|
// SAFETY: by the safety requirement of `RawDeviceIdIndex`,
|
|
// `T::DRIVER_DATA_OFFSET` is guaranteed to be the correct offset (in bytes) to
|
|
// a field within `T::RawType`.
|
|
unsafe { Self::build(ids, Some(T::DRIVER_DATA_OFFSET)) }
|
|
}
|
|
}
|
|
|
|
/// A device id table.
|
|
///
|
|
/// This trait is only implemented by `IdArray`.
|
|
///
|
|
/// The purpose of this trait is to allow `&'static dyn IdArray<T, U>` to be in context when `N` in
|
|
/// `IdArray` doesn't matter.
|
|
pub trait IdTable<T: RawDeviceId, U> {
|
|
/// Obtain the pointer to the ID table.
|
|
fn as_ptr(&self) -> *const T::RawType;
|
|
|
|
/// Obtain the pointer to the bus specific device ID from an index.
|
|
fn id(&self, index: usize) -> &T::RawType;
|
|
|
|
/// Obtain the pointer to the driver-specific information from an index.
|
|
fn info(&self, index: usize) -> &U;
|
|
}
|
|
|
|
impl<T: RawDeviceId, U, const N: usize> IdTable<T, U> for IdArray<T, U, N> {
|
|
fn as_ptr(&self) -> *const T::RawType {
|
|
// This cannot be `self.ids.as_ptr()`, as the return pointer must have correct provenance
|
|
// to access the sentinel.
|
|
core::ptr::from_ref(self).cast()
|
|
}
|
|
|
|
fn id(&self, index: usize) -> &T::RawType {
|
|
&self.raw_ids.ids[index]
|
|
}
|
|
|
|
fn info(&self, index: usize) -> &U {
|
|
&self.id_infos[index]
|
|
}
|
|
}
|
|
|
|
/// Create device table alias for modpost.
|
|
#[macro_export]
|
|
macro_rules! module_device_table {
|
|
($table_type: literal, $module_table_name:ident, $table_name:ident) => {
|
|
#[rustfmt::skip]
|
|
#[export_name =
|
|
concat!("__mod_device_table__", $table_type,
|
|
"__", module_path!(),
|
|
"_", line!(),
|
|
"_", stringify!($table_name))
|
|
]
|
|
static $module_table_name: [::core::mem::MaybeUninit<u8>; $table_name.raw_ids().size()] =
|
|
unsafe { ::core::mem::transmute_copy($table_name.raw_ids()) };
|
|
};
|
|
}
|