mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00: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 ...
210 lines
7.4 KiB
Rust
210 lines
7.4 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: Some(Self::release),
|
|
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().cast_mut(),
|
|
desc: T::INFO.desc.as_char_ptr().cast_mut(),
|
|
|
|
driver_features: drm::driver::FEAT_GEM,
|
|
ioctls: T::IOCTLS.as_ptr(),
|
|
num_ioctls: T::IOCTLS.len() as i32,
|
|
fops: &Self::GEM_FOPS,
|
|
};
|
|
|
|
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 {
|
|
// 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!(Opaque::cast_from(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 from_raw<'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() }
|
|
}
|
|
|
|
extern "C" fn release(ptr: *mut bindings::drm_device) {
|
|
// SAFETY: `ptr` is a valid pointer to a `struct drm_device` and embedded in `Self`.
|
|
let this = unsafe { Self::from_drm_device(ptr) };
|
|
|
|
// SAFETY:
|
|
// - When `release` runs it is guaranteed that there is no further access to `this`.
|
|
// - `this` is valid for dropping.
|
|
unsafe { core::ptr::drop_in_place(this) };
|
|
}
|
|
}
|
|
|
|
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::from_raw((*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> {}
|