mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 06:04:44 +01:00
ab309b6e08
Like commit 0903b9e2a4 ("rust: alloc: eschew
`Box<MaybeUninit<T>>::write`"), but for the new `rbtree` and `alloc` code.
That is, `feature(new_uninit)` [1] got partially stabilized [2]
for Rust 1.82.0 (expected to be released on 2024-10-17), but it
did not include `Box<MaybeUninit<T>>::write`, which got split into
`feature(box_uninit_write)` [3].
To avoid relying on a new unstable feature, rewrite the `write` +
`assume_init` pair manually.
Link: https://github.com/rust-lang/rust/issues/63291 [1]
Link: https://github.com/rust-lang/rust/pull/129401 [2]
Link: https://github.com/rust-lang/rust/issues/129397 [3]
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Matt Gilbride <mattgilbride@google.com>
Link: https://lore.kernel.org/r/20240904144229.18592-1-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
87 lines
3.1 KiB
Rust
87 lines
3.1 KiB
Rust
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
//! Extensions to [`Box`] for fallible allocations.
|
|
|
|
use super::{AllocError, Flags};
|
|
use alloc::boxed::Box;
|
|
use core::{mem::MaybeUninit, ptr, result::Result};
|
|
|
|
/// Extensions to [`Box`].
|
|
pub trait BoxExt<T>: Sized {
|
|
/// Allocates a new box.
|
|
///
|
|
/// The allocation may fail, in which case an error is returned.
|
|
fn new(x: T, flags: Flags) -> Result<Self, AllocError>;
|
|
|
|
/// Allocates a new uninitialised box.
|
|
///
|
|
/// 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
|
|
///
|
|
/// ```
|
|
/// use kernel::alloc::{flags, box_ext::BoxExt};
|
|
/// let value = Box::new([0; 32], flags::GFP_KERNEL)?;
|
|
/// assert_eq!(*value, [0; 32]);
|
|
/// let mut value = Box::drop_contents(value);
|
|
/// // Now we can re-use `value`:
|
|
/// value.write([1; 32]);
|
|
/// // SAFETY: We just wrote to it.
|
|
/// let value = unsafe { value.assume_init() };
|
|
/// assert_eq!(*value, [1; 32]);
|
|
/// # Ok::<(), Error>(())
|
|
/// ```
|
|
fn drop_contents(this: Self) -> Box<MaybeUninit<T>>;
|
|
}
|
|
|
|
impl<T> BoxExt<T> for Box<T> {
|
|
fn new(x: T, flags: Flags) -> Result<Self, AllocError> {
|
|
let b = <Self as BoxExt<_>>::new_uninit(flags)?;
|
|
Ok(Box::write(b, x))
|
|
}
|
|
|
|
#[cfg(any(test, testlib))]
|
|
fn new_uninit(_flags: Flags) -> Result<Box<MaybeUninit<T>>, AllocError> {
|
|
Ok(Box::new_uninit())
|
|
}
|
|
|
|
#[cfg(not(any(test, testlib)))]
|
|
fn new_uninit(flags: Flags) -> Result<Box<MaybeUninit<T>>, AllocError> {
|
|
let ptr = if core::mem::size_of::<MaybeUninit<T>>() == 0 {
|
|
core::ptr::NonNull::<_>::dangling().as_ptr()
|
|
} else {
|
|
let layout = core::alloc::Layout::new::<MaybeUninit<T>>();
|
|
|
|
// SAFETY: Memory is being allocated (first arg is null). The only other source of
|
|
// safety issues is sleeping on atomic context, which is addressed by klint. Lastly,
|
|
// the type is not a SZT (checked above).
|
|
let ptr =
|
|
unsafe { super::allocator::krealloc_aligned(core::ptr::null_mut(), layout, flags) };
|
|
if ptr.is_null() {
|
|
return Err(AllocError);
|
|
}
|
|
|
|
ptr.cast::<MaybeUninit<T>>()
|
|
};
|
|
|
|
// SAFETY: For non-zero-sized types, we allocate above using the global allocator. For
|
|
// zero-sized types, we use `NonNull::dangling`.
|
|
Ok(unsafe { Box::from_raw(ptr) })
|
|
}
|
|
|
|
fn drop_contents(this: Self) -> Box<MaybeUninit<T>> {
|
|
let ptr = Box::into_raw(this);
|
|
// SAFETY: `ptr` is valid, because it came from `Box::into_raw`.
|
|
unsafe { ptr::drop_in_place(ptr) };
|
|
|
|
// CAST: `MaybeUninit<T>` is a transparent wrapper of `T`.
|
|
let ptr = ptr.cast::<MaybeUninit<T>>();
|
|
|
|
// SAFETY: `ptr` is valid for writes, because it came from `Box::into_raw` and it is valid for
|
|
// reads, since the pointer came from `Box::into_raw` and the type is `MaybeUninit<T>`.
|
|
unsafe { Box::from_raw(ptr) }
|
|
}
|
|
}
|