From: "Andreas Hindborg (Samsung)" <nmi@metaspace.dk>
To: Benno Lossin <benno.lossin@proton.me>
Cc: "Miguel Ojeda" <ojeda@kernel.org>,
"Wedson Almeida Filho" <wedsonaf@gmail.com>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Alice Ryhl" <aliceryhl@google.com>,
rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@lists.linux.dev
Subject: Re: [PATCH] rust: types: make `Opaque` be `!Unpin`
Date: Mon, 03 Jul 2023 11:30:56 +0200 [thread overview]
Message-ID: <87mt0dcp9f.fsf@metaspace.dk> (raw)
In-Reply-To: <20230630150216.109789-1-benno.lossin@proton.me>
Benno Lossin <benno.lossin@proton.me> writes:
> 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: Andreas Hindborg <a.hindborg@samsung.com>
> This patch depends on the patch that swaps `UnsafeCell` with
> `MaybeUninit` inside `Opaque` [1].
>
> [1]: https://lore.kernel.org/rust-for-linux/20230614115328.2825961-1-aliceryhl@google.com/
> ---
> rust/kernel/types.rs | 19 ++++++++++++++-----
> 1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/rust/kernel/types.rs b/rust/kernel/types.rs
> index fb41635f1e1f..e664a2beef30 100644
> --- a/rust/kernel/types.rs
> +++ b/rust/kernel/types.rs
> @@ -6,7 +6,7 @@
> use alloc::boxed::Box;
> use core::{
> cell::UnsafeCell,
> - marker::PhantomData,
> + marker::{PhantomData, PhantomPinned},
> mem::MaybeUninit,
> ops::{Deref, DerefMut},
> ptr::NonNull,
> @@ -224,17 +224,26 @@ fn drop(&mut self) {
> ///
> /// 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.
> @@ -258,7 +267,7 @@ pub fn ffi_init(init_func: impl FnOnce(*mut T)) -> impl PinInit<Self> {
>
> /// 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`.
next prev parent reply other threads:[~2023-07-03 9:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 15:03 [PATCH] rust: types: make `Opaque` be `!Unpin` Benno Lossin
2023-06-30 15:32 ` Alice Ryhl
2023-06-30 17:52 ` Gary Guo
2023-07-03 9:30 ` Andreas Hindborg (Samsung) [this message]
2023-08-09 23:21 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mt0dcp9f.fsf@metaspace.dk \
--to=nmi@metaspace.dk \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=patches@lists.linux.dev \
--cc=rust-for-linux@vger.kernel.org \
--cc=wedsonaf@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox