From: Benno Lossin <y86-dev@protonmail.com>
To: "Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Wedson Almeida Filho" <wedsonaf@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>
Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@lists.linux.dev
Subject: [PATCH v2 5/5] rust: sync: reduce stack usage of `UniqueArc::try_new_uninit`
Date: Tue, 21 Mar 2023 19:50:10 +0000 [thread overview]
Message-ID: <20230321194934.908891-6-y86-dev@protonmail.com> (raw)
In-Reply-To: <20230321194934.908891-1-y86-dev@protonmail.com>
`UniqueArc::try_new_uninit` calls `Arc::try_new(MaybeUninit::uninit())`.
This results in the uninitialized memory being placed on the stack,
which may be arbitrarily large due to the generic `T` and thus could
cause a stack overflow for large types.
Change the implementation to use the pin-init API which enables in-place
initialization. In particular it avoids having to first construct and
then move the uninitialized memory from the stack into the final location.
Signed-off-by: Benno Lossin <y86-dev@protonmail.com>
---
rust/kernel/lib.rs | 1 -
rust/kernel/sync/arc.rs | 12 +++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 3e2777d26ff5..d9df77132fa2 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -27,7 +27,6 @@
#[cfg(not(CONFIG_RUST))]
compile_error!("Missing kernel configuration for conditional compilation");
-#[allow(unused_extern_crates)]
// Allow proc-macros to refer to `::kernel` inside the `kernel` crate (this crate).
extern crate self as kernel;
diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs
index 5b4f64dd3ac8..0518ff99b6c5 100644
--- a/rust/kernel/sync/arc.rs
+++ b/rust/kernel/sync/arc.rs
@@ -18,6 +18,7 @@
use crate::{
bindings,
error::{Error, Result},
+ init,
init::{InPlaceInit, Init, PinInit},
types::{ForeignOwnable, Opaque},
};
@@ -29,6 +30,7 @@ use core::{
pin::Pin,
ptr::NonNull,
};
+use macros::pin_data;
/// A reference-counted pointer to an instance of `T`.
///
@@ -121,6 +123,7 @@ pub struct Arc<T: ?Sized> {
_p: PhantomData<ArcInner<T>>,
}
+#[pin_data]
#[repr(C)]
struct ArcInner<T: ?Sized> {
refcount: Opaque<bindings::refcount_t>,
@@ -501,9 +504,16 @@ impl<T> UniqueArc<T> {
/// Tries to allocate a new [`UniqueArc`] instance whose contents are not initialised yet.
pub fn try_new_uninit() -> Result<UniqueArc<MaybeUninit<T>>> {
+ // INVARIANT: The refcount is initialised to a non-zero value.
+ let inner = Box::init(init!(ArcInner::<MaybeUninit<T>> {
+ // SAFETY: There are no safety requirements for this FFI call.
+ refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }),
+ data <- init::uninit(),
+ }))?;
Ok(UniqueArc::<MaybeUninit<T>> {
// INVARIANT: The newly-created object has a ref-count of 1.
- inner: Arc::try_new(MaybeUninit::uninit())?,
+ // SAFETY: The pointer from the `Box` is valid.
+ inner: unsafe { Arc::from_inner(Box::leak(inner).into()) },
})
}
}
--
2.39.2
next prev parent reply other threads:[~2023-03-21 19:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-21 19:49 [PATCH v2 0/5] Rust pin-init API for pinned initialization of structs Benno Lossin
2023-03-21 19:49 ` [PATCH v2 1/5] rust: macros: add `quote!` macro Benno Lossin
2023-03-21 19:49 ` [PATCH v2 2/5] rust: sync: add `assume_init` to `UniqueArc` Benno Lossin
2023-03-21 19:50 ` [PATCH v2 3/5] rust: add pin-init API Benno Lossin
2023-03-23 6:30 ` Boqun Feng
2023-03-24 8:39 ` Benno Lossin
2023-03-21 19:50 ` [PATCH v2 4/5] rust: init: add common init-helper functions for `Opaque` Benno Lossin
2023-03-21 20:06 ` Boqun Feng
2023-03-22 16:18 ` Benno Lossin
2023-03-21 19:50 ` Benno Lossin [this message]
2023-03-22 16:13 ` [PATCH v2 0/5] Rust pin-init API for pinned initialization of structs Benno Lossin
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=20230321194934.908891-6-y86-dev@protonmail.com \
--to=y86-dev@protonmail.com \
--cc=alex.gaynor@gmail.com \
--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=patches@lists.linux.dev \
--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).