From: Tamir Duberstein <tamird@gmail.com>
To: "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@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>
Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
Tamir Duberstein <tamird@gmail.com>
Subject: [PATCH v2 1/6] rust: arc: use `NonNull::new_unchecked`
Date: Mon, 04 Nov 2024 17:20:27 -0400 [thread overview]
Message-ID: <20241104-borrow-mut-v2-1-de650678648d@gmail.com> (raw)
In-Reply-To: <20241104-borrow-mut-v2-0-de650678648d@gmail.com>
There is no need to check (and panic on violations of) the safety
requirements on `ForeignOwnable` functions. Avoiding the check is
consistent with the implementation of `ForeignOwnable` for `Box`.
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
---
rust/kernel/sync/arc.rs | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs
index db9da352d588f65348aa7a5204abbb165b70197f..2c9b7d4a2554278ce8608f4f4c7f9cfe87b21492 100644
--- a/rust/kernel/sync/arc.rs
+++ b/rust/kernel/sync/arc.rs
@@ -337,9 +337,9 @@ fn into_foreign(self) -> *const core::ffi::c_void {
}
unsafe fn borrow<'a>(ptr: *const core::ffi::c_void) -> ArcBorrow<'a, T> {
- // By the safety requirement of this function, we know that `ptr` came from
- // a previous call to `Arc::into_foreign`.
- let inner = NonNull::new(ptr as *mut ArcInner<T>).unwrap();
+ // SAFETY: The safety requirements of this function ensure that `ptr` comes from a previous
+ // call to `Self::into_foreign`.
+ let inner = unsafe { NonNull::new_unchecked(ptr as *mut ArcInner<T>) };
// SAFETY: The safety requirements of `from_foreign` ensure that the object remains alive
// for the lifetime of the returned value.
@@ -347,10 +347,14 @@ unsafe fn borrow<'a>(ptr: *const core::ffi::c_void) -> ArcBorrow<'a, T> {
}
unsafe fn from_foreign(ptr: *const core::ffi::c_void) -> Self {
+ // SAFETY: The safety requirements of this function ensure that `ptr` comes from a previous
+ // call to `Self::into_foreign`.
+ let inner = unsafe { NonNull::new_unchecked(ptr as *mut ArcInner<T>) };
+
// SAFETY: By the safety requirement of this function, we know that `ptr` came from
// a previous call to `Arc::into_foreign`, which guarantees that `ptr` is valid and
// holds a reference count increment that is transferrable to us.
- unsafe { Self::from_inner(NonNull::new(ptr as _).unwrap()) }
+ unsafe { Self::from_inner(inner) }
}
}
--
2.47.0
next prev parent reply other threads:[~2024-11-04 21:20 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-04 21:20 [PATCH v2 0/6] rust: add improved version of `ForeignOwnable::borrow_mut` Tamir Duberstein
2024-11-04 21:20 ` Tamir Duberstein [this message]
2024-11-04 21:20 ` [PATCH v2 2/6] rust: types: avoid `as` casts Tamir Duberstein
2024-11-08 11:35 ` Alice Ryhl
2024-11-08 12:22 ` Tamir Duberstein
2024-11-08 13:15 ` Miguel Ojeda
2024-11-08 13:20 ` Tamir Duberstein
2024-11-08 13:14 ` Miguel Ojeda
2024-11-08 13:13 ` Miguel Ojeda
2024-11-08 13:14 ` Tamir Duberstein
2024-11-04 21:20 ` [PATCH v2 3/6] rust: arc: split unsafe block, add missing comment Tamir Duberstein
2024-11-08 11:38 ` Alice Ryhl
2024-11-08 12:29 ` Tamir Duberstein
2024-11-08 12:37 ` Alice Ryhl
2024-11-08 12:40 ` Tamir Duberstein
2024-11-08 12:47 ` Alice Ryhl
2024-11-08 12:53 ` Tamir Duberstein
2024-11-04 21:20 ` [PATCH v2 4/6] rust: change `ForeignOwnable` pointer to mut Tamir Duberstein
2024-11-08 11:39 ` Alice Ryhl
2024-11-08 12:23 ` Tamir Duberstein
2024-11-04 21:20 ` [PATCH v2 5/6] rust: reorder `ForeignOwnable` items Tamir Duberstein
2024-11-08 11:42 ` Alice Ryhl
2024-11-04 21:20 ` [PATCH v2 6/6] rust: add improved version of `ForeignOwnable::borrow_mut` Tamir Duberstein
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=20241104-borrow-mut-v2-1-de650678648d@gmail.com \
--to=tamird@gmail.com \
--cc=a.hindborg@kernel.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=dakr@kernel.org \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tmgross@umich.edu \
/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).