Merge pull request #4318 from tgross35/backport-morel

[0.2] Backports

Author: tgross35

ci/docker/sparc64-unknown-linux-gnu/Dockerfile

@@ -1,11 +1,4 @@
-# FIXME(sparc): newer versions of Ubuntu get the following errors
-# ```
-# /prog: /lib/sparc64-linux-gnu/libm.so.6: version `GLIBC_2.38' not found (required by /prog)
-# /prog: /lib/sparc64-linux-gnu/libc.so.6: version `GLIBC_2.39' not found (required by /prog)
-# ```
-# Not sure if this is a problem from rustc, our libc, or Ubuntu so we just
-# stick with an old LTS for now.
-FROM ubuntu:22.04
+FROM ubuntu:24.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         curl ca-certificates \

ci/linux-s390x.sh

@@ -6,8 +6,8 @@ mkdir -m 777 /qemu
 cd /qemu
 
 curl --retry 5 -LO https://github.com/qemu/qemu/raw/HEAD/pc-bios/s390-ccw.img
-curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20230607/images/generic/kernel.debian
-curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20230607/images/generic/initrd.debian
+curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20241227/images/generic/kernel.debian
+curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20241227/images/generic/initrd.debian
 
 mv kernel.debian kernel
 mv initrd.debian initrd.gz

ci/linux-sparc64.sh

@@ -5,11 +5,11 @@ set -eux
 mkdir -m 777 /qemu
 cd /qemu
 
-curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2022-12-09/debian-11.0.0-sparc64-NETINST-1.iso
-7z e debian-11.0.0-sparc64-NETINST-1.iso install/initrd.gz
-7z e debian-11.0.0-sparc64-NETINST-1.iso install/vmlinux
+curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2024-12-24/debian-12.0.0-sparc64-NETINST-1.iso
+7z e debian-12.0.0-sparc64-NETINST-1.iso install/initrd.gz
+7z e debian-12.0.0-sparc64-NETINST-1.iso install/vmlinux
 mv vmlinux kernel
-rm debian-11.0.0-sparc64-NETINST-1.iso
+rm debian-12.0.0-sparc64-NETINST-1.iso
 
 mkdir init
 cd init

ci/run.sh

@@ -87,7 +87,6 @@ test_flags="--skip check_style"
 case "$target" in
     # Only run `libc-test` 
     # FIXME(android): unit tests fail to start on Android
-    # FIXME(s390x): unit tests fail to locate glibc
     *android*) cmd="$cmd --manifest-path libc-test/Cargo.toml" ;;
     *s390x*) cmd="$cmd --manifest-path libc-test/Cargo.toml" ;;
     # For all other platforms, test everything in the workspace

libc-test/build.rs

@@ -4135,6 +4135,10 @@ fn test_linux(target: &str) {
             // FIXME(linux): Requires >= 6.9 kernel headers.
             "epoll_params" => true,
 
+            // FIXME(linux): Requires >= 6.12 kernel headers.
+            "dmabuf_cmsg" |
+            "dmabuf_token" => true,
+
             _ => false,
         }
     });
@@ -4237,6 +4241,26 @@ fn test_linux(target: &str) {
             {
                 return true;
             }
+            // FIXME(musl): Not in musl yet
+            if name == "SO_NETNS_COOKIE"
+                || name == "SO_BUF_LOCK"
+                || name == "SO_RESERVE_MEM"
+                || name == "SO_TXREHASH"
+                || name == "SO_RCVMARK"
+                || name == "SO_PASSPIDFD"
+                || name == "SO_PEERPIDFD"
+                || name == "SO_DEVMEM_LINEAR"
+                || name == "SO_DEVMEM_DMABUF"
+                || name == "SO_DEVMEM_DONTNEED"
+            {
+                        return true;
+            }
+            // FIXME(musl): Not in musl yet
+            if name == "SCM_DEVMEM_LINEAR"
+                || name == "SCM_DEVMEM_DMABUF"
+            {
+                        return true;
+            }
         }
         match name {
             // These constants are not available if gnu headers have been included
@@ -4255,7 +4279,9 @@ fn test_linux(target: &str) {
             | "F_SEAL_SEAL"
             | "F_SEAL_SHRINK"
             | "F_SEAL_GROW"
-            | "F_SEAL_WRITE" => true,
+            | "F_SEAL_WRITE"
+            | "F_SEAL_FUTURE_WRITE"
+            | "F_SEAL_EXEC" => true,
             // The `ARPHRD_CAN` is tested in the `linux_if_arp.rs` tests
             // because including `linux/if_arp.h` causes some conflicts:
             "ARPHRD_CAN" => true,
@@ -4534,6 +4560,13 @@ fn test_linux(target: &str) {
             // FIXME(linux): Requires >= 6.12 kernel headers.
             "SOF_TIMESTAMPING_OPT_RX_FILTER" => true,
 
+            // FIXME(linux): Requires >= 6.12 kernel headers.
+            "SO_DEVMEM_LINEAR"
+            | "SO_DEVMEM_DMABUF"
+            | "SO_DEVMEM_DONTNEED"
+            | "SCM_DEVMEM_LINEAR"
+            | "SCM_DEVMEM_DMABUF" => true,
+
             _ => false,
         }
     });

libc-test/semver/android.txt

@@ -685,6 +685,7 @@ F_OFD_SETLK
 F_OFD_SETLKW
 F_OK
 F_RDLCK
+F_SEAL_EXEC
 F_SEAL_GROW
 F_SEAL_SEAL
 F_SEAL_SHRINK

libc-test/semver/linux.txt

@@ -864,6 +864,7 @@ F_OFD_GETLK
 F_OFD_SETLK
 F_OFD_SETLKW
 F_RDLCK
+F_SEAL_EXEC
 F_SEAL_FUTURE_WRITE
 F_SEAL_GROW
 F_SEAL_SEAL
@@ -2647,6 +2648,8 @@ SCHED_OTHER
 SCHED_RESET_ON_FORK
 SCHED_RR
 SCM_CREDENTIALS
+SCM_DEVMEM_DMABUF
+SCM_DEVMEM_LINEAR
 SCM_J1939_DEST_ADDR
 SCM_J1939_DEST_NAME
 SCM_J1939_ERRQUEUE
@@ -2953,8 +2956,12 @@ SOL_X25
 SOL_XDP
 SOMAXCONN
 SO_BINDTODEVICE
+SO_BUF_LOCK
 SO_BUSY_POLL
 SO_BUSY_POLL_BUDGET
+SO_DEVMEM_DMABUF
+SO_DEVMEM_DONTNEED
+SO_DEVMEM_LINEAR
 SO_DOMAIN
 SO_EE_OFFENDER
 SO_EE_ORIGIN_ICMP
@@ -2968,20 +2975,26 @@ SO_J1939_FILTER
 SO_J1939_PROMISC
 SO_J1939_SEND_PRIO
 SO_MARK
+SO_NETNS_COOKIE
 SO_ORIGINAL_DST
 SO_PASSCRED
+SO_PASSPIDFD
 SO_PASSSEC
 SO_PEEK_OFF
 SO_PEERCRED
+SO_PEERPIDFD
 SO_PEERSEC
 SO_PREFER_BUSY_POLL
 SO_RCVBUFFORCE
+SO_RCVMARK
+SO_RESERVE_MEM
 SO_REUSEPORT
 SO_RXQ_OVFL
 SO_SNDBUFFORCE
 SO_TIMESTAMP
 SO_TIMESTAMPING
 SO_TIMESTAMPNS
+SO_TXREHASH
 SPLICE_F_GIFT
 SPLICE_F_MORE
 SPLICE_F_MOVE

src/unix/bsd/apple/mod.rs

@@ -1303,6 +1303,12 @@ s! {
         pub ctl_id: u32,
         pub ctl_name: [c_char; MAX_KCTL_NAME],
     }
+
+    // sys/proc_info.h
+    pub struct proc_fdinfo {
+        pub proc_fd: i32,
+        pub proc_fdtype: u32,
+    }
 }
 
 s_no_extra_traits! {
@@ -5139,6 +5145,21 @@ pub const PROC_PIDTASKINFO: c_int = 4;
 pub const PROC_PIDTHREADINFO: c_int = 5;
 pub const PROC_PIDVNODEPATHINFO: c_int = 9;
 pub const PROC_PIDPATHINFO_MAXSIZE: c_int = 4096;
+
+pub const PROC_PIDLISTFDS: c_int = 1;
+pub const PROC_PIDLISTFD_SIZE: c_int = mem::size_of::<proc_fdinfo>() as c_int;
+pub const PROX_FDTYPE_ATALK: c_int = 0;
+pub const PROX_FDTYPE_VNODE: c_int = 1;
+pub const PROX_FDTYPE_SOCKET: c_int = 2;
+pub const PROX_FDTYPE_PSHM: c_int = 3;
+pub const PROX_FDTYPE_PSEM: c_int = 4;
+pub const PROX_FDTYPE_KQUEUE: c_int = 5;
+pub const PROX_FDTYPE_PIPE: c_int = 6;
+pub const PROX_FDTYPE_FSEVENTS: c_int = 7;
+pub const PROX_FDTYPE_NETPOLICY: c_int = 9;
+pub const PROX_FDTYPE_CHANNEL: c_int = 10;
+pub const PROX_FDTYPE_NEXUS: c_int = 11;
+
 pub const PROC_CSM_ALL: c_uint = 0x0001;
 pub const PROC_CSM_NOSMT: c_uint = 0x0002;
 pub const PROC_CSM_TECS: c_uint = 0x0004;

src/unix/linux_like/android/mod.rs

@@ -1305,6 +1305,7 @@ pub const F_TLOCK: c_int = 2;
 pub const F_ULOCK: c_int = 0;
 
 pub const F_SEAL_FUTURE_WRITE: c_int = 0x0010;
+pub const F_SEAL_EXEC: c_int = 0x0020;
 
 pub const IFF_LOWER_UP: c_int = 0x10000;
 pub const IFF_DORMANT: c_int = 0x20000;

src/unix/linux_like/linux/arch/generic/mod.rs

@@ -147,6 +147,16 @@ cfg_if! {
 }
 pub const SO_PREFER_BUSY_POLL: c_int = 69;
 pub const SO_BUSY_POLL_BUDGET: c_int = 70;
+pub const SO_NETNS_COOKIE: c_int = 71;
+pub const SO_BUF_LOCK: c_int = 72;
+pub const SO_RESERVE_MEM: c_int = 73;
+pub const SO_TXREHASH: c_int = 74;
+pub const SO_RCVMARK: c_int = 75;
+pub const SO_PASSPIDFD: c_int = 76;
+pub const SO_PEERPIDFD: c_int = 77;
+pub const SO_DEVMEM_LINEAR: c_int = 78;
+pub const SO_DEVMEM_DMABUF: c_int = 79;
+pub const SO_DEVMEM_DONTNEED: c_int = 80;
 
 cfg_if! {
     if #[cfg(any(
@@ -169,6 +179,9 @@ cfg_if! {
 pub const SCM_TIMESTAMPNS: c_int = SO_TIMESTAMPNS;
 pub const SCM_TIMESTAMPING: c_int = SO_TIMESTAMPING;
 
+pub const SCM_DEVMEM_LINEAR: c_int = SO_DEVMEM_LINEAR;
+pub const SCM_DEVMEM_DMABUF: c_int = SO_DEVMEM_DMABUF;
+
 // Ioctl Constants
 
 pub const TCGETS: Ioctl = 0x5401;