From: Wedson Almeida Filho <wedsonaf@gmail.com>
To: rust-for-linux@vger.kernel.org
Cc: "Miguel Ojeda" <ojeda@kernel.org>,
"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>,
"Benno Lossin" <benno.lossin@proton.me>,
"Andreas Hindborg" <a.hindborg@samsung.com>,
"Alice Ryhl" <aliceryhl@google.com>,
linux-kernel@vger.kernel.org,
"Wedson Almeida Filho" <walmeida@microsoft.com>
Subject: [PATCH 02/10] rust: alloc: introduce the `VecExt` trait
Date: Mon, 25 Mar 2024 16:54:10 -0300 [thread overview]
Message-ID: <20240325195418.166013-3-wedsonaf@gmail.com> (raw)
In-Reply-To: <20240325195418.166013-1-wedsonaf@gmail.com>
From: Wedson Almeida Filho <walmeida@microsoft.com>
Make `try_with_capacity`, `try_push`, and `try_extend_from_slice`
methods available in `Vec` even though it doesn't implement them. It is
implemented with `try_reserve` and `push_within_capacity`.
This is in preparation for switching to the upstream `alloc` crate.
Suggested-by: Gary Guo <gary@garyguo.net>
Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
---
rust/kernel/alloc.rs | 1 +
rust/kernel/alloc/vecext.rs | 52 +++++++++++++++++++++++++++++++++++++
rust/kernel/lib.rs | 1 +
rust/kernel/prelude.rs | 2 ++
4 files changed, 56 insertions(+)
create mode 100644 rust/kernel/alloc/vecext.rs
diff --git a/rust/kernel/alloc.rs b/rust/kernel/alloc.rs
index ccd4149932c3..8ad57a2e693e 100644
--- a/rust/kernel/alloc.rs
+++ b/rust/kernel/alloc.rs
@@ -5,3 +5,4 @@
#[cfg(not(test))]
#[cfg(not(testlib))]
mod allocator;
+pub mod vecext;
diff --git a/rust/kernel/alloc/vecext.rs b/rust/kernel/alloc/vecext.rs
new file mode 100644
index 000000000000..59e92bab534e
--- /dev/null
+++ b/rust/kernel/alloc/vecext.rs
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0
+
+//! Extensions to [`Vec`] for fallible allocations.
+
+use alloc::{collections::TryReserveError, vec::Vec};
+use core::result::Result;
+
+/// Extensions to [`Vec`].
+pub trait VecExt<T>: Sized {
+ /// Creates a new [`Vec`] instance with at least the given capacity.
+ fn try_with_capacity(capacity: usize) -> Result<Self, TryReserveError>;
+
+ /// Appends an element to the back of the [`Vec`] instance.
+ fn try_push(&mut self, v: T) -> Result<(), TryReserveError>;
+
+ /// Pushes clones of the elements of slice into the [`Vec`] instance.
+ fn try_extend_from_slice(&mut self, other: &[T]) -> Result<(), TryReserveError>
+ where
+ T: Clone;
+}
+
+impl<T> VecExt<T> for Vec<T> {
+ fn try_with_capacity(capacity: usize) -> Result<Self, TryReserveError> {
+ let mut v = Vec::new();
+ v.try_reserve(capacity)?;
+ Ok(v)
+ }
+
+ fn try_push(&mut self, v: T) -> Result<(), TryReserveError> {
+ if let Err(retry) = self.push_within_capacity(v) {
+ self.try_reserve(1)?;
+ let _ = self.push_within_capacity(retry);
+ }
+ Ok(())
+ }
+
+ fn try_extend_from_slice(&mut self, other: &[T]) -> Result<(), TryReserveError>
+ where
+ T: Clone,
+ {
+ let extra_cap = self.capacity() - self.len();
+ if extra_cap > 0 {
+ self.try_reserve(extra_cap)?;
+ }
+
+ for item in other {
+ self.try_push(item.clone())?;
+ }
+
+ Ok(())
+ }
+}
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 51f30e55bd00..7f2841a18d05 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -19,6 +19,7 @@
#![feature(offset_of)]
#![feature(receiver_trait)]
#![feature(unsize)]
+#![feature(vec_push_within_capacity)]
// Ensure conditional compilation based on the kernel configuration works;
// otherwise we may silently break things like initcall handling.
diff --git a/rust/kernel/prelude.rs b/rust/kernel/prelude.rs
index ae21600970b3..a0177f195dec 100644
--- a/rust/kernel/prelude.rs
+++ b/rust/kernel/prelude.rs
@@ -14,6 +14,8 @@
#[doc(no_inline)]
pub use core::pin::Pin;
+pub use crate::alloc::vecext::VecExt;
+
#[doc(no_inline)]
pub use alloc::{boxed::Box, vec::Vec};
--
2.34.1
next prev parent reply other threads:[~2024-03-25 19:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 19:54 [PATCH 00/10] Allocation APIs Wedson Almeida Filho
2024-03-25 19:54 ` [PATCH 01/10] rust: kernel: move `allocator` module under `alloc` Wedson Almeida Filho
2024-03-25 21:56 ` Benno Lossin
2024-03-26 0:04 ` Wedson Almeida Filho
2024-03-25 19:54 ` Wedson Almeida Filho [this message]
2024-03-25 22:05 ` [PATCH 02/10] rust: alloc: introduce the `VecExt` trait Benno Lossin
2024-03-26 0:02 ` Wedson Almeida Filho
2024-03-25 19:54 ` [PATCH 03/10] kbuild: use the upstream `alloc` crate Wedson Almeida Filho
2024-03-25 19:54 ` [PATCH 04/10] rust: alloc: remove our fork of the " Wedson Almeida Filho
2024-03-25 22:24 ` Benno Lossin
2024-03-25 19:54 ` [PATCH 05/10] rust: alloc: introduce allocation flags Wedson Almeida Filho
2024-03-25 22:26 ` Benno Lossin
2024-03-25 19:54 ` [PATCH 06/10] rust: alloc: introduce the `BoxExt` trait Wedson Almeida Filho
2024-03-25 22:37 ` Benno Lossin
2024-03-26 0:17 ` Wedson Almeida Filho
2024-03-26 13:30 ` Benno Lossin
2024-03-27 1:54 ` Wedson Almeida Filho
2024-03-27 1:55 ` Wedson Almeida Filho
2024-03-25 19:54 ` [PATCH 07/10] rust: alloc: update `VecExt` to take allocation flags Wedson Almeida Filho
2024-03-25 20:44 ` Boqun Feng
2024-03-26 0:03 ` Wedson Almeida Filho
2024-03-26 13:58 ` Benno Lossin
2024-03-25 19:54 ` [PATCH 08/10] rust: sync: update `Arc` and `UniqueArc` " Wedson Almeida Filho
2024-03-26 14:01 ` Benno Lossin
2024-03-25 19:54 ` [PATCH 09/10] rust: init: update `init` module " Wedson Almeida Filho
2024-03-26 14:08 ` Benno Lossin
2024-03-27 2:17 ` Wedson Almeida Filho
2024-03-25 19:54 ` [PATCH 10/10] rust: kernel: remove usage of `allocator_api` unstable feature Wedson Almeida Filho
2024-03-26 15:27 ` Benno Lossin
2024-03-27 2:13 ` Wedson Almeida Filho
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=20240325195418.166013-3-wedsonaf@gmail.com \
--to=wedsonaf@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=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=walmeida@microsoft.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