From: Danilo Krummrich <dakr@kernel.org>
To: dakr@kernel.org, aliceryhl@google.com, acourbot@nvidia.com,
daniel.almeida@collabora.com, ojeda@kernel.org, boqun@kernel.org,
gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org,
a.hindborg@kernel.org, tmgross@umich.edu, tamird@kernel.org,
work@onurozkan.dev, brauner@kernel.org, lyude@redhat.com,
j@jananu.net, alvin.sun@linux.dev, deborah.brouwer@collabora.com,
laura.nao@collabora.com, beata.michalska@arm.com
Cc: nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org,
rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/7] rust: drm: wrap fops open with RegistrationGuard
Date: Sat, 15 Aug 2026 01:09:03 +0200 [thread overview]
Message-ID: <20260814230923.1292966-6-dakr@kernel.org> (raw)
In-Reply-To: <20260814230923.1292966-1-dakr@kernel.org>
Add a Minor abstraction with RAII release and a fops_open() wrapper that
holds a RegistrationGuard (drm_dev_enter / drm_dev_exit) across the
entire drm_open() call.
This guarantees that drm_dev_unplug() in Registration::drop() waits for
the full open sequence to complete, so all files are visible in the
filelist when iterating for cleanup.
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---
rust/kernel/drm/device.rs | 63 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs
index a2940e172073..09903ed783e1 100644
--- a/rust/kernel/drm/device.rs
+++ b/rust/kernel/drm/device.rs
@@ -42,6 +42,42 @@
},
};
+/// A reference to a `struct drm_minor` with RAII release.
+struct Minor(NonNull<bindings::drm_minor>);
+
+// Methods use `#[inline(never)]` to prevent the unexported `drm_minor_acquire()` /
+// `drm_minor_release()` symbols from being inlined into driver modules.
+impl Minor {
+ /// Acquire a minor by ID. Increments the underlying device's refcount.
+ #[inline(never)]
+ fn acquire(minor_id: u32) -> Result<Self> {
+ // SAFETY: `drm_minors_xa` is a valid global xarray; any `minor_id` is safe to
+ // look up (returns ERR_PTR on failure).
+ let ptr =
+ unsafe { bindings::drm_minor_acquire(&raw mut bindings::drm_minors_xa, minor_id) };
+ Ok(Self(NonNull::new(from_err_ptr(ptr)?).ok_or(ENODEV)?))
+ }
+
+ /// Returns a reference to the DRM device for this minor.
+ ///
+ /// # Safety
+ ///
+ /// The caller must ensure that the minor belongs to a `Device<T>`.
+ unsafe fn device<T: drm::Driver>(&self) -> &Device<T, Userspace> {
+ // SAFETY: The minor is valid (from `drm_minor_acquire()`) and `minor->dev`
+ // is a valid `drm_device`. The caller guarantees it is a `Device<T>`.
+ unsafe { Device::from_raw((*self.0.as_ptr()).dev) }
+ }
+}
+
+impl Drop for Minor {
+ #[inline(never)]
+ fn drop(&mut self) {
+ // SAFETY: `self.0` came from `drm_minor_acquire()` and has not been released yet.
+ unsafe { bindings::drm_minor_release(self.0.as_ptr()) }
+ }
+}
+
#[cfg(CONFIG_DRM_LEGACY)]
macro_rules! drm_legacy_fields {
( $($field:ident: $val:expr),* $(,)? ) => {
@@ -198,11 +234,36 @@ const fn compute_features() -> u32 {
fops: &Self::FOPS,
};
+ /// Wrapper for `fops.open` that holds a [`RegistrationGuard`] across the entire `drm_open()`
+ /// call. This guarantees that `drm_dev_unplug()` in `Registration::drop()` waits for the full
+ /// open sequence.
+ extern "C" fn fops_open(inode: *mut bindings::inode, filp: *mut bindings::file) -> c_int {
+ let f = || -> Result<c_int> {
+ // SAFETY: `inode` is valid.
+ let minor_id = unsafe { bindings::iminor(inode) };
+ let minor = Minor::acquire(minor_id)?;
+
+ // SAFETY: `fops_open` is only installed for devices of type `T` (via `FOPS`).
+ let _guard = (unsafe { minor.device::<T>() })
+ .registration_guard()
+ .ok_or(ENODEV)?;
+
+ // SAFETY: `inode` and `filp` are valid. The RegistrationGuard ensures the entire
+ // `drm_open()` runs within the SRCU critical section.
+ Ok(unsafe { bindings::drm_open(inode, filp) })
+ };
+
+ match f() {
+ Ok(ret) => ret,
+ Err(e) => e.to_errno(),
+ }
+ }
+
const FOPS: bindings::file_operations = {
let mut fops: bindings::file_operations = pin_init::zeroed();
fops.owner = core::ptr::null_mut();
- fops.open = Some(bindings::drm_open);
+ fops.open = Some(Self::fops_open);
fops.release = Some(bindings::drm_release);
fops.unlocked_ioctl = Some(bindings::drm_ioctl);
#[cfg(CONFIG_COMPAT)]
--
2.55.0
next prev parent reply other threads:[~2026-08-14 23:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-14 23:08 [PATCH 0/7] lifetime-parameterized DRM File private data Danilo Krummrich
2026-08-14 23:08 ` [PATCH 1/7] rust: drm: rename Ioctl device context to Userspace Danilo Krummrich
2026-08-14 23:09 ` [PATCH 2/7] rust: drm: gem: gate open/close callbacks with RegistrationGuard Danilo Krummrich
2026-08-14 23:21 ` sashiko-bot
2026-08-14 23:09 ` [PATCH 3/7] rust: drm: move file_operations from gem to device Danilo Krummrich
2026-08-14 23:22 ` sashiko-bot
2026-08-14 23:09 ` [PATCH 4/7] rust: fs: add iminor() helper Danilo Krummrich
2026-08-14 23:09 ` Danilo Krummrich [this message]
2026-08-14 23:29 ` [PATCH 5/7] rust: drm: wrap fops open with RegistrationGuard sashiko-bot
2026-08-14 23:09 ` [PATCH 6/7] rust: drm: make Driver::File lifetime-parameterized Danilo Krummrich
2026-08-14 23:23 ` sashiko-bot
2026-08-14 23:09 ` [PATCH 7/7] rust: drm: return impl PinInit from DriverFile::open() Danilo Krummrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260814230923.1292966-6-dakr@kernel.org \
--to=dakr@kernel.org \
--cc=a.hindborg@kernel.org \
--cc=acourbot@nvidia.com \
--cc=aliceryhl@google.com \
--cc=alvin.sun@linux.dev \
--cc=beata.michalska@arm.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun@kernel.org \
--cc=brauner@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=deborah.brouwer@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gary@garyguo.net \
--cc=j@jananu.net \
--cc=laura.nao@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=lyude@redhat.com \
--cc=nova-gpu@lists.linux.dev \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tamird@kernel.org \
--cc=tmgross@umich.edu \
--cc=work@onurozkan.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.