Skip to content

Commit 15abc88

Browse files
Lyudefbq
authored andcommitted
rust: sync: Add Lock::from_raw() for Lock<(), B>
The KMS bindings [1] have a few bindings that require manually acquiring specific locks before calling certain functions. At the moment though, the only way of acquiring these locks in bindings is to simply call the C locking functions directly - since said locks are not initialized on the Rust side of things. However - if we add `#[repr(C)]` to `Lock<(), B>`, then given `()` is a ZST - `Lock<(), B>` becomes equivalent in data layout to its inner `B::State` type. Since locks in C don't have data explicitly associated with them anyway, we can take advantage of this to add a `Lock::from_raw()` function that can translate a raw pointer to `B::State` into its proper `Lock<(), B>` equivalent. This lets us simply acquire a reference to the lock in question and work with it like it was initialized on the Rust side of things, allowing us to use less unsafe code to implement bindings with lock requirements. [Boqun: Use "Link:" instead of a URL and format the commit log] Signed-off-by: Lyude Paul <lyude@redhat.com> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Link: https://patchwork.freedesktop.org/series/131522/ [1] Signed-off-by: Boqun Feng <boqun.feng@gmail.com> Link: https://lore.kernel.org/r/20241119231146.2298971-2-lyude@redhat.com
1 parent 9793c9b commit 15abc88

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

rust/kernel/sync/lock.rs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ pub unsafe trait Backend {
9696
///
9797
/// Exposes one of the kernel locking primitives. Which one is exposed depends on the lock
9898
/// [`Backend`] specified as the generic parameter `B`.
99+
#[repr(C)]
99100
#[pin_data]
100101
pub struct Lock<T: ?Sized, B: Backend> {
101102
/// The kernel lock object.
@@ -134,6 +135,28 @@ impl<T, B: Backend> Lock<T, B> {
134135
}
135136
}
136137

138+
impl<B: Backend> Lock<(), B> {
139+
/// Constructs a [`Lock`] from a raw pointer.
140+
///
141+
/// This can be useful for interacting with a lock which was initialised outside of Rust.
142+
///
143+
/// # Safety
144+
///
145+
/// The caller promises that `ptr` points to a valid initialised instance of [`State`] during
146+
/// the whole lifetime of `'a`.
147+
///
148+
/// [`State`]: Backend::State
149+
pub unsafe fn from_raw<'a>(ptr: *mut B::State) -> &'a Self {
150+
// SAFETY:
151+
// - By the safety contract `ptr` must point to a valid initialised instance of `B::State`
152+
// - Since the lock data type is `()` which is a ZST, `state` is the only non-ZST member of
153+
// the struct
154+
// - Combined with `#[repr(C)]`, this guarantees `Self` has an equivalent data layout to
155+
// `B::State`.
156+
unsafe { &*ptr.cast() }
157+
}
158+
}
159+
137160
impl<T: ?Sized, B: Backend> Lock<T, B> {
138161
/// Acquires the lock and gives the caller access to the data protected by it.
139162
pub fn lock(&self) -> Guard<'_, T, B> {

0 commit comments

Comments
 (0)