[starnix] Regenerate linux uapi bindings.

The rust binding generator has updated and changed the way opaque blobs
are generated.
This updates our generator to still allow these blobs to be handled by
zerocopy

Change-Id: Ic6ec8037540e915b11d60048787d0e9ea5ce96bc
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1359331
Reviewed-by: Kevin Lindkvist <[email protected]>
Fuchsia-Auto-Submit: Benjamin Lerman <[email protected]>
Commit-Queue: Benjamin Lerman <[email protected]>

Author: Benjamin Lerman

src/starnix/kernel/signals/types.rs

@@ -704,13 +704,13 @@ pub struct SignalEventValue(pub u64);
 
 impl From<sigval_t> for SignalEventValue {
     fn from(value: sigval_t) -> Self {
-        SignalEventValue(unsafe { value._bindgen_opaque_blob })
+        SignalEventValue(zerocopy::transmute!(unsafe { value._bindgen_opaque_blob }))
     }
 }
 
 impl From<SignalEventValue> for sigval_t {
     fn from(value: SignalEventValue) -> Self {
-        Self { _bindgen_opaque_blob: value.0 }
+        Self { _bindgen_opaque_blob: zerocopy::transmute!(value.0) }
     }
 }
 

src/starnix/lib/linux_uapi/generate.py

@@ -36,6 +36,19 @@
 """
 )
 
+for s in [8, 16, 144, 272]:
+    RAW_LINES += (
+        """
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; %dusize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {
+    }
+}
+"""
+        % s
+    )
+
 PTR_TYPES = """
 #[repr(transparent)]
 #[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, IntoBytes, FromBytes, KnownLayout, Immutable)]
@@ -107,7 +120,6 @@
         Self { addr: ur.addr.into(), _phantom: Default::default() }
     }
 }
-
 """
 
 # Tell bindgen not to produce records for these types.
@@ -142,6 +154,14 @@
         r"__BindgenUnionField",
         ["IntoBytes", "FromBytes", "KnownLayout", "Immutable"],
     ),
+    (
+        r"__BindgenOpaqueArray$",
+        ["IntoBytes", "FromBytes", "KnownLayout", "Immutable"],
+    ),
+    (
+        r"__BindgenOpaqueArray8$",
+        ["FromBytes", "KnownLayout", "Immutable"],
+    ),
     (
         r"__sifields__bindgen_ty_(2|3|7)",
         ["IntoBytes", "FromBytes", "KnownLayout", "Immutable"],

src/starnix/lib/linux_uapi/src/arm.rs

@@ -19,6 +19,30 @@
 use crate::fscrypt_key_specifier;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; 8usize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {}
+}
+
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; 16usize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {}
+}
+
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; 144usize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {}
+}
+
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; 272usize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {}
+}
+
 #[repr(C)]
 #[derive(
     Copy,
@@ -147,6 +171,24 @@ where
         }
     }
 }
+#[derive(PartialEq, Eq, Copy, Clone, Debug, Hash)]
+#[repr(C)]
+#[derive(FromBytes, Immutable, IntoBytes, KnownLayout)]
+pub struct __BindgenOpaqueArray<T>(pub T);
+impl<T: Copy + Default, const N: usize> Default for __BindgenOpaqueArray<[T; N]> {
+    fn default() -> Self {
+        Self([<T as Default>::default(); N])
+    }
+}
+#[derive(PartialEq, Eq, Copy, Clone, Debug, Hash)]
+#[repr(C, align(8))]
+#[derive(FromBytes, Immutable, KnownLayout)]
+pub struct __BindgenOpaqueArray8<T>(pub T);
+impl<T: Copy + Default, const N: usize> Default for __BindgenOpaqueArray8<[T; N]> {
+    fn default() -> Self {
+        Self([<T as Default>::default(); N])
+    }
+}
 #[repr(transparent)]
 #[derive(Default, Clone, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct __IncompleteArrayField<T>(::std::marker::PhantomData<T>, [T; 0]);
@@ -10547,7 +10589,7 @@ pub struct io_uring_sqe__bindgen_ty_6 {
     pub __bindgen_anon_1: __BindgenUnionField<io_uring_sqe__bindgen_ty_6__bindgen_ty_1>,
     pub optval: __BindgenUnionField<__u64>,
     pub cmd: __BindgenUnionField<[__u8; 0usize]>,
-    pub bindgen_union_field: [u64; 2usize],
+    pub bindgen_union_field: __BindgenOpaqueArray8<[u8; 16usize]>,
 }
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
@@ -10844,7 +10886,7 @@ pub struct io_uring_buf_ring {
 pub struct io_uring_buf_ring__bindgen_ty_1 {
     pub __bindgen_anon_1: __BindgenUnionField<io_uring_buf_ring__bindgen_ty_1__bindgen_ty_1>,
     pub __bindgen_anon_2: __BindgenUnionField<io_uring_buf_ring__bindgen_ty_1__bindgen_ty_2>,
-    pub bindgen_union_field: [u64; 2usize],
+    pub bindgen_union_field: __BindgenOpaqueArray8<[u8; 16usize]>,
 }
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
@@ -11770,41 +11812,27 @@ impl Default for group_source_req {
 }
 #[repr(C)]
 #[repr(align(4))]
+#[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
 pub struct group_filter {
-    pub _bindgen_opaque_blob: [u32; 67usize],
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray<[u32; 67usize]>,
 }
 #[repr(C)]
 #[repr(align(4))]
-pub struct group_filter__bindgen_ty_1 {
-    pub _bindgen_opaque_blob: [u32; 67usize],
+#[derive(Copy, Clone)]
+pub union group_filter__bindgen_ty_1 {
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray<[u32; 67usize]>,
 }
 #[repr(C)]
 #[repr(align(4))]
+#[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
 pub struct group_filter__bindgen_ty_1__bindgen_ty_1 {
-    pub _bindgen_opaque_blob: [u32; 67usize],
-}
-impl Default for group_filter__bindgen_ty_1__bindgen_ty_1 {
-    fn default() -> Self {
-        let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
-        unsafe {
-            ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
-            s.assume_init()
-        }
-    }
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray<[u32; 67usize]>,
 }
 #[repr(C)]
 #[repr(align(4))]
+#[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
 pub struct group_filter__bindgen_ty_1__bindgen_ty_2 {
-    pub _bindgen_opaque_blob: [u32; 35usize],
-}
-impl Default for group_filter__bindgen_ty_1__bindgen_ty_2 {
-    fn default() -> Self {
-        let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
-        unsafe {
-            ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
-            s.assume_init()
-        }
-    }
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray<[u32; 35usize]>,
 }
 impl Default for group_filter__bindgen_ty_1 {
     fn default() -> Self {
@@ -11815,15 +11843,6 @@ impl Default for group_filter__bindgen_ty_1 {
         }
     }
 }
-impl Default for group_filter {
-    fn default() -> Self {
-        let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
-        unsafe {
-            ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
-            s.assume_init()
-        }
-    }
-}
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
 pub struct in_pktinfo {
@@ -19445,7 +19464,7 @@ pub struct fastrpc_ioctl_capability {
 #[repr(align(8))]
 #[derive(Debug, Default)]
 pub struct StdAtomicI64 {
-    pub _bindgen_opaque_blob: u64,
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 8usize]>,
 }
 #[repr(C)]
 #[repr(align(4))]
@@ -19457,7 +19476,7 @@ pub struct StdAtomicU32 {
 #[repr(align(8))]
 #[derive(Debug, Default)]
 pub struct StdAtomicU64 {
-    pub _bindgen_opaque_blob: u64,
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 8usize]>,
 }
 #[repr(C)]
 #[derive(Debug, Default)]

src/starnix/lib/linux_uapi/src/arm64.rs

@@ -19,6 +19,30 @@
 use crate::fscrypt_key_specifier;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; 8usize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {}
+}
+
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; 16usize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {}
+}
+
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; 144usize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {}
+}
+
+// SAFETY: The IntoBytes implementation is safe because the array size is a
+// multiple of 8, so there is no padding.
+unsafe impl IntoBytes for __BindgenOpaqueArray8<[u8; 272usize]> {
+    fn only_derive_is_allowed_to_implement_this_trait() {}
+}
+
 #[repr(transparent)]
 #[derive(
     Debug,
@@ -272,6 +296,15 @@ where
         }
     }
 }
+#[derive(PartialEq, Eq, Copy, Clone, Debug, Hash)]
+#[repr(C, align(8))]
+#[derive(FromBytes, Immutable, KnownLayout)]
+pub struct __BindgenOpaqueArray8<T>(pub T);
+impl<T: Copy + Default, const N: usize> Default for __BindgenOpaqueArray8<[T; N]> {
+    fn default() -> Self {
+        Self([<T as Default>::default(); N])
+    }
+}
 #[repr(transparent)]
 #[derive(Default, Clone, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct __IncompleteArrayField<T>(::std::marker::PhantomData<T>, [T; 0]);
@@ -10714,7 +10747,7 @@ pub struct io_uring_sqe__bindgen_ty_6 {
     pub __bindgen_anon_1: __BindgenUnionField<io_uring_sqe__bindgen_ty_6__bindgen_ty_1>,
     pub optval: __BindgenUnionField<__u64>,
     pub cmd: __BindgenUnionField<[__u8; 0usize]>,
-    pub bindgen_union_field: [u64; 2usize],
+    pub bindgen_union_field: __BindgenOpaqueArray8<[u8; 16usize]>,
 }
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
@@ -11011,7 +11044,7 @@ pub struct io_uring_buf_ring {
 pub struct io_uring_buf_ring__bindgen_ty_1 {
     pub __bindgen_anon_1: __BindgenUnionField<io_uring_buf_ring__bindgen_ty_1__bindgen_ty_1>,
     pub __bindgen_anon_2: __BindgenUnionField<io_uring_buf_ring__bindgen_ty_1__bindgen_ty_2>,
-    pub bindgen_union_field: [u64; 2usize],
+    pub bindgen_union_field: __BindgenOpaqueArray8<[u8; 16usize]>,
 }
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
@@ -11939,33 +11972,27 @@ impl Default for group_source_req {
 }
 #[repr(C)]
 #[repr(align(8))]
+#[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
 pub struct group_filter {
-    pub _bindgen_opaque_blob: [u64; 34usize],
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 272usize]>,
 }
 #[repr(C)]
 #[repr(align(8))]
-pub struct group_filter__bindgen_ty_1 {
-    pub _bindgen_opaque_blob: [u64; 34usize],
+#[derive(Copy, Clone)]
+pub union group_filter__bindgen_ty_1 {
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 272usize]>,
 }
 #[repr(C)]
 #[repr(align(8))]
+#[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
 pub struct group_filter__bindgen_ty_1__bindgen_ty_1 {
-    pub _bindgen_opaque_blob: [u64; 34usize],
-}
-impl Default for group_filter__bindgen_ty_1__bindgen_ty_1 {
-    fn default() -> Self {
-        let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
-        unsafe {
-            ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
-            s.assume_init()
-        }
-    }
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 272usize]>,
 }
 #[repr(C)]
 #[repr(align(8))]
 #[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
 pub struct group_filter__bindgen_ty_1__bindgen_ty_2 {
-    pub _bindgen_opaque_blob: [u64; 18usize],
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 144usize]>,
 }
 impl Default for group_filter__bindgen_ty_1 {
     fn default() -> Self {
@@ -11976,15 +12003,6 @@ impl Default for group_filter__bindgen_ty_1 {
         }
     }
 }
-impl Default for group_filter {
-    fn default() -> Self {
-        let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
-        unsafe {
-            ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
-            s.assume_init()
-        }
-    }
-}
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone, IntoBytes, FromBytes, KnownLayout, Immutable)]
 pub struct in_pktinfo {
@@ -16277,7 +16295,7 @@ pub struct seccomp_notif_addfd {
 #[repr(align(8))]
 #[derive(Copy, Clone, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub union sigval {
-    pub _bindgen_opaque_blob: u64,
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 8usize]>,
 }
 impl Default for sigval {
     fn default() -> Self {
@@ -22922,7 +22940,7 @@ pub struct fastrpc_ioctl_capability {
 #[repr(align(8))]
 #[derive(Debug, Default)]
 pub struct StdAtomicI64 {
-    pub _bindgen_opaque_blob: u64,
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 8usize]>,
 }
 #[repr(C)]
 #[repr(align(4))]
@@ -22934,7 +22952,7 @@ pub struct StdAtomicU32 {
 #[repr(align(8))]
 #[derive(Debug, Default)]
 pub struct StdAtomicU64 {
-    pub _bindgen_opaque_blob: u64,
+    pub _bindgen_opaque_blob: __BindgenOpaqueArray8<[u8; 8usize]>,
 }
 #[repr(C)]
 #[derive(Debug, Default)]

src/starnix/lib/linux_uapi/src/arm_manual.rs

@@ -250,7 +250,8 @@ impl From<crate::arch32::sigval> for crate::sigval {
     fn from(sigval: crate::arch32::sigval) -> Self {
         // SAFETY: This is safe because the union has a single field.
         let bindgen_opaque_blob = unsafe { sigval._bindgen_opaque_blob };
-        Self { _bindgen_opaque_blob: bindgen_opaque_blob.into() }
+        let bindgen_opaque_blob_as_u64: u64 = bindgen_opaque_blob.into();
+        Self { _bindgen_opaque_blob: zerocopy::transmute!(bindgen_opaque_blob_as_u64) }
     }
 }
 
@@ -259,7 +260,8 @@ impl TryFrom<crate::sigval> for crate::arch32::sigval {
     fn try_from(sigval: crate::sigval) -> Result<Self, ()> {
         // SAFETY: This is safe because the union has a single field.
         let bindgen_opaque_blob = unsafe { sigval._bindgen_opaque_blob };
-        Ok(Self { _bindgen_opaque_blob: bindgen_opaque_blob.try_into().map_err(|_| ())? })
+        let bindgen_opaque_blob_as_u64: u64 = zerocopy::transmute!(bindgen_opaque_blob);
+        Ok(Self { _bindgen_opaque_blob: bindgen_opaque_blob_as_u64.try_into().map_err(|_| ())? })
     }
 }