* [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt`
@ 2024-07-08 20:53 Benno Lossin
2024-07-08 20:53 ` [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions Benno Lossin
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Benno Lossin @ 2024-07-08 20:53 UTC (permalink / raw)
To: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl
Cc: rust-for-linux, linux-kernel
Sometimes (see [1]) it is necessary to drop the value inside of a
`Box<T>`, but retain the allocation. For example to reuse the allocation
in the future.
Introduce a new function `drop_contents` that turns a `Box<T>` into
`Box<MaybeUninit<T>>` by dropping the value.
Signed-off-by: Benno Lossin <benno.lossin@proton.me>
Link: https://lore.kernel.org/rust-for-linux/20240418-b4-rbtree-v3-5-323e134390ce@google.com/ [1]
---
rust/kernel/alloc/box_ext.rs | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/rust/kernel/alloc/box_ext.rs b/rust/kernel/alloc/box_ext.rs
index cdbb5ad166d9..6cf79f96d6c7 100644
--- a/rust/kernel/alloc/box_ext.rs
+++ b/rust/kernel/alloc/box_ext.rs
@@ -5,6 +5,7 @@
use super::{AllocError, Flags};
use alloc::boxed::Box;
use core::mem::MaybeUninit;
+use core::ptr;
use core::result::Result;
/// Extensions to [`Box`].
@@ -18,6 +19,18 @@ pub trait BoxExt<T>: Sized {
///
/// The allocation may fail, in which case an error is returned.
fn new_uninit(flags: Flags) -> Result<Box<MaybeUninit<T>>, AllocError>;
+
+ /// Drops the contents, but keeps the allocation.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// let value = Box::new([0; 32], flags::GFP_KERNEL)
+ /// let value = value.drop_contents();
+ /// // Now we can re-use `value`:
+ /// Box::write(value, [1; 32]);
+ /// ```
+ fn drop_contents(self) -> Box<MaybeUninit<T>>;
}
impl<T> BoxExt<T> for Box<T> {
@@ -54,4 +67,12 @@ fn new_uninit(flags: Flags) -> Result<Box<MaybeUninit<T>>, AllocError> {
// zero-sized types, we use `NonNull::dangling`.
Ok(unsafe { Box::from_raw(ptr) })
}
+
+ fn drop_contents(self) -> Box<MaybeUninit<T>> {
+ let ptr = Box::into_raw(self);
+ // SAFETY: `ptr` is valid, because it came from `Box::into_raw`.
+ unsafe { ptr::drop_in_place(ptr) };
+ // SAFETY: `ptr` is valid, because it came from `Box::into_raw`.
+ unsafe { Box::from_raw(ptr.cast()) }
+ }
}
--
2.44.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions
2024-07-08 20:53 [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt` Benno Lossin
@ 2024-07-08 20:53 ` Benno Lossin
2024-07-08 21:27 ` Boqun Feng
` (2 more replies)
2024-07-08 21:14 ` [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt` Boqun Feng
2024-08-01 9:01 ` Alice Ryhl
2 siblings, 3 replies; 9+ messages in thread
From: Benno Lossin @ 2024-07-08 20:53 UTC (permalink / raw)
To: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl
Cc: rust-for-linux, linux-kernel
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]
---
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 9608f2bd2211..35c4d9b75a97 100644
--- a/rust/kernel/init.rs
+++ b/rust/kernel/init.rs
@@ -1159,13 +1159,7 @@ fn try_pin_init<E>(init: impl PinInit<T, E>, flags: Flags) -> Result<Pin<Self>,
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]
@@ -1173,13 +1167,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)
}
}
@@ -1189,13 +1177,7 @@ fn try_pin_init<E>(init: impl PinInit<T, E>, flags: Flags) -> Result<Pin<Self>,
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]
@@ -1203,13 +1185,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.44.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt`
2024-07-08 20:53 [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt` Benno Lossin
2024-07-08 20:53 ` [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions Benno Lossin
@ 2024-07-08 21:14 ` Boqun Feng
2024-07-08 21:52 ` Boqun Feng
2024-08-01 9:01 ` Alice Ryhl
2 siblings, 1 reply; 9+ messages in thread
From: Boqun Feng @ 2024-07-08 21:14 UTC (permalink / raw)
To: Benno Lossin
Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Gary Guo,
Björn Roy Baron, Andreas Hindborg, Alice Ryhl,
rust-for-linux, linux-kernel
On Mon, Jul 08, 2024 at 08:53:38PM +0000, Benno Lossin wrote:
> Sometimes (see [1]) it is necessary to drop the value inside of a
> `Box<T>`, but retain the allocation. For example to reuse the allocation
> in the future.
> Introduce a new function `drop_contents` that turns a `Box<T>` into
> `Box<MaybeUninit<T>>` by dropping the value.
>
> Signed-off-by: Benno Lossin <benno.lossin@proton.me>
> Link: https://lore.kernel.org/rust-for-linux/20240418-b4-rbtree-v3-5-323e134390ce@google.com/ [1]
> ---
> rust/kernel/alloc/box_ext.rs | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/rust/kernel/alloc/box_ext.rs b/rust/kernel/alloc/box_ext.rs
> index cdbb5ad166d9..6cf79f96d6c7 100644
> --- a/rust/kernel/alloc/box_ext.rs
> +++ b/rust/kernel/alloc/box_ext.rs
> @@ -5,6 +5,7 @@
> use super::{AllocError, Flags};
> use alloc::boxed::Box;
> use core::mem::MaybeUninit;
> +use core::ptr;
> use core::result::Result;
>
> /// Extensions to [`Box`].
> @@ -18,6 +19,18 @@ pub trait BoxExt<T>: Sized {
> ///
> /// The allocation may fail, in which case an error is returned.
> fn new_uninit(flags: Flags) -> Result<Box<MaybeUninit<T>>, AllocError>;
> +
> + /// Drops the contents, but keeps the allocation.
> + ///
> + /// # Examples
> + ///
> + /// ```
> + /// let value = Box::new([0; 32], flags::GFP_KERNEL)
> + /// let value = value.drop_contents();
> + /// // Now we can re-use `value`:
> + /// Box::write(value, [1; 32]);
> + /// ```
> + fn drop_contents(self) -> Box<MaybeUninit<T>>;
> }
>
> impl<T> BoxExt<T> for Box<T> {
> @@ -54,4 +67,12 @@ fn new_uninit(flags: Flags) -> Result<Box<MaybeUninit<T>>, AllocError> {
> // zero-sized types, we use `NonNull::dangling`.
> Ok(unsafe { Box::from_raw(ptr) })
> }
> +
> + fn drop_contents(self) -> Box<MaybeUninit<T>> {
> + let ptr = Box::into_raw(self);
> + // SAFETY: `ptr` is valid, because it came from `Box::into_raw`.
> + unsafe { ptr::drop_in_place(ptr) };
> + // SAFETY: `ptr` is valid, because it came from `Box::into_raw`.
Maybe add
// And `ptr.cast()` is a valid pointer to `MaybeUninit<T>`,
// since `MaybeUninit<T>` and `T` has the same layout.
?
> + unsafe { Box::from_raw(ptr.cast()) }
> + }
With the above or similar:
Reviewed-by: Boqun Feng <boqun.feng@gmail.com>
Regards,
Boqun
> }
> --
> 2.44.0
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions
2024-07-08 20:53 ` [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions Benno Lossin
@ 2024-07-08 21:27 ` Boqun Feng
2024-08-01 9:02 ` Alice Ryhl
2024-08-01 12:30 ` Gary Guo
2 siblings, 0 replies; 9+ messages in thread
From: Boqun Feng @ 2024-07-08 21:27 UTC (permalink / raw)
To: Benno Lossin
Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Gary Guo,
Björn Roy Baron, Andreas Hindborg, Alice Ryhl,
rust-for-linux, linux-kernel
On Mon, Jul 08, 2024 at 08:53:46PM +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>
Reviewed-by: Boqun Feng <boqun.feng@gmail.com>
Regards,
Boqun
> Link: https://lore.kernel.org/rust-for-linux/f026532f-8594-4f18-9aa5-57ad3f5bc592@proton.me/ [1]
> ---
> 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 9608f2bd2211..35c4d9b75a97 100644
> --- a/rust/kernel/init.rs
> +++ b/rust/kernel/init.rs
> @@ -1159,13 +1159,7 @@ fn try_pin_init<E>(init: impl PinInit<T, E>, flags: Flags) -> Result<Pin<Self>,
> 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]
> @@ -1173,13 +1167,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)
> }
> }
>
> @@ -1189,13 +1177,7 @@ fn try_pin_init<E>(init: impl PinInit<T, E>, flags: Flags) -> Result<Pin<Self>,
> 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]
> @@ -1203,13 +1185,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.44.0
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt`
2024-07-08 21:14 ` [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt` Boqun Feng
@ 2024-07-08 21:52 ` Boqun Feng
2024-07-17 19:54 ` Benno Lossin
0 siblings, 1 reply; 9+ messages in thread
From: Boqun Feng @ 2024-07-08 21:52 UTC (permalink / raw)
To: Benno Lossin
Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Gary Guo,
Björn Roy Baron, Andreas Hindborg, Alice Ryhl,
rust-for-linux, linux-kernel
On Mon, Jul 08, 2024 at 02:14:50PM -0700, Boqun Feng wrote:
> On Mon, Jul 08, 2024 at 08:53:38PM +0000, Benno Lossin wrote:
> > Sometimes (see [1]) it is necessary to drop the value inside of a
> > `Box<T>`, but retain the allocation. For example to reuse the allocation
> > in the future.
> > Introduce a new function `drop_contents` that turns a `Box<T>` into
> > `Box<MaybeUninit<T>>` by dropping the value.
> >
> > Signed-off-by: Benno Lossin <benno.lossin@proton.me>
> > Link: https://lore.kernel.org/rust-for-linux/20240418-b4-rbtree-v3-5-323e134390ce@google.com/ [1]
> > ---
> > rust/kernel/alloc/box_ext.rs | 21 +++++++++++++++++++++
> > 1 file changed, 21 insertions(+)
> >
> > diff --git a/rust/kernel/alloc/box_ext.rs b/rust/kernel/alloc/box_ext.rs
> > index cdbb5ad166d9..6cf79f96d6c7 100644
> > --- a/rust/kernel/alloc/box_ext.rs
> > +++ b/rust/kernel/alloc/box_ext.rs
> > @@ -5,6 +5,7 @@
> > use super::{AllocError, Flags};
> > use alloc::boxed::Box;
> > use core::mem::MaybeUninit;
> > +use core::ptr;
> > use core::result::Result;
> >
> > /// Extensions to [`Box`].
> > @@ -18,6 +19,18 @@ pub trait BoxExt<T>: Sized {
> > ///
> > /// The allocation may fail, in which case an error is returned.
> > fn new_uninit(flags: Flags) -> Result<Box<MaybeUninit<T>>, AllocError>;
> > +
> > + /// Drops the contents, but keeps the allocation.
> > + ///
(I spoke too soon ;-))
> > + /// # Examples
> > + ///
> > + /// ```
need a `use` here:
use kernel::alloc::{flags, box_ext::BoxExt};
> > + /// let value = Box::new([0; 32], flags::GFP_KERNEL)
missing a '?' and a ';' at the end of this line.
> > + /// let value = value.drop_contents();
> > + /// // Now we can re-use `value`:
> > + /// Box::write(value, [1; 32]);
Need a line:
# Ok::<(), Error>(())
here.
> > + /// ```
> > + fn drop_contents(self) -> Box<MaybeUninit<T>>;
> > }
> >
[...]
I queued this patch in rust-dev with these fixes applied, FYI.
Regards,
Boqun
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt`
2024-07-08 21:52 ` Boqun Feng
@ 2024-07-17 19:54 ` Benno Lossin
0 siblings, 0 replies; 9+ messages in thread
From: Benno Lossin @ 2024-07-17 19:54 UTC (permalink / raw)
To: Boqun Feng
Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Gary Guo,
Björn Roy Baron, Andreas Hindborg, Alice Ryhl,
rust-for-linux, linux-kernel
On 08.07.24 23:52, Boqun Feng wrote:
> On Mon, Jul 08, 2024 at 02:14:50PM -0700, Boqun Feng wrote:
>> On Mon, Jul 08, 2024 at 08:53:38PM +0000, Benno Lossin wrote:
>>> Sometimes (see [1]) it is necessary to drop the value inside of a
>>> `Box<T>`, but retain the allocation. For example to reuse the allocation
>>> in the future.
>>> Introduce a new function `drop_contents` that turns a `Box<T>` into
>>> `Box<MaybeUninit<T>>` by dropping the value.
>>>
>>> Signed-off-by: Benno Lossin <benno.lossin@proton.me>
>>> Link: https://lore.kernel.org/rust-for-linux/20240418-b4-rbtree-v3-5-323e134390ce@google.com/ [1]
>>> ---
>>> rust/kernel/alloc/box_ext.rs | 21 +++++++++++++++++++++
>>> 1 file changed, 21 insertions(+)
>>>
>>> diff --git a/rust/kernel/alloc/box_ext.rs b/rust/kernel/alloc/box_ext.rs
>>> index cdbb5ad166d9..6cf79f96d6c7 100644
>>> --- a/rust/kernel/alloc/box_ext.rs
>>> +++ b/rust/kernel/alloc/box_ext.rs
>>> @@ -5,6 +5,7 @@
>>> use super::{AllocError, Flags};
>>> use alloc::boxed::Box;
>>> use core::mem::MaybeUninit;
>>> +use core::ptr;
>>> use core::result::Result;
>>>
>>> /// Extensions to [`Box`].
>>> @@ -18,6 +19,18 @@ pub trait BoxExt<T>: Sized {
>>> ///
>>> /// The allocation may fail, in which case an error is returned.
>>> fn new_uninit(flags: Flags) -> Result<Box<MaybeUninit<T>>, AllocError>;
>>> +
>>> + /// Drops the contents, but keeps the allocation.
>>> + ///
>
> (I spoke too soon ;-))
>
>>> + /// # Examples
>>> + ///
>>> + /// ```
>
> need a `use` here:
>
> use kernel::alloc::{flags, box_ext::BoxExt};
Oops, should have checked that.
>>> + /// let value = Box::new([0; 32], flags::GFP_KERNEL)
>
> missing a '?' and a ';' at the end of this line.
>
>>> + /// let value = value.drop_contents();
>>> + /// // Now we can re-use `value`:
>>> + /// Box::write(value, [1; 32]);
>
> Need a line:
>
> # Ok::<(), Error>(())
>
> here.
>>> + /// ```
>>> + fn drop_contents(self) -> Box<MaybeUninit<T>>;
>>> }
>>>
> [...]
>
> I queued this patch in rust-dev with these fixes applied, FYI.
Thanks!
@Miguel, when you take this, then apply the fixes that Boqun suggested.
---
Cheers,
Benno
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt`
2024-07-08 20:53 [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt` Benno Lossin
2024-07-08 20:53 ` [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions Benno Lossin
2024-07-08 21:14 ` [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt` Boqun Feng
@ 2024-08-01 9:01 ` Alice Ryhl
2 siblings, 0 replies; 9+ messages in thread
From: Alice Ryhl @ 2024-08-01 9:01 UTC (permalink / raw)
To: Benno Lossin
Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
Gary Guo, Björn Roy Baron, Andreas Hindborg, rust-for-linux,
linux-kernel
On Mon, Jul 8, 2024 at 10:53 PM Benno Lossin <benno.lossin@proton.me> wrote:
>
> Sometimes (see [1]) it is necessary to drop the value inside of a
> `Box<T>`, but retain the allocation. For example to reuse the allocation
> in the future.
> Introduce a new function `drop_contents` that turns a `Box<T>` into
> `Box<MaybeUninit<T>>` by dropping the value.
>
> Signed-off-by: Benno Lossin <benno.lossin@proton.me>
> Link: https://lore.kernel.org/rust-for-linux/20240418-b4-rbtree-v3-5-323e134390ce@google.com/ [1]
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions
2024-07-08 20:53 ` [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions Benno Lossin
2024-07-08 21:27 ` Boqun Feng
@ 2024-08-01 9:02 ` Alice Ryhl
2024-08-01 12:30 ` Gary Guo
2 siblings, 0 replies; 9+ messages in thread
From: Alice Ryhl @ 2024-08-01 9:02 UTC (permalink / raw)
To: Benno Lossin
Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
Gary Guo, Björn Roy Baron, Andreas Hindborg, rust-for-linux,
linux-kernel
On Mon, Jul 8, 2024 at 10:53 PM Benno Lossin <benno.lossin@proton.me> 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: Alice Ryhl <aliceryhl@google.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions
2024-07-08 20:53 ` [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions Benno Lossin
2024-07-08 21:27 ` Boqun Feng
2024-08-01 9:02 ` Alice Ryhl
@ 2024-08-01 12:30 ` Gary Guo
2 siblings, 0 replies; 9+ messages in thread
From: Gary Guo @ 2024-08-01 12:30 UTC (permalink / raw)
To: Benno Lossin
Cc: Miguel Ojeda, Alex Gaynor, Wedson Almeida Filho, Boqun Feng,
Björn Roy Baron, Andreas Hindborg, Alice Ryhl,
rust-for-linux, linux-kernel
On Mon, 08 Jul 2024 20:53:46 +0000
Benno Lossin <benno.lossin@proton.me> 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>
Reviewed-by: Gary Guo <gary@garyguo.net>
> Link: https://lore.kernel.org/rust-for-linux/f026532f-8594-4f18-9aa5-57ad3f5bc592@proton.me/ [1]
> ---
> rust/kernel/init.rs | 84 ++++++++++++++++++++++++++++++------------
> rust/kernel/prelude.rs | 2 +-
> 2 files changed, 61 insertions(+), 25 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-08-01 12:33 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-08 20:53 [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt` Benno Lossin
2024-07-08 20:53 ` [PATCH v2 2/2] rust: init: add `write_[pin_]init` functions Benno Lossin
2024-07-08 21:27 ` Boqun Feng
2024-08-01 9:02 ` Alice Ryhl
2024-08-01 12:30 ` Gary Guo
2024-07-08 21:14 ` [PATCH v2 1/2] rust: kernel: add `drop_contents` to `BoxExt` Boqun Feng
2024-07-08 21:52 ` Boqun Feng
2024-07-17 19:54 ` Benno Lossin
2024-08-01 9:01 ` Alice Ryhl
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).