Commit 44f2e626 authored by Alice Ryhl's avatar Alice Ryhl Committed by Miguel Ojeda
Browse files

rust: kernel: stop using ptr_metadata feature



The `byte_sub` method was stabilized in Rust 1.75.0. By using that
method, we no longer need the unstable `ptr_metadata` feature for
implementing `Arc::from_raw`.

This brings us one step closer towards not using unstable compiler
features.

Reviewed-by: default avatarBenno Lossin <benno.lossin@proton.me>
Reviewed-by: default avatarMartin Rodriguez Reboredo <yakoyoku@gmail.com>
Reviewed-by: default avatarTrevor Gross <tmgross@umich.edu>
Signed-off-by: default avatarAlice Ryhl <aliceryhl@google.com>
Link: https://lore.kernel.org/r/20240215104601.1267763-1-aliceryhl@google.com


[ Reworded title. ]
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent e283ee23
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
#![feature(dispatch_from_dyn)]
#![feature(new_uninit)]
#![feature(offset_of)]
#![feature(ptr_metadata)]
#![feature(receiver_trait)]
#![feature(unsize)]

+7 −9
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
    mem::{ManuallyDrop, MaybeUninit},
    ops::{Deref, DerefMut},
    pin::Pin,
    ptr::{NonNull, Pointee},
    ptr::NonNull,
};
use macros::pin_data;

@@ -239,22 +239,20 @@ pub unsafe fn from_raw(ptr: *const T) -> Self {
        // binary, so its layout is not so large that it can trigger arithmetic overflow.
        let val_offset = unsafe { refcount_layout.extend(val_layout).unwrap_unchecked().1 };

        let metadata: <T as Pointee>::Metadata = core::ptr::metadata(ptr);
        // SAFETY: The metadata of `T` and `ArcInner<T>` is the same because `ArcInner` is a struct
        // with `T` as its last field.
        // Pointer casts leave the metadata unchanged. This is okay because the metadata of `T` and
        // `ArcInner<T>` is the same since `ArcInner` is a struct with `T` as its last field.
        //
        // This is documented at:
        // <https://doc.rust-lang.org/std/ptr/trait.Pointee.html>.
        let metadata: <ArcInner<T> as Pointee>::Metadata =
            unsafe { core::mem::transmute_copy(&metadata) };
        let ptr = ptr as *const ArcInner<T>;

        // SAFETY: The pointer is in-bounds of an allocation both before and after offsetting the
        // pointer, since it originates from a previous call to `Arc::into_raw` and is still valid.
        let ptr = unsafe { (ptr as *mut u8).sub(val_offset) as *mut () };
        let ptr = core::ptr::from_raw_parts_mut(ptr, metadata);
        let ptr = unsafe { ptr.byte_sub(val_offset) };

        // SAFETY: By the safety requirements we know that `ptr` came from `Arc::into_raw`, so the
        // reference count held then will be owned by the new `Arc` object.
        unsafe { Self::from_inner(NonNull::new_unchecked(ptr)) }
        unsafe { Self::from_inner(NonNull::new_unchecked(ptr.cast_mut())) }
    }

    /// Returns an [`ArcBorrow`] from the given [`Arc`].