mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 04:47:05 +00:00
Code Issues Releases Wiki Activity

rust: make UnsafeCell the outer type in Opaque

Browse source 
[ Upstream commit 35cad617df ]

When combining `UnsafeCell` with `MaybeUninit`, it is idiomatic to use
`UnsafeCell` as the outer type. Intuitively, this is because a
`MaybeUninit<T>` might not contain a `T`, but we always want the effect
of the `UnsafeCell`, even if the inner value is uninitialized.

Now, strictly speaking, this doesn't really make a difference. The
compiler will always apply the `UnsafeCell` effect even if the inner
value is uninitialized. But I think we should follow the convention
here.

Signed-off-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Benno Lossin <benno.lossin@proton.me>
Reviewed-by: Gary Guo <gary@garyguo.net>
Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
Link: https://lore.kernel.org/r/20230614115328.2825961-1-aliceryhl@google.com
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Stable-dep-of: 0b4e3b6f6b ("rust: types: make `Opaque` be `!Unpin`")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Alice Ryhl 2023-06-14 11:53:28 +00:00 committed by Greg Kroah-Hartman
parent 07256dc046
commit 7fba72536e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rust/kernel/types.rs
View file

@ -206,17 +206,17 @@ fn drop(&mut self) {
/// ///
/// This is meant to be used with FFI objects that are never interpreted by Rust code. /// This is meant to be used with FFI objects that are never interpreted by Rust code.
#[repr(transparent)] #[repr(transparent)]
pub struct Opaque<T>(MaybeUninit<UnsafeCell<T>>); pub struct Opaque<T>(UnsafeCell<MaybeUninit<T>>);
impl<T> Opaque<T> { impl<T> Opaque<T> {
/// Creates a new opaque value. /// Creates a new opaque value.
pub const fn new(value: T) -> Self { pub const fn new(value: T) -> Self {
Self(MaybeUninit::new(UnsafeCell::new(value))) Self(UnsafeCell::new(MaybeUninit::new(value)))
} }
/// Creates an uninitialised value. /// Creates an uninitialised value.
pub const fn uninit() -> Self { pub const fn uninit() -> Self {
Self(MaybeUninit::uninit()) Self(UnsafeCell::new(MaybeUninit::uninit()))
} }
/// Creates a pin-initializer from the given initializer closure. /// Creates a pin-initializer from the given initializer closure.
@ -240,7 +240,7 @@ pub fn ffi_init(init_func: impl FnOnce(*mut T)) -> impl PinInit<Self> {
/// Returns a raw pointer to the opaque data. /// Returns a raw pointer to the opaque data.
pub fn get(&self) -> *mut T { pub fn get(&self) -> *mut T {
UnsafeCell::raw_get(self.0.as_ptr()) UnsafeCell::get(&self.0).cast::<T>()
} }
/// Gets the value behind `this`. /// Gets the value behind `this`.
@ -248,7 +248,7 @@ pub fn get(&self) -> *mut T {
/// This function is useful to get access to the value without creating intermediate /// This function is useful to get access to the value without creating intermediate
/// references. /// references.
pub const fn raw_get(this: *const Self) -> *mut T { pub const fn raw_get(this: *const Self) -> *mut T {
UnsafeCell::raw_get(this.cast::<UnsafeCell<T>>()) UnsafeCell::raw_get(this.cast::<UnsafeCell<MaybeUninit<T>>>()).cast::<T>()
} }
} }