Commit 8f65291d authored Mar 07, 2025 by Alice Ryhl Committed by Ingo Molnar Mar 08, 2025

rust: sync: Add accessor for the lock behind a given guard



In order to assert a particular `Guard` is associated with a particular
`Lock`, add an accessor to obtain a reference to the underlying `Lock`
of a `Guard`.

Binder needs this assertion to ensure unsafe list operations are done
with the correct lock held.

[Boqun: Capitalize the title and reword the commit log]

Signed-off-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Fiona Behrens <me@kloenk.dev>
Link: https://lore.kernel.org/r/20250205-guard-get-lock-v2-1-ba32a8c1d5b7@google.com
Link: https://lore.kernel.org/r/20250307232717.1759087-8-boqun.feng@gmail.com

parent de4b59d6

rust/kernel/sync/lock.rs

+6 −1

Original line number	Diff line number	Diff line
		@@ -199,7 +199,12 @@ pub struct Guard<'a, T: ?Sized, B: Backend> {
		// SAFETY: `Guard` is sync when the data protected by the lock is also sync.
		unsafe impl<T: Sync + ?Sized, B: Backend> Sync for Guard<'_, T, B> {}

		impl<T: ?Sized, B: Backend> Guard<'_, T, B> {
		impl<'a, T: ?Sized, B: Backend> Guard<'a, T, B> {
		/// Returns the lock that this guard originates from.
		pub fn lock_ref(&self) -> &'a Lock<T, B> {
		self.lock
		}

		pub(crate) 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) };