Pass registration data to ioctl handlers via drm::Device<Registered>::registration_data_with(). The closure's HRTB ties the lifetime to the closure scope, and the pointer cast shortens it from 'static internally. The reference is valid for the duration of the drm_dev_enter/exit critical section held by RegistrationGuard.
Signed-off-by: Danilo Krummrich <[email protected]> --- drivers/gpu/drm/nova/file.rs | 3 +++ drivers/gpu/drm/tyr/file.rs | 1 + rust/kernel/drm/ioctl.rs | 31 ++++++++++++++++++------------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/nova/file.rs b/drivers/gpu/drm/nova/file.rs index 19fb89b28984..208be4e38188 100644 --- a/drivers/gpu/drm/nova/file.rs +++ b/drivers/gpu/drm/nova/file.rs @@ -28,6 +28,7 @@ impl File { /// IOCTL: get_param: Query GPU / driver metadata. pub(crate) fn get_param( dev: &NovaDevice<Registered>, + _reg_data: &(), getparam: &mut uapi::drm_nova_getparam, _file: &drm::File<File>, ) -> Result<u32> { @@ -48,6 +49,7 @@ pub(crate) fn get_param( /// IOCTL: gem_create: Create a new DRM GEM object. pub(crate) fn gem_create( dev: &NovaDevice<Registered>, + _reg_data: &(), req: &mut uapi::drm_nova_gem_create, file: &drm::File<File>, ) -> Result<u32> { @@ -61,6 +63,7 @@ pub(crate) fn gem_create( /// IOCTL: gem_info: Query GEM metadata. pub(crate) fn gem_info( _dev: &NovaDevice<Registered>, + _reg_data: &(), req: &mut uapi::drm_nova_gem_info, file: &drm::File<File>, ) -> Result<u32> { diff --git a/drivers/gpu/drm/tyr/file.rs b/drivers/gpu/drm/tyr/file.rs index fb9233eae01c..b686041d5d6b 100644 --- a/drivers/gpu/drm/tyr/file.rs +++ b/drivers/gpu/drm/tyr/file.rs @@ -32,6 +32,7 @@ fn open(_dev: &drm::Device<Self::Driver>) -> Result<Pin<KBox<Self>>> { impl TyrDrmFileData { pub(crate) fn dev_query( ddev: &TyrDrmDevice<Registered>, + _reg_data: &(), devquery: &mut uapi::drm_panthor_dev_query, _file: &TyrDrmFile, ) -> Result<u32> { diff --git a/rust/kernel/drm/ioctl.rs b/rust/kernel/drm/ioctl.rs index 6cefd26b31f9..75944e72d7af 100644 --- a/rust/kernel/drm/ioctl.rs +++ b/rust/kernel/drm/ioctl.rs @@ -97,12 +97,13 @@ pub const fn __dev_ctx_cast<T: super::super::Driver>( #[inline(always)] pub unsafe fn __call_ioctl< 'a, + Anchor, Dev: 'a, Data: 'a, F: super::super::file::DriverFile + 'a, Ret, >( - _anchor: &'a (), + _anchor: &'a Anchor, dev: &'a Dev, raw_data: *mut ::core::ffi::c_void, raw_file: *mut drm_file, @@ -128,6 +129,7 @@ pub unsafe fn __call_ioctl< /// /// ```ignore /// fn foo(device: &kernel::drm::Device<Self, kernel::drm::Registered>, +/// reg_data: &<Self::RegistrationData as kernel::types::ForLt>::Of<'_>, /// data: &mut uapi::argument_type, /// file: &kernel::drm::File<Self::File>, /// ) -> Result<u32> @@ -202,25 +204,28 @@ macro_rules! declare_drm_ioctls { unsafe { &*__ptr }, unreachable!(), unreachable!(), + unreachable!(), ) }; let Some(guard) = dev.registration_guard() else { return $crate::error::code::ENODEV.to_errno(); }; - let __anchor = (); - // SAFETY: - // - The ioctl argument has size `_IOC_SIZE(cmd)`, which we asserted - // above matches the size of this type, and all bit patterns of UAPI - // structs must be valid. The argument is exclusively owned by this - // handler, guaranteed by `drm_ioctl()` to remain valid for the - // duration of the call. - // - `raw_file` is a valid `struct drm_file` pointer provided by the - // DRM core. - match unsafe { $crate::drm::ioctl::internal::__call_ioctl( - &__anchor, &*guard, raw_data, raw_file, $func, - ) } { + match guard.registration_data_with(|reg_data| { + // SAFETY: + // - The ioctl argument has size `_IOC_SIZE(cmd)`, which we asserted + // above matches the size of this type, and all bit patterns of + // UAPI structs must be valid. The argument is exclusively owned + // by this handler, guaranteed by `drm_ioctl()` to remain valid + // for the duration of the call. + // - `raw_file` is a valid `struct drm_file` pointer provided by + // the DRM core. + unsafe { $crate::drm::ioctl::internal::__call_ioctl( + reg_data, &*guard, raw_data, raw_file, + |dev, data, file| $func(dev, reg_data, data, file), + ) } + }) { Err(e) => e.to_errno(), Ok(i) => i.try_into() .unwrap_or($crate::error::code::ERANGE.to_errno()), -- 2.54.0
