move AF_XDP structs and constants to linux/mod.rs

.git-blame-ignore-revs

@@ -1,5 +1,6 @@
 # Format macro bodies
 a0c7f8017b964a2de8bc3aabebdabd4a8f2c0905
 
-# Automated changes to upgrade to the 2021 edition
+# Automated changes related to the 2021 edition upgrade
 20f6aa4c8135ba5e2c079ff21b20f0a1be87e1c4
+f8a018a8e3efaf8cc4fbad84974255b0fa899fc2

.github/workflows/ci.yaml

@@ -17,6 +17,7 @@ jobs:
   style_check:
     name: Style check
     runs-on: ubuntu-24.04
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
@@ -35,6 +36,7 @@ jobs:
           - toolchain: beta
             os: ubuntu-24.04
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 25
     env:
       TOOLCHAIN: ${{ matrix.toolchain }}
     steps:
@@ -72,6 +74,7 @@ jobs:
           - target: i686-pc-windows-msvc
             os: windows-2022
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 25
     env:
       TARGET: ${{ matrix.target }}
     steps:
@@ -122,6 +125,7 @@ jobs:
           # FIXME: It seems some items in `src/unix/mod.rs`
           # aren't defined on redox actually.
           # - x86_64-unknown-redox
+    timeout-minutes: 25
     env:
       TARGET: ${{ matrix.target }}
     steps:
@@ -140,6 +144,7 @@ jobs:
       matrix:
         target:
           - x86_64-pc-solaris
+    timeout-minutes: 25
     steps:
       - uses: actions/checkout@v4
       - name: test on Solaris
@@ -163,6 +168,7 @@ jobs:
     runs-on: ubuntu-24.04
     env:
       TOOLCHAIN: nightly
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain

ci/style.rs

@@ -115,7 +115,7 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
             }
         }
         if line.contains("#[derive(") && (line.contains("Copy") || line.contains("Clone")) {
-            err.error(path, i, "impl ::Copy and ::Clone manually");
+            err.error(path, i, "impl Copy and Clone manually");
         }
         if line.contains("impl") {
             in_impl = true;

libc-test/semver/linux-gnu.txt

@@ -411,7 +411,6 @@ SOL_PPPOL2TP
 SOL_RAW
 SOL_RDS
 SOL_RXRPC
-SOL_XDP
 STATX_ALL
 STATX_ATIME
 STATX_ATTR_APPEND
@@ -478,31 +477,8 @@ UDF_SUPER_MAGIC
 UNAME26
 USBDEVICE_SUPER_MAGIC
 USER_PROCESS
-XDP_COPY
-XDP_MMAP_OFFSETS
-XDP_OPTIONS
-XDP_OPTIONS_ZEROCOPY
-XDP_PGOFF_RX_RING
-XDP_PGOFF_TX_RING
-XDP_PKT_CONTD
-XDP_RING_NEED_WAKEUP
-XDP_RX_RING
-XDP_SHARED_UMEM
-XDP_STATISTICS
-XDP_TX_RING
-XDP_UMEM_COMPLETION_RING
-XDP_UMEM_FILL_RING
-XDP_UMEM_PGOFF_COMPLETION_RING
-XDP_UMEM_PGOFF_FILL_RING
-XDP_UMEM_REG
-XDP_UMEM_UNALIGNED_CHUNK_FLAG
-XDP_USE_NEED_WAKEUP
-XDP_USE_SG
-XDP_ZEROCOPY
 XENFS_SUPER_MAGIC
 XFS_SUPER_MAGIC
-XSK_UNALIGNED_BUF_ADDR_MASK
-XSK_UNALIGNED_BUF_OFFSET_SHIFT
 _CS_GNU_LIBC_VERSION
 _CS_GNU_LIBPTHREAD_VERSION
 _CS_V6_ENV

libc-test/semver/linux-musl.txt

@@ -35,31 +35,7 @@ RWF_DSYNC
 RWF_HIPRI
 RWF_NOWAIT
 RWF_SYNC
-SOL_XDP
 USER_PROCESS
-XDP_COPY
-XDP_MMAP_OFFSETS
-XDP_OPTIONS
-XDP_OPTIONS_ZEROCOPY
-XDP_PGOFF_RX_RING
-XDP_PGOFF_TX_RING
-XDP_PKT_CONTD
-XDP_RING_NEED_WAKEUP
-XDP_RX_RING
-XDP_SHARED_UMEM
-XDP_STATISTICS
-XDP_TX_RING
-XDP_UMEM_COMPLETION_RING
-XDP_UMEM_FILL_RING
-XDP_UMEM_PGOFF_COMPLETION_RING
-XDP_UMEM_PGOFF_FILL_RING
-XDP_UMEM_REG
-XDP_UMEM_UNALIGNED_CHUNK_FLAG
-XDP_USE_NEED_WAKEUP
-XDP_USE_SG
-XDP_ZEROCOPY
-XSK_UNALIGNED_BUF_ADDR_MASK
-XSK_UNALIGNED_BUF_OFFSET_SHIFT
 _CS_V6_ENV
 _CS_V7_ENV
 adjtimex

libc-test/semver/linux.txt

@@ -2892,6 +2892,7 @@ SOL_TIPC
 SOL_TLS
 SOL_UDP
 SOL_X25
+SOL_XDP
 SOMAXCONN
 SO_BINDTODEVICE
 SO_BUSY_POLL
@@ -3400,11 +3401,34 @@ W_EXITCODE
 W_STOPCODE
 XATTR_CREATE
 XATTR_REPLACE
+XDP_COPY
+XDP_MMAP_OFFSETS
+XDP_OPTIONS
+XDP_OPTIONS_ZEROCOPY
+XDP_PGOFF_RX_RING
+XDP_PGOFF_TX_RING
+XDP_PKT_CONTD
+XDP_RING_NEED_WAKEUP
+XDP_RX_RING
+XDP_SHARED_UMEM
+XDP_STATISTICS
 XDP_TXMD_FLAGS_CHECKSUM
 XDP_TXMD_FLAGS_TIMESTAMP
 XDP_TX_METADATA
+XDP_TX_RING
+XDP_UMEM_COMPLETION_RING
+XDP_UMEM_FILL_RING
+XDP_UMEM_PGOFF_COMPLETION_RING
+XDP_UMEM_PGOFF_FILL_RING
+XDP_UMEM_REG
 XDP_UMEM_TX_METADATA_LEN
 XDP_UMEM_TX_SW_CSUM
+XDP_UMEM_UNALIGNED_CHUNK_FLAG
+XDP_USE_NEED_WAKEUP
+XDP_USE_SG
+XDP_ZEROCOPY
+XSK_UNALIGNED_BUF_ADDR_MASK
+XSK_UNALIGNED_BUF_OFFSET_SHIFT
 XTABS
 YESEXPR
 YESSTR

libc-test/semver/solarish.txt

@@ -17,6 +17,7 @@ LIO_WRITE
 PIPE_BUF
 SIGEV_PORT
 _POSIX_VDISABLE
+_ST_FSTYPSZ
 aio_cancel
 aio_error
 aio_fsync

src/fuchsia/aarch64.rs

@@ -1,4 +1,5 @@
-use crate::{c_int, c_long, c_uint, c_ulong, c_ulonglong, c_ushort, off_t, size_t};
+use crate::off_t;
+use crate::prelude::*;
 
 pub type c_char = u8;
 pub type __u64 = c_ulonglong;