Skip to content

Commit

Permalink
rust: types: make Opaque be !Unpin
Browse files Browse the repository at this point in the history
[ Upstream commit 0b4e3b6 ]

Adds a `PhantomPinned` field to `Opaque<T>`. This removes the last Rust
guarantee: the assumption that the type `T` can be freely moved. This is
not the case for many types from the C side (e.g. if they contain a
`struct list_head`). This change removes the need to add a
`PhantomPinned` field manually to Rust structs that contain C structs
which must not be moved.

Signed-off-by: Benno Lossin <benno.lossin@proton.me>
Reviewed-by: Gary Guo <gary@garyguo.net>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Andreas Hindborg <a.hindborg@samsung.com>
Link: https://lore.kernel.org/r/20230630150216.109789-1-benno.lossin@proton.me
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Benno Lossin authored and gregkh committed Nov 8, 2023
1 parent 7fba725 commit a58f5fa
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions rust/kernel/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::init::{self, PinInit};
use alloc::boxed::Box;
use core::{
cell::UnsafeCell,
marker::PhantomData,
marker::{PhantomData, PhantomPinned},
mem::MaybeUninit,
ops::{Deref, DerefMut},
ptr::NonNull,
Expand Down Expand Up @@ -206,17 +206,26 @@ impl<T, F: FnOnce(T)> Drop for ScopeGuard<T, F> {
///
/// This is meant to be used with FFI objects that are never interpreted by Rust code.
#[repr(transparent)]
pub struct Opaque<T>(UnsafeCell<MaybeUninit<T>>);
pub struct Opaque<T> {
value: UnsafeCell<MaybeUninit<T>>,
_pin: PhantomPinned,
}

impl<T> Opaque<T> {
/// Creates a new opaque value.
pub const fn new(value: T) -> Self {
Self(UnsafeCell::new(MaybeUninit::new(value)))
Self {
value: UnsafeCell::new(MaybeUninit::new(value)),
_pin: PhantomPinned,
}
}

/// Creates an uninitialised value.
pub const fn uninit() -> Self {
Self(UnsafeCell::new(MaybeUninit::uninit()))
Self {
value: UnsafeCell::new(MaybeUninit::uninit()),
_pin: PhantomPinned,
}
}

/// Creates a pin-initializer from the given initializer closure.
Expand All @@ -240,7 +249,7 @@ impl<T> Opaque<T> {

/// Returns a raw pointer to the opaque data.
pub fn get(&self) -> *mut T {
UnsafeCell::get(&self.0).cast::<T>()
UnsafeCell::get(&self.value).cast::<T>()
}

/// Gets the value behind `this`.
Expand Down

0 comments on commit a58f5fa

Please sign in to comment.