[PATCH v3] rust: lock: Export Guard::do_unlocked()
From: Lyude Paul
Date: Thu Jul 24 2025 - 17:16:57 EST
In RVKMS, I discovered a silly issue where as a result of our HrTimer for
vblank emulation and our vblank enable/disable callbacks sharing a
spinlock, it was possible to deadlock while trying to disable the vblank
timer.
The solution for this ended up being simple: keep track of when the HrTimer
could potentially acquire the shared spinlock, and simply drop the spinlock
temporarily from our vblank enable/disable callbacks when stopping the
timer. And do_unlocked() ended up being perfect for this.
Since this seems like it's useful, let's export this for use by the rest of
the world and write short documentation for it.
Signed-off-by: Lyude Paul <lyude@xxxxxxxxxx>
---
V2:
* Fix documentation for do_unlocked
* Add an example
V3:
* Documentation changes from Miguel
rust/kernel/sync/lock.rs | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs
index e82fa5be289c1..800cdd16dce6e 100644
--- a/rust/kernel/sync/lock.rs
+++ b/rust/kernel/sync/lock.rs
@@ -228,7 +228,40 @@ pub fn lock_ref(&self) -> &'a Lock<T, B> {
self.lock
}
- pub(crate) fn do_unlocked<U>(&mut self, cb: impl FnOnce() -> U) -> U {
+ /// Releases this [`Guard`]'s lock temporarily, executes `cb` and then re-acquires it.
+ ///
+ /// This can be useful for situations where you may need to do a temporary unlock dance to avoid
+ /// issues like circular locking dependencies.
+ ///
+ /// It returns the value returned by the closure.
+ ///
+ /// # Examples
+ ///
+ /// The following example shows how to use [`Guard::do_unlocked`] to temporarily release a lock,
+ /// do some work, then re-lock it.
+ ///
+ /// ```
+ /// # use kernel::{new_spinlock, sync::lock::{Backend, Guard, Lock}};
+ /// # use pin_init::stack_pin_init;
+ /// fn assert_held<T, B: Backend>(guard: &Guard<'_, T, B>, lock: &Lock<T, B>) {
+ /// // Address-equal means the same lock.
+ /// assert!(core::ptr::eq(guard.lock_ref(), lock));
+ /// }
+ ///
+ /// stack_pin_init! {
+ /// let l = new_spinlock!(42)
+ /// }
+ ///
+ /// let mut g = l.lock();
+ /// let val = *g;
+ ///
+ /// // The lock will be released, but only temporarily
+ /// g.do_unlocked(|| assert_eq!(val, 42));
+ ///
+ /// // `g` originates from `l` and should be relocked now.
+ /// assert_held(&g, &l);
+ /// ```
+ pub fn do_unlocked<U>(&mut self, cb: impl FnOnce() -> U) -> U {
// SAFETY: The caller owns the lock, so it is safe to unlock it.
unsafe { B::unlock(self.lock.state.get(), &self.state) };
base-commit: dff64b072708ffef23c117fa1ee1ea59eb417807
--
2.50.0