]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
rust: zerocopy: update to v0.8.54
authorMiguel Ojeda <ojeda@kernel.org>
Thu, 9 Jul 2026 21:13:11 +0000 (23:13 +0200)
committerMiguel Ojeda <ojeda@kernel.org>
Sat, 11 Jul 2026 11:46:02 +0000 (13:46 +0200)
Update our vendored copy of `zerocopy` (and `zerocopy-derive`) to v0.8.54.

It is a very small delta from v0.8.52, and most importantly it resolves
the unexpected lack of inlining [1] which triggered a modpost error
under `CONFIG_CC_OPTIMIZE_FOR_SIZE=y` reported by Alexandre using Gary's
suggestion [2]:

    ERROR: modpost: "_RNvMNtCs5wX7wwEUCR9_8zerocopy6layoutNtB2_8SizeInfo24try_to_nonzero_elem_size" [drivers/gpu/nova-core.ko] undefined!
    ERROR: modpost: "_RNvNtCs5wX7wwEUCR9_8zerocopy4util18padding_needed_for" [drivers/gpu/nova-core.ko] undefined!

It also resolves `most_traits` being unexpectedly documented [3] that I
reported and adds a missing SPDX license identifier [4] that I requested
to match the kernel version.

The following script may be used to check for the remaining differences:

    for path in $(cd rust/zerocopy-derive/ && find . -type f ! -name README.md); do
        curl --silent --show-error --location \
            https://github.com/google/zerocopy/raw/v0.8.54/zerocopy/zerocopy-derive/src/$path |
            git diff --no-index - rust/zerocopy-derive/$path &&
            echo $path: OK
    done

    for path in $(cd rust/zerocopy/ && find . -type f ! -name README.md); do
        curl --silent --show-error --location \
            https://github.com/google/zerocopy/raw/v0.8.54/zerocopy/$path |
            git diff --no-index - rust/zerocopy/$path &&
            echo $path: OK
    done

Cc: Joshua Liebow-Feeser <joshlf@google.com>
Cc: Jack Wrenn <jswrenn@google.com>
Reported-by: Alexandre Courbot <acourbot@nvidia.com>
Closes: https://lore.kernel.org/rust-for-linux/20260708-zerocopy-export-v1-1-2bfc355853c6@nvidia.com/ [1]
Suggested-by: Gary Guo <gary@garyguo.net>
Link: https://lore.kernel.org/rust-for-linux/DJT6235B3DOV.222XR5O6VHG4M@garyguo.net/
Link: https://github.com/google/zerocopy/issues/3466
Link: https://github.com/google/zerocopy/issues/3457
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Tested-by: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-by: Gary Guo <gary@garyguo.net>
Link: https://patch.msgid.link/20260709211311.142544-1-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
rust/Makefile
rust/zerocopy-derive/README.md
rust/zerocopy-derive/lib.rs
rust/zerocopy/README.md
rust/zerocopy/rustdoc/style.css
rust/zerocopy/src/byteorder.rs
rust/zerocopy/src/layout.rs
rust/zerocopy/src/lib.rs
rust/zerocopy/src/util/mod.rs

index 835cf10e1c0b07767e3f85b0aeb9ed8c9fb6685c..627ed79dc6f504472886995afac4c8595616b4fd 100644 (file)
@@ -92,7 +92,7 @@ zerocopy-flags := \
     $(call cfgs-to-flags,$(zerocopy-cfgs))
 
 zerocopy-envs := \
-    CARGO_PKG_VERSION=0.8.52
+    CARGO_PKG_VERSION=0.8.54
 
 proc_macro2-cfgs := \
     feature="proc-macro" \
index 2a3dcf1212aff079f70212e4b7d1ab4762cc923f..d62c798043424858a1b54b288d6a5156de9eac92 100644 (file)
@@ -1,14 +1,14 @@
 # `zerocopy-derive`
 
-These source files come from the Rust `zerocopy-derive` crate, version v0.8.52
-(released 2026-06-09), hosted in the <https://github.com/google/zerocopy>
+These source files come from the Rust `zerocopy-derive` crate, version v0.8.54
+(released 2026-07-08), hosted in the <https://github.com/google/zerocopy>
 repository, licensed under "BSD-2-Clause OR Apache-2.0 OR MIT" and only
 modified to tweak the SPDX license identifiers and to remove the generation of
 non-ASCII identifiers.
 
 For copyright details, please see:
 
-    https://github.com/google/zerocopy/blob/v0.8.52/README.md?plain=1
-    https://github.com/google/zerocopy/blob/v0.8.52/LICENSE-BSD
-    https://github.com/google/zerocopy/blob/v0.8.52/LICENSE-APACHE
-    https://github.com/google/zerocopy/blob/v0.8.52/LICENSE-MIT
+    https://github.com/google/zerocopy/blob/v0.8.54/README.md?plain=1
+    https://github.com/google/zerocopy/blob/v0.8.54/LICENSE-BSD
+    https://github.com/google/zerocopy/blob/v0.8.54/LICENSE-APACHE
+    https://github.com/google/zerocopy/blob/v0.8.54/LICENSE-MIT
index 88599e7508942f3685067ddaf496f824249f17ee..d387de3683674a356bc35366d9e212c4b40f2fb1 100644 (file)
@@ -129,7 +129,7 @@ derive!(ByteHash => derive_hash => crate::derive::derive_hash);
 derive!(ByteEq => derive_eq => crate::derive::derive_eq);
 derive!(SplitAt => derive_split_at => crate::derive::derive_split_at);
 
-#[cfg_attr(zerocopy_unstable_linux, doc(hidden))]
+#[cfg_attr(not(zerocopy_unstable_linux), doc(hidden))]
 #[proc_macro_derive(most_traits, attributes(zerocopy))]
 pub fn most_traits(ts: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse_macro_input!(ts as DeriveInput);
index 712b0317df25e042b179f707b506ecb5f9b95d9a..3d11a6502cf0cb048f02bb90ada6136cd35f888a 100644 (file)
@@ -1,13 +1,13 @@
 # `zerocopy`
 
-These source files come from the Rust `zerocopy` crate, version v0.8.52
-(released 2026-06-09), hosted in the <https://github.com/google/zerocopy>
+These source files come from the Rust `zerocopy` crate, version v0.8.54
+(released 2026-07-08), hosted in the <https://github.com/google/zerocopy>
 repository, licensed under "BSD-2-Clause OR Apache-2.0 OR MIT" and only
 modified to tweak the SPDX license identifiers.
 
 For copyright details, please see:
 
-    https://github.com/google/zerocopy/blob/v0.8.52/README.md?plain=1
-    https://github.com/google/zerocopy/blob/v0.8.52/LICENSE-BSD
-    https://github.com/google/zerocopy/blob/v0.8.52/LICENSE-APACHE
-    https://github.com/google/zerocopy/blob/v0.8.52/LICENSE-MIT
+    https://github.com/google/zerocopy/blob/v0.8.54/README.md?plain=1
+    https://github.com/google/zerocopy/blob/v0.8.54/LICENSE-BSD
+    https://github.com/google/zerocopy/blob/v0.8.54/LICENSE-APACHE
+    https://github.com/google/zerocopy/blob/v0.8.54/LICENSE-MIT
index 414348964af279192097db0cca1188edfc53f087..d2d55ad2e6893ede1980c604848cd3efbbcb6277 100644 (file)
@@ -1,5 +1,4 @@
 /* SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT */
-
 /*
 Copyright 2026 The Fuchsia Authors
 
index ecf95e38eebdb7202e41359900e3a0610980ec8a..c761d5728320bfebb9f633acbdb7b10d8b33189f 100644 (file)
@@ -100,6 +100,7 @@ mod private {
 
 #[allow(missing_copy_implementations, missing_debug_implementations)]
 #[doc(hidden)]
+#[derive(PartialEq)]
 pub enum Order {
     BigEndian,
     LittleEndian,
index 942d35db895726c7b4695710f881ed0be4551bff..b1fa0cd436db8d8de1b7df46287ca7419e7c2b3e 100644 (file)
@@ -71,6 +71,8 @@ impl SizeInfo {
     /// Attempts to create a `SizeInfo` from `Self` in which `elem_size` is a
     /// `NonZeroUsize`. If `elem_size` is 0, returns `None`.
     #[allow(unused)]
+    #[cfg_attr(not(zerocopy_inline_always), inline)]
+    #[cfg_attr(zerocopy_inline_always, inline(always))]
     const fn try_to_nonzero_elem_size(&self) -> Option<SizeInfo<NonZeroUsize>> {
         Some(match *self {
             SizeInfo::Sized { size } => SizeInfo::Sized { size },
index 700fece1b728f3f1d48f54af9d52a36d72ac261a..572f0563fe2f2ede65f630e65ee33540b8825cba 100644 (file)
@@ -435,7 +435,6 @@ const _: () = {
     WARNING
 };
 
-#[doc(hidden)]
 #[cfg(all(any(feature = "derive", test), zerocopy_unstable_linux))]
 pub use zerocopy_derive::most_traits;
 /// Implements [`KnownLayout`].
index f8affbbd336cfaae6d326fb171f9b0f06226f7ec..02fd4ed62741b58ca227305760b41ac208c666bb 100644 (file)
@@ -150,6 +150,8 @@ pub(crate) fn validate_aligned_to<T: AsAddress, U>(t: T) -> Result<(), Alignment
     // Ensures that we add the minimum required padding.
     kani::ensures(|&p| p < align.get()),
 )]
+#[cfg_attr(not(zerocopy_inline_always), inline)]
+#[cfg_attr(zerocopy_inline_always, inline(always))]
 pub(crate) const fn padding_needed_for(len: usize, align: NonZeroUsize) -> usize {
     #[cfg(kani)]
     #[kani::proof_for_contract(padding_needed_for)]
@@ -251,6 +253,8 @@ pub(crate) const fn round_down_to_next_multiple_of_alignment(
     n & mask
 }
 
+#[cfg_attr(not(zerocopy_inline_always), inline)]
+#[cfg_attr(zerocopy_inline_always, inline(always))]
 pub(crate) const fn max(a: NonZeroUsize, b: NonZeroUsize) -> NonZeroUsize {
     if a.get() < b.get() {
         b
@@ -259,6 +263,8 @@ pub(crate) const fn max(a: NonZeroUsize, b: NonZeroUsize) -> NonZeroUsize {
     }
 }
 
+#[cfg_attr(not(zerocopy_inline_always), inline)]
+#[cfg_attr(zerocopy_inline_always, inline(always))]
 pub(crate) const fn min(a: NonZeroUsize, b: NonZeroUsize) -> NonZeroUsize {
     if a.get() > b.get() {
         b