Auto merge of #3120 - nathaniel-bennett:master, r=JohnTitor

Additional linux AF_PACKET functionality

Added socket options, structs and other miscellaneous constants that make memory-mapped packet sockets possible in Linux (PACKET_TX_RING, PACKET_RX_RING, etc.).

Author: bors

libc-test/build.rs

@@ -3168,7 +3168,6 @@ fn test_linux(target: &str) {
                "netinet/ip.h",
                "netinet/tcp.h",
                "netinet/udp.h",
-               "netpacket/packet.h",
                "poll.h",
                "pthread.h",
                "pty.h",
@@ -3267,6 +3266,7 @@ fn test_linux(target: &str) {
         "linux/if_addr.h",
         "linux/if_alg.h",
         "linux/if_ether.h",
+        "linux/if_packet.h",
         "linux/if_tun.h",
         "linux/input.h",
         "linux/ipv6.h",
@@ -3409,6 +3409,42 @@ fn test_linux(target: &str) {
         if sparc64 && (ty == "uinput_ff_erase" || ty == "uinput_abs_setup") {
             return true;
         }
+
+        // FIXME: sparc64 and musl CI images are big endian, which doesn't play well with structs that are not multiples of 32 or 64 bits
+        if (musl || sparc64) && ty == "sockaddr_pkt" {
+            return true;
+        }
+
+        // FIXME: sparc64 is 64-bit big endian, which doesn't play well with structs that are not multiples of 64 bits
+        if sparc64 && ty == "tpacket_auxdata" {
+            return true;
+        }
+
+        // FIXME: sparc64 is 64-bit big endian, which doesn't play well with structs that are not multiples of 64 bits
+        if sparc64 && ty == "tpacket_hdr_variant1" {
+            return true;
+        }
+
+        // FIXME: sparc64 is 64-bit big endian, which doesn't play well with structs that are not multiples of 64 bits
+        if sparc64 && ty == "tpacket_req3" {
+            return true;
+        }
+
+        // FIXME: sparc64 is 64-bit big endian, which doesn't play well with structs that are not multiples of 64 bits
+        if sparc64 && ty == "tpacket_stats_v3" {
+            return true;
+        }
+
+        // FIXME: sparc64 is 64-bit big endian, which doesn't play well with structs that are not multiples of 64 bits
+        if sparc64 && ty == "tpacket_req_u" {
+            return true;
+        }
+
+        // FIXME: sparc64 is 64-bit big endian, which doesn't play well with structs that are not multiples of 64 bits
+        if sparc64 && ty == "tpacket3_hdr" {
+            return true;
+        }
+
         // FIXME(https://github.com/rust-lang/libc/issues/1558): passing by
         // value corrupts the value for reasons not understood.
         if (gnu && sparc64) && (ty == "ip_mreqn" || ty == "hwtstamp_config") {
@@ -3427,6 +3463,9 @@ fn test_linux(target: &str) {
             // FIXME: This is actually a union, not a struct
             "sigval" => true,
 
+            // FIXME: remove these once musl/sparc64 CI versions are upgraded (currently not a recognized struct)
+            "fanout_args" if musl || sparc64 => true,
+
             // This type is tested in the `linux_termios.rs` file since there
             // are header conflicts when including them with all the other
             // structs.
@@ -3642,6 +3681,9 @@ fn test_linux(target: &str) {
             // present in recent kernels only >= 5.19
             "PR_SME_SET_VL" | "PR_SME_GET_VL" | "PR_SME_VL_LEN_MAX" | "PR_SME_SET_VL_INHERIT" | "PR_SME_SET_VL_ONE_EXEC" => true,
 
+            // FIXME: Alignment issues with tpacket3_hdr struct
+            "TPACKET3_HDRLEN" if sparc64 => true,
+
             // Added in Linux 5.14
             "FUTEX_LOCK_PI2" => true,
 
@@ -3901,6 +3943,10 @@ fn test_linux(target: &str) {
         (struct_ == "sockaddr_vm" && field == "svm_zero") ||
         // the `ifr_ifru` field is an anonymous union
         (struct_ == "ifreq" && field == "ifr_ifru") ||
+        // the `hdr_variant` field is an anonymous union
+        (struct_ == "tpacket3_hdr" && field == "hdr_variant") ||
+        // the `ts_subsec` field is an anonymous union
+        (struct_ == "tpacket_bd_ts" && field == "ts_subsec") ||
         // glibc uses a single array `uregs` instead of individual fields.
         (struct_ == "user_regs" && arm)
     });

libc-test/semver/linux.txt

@@ -1713,11 +1713,40 @@ O_RSYNC
 O_SYNC
 O_TMPFILE
 PACKET_ADD_MEMBERSHIP
+PACKET_AUXDATA
+PACKET_BROADCAST
 PACKET_DROP_MEMBERSHIP
+PACKET_FANOUT
+PACKET_HOST
+PACKET_KERNEL
+PACKET_LOOPBACK
+PACKET_LOSS
 PACKET_MR_ALLMULTI
 PACKET_MR_MULTICAST
 PACKET_MR_PROMISC
 PACKET_MR_UNICAST
+PACKET_MULTICAST
+PACKET_OTHERHOST
+PACKET_OUTGOING
+PACKET_QDISC_BYPASS
+PACKET_RESERVE
+PACKET_RX_RING
+PACKET_STATISTICS
+PACKET_TIMESTAMP
+PACKET_TX_RING
+PACKET_USER
+PACKET_VERSION
+PACKET_FANOUT_CBPF
+PACKET_FANOUT_CPU
+PACKET_FANOUT_EBPF
+PACKET_FANOUT_FLAG_DEFRAG
+PACKET_FANOUT_FLAG_ROLLOVER
+PACKET_FANOUT_FLAG_UNIQUEID
+PACKET_FANOUT_HASH
+PACKET_FANOUT_LB
+PACKET_FANOUT_QM
+PACKET_FANOUT_RND
+PACKET_FANOUT_ROLLOVER
 PENDIN
 PF_ALG
 PF_APPLETALK
@@ -2828,6 +2857,22 @@ TIOCSCTTY
 TIOCSPGRP
 TIOCSSOFTCAR
 TIOCSTI
+TP_STATUS_AVAILABLE
+TP_STATUS_BLK_TMO
+TP_STATUS_COPY
+TP_STATUS_CSUMNOTREADY
+TP_STATUS_CSUM_VALID
+TP_STATUS_KERNEL
+TP_STATUS_LOSING
+TP_STATUS_SENDING
+TP_STATUS_SEND_REQUEST
+TP_STATUS_TS_RAW_HARDWARE
+TP_STATUS_TS_SOFTWARE
+TP_STATUS_TS_SYS_HARDWARE
+TP_STATUS_USER
+TP_STATUS_VLAN_TPID_VALID
+TP_STATUS_VLAN_VALID
+TP_STATUS_WRONG_FORMAT
 TUN_READQ_SIZE
 TUN_TAP_DEV
 TUN_TUN_DEV
@@ -3089,6 +3134,7 @@ fanotify_event_metadata
 fanotify_init
 fanotify_mark
 fanotify_response
+fanout_args
 fchdir
 fdatasync
 fdopendir
@@ -3442,6 +3488,7 @@ sockaddr_alg
 sockaddr_can
 sockaddr_ll
 sockaddr_nl
+sockaddr_pkt
 sockaddr_vm
 splice
 spwd
@@ -3476,6 +3523,22 @@ timer_getoverrun
 timer_gettime
 timer_settime
 tmpfile64
+tpacket2_hdr
+tpacket3_hdr
+tpacket_auxdata
+tpacket_bd_header_u
+tpacket_bd_ts
+tpacket_block_desc
+tpacket_hdr
+tpacket_hdr_v1
+tpacket_hdr_variant1
+tpacket_req
+tpacket_req3
+tpacket_req_u
+tpacket_rollover_stats
+tpacket_stats
+tpacket_stats_v3
+tpacket_versions
 truncate
 truncate64
 ttyname_r