From: Boqun Feng <boqun.feng@gmail.com>
To: Benno Lossin <benno.lossin@proton.me>
Cc: "Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Wedson Almeida Filho" <wedsonaf@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Andreas Hindborg" <a.hindborg@samsung.com>,
"Alice Ryhl" <aliceryhl@google.com>,
rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 2/2] rust: init: add `write_[pin_]init` functions
Date: Mon, 19 Aug 2024 10:24:47 -0700 [thread overview]
Message-ID: <ZsN_3wJHineYUL7i@boqun-archlinux> (raw)
In-Reply-To: <20240819112415.99810-2-benno.lossin@proton.me>
On Mon, Aug 19, 2024 at 11:24:39AM +0000, Benno Lossin wrote:
> Sometimes it is necessary to split allocation and initialization into
> two steps. One such situation is when reusing existing allocations
> obtained via `Box::drop_contents`. See [1] for an example.
> In order to support this use case add `write_[pin_]init` functions to the
> pin-init API. These functions operate on already allocated smart
> pointers that wrap `MaybeUninit<T>`.
>
> Signed-off-by: Benno Lossin <benno.lossin@proton.me>
> Link: https://lore.kernel.org/rust-for-linux/f026532f-8594-4f18-9aa5-57ad3f5bc592@proton.me/ [1]
Reviewed-by: Boqun Feng <boqun.feng@gmail.com>
Regards,
Boqun
> ---
> rust/kernel/init.rs | 84 ++++++++++++++++++++++++++++++------------
> rust/kernel/prelude.rs | 2 +-
> 2 files changed, 61 insertions(+), 25 deletions(-)
>
> diff --git a/rust/kernel/init.rs b/rust/kernel/init.rs
> index 771701805a97..a8068f99fcaa 100644
> --- a/rust/kernel/init.rs
> +++ b/rust/kernel/init.rs
> @@ -1183,13 +1183,7 @@ fn try_pin_init<E>(init: impl PinInit<T, E>, flags: Flags) -> Result<Self::Pinne
> where
> E: From<AllocError>,
> {
> - let mut this = <Box<_> as BoxExt<_>>::new_uninit(flags)?;
> - let slot = this.as_mut_ptr();
> - // SAFETY: When init errors/panics, slot will get deallocated but not dropped,
> - // slot is valid and will not be moved, because we pin it later.
> - unsafe { init.__pinned_init(slot)? };
> - // SAFETY: All fields have been initialized.
> - Ok(unsafe { this.assume_init() }.into())
> + <Box<_> as BoxExt<_>>::new_uninit(flags)?.write_pin_init(init)
> }
>
> #[inline]
> @@ -1197,13 +1191,7 @@ fn try_init<E>(init: impl Init<T, E>, flags: Flags) -> Result<Self, E>
> where
> E: From<AllocError>,
> {
> - let mut this = <Box<_> as BoxExt<_>>::new_uninit(flags)?;
> - let slot = this.as_mut_ptr();
> - // SAFETY: When init errors/panics, slot will get deallocated but not dropped,
> - // slot is valid.
> - unsafe { init.__init(slot)? };
> - // SAFETY: All fields have been initialized.
> - Ok(unsafe { this.assume_init() })
> + <Box<_> as BoxExt<_>>::new_uninit(flags)?.write_init(init)
> }
> }
>
> @@ -1215,13 +1203,7 @@ fn try_pin_init<E>(init: impl PinInit<T, E>, flags: Flags) -> Result<Self::Pinne
> where
> E: From<AllocError>,
> {
> - let mut this = UniqueArc::new_uninit(flags)?;
> - let slot = this.as_mut_ptr();
> - // SAFETY: When init errors/panics, slot will get deallocated but not dropped,
> - // slot is valid and will not be moved, because we pin it later.
> - unsafe { init.__pinned_init(slot)? };
> - // SAFETY: All fields have been initialized.
> - Ok(unsafe { this.assume_init() }.into())
> + UniqueArc::new_uninit(flags)?.write_pin_init(init)
> }
>
> #[inline]
> @@ -1229,13 +1211,67 @@ fn try_init<E>(init: impl Init<T, E>, flags: Flags) -> Result<Self, E>
> where
> E: From<AllocError>,
> {
> - let mut this = UniqueArc::new_uninit(flags)?;
> - let slot = this.as_mut_ptr();
> + UniqueArc::new_uninit(flags)?.write_init(init)
> + }
> +}
> +
> +/// Smart pointer containing uninitialized memory and that can write a value.
> +pub trait InPlaceWrite<T> {
> + /// The type `Self` turns into when the contents are initialized.
> + type Initialized;
> +
> + /// Use the given initializer to write a value into `self`.
> + ///
> + /// Does not drop the current value and considers it as uninitialized memory.
> + fn write_init<E>(self, init: impl Init<T, E>) -> Result<Self::Initialized, E>;
> +
> + /// Use the given pin-initializer to write a value into `self`.
> + ///
> + /// Does not drop the current value and considers it as uninitialized memory.
> + fn write_pin_init<E>(self, init: impl PinInit<T, E>) -> Result<Pin<Self::Initialized>, E>;
> +}
> +
> +impl<T> InPlaceWrite<T> for Box<MaybeUninit<T>> {
> + type Initialized = Box<T>;
> +
> + fn write_init<E>(mut self, init: impl Init<T, E>) -> Result<Self::Initialized, E> {
> + let slot = self.as_mut_ptr();
> // SAFETY: When init errors/panics, slot will get deallocated but not dropped,
> // slot is valid.
> unsafe { init.__init(slot)? };
> // SAFETY: All fields have been initialized.
> - Ok(unsafe { this.assume_init() })
> + Ok(unsafe { self.assume_init() })
> + }
> +
> + fn write_pin_init<E>(mut self, init: impl PinInit<T, E>) -> Result<Pin<Self::Initialized>, E> {
> + let slot = self.as_mut_ptr();
> + // SAFETY: When init errors/panics, slot will get deallocated but not dropped,
> + // slot is valid and will not be moved, because we pin it later.
> + unsafe { init.__pinned_init(slot)? };
> + // SAFETY: All fields have been initialized.
> + Ok(unsafe { self.assume_init() }.into())
> + }
> +}
> +
> +impl<T> InPlaceWrite<T> for UniqueArc<MaybeUninit<T>> {
> + type Initialized = UniqueArc<T>;
> +
> + fn write_init<E>(mut self, init: impl Init<T, E>) -> Result<Self::Initialized, E> {
> + let slot = self.as_mut_ptr();
> + // SAFETY: When init errors/panics, slot will get deallocated but not dropped,
> + // slot is valid.
> + unsafe { init.__init(slot)? };
> + // SAFETY: All fields have been initialized.
> + Ok(unsafe { self.assume_init() })
> + }
> +
> + fn write_pin_init<E>(mut self, init: impl PinInit<T, E>) -> Result<Pin<Self::Initialized>, E> {
> + let slot = self.as_mut_ptr();
> + // SAFETY: When init errors/panics, slot will get deallocated but not dropped,
> + // slot is valid and will not be moved, because we pin it later.
> + unsafe { init.__pinned_init(slot)? };
> + // SAFETY: All fields have been initialized.
> + Ok(unsafe { self.assume_init() }.into())
> }
> }
>
> diff --git a/rust/kernel/prelude.rs b/rust/kernel/prelude.rs
> index b37a0b3180fb..4571daec0961 100644
> --- a/rust/kernel/prelude.rs
> +++ b/rust/kernel/prelude.rs
> @@ -37,6 +37,6 @@
>
> pub use super::{str::CStr, ThisModule};
>
> -pub use super::init::{InPlaceInit, Init, PinInit};
> +pub use super::init::{InPlaceInit, InPlaceWrite, Init, PinInit};
>
> pub use super::current;
> --
> 2.45.2
>
>
>
next prev parent reply other threads:[~2024-08-19 17:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-19 11:24 [PATCH v4 1/2] rust: kernel: add `drop_contents` to `BoxExt` Benno Lossin
2024-08-19 11:24 ` [PATCH v4 2/2] rust: init: add `write_[pin_]init` functions Benno Lossin
2024-08-19 11:36 ` Alice Ryhl
2024-08-19 17:24 ` Boqun Feng [this message]
2024-08-19 11:33 ` [PATCH v4 1/2] rust: kernel: add `drop_contents` to `BoxExt` Alice Ryhl
2024-08-19 17:23 ` Boqun Feng
2024-08-21 22:16 ` 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=ZsN_3wJHineYUL7i@boqun-archlinux \
--to=boqun.feng@gmail.com \
--cc=a.hindborg@samsung.com \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).