From: Danilo Krummrich <dakr@kernel.org>
To: ojeda@kernel.org, alex.gaynor@gmail.com, wedsonaf@gmail.com,
boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com,
benno.lossin@proton.me, a.hindborg@samsung.com,
aliceryhl@google.com, akpm@linux-foundation.org
Cc: daniel.almeida@collabora.com, faith.ekstrand@collabora.com,
boris.brezillon@collabora.com, lina@asahilina.net,
mcanal@igalia.com, zhiw@nvidia.com, cjia@nvidia.com,
jhubbard@nvidia.com, airlied@redhat.com, ajanulgu@redhat.com,
lyude@redhat.com, linux-kernel@vger.kernel.org,
rust-for-linux@vger.kernel.org, linux-mm@kvack.org,
Danilo Krummrich <dakr@kernel.org>
Subject: [PATCH v8 15/29] rust: alloc: introduce `ArrayLayout`
Date: Tue, 1 Oct 2024 16:59:50 +0200 [thread overview]
Message-ID: <20241001150008.183102-16-dakr@kernel.org> (raw)
In-Reply-To: <20241001150008.183102-1-dakr@kernel.org>
From: Benno Lossin <benno.lossin@proton.me>
When allocating memory for arrays using allocators, the `Layout::array`
function is typically used. It returns a result, since the given size
might be too big. However, `Vec` and its iterators store their allocated
capacity and thus they already did check that the size is not too big.
The `ArrayLayout` type provides this exact behavior, as it can be
infallibly converted into a `Layout`. Instead of a `usize` capacity,
`Vec` and other similar array-storing types can use `ArrayLayout`
instead.
Signed-off-by: Benno Lossin <benno.lossin@proton.me>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---
rust/kernel/alloc.rs | 1 +
rust/kernel/alloc/layout.rs | 91 +++++++++++++++++++++++++++++++++++++
2 files changed, 92 insertions(+)
create mode 100644 rust/kernel/alloc/layout.rs
diff --git a/rust/kernel/alloc.rs b/rust/kernel/alloc.rs
index ebe58247504f..bf143a71d53d 100644
--- a/rust/kernel/alloc.rs
+++ b/rust/kernel/alloc.rs
@@ -5,6 +5,7 @@
#[cfg(not(any(test, testlib)))]
pub mod allocator;
pub mod kbox;
+pub mod layout;
pub mod vec_ext;
#[cfg(any(test, testlib))]
diff --git a/rust/kernel/alloc/layout.rs b/rust/kernel/alloc/layout.rs
new file mode 100644
index 000000000000..a9c987aad8fb
--- /dev/null
+++ b/rust/kernel/alloc/layout.rs
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: GPL-2.0
+
+//! Memory layout.
+//!
+//! Custom layout types extending or improving [`Layout`].
+
+use core::{alloc::Layout, marker::PhantomData};
+
+/// Error when constructing an [`ArrayLayout`].
+pub struct LayoutError;
+
+/// A layout for an array `[T; n]`.
+///
+/// # Invariants
+///
+/// - `len * size_of::<T>() <= isize::MAX`
+pub struct ArrayLayout<T> {
+ len: usize,
+ _phantom: PhantomData<fn() -> T>,
+}
+
+impl<T> Clone for ArrayLayout<T> {
+ fn clone(&self) -> Self {
+ *self
+ }
+}
+impl<T> Copy for ArrayLayout<T> {}
+
+const ISIZE_MAX: usize = isize::MAX as usize;
+
+impl<T> ArrayLayout<T> {
+ /// Creates a new layout for `[T; 0]`.
+ pub const fn empty() -> Self {
+ // INVARIANT: `0 * size_of::<T>() <= isize::MAX`
+ Self {
+ len: 0,
+ _phantom: PhantomData,
+ }
+ }
+
+ /// Creates a new layout for `[T; len]`.
+ ///
+ /// # Errors
+ ///
+ /// When `len * size_of::<T>()` overflows or when `len * size_of::<T>() > isize::MAX`.
+ pub const fn new(len: usize) -> Result<Self, LayoutError> {
+ match len.checked_mul(size_of::<T>()) {
+ Some(len) if len <= ISIZE_MAX => {
+ // INVARIANT: we checked above that `len * size_of::<T>() <= isize::MAX`
+ Ok(Self {
+ len,
+ _phantom: PhantomData,
+ })
+ }
+ _ => Err(LayoutError),
+ }
+ }
+
+ /// Creates a new layout for `[T; len]`.
+ ///
+ /// # Safety
+ ///
+ /// `len` must be a value, for which `len * size_of::<T>() <= isize::MAX` is true.
+ pub unsafe fn new_unchecked(len: usize) -> Self {
+ // INVARIANT: By the safety requirements of this function
+ // `len * size_of::<T>() <= isize::MAX`.
+ Self {
+ len,
+ _phantom: PhantomData,
+ }
+ }
+
+ /// Returns the number of array elements represented by this layout.
+ pub const fn len(&self) -> usize {
+ self.len
+ }
+
+ /// Returns `true` when no array elements are represented by this layout.
+ pub const fn is_empty(&self) -> bool {
+ self.len == 0
+ }
+}
+
+impl<T> From<ArrayLayout<T>> for Layout {
+ fn from(value: ArrayLayout<T>) -> Self {
+ let res = Layout::array::<T>(value.len);
+ // SAFETY: by the type invariant of `ArrayLayout` we have
+ // `len * size_of::<T>() <= isize::MAX` and thus the result must be `Ok`.
+ unsafe { res.unwrap_unchecked() }
+ }
+}
--
2.46.1
next prev parent reply other threads:[~2024-10-01 15:01 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-01 14:59 [PATCH v8 00/29] Generic `Allocator` support for Rust Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 01/29] rust: alloc: add `Allocator` trait Danilo Krummrich
2024-10-01 18:24 ` Gary Guo
2024-10-02 14:59 ` Benno Lossin
2024-10-01 14:59 ` [PATCH v8 02/29] rust: alloc: separate `aligned_size` from `krealloc_aligned` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 03/29] rust: alloc: rename `KernelAllocator` to `Kmalloc` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 04/29] rust: alloc: implement `ReallocFunc` Danilo Krummrich
2024-10-01 16:11 ` Benno Lossin
2024-10-01 18:25 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 05/29] rust: alloc: make `allocator` module public Danilo Krummrich
2024-10-01 16:01 ` Benno Lossin
2024-10-01 18:25 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 06/29] rust: alloc: implement `Allocator` for `Kmalloc` Danilo Krummrich
2024-10-01 16:01 ` Benno Lossin
2024-10-01 18:26 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 07/29] rust: alloc: add module `allocator_test` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 08/29] rust: alloc: implement `Vmalloc` allocator Danilo Krummrich
2024-10-01 18:26 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 09/29] rust: alloc: implement `KVmalloc` allocator Danilo Krummrich
2024-10-01 18:27 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 10/29] rust: alloc: add __GFP_NOWARN to `Flags` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 11/29] rust: alloc: implement kernel `Box` Danilo Krummrich
2024-10-01 18:28 ` Gary Guo
2024-10-03 23:00 ` Miguel Ojeda
2024-10-04 12:04 ` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 12/29] rust: treewide: switch to our kernel `Box` type Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 13/29] rust: alloc: remove extension of std's `Box` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 14/29] rust: alloc: add `Box` to prelude Danilo Krummrich
2024-10-01 14:59 ` Danilo Krummrich [this message]
2024-10-01 18:31 ` [PATCH v8 15/29] rust: alloc: introduce `ArrayLayout` Gary Guo
2024-10-03 0:27 ` kernel test robot
2024-10-01 14:59 ` [PATCH v8 16/29] rust: alloc: implement kernel `Vec` type Danilo Krummrich
2024-10-01 18:39 ` Gary Guo
2024-10-02 15:02 ` Benno Lossin
2024-10-02 15:20 ` Danilo Krummrich
2024-10-02 19:04 ` Benno Lossin
2024-10-01 14:59 ` [PATCH v8 17/29] rust: alloc: implement `IntoIterator` for `Vec` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 18/29] rust: alloc: implement `collect` for `IntoIter` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 19/29] rust: treewide: switch to the kernel `Vec` type Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 20/29] rust: alloc: remove `VecExt` extension Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 21/29] rust: alloc: add `Vec` to prelude Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 22/29] rust: error: use `core::alloc::LayoutError` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 23/29] rust: error: check for config `test` in `Error::name` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 24/29] rust: alloc: implement `contains` for `Flags` Danilo Krummrich
2024-10-01 15:00 ` [PATCH v8 25/29] rust: alloc: implement `Cmalloc` in module allocator_test Danilo Krummrich
2024-10-02 14:58 ` Benno Lossin
2024-10-02 20:37 ` Gary Guo
2024-10-01 15:00 ` [PATCH v8 26/29] rust: str: test: replace `alloc::format` Danilo Krummrich
2024-10-01 15:00 ` [PATCH v8 27/29] rust: alloc: update module comment of alloc.rs Danilo Krummrich
2024-10-01 15:00 ` [PATCH v8 28/29] kbuild: rust: remove the `alloc` crate and `GlobalAlloc` Danilo Krummrich
2024-10-01 15:00 ` [PATCH v8 29/29] MAINTAINERS: add entry for the Rust `alloc` module Danilo Krummrich
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=20241001150008.183102-16-dakr@kernel.org \
--to=dakr@kernel.org \
--cc=a.hindborg@samsung.com \
--cc=airlied@redhat.com \
--cc=ajanulgu@redhat.com \
--cc=akpm@linux-foundation.org \
--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=boris.brezillon@collabora.com \
--cc=cjia@nvidia.com \
--cc=daniel.almeida@collabora.com \
--cc=faith.ekstrand@collabora.com \
--cc=gary@garyguo.net \
--cc=jhubbard@nvidia.com \
--cc=lina@asahilina.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lyude@redhat.com \
--cc=mcanal@igalia.com \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=wedsonaf@gmail.com \
--cc=zhiw@nvidia.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).