From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E08731C84D7; Sat, 20 Jun 2026 00:59:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781917196; cv=none; b=qLQxU1CCoYaX68qxTsTv4rzAjq9dzgg/BBqkKywBbQaPBJ7dRCuiPVXBz4wMbOr0NXsWS4qGM5mj9RZE1vMkzGmjrrl3N1R9umuoRsVny3h0Esz8ZqJqWMQQdX2BQNyy0A9wX4Tl9bzhUiovH/uMBtbxen1czeONmU4DTXc0RAY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781917196; c=relaxed/simple; bh=y2T6zLywtCoI6Rp3zIdp609rJLz+vQaztyf6EPUI2Zw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oTxU5XFfuakSa7LZgoUyTQ6Ch1WyEQe4c/uu01ymrK2/3wHJCdjs5OrZ3h8kpF0aXTb00CWwRZ3zdUpK4NKSKq95RnvVsK+PEmH5MCFOc6JGUBnUh/DsUaMnpynmxDClzpU05ZuNWotgFEfIsnGVShK/RYK7fSfTey410yuBfqU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SBmQ3YRo; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SBmQ3YRo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC0CC1F000E9; Sat, 20 Jun 2026 00:59:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781917194; bh=hnLJscSYFxaJHX8//CAzr3Tijjv4ko8kGOqkgAPa8gA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SBmQ3YRoV9s5NwSoL1z1guf7zs8L5lkeh3TMZ0nlCrHFgTBYJmjt1A9EcQJotHtmG HU3AMiwVEA2B7un5D0aR2jooLyxVGQV8KfQStjj/fNg6AHHnUdHd1DhQ5aaxFgH6J+ dGG/1SfM3VM1D0rzu5PHH6I9dFHO+WOTfhfJdp6DdGlZyiEygg9FhIZqVTSDdEZ//j Oth6GS1IkN9ZX7X4IBuuMcZasoa1g00BvagOP+aqck6oQlLXnp/iZ9MrqbTiJqdI78 uc1EJa7dj5JNGYuONv4fD06Es79ZQAqZIIVw4Dd9e3YEtcXPcZg2pnfOUwsPebFLjc FlAHwbu5jP43A== From: Danilo Krummrich To: dakr@kernel.org, aliceryhl@google.com, daniel.almeida@collabora.com, acourbot@nvidia.com, ecourtney@nvidia.com, ojeda@kernel.org, boqun@kernel.org, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, tmgross@umich.edu, deborah.brouwer@collabora.com, boris.brezillon@collabora.com, lyude@redhat.com Cc: driver-core@lists.linux.dev, linux-kernel@vger.kernel.org, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, rust-for-linux@vger.kernel.org Subject: [PATCH v3 12/13] rust: drm: Pass registration data to ioctl handlers Date: Sat, 20 Jun 2026 02:51:24 +0200 Message-ID: <20260620005431.1562115-13-dakr@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260620005431.1562115-1-dakr@kernel.org> References: <20260620005431.1562115-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: driver-core@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Pass registration data to ioctl handlers via drm::Device::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 --- drivers/gpu/drm/nova/file.rs | 3 +++ drivers/gpu/drm/tyr/file.rs | 1 + rust/kernel/drm/ioctl.rs | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nova/file.rs b/drivers/gpu/drm/nova/file.rs index a3b7bd36792c..4c9fa409a8be 100644 --- a/drivers/gpu/drm/nova/file.rs +++ b/drivers/gpu/drm/nova/file.rs @@ -24,6 +24,7 @@ impl File { /// IOCTL: get_param: Query GPU / driver metadata. pub(crate) fn get_param( dev: &NovaDevice, + _reg_data: &(), getparam: &mut uapi::drm_nova_getparam, _file: &drm::File, ) -> Result { @@ -44,6 +45,7 @@ pub(crate) fn get_param( /// IOCTL: gem_create: Create a new DRM GEM object. pub(crate) fn gem_create( dev: &NovaDevice, + _reg_data: &(), req: &mut uapi::drm_nova_gem_create, file: &drm::File, ) -> Result { @@ -57,6 +59,7 @@ pub(crate) fn gem_create( /// IOCTL: gem_info: Query GEM metadata. pub(crate) fn gem_info( _dev: &NovaDevice, + _reg_data: &(), req: &mut uapi::drm_nova_gem_info, file: &drm::File, ) -> Result { diff --git a/drivers/gpu/drm/tyr/file.rs b/drivers/gpu/drm/tyr/file.rs index 31411da203c5..6262114c6a8d 100644 --- a/drivers/gpu/drm/tyr/file.rs +++ b/drivers/gpu/drm/tyr/file.rs @@ -29,6 +29,7 @@ fn open(_dev: &drm::Device) -> Result>> { impl TyrDrmFileData { pub(crate) fn dev_query( ddev: &TyrDrmDevice, + _reg_data: &(), devquery: &mut uapi::drm_panthor_dev_query, _file: &TyrDrmFile, ) -> Result { diff --git a/rust/kernel/drm/ioctl.rs b/rust/kernel/drm/ioctl.rs index c6a03be018e6..ecc1a0383635 100644 --- a/rust/kernel/drm/ioctl.rs +++ b/rust/kernel/drm/ioctl.rs @@ -83,6 +83,7 @@ pub mod internal { /// /// ```ignore /// fn foo(device: &kernel::drm::Device, +/// reg_data: &::Of<'_>, /// data: &mut uapi::argument_type, /// file: &kernel::drm::File, /// ) -> Result @@ -143,9 +144,16 @@ macro_rules! declare_drm_ioctls { // type to `$func`'s first parameter, which the compiler cannot infer // through method resolution and associated-type projections alone. #[allow(unreachable_code)] - let _ = || $func(dev, unreachable!(), unreachable!()); + let _ = || { + $func( + dev, + unreachable!(), + unreachable!(), + unreachable!(), + ) + }; - let Some(_guard) = dev.registration_guard() else { + let Some(guard) = dev.registration_guard() else { return $crate::error::code::ENODEV.to_errno(); }; // SAFETY: The ioctl argument has size `_IOC_SIZE(cmd)`, which we @@ -160,7 +168,9 @@ macro_rules! declare_drm_ioctls { // SAFETY: This is just the DRM file structure let file = unsafe { $crate::drm::File::from_raw(raw_file) }; - match $func(dev, data, file) { + match guard.registration_data_with(|reg_data| { + $func(&*guard, 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