mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08: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 ...
203 lines
7.0 KiB
Rust
203 lines
7.0 KiB
Rust
// SPDX-License-Identifier: GPL-2.0 OR MIT
|
|
|
|
//! DRM device.
|
|
//!
|
|
//! C header: [`include/linux/drm/drm_device.h`](srctree/include/linux/drm/drm_device.h)
|
|
|
|
use crate::{
|
|
bindings, device, drm,
|
|
drm::driver::AllocImpl,
|
|
error::from_err_ptr,
|
|
error::Result,
|
|
prelude::*,
|
|
types::{ARef, AlwaysRefCounted, Opaque},
|
|
};
|
|
use core::{mem, ops::Deref, ptr, ptr::NonNull};
|
|
|
|
#[cfg(CONFIG_DRM_LEGACY)]
|
|
macro_rules! drm_legacy_fields {
|
|
( $($field:ident: $val:expr),* $(,)? ) => {
|
|
bindings::drm_driver {
|
|
$( $field: $val ),*,
|
|
firstopen: None,
|
|
preclose: None,
|
|
dma_ioctl: None,
|
|
dma_quiescent: None,
|
|
context_dtor: None,
|
|
irq_handler: None,
|
|
irq_preinstall: None,
|
|
irq_postinstall: None,
|
|
irq_uninstall: None,
|
|
get_vblank_counter: None,
|
|
enable_vblank: None,
|
|
disable_vblank: None,
|
|
dev_priv_size: 0,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(not(CONFIG_DRM_LEGACY))]
|
|
macro_rules! drm_legacy_fields {
|
|
( $($field:ident: $val:expr),* $(,)? ) => {
|
|
bindings::drm_driver {
|
|
$( $field: $val ),*
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A typed DRM device with a specific `drm::Driver` implementation.
|
|
///
|
|
/// The device is always reference-counted.
|
|
///
|
|
/// # Invariants
|
|
///
|
|
/// `self.dev` is a valid instance of a `struct device`.
|
|
#[repr(C)]
|
|
#[pin_data]
|
|
pub struct Device<T: drm::Driver> {
|
|
dev: Opaque<bindings::drm_device>,
|
|
#[pin]
|
|
data: T::Data,
|
|
}
|
|
|
|
impl<T: drm::Driver> Device<T> {
|
|
const VTABLE: bindings::drm_driver = drm_legacy_fields! {
|
|
load: None,
|
|
open: Some(drm::File::<T::File>::open_callback),
|
|
postclose: Some(drm::File::<T::File>::postclose_callback),
|
|
unload: None,
|
|
release: None,
|
|
master_set: None,
|
|
master_drop: None,
|
|
debugfs_init: None,
|
|
gem_create_object: T::Object::ALLOC_OPS.gem_create_object,
|
|
prime_handle_to_fd: T::Object::ALLOC_OPS.prime_handle_to_fd,
|
|
prime_fd_to_handle: T::Object::ALLOC_OPS.prime_fd_to_handle,
|
|
gem_prime_import: T::Object::ALLOC_OPS.gem_prime_import,
|
|
gem_prime_import_sg_table: T::Object::ALLOC_OPS.gem_prime_import_sg_table,
|
|
dumb_create: T::Object::ALLOC_OPS.dumb_create,
|
|
dumb_map_offset: T::Object::ALLOC_OPS.dumb_map_offset,
|
|
show_fdinfo: None,
|
|
fbdev_probe: None,
|
|
|
|
major: T::INFO.major,
|
|
minor: T::INFO.minor,
|
|
patchlevel: T::INFO.patchlevel,
|
|
name: T::INFO.name.as_char_ptr() as *mut _,
|
|
desc: T::INFO.desc.as_char_ptr() as *mut _,
|
|
|
|
driver_features: drm::driver::FEAT_GEM,
|
|
ioctls: T::IOCTLS.as_ptr(),
|
|
num_ioctls: T::IOCTLS.len() as i32,
|
|
fops: &Self::GEM_FOPS as _,
|
|
};
|
|
|
|
const GEM_FOPS: bindings::file_operations = drm::gem::create_fops();
|
|
|
|
/// Create a new `drm::Device` for a `drm::Driver`.
|
|
pub fn new(dev: &device::Device, data: impl PinInit<T::Data, Error>) -> Result<ARef<Self>> {
|
|
// SAFETY:
|
|
// - `VTABLE`, as a `const` is pinned to the read-only section of the compilation,
|
|
// - `dev` is valid by its type invarants,
|
|
let raw_drm: *mut Self = unsafe {
|
|
bindings::__drm_dev_alloc(
|
|
dev.as_raw(),
|
|
&Self::VTABLE,
|
|
mem::size_of::<Self>(),
|
|
mem::offset_of!(Self, dev),
|
|
)
|
|
}
|
|
.cast();
|
|
let raw_drm = NonNull::new(from_err_ptr(raw_drm)?).ok_or(ENOMEM)?;
|
|
|
|
// SAFETY: `raw_drm` is a valid pointer to `Self`.
|
|
let raw_data = unsafe { ptr::addr_of_mut!((*raw_drm.as_ptr()).data) };
|
|
|
|
// SAFETY:
|
|
// - `raw_data` is a valid pointer to uninitialized memory.
|
|
// - `raw_data` will not move until it is dropped.
|
|
unsafe { data.__pinned_init(raw_data) }.inspect_err(|_| {
|
|
// SAFETY: `__drm_dev_alloc()` was successful, hence `raw_drm` must be valid and the
|
|
// refcount must be non-zero.
|
|
unsafe { bindings::drm_dev_put(ptr::addr_of_mut!((*raw_drm.as_ptr()).dev).cast()) };
|
|
})?;
|
|
|
|
// SAFETY: The reference count is one, and now we take ownership of that reference as a
|
|
// `drm::Device`.
|
|
Ok(unsafe { ARef::from_raw(raw_drm) })
|
|
}
|
|
|
|
pub(crate) fn as_raw(&self) -> *mut bindings::drm_device {
|
|
self.dev.get()
|
|
}
|
|
|
|
/// # Safety
|
|
///
|
|
/// `ptr` must be a valid pointer to a `struct device` embedded in `Self`.
|
|
unsafe fn from_drm_device(ptr: *const bindings::drm_device) -> *mut Self {
|
|
let ptr: *const Opaque<bindings::drm_device> = ptr.cast();
|
|
|
|
// SAFETY: By the safety requirements of this function `ptr` is a valid pointer to a
|
|
// `struct drm_device` embedded in `Self`.
|
|
unsafe { crate::container_of!(ptr, Self, dev) }.cast_mut()
|
|
}
|
|
|
|
/// Not intended to be called externally, except via declare_drm_ioctls!()
|
|
///
|
|
/// # Safety
|
|
///
|
|
/// Callers must ensure that `ptr` is valid, non-null, and has a non-zero reference count,
|
|
/// i.e. it must be ensured that the reference count of the C `struct drm_device` `ptr` points
|
|
/// to can't drop to zero, for the duration of this function call and the entire duration when
|
|
/// the returned reference exists.
|
|
///
|
|
/// Additionally, callers must ensure that the `struct device`, `ptr` is pointing to, is
|
|
/// embedded in `Self`.
|
|
#[doc(hidden)]
|
|
pub unsafe fn as_ref<'a>(ptr: *const bindings::drm_device) -> &'a Self {
|
|
// SAFETY: By the safety requirements of this function `ptr` is a valid pointer to a
|
|
// `struct drm_device` embedded in `Self`.
|
|
let ptr = unsafe { Self::from_drm_device(ptr) };
|
|
|
|
// SAFETY: `ptr` is valid by the safety requirements of this function.
|
|
unsafe { &*ptr.cast() }
|
|
}
|
|
}
|
|
|
|
impl<T: drm::Driver> Deref for Device<T> {
|
|
type Target = T::Data;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.data
|
|
}
|
|
}
|
|
|
|
// SAFETY: DRM device objects are always reference counted and the get/put functions
|
|
// satisfy the requirements.
|
|
unsafe impl<T: drm::Driver> AlwaysRefCounted for Device<T> {
|
|
fn inc_ref(&self) {
|
|
// SAFETY: The existence of a shared reference guarantees that the refcount is non-zero.
|
|
unsafe { bindings::drm_dev_get(self.as_raw()) };
|
|
}
|
|
|
|
unsafe fn dec_ref(obj: NonNull<Self>) {
|
|
// SAFETY: The safety requirements guarantee that the refcount is non-zero.
|
|
unsafe { bindings::drm_dev_put(obj.cast().as_ptr()) };
|
|
}
|
|
}
|
|
|
|
impl<T: drm::Driver> AsRef<device::Device> for Device<T> {
|
|
fn as_ref(&self) -> &device::Device {
|
|
// SAFETY: `bindings::drm_device::dev` is valid as long as the DRM device itself is valid,
|
|
// which is guaranteed by the type invariant.
|
|
unsafe { device::Device::as_ref((*self.as_raw()).dev) }
|
|
}
|
|
}
|
|
|
|
// SAFETY: A `drm::Device` can be released from any thread.
|
|
unsafe impl<T: drm::Driver> Send for Device<T> {}
|
|
|
|
// SAFETY: A `drm::Device` can be shared among threads because all immutable methods are protected
|
|
// by the synchronization in `struct drm_device`.
|
|
unsafe impl<T: drm::Driver> Sync for Device<T> {}
|