linux: Restructure netlink to src/new

Move netlink types defined in UAPI to the `new` module. This resolves
the following build error on uclibc platforms:

    error[E0425]: cannot find value `NLMSG_MIN_TYPE` in the crate root
        --> /home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.179/src/unix/linux_like/linux/mod.rs:1999:48
         |
    1999 | pub const NFNL_MSG_BATCH_BEGIN: c_int = crate::NLMSG_MIN_TYPE;
         |                                                ^^^^^^^^^^^^^^ not found in the crate root
         |
    note: found an item that was configured out
        --> /home/runner/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.179/src/unix/linux_like/linux_l4re_shared.rs:1222:19
         |
    1200 |     if #[cfg(not(target_env = "uclibc"))] {
         |                 ----------------------- the item is gated here
    ...
    1222 |         pub const NLMSG_MIN_TYPE: c_int = 0x10;
         |                   ^^^^^^^^^^^^^^

Fixes: 2fe1d91 ("Separate L4Re from Linux code and enable tests")

(backport <#4915>)
(cherry picked from commit e0ed72d)

Author: tgross35

libc-test/semver/linux-gnu.txt

@@ -117,7 +117,6 @@ LOGIN_PROCESS
 Lmid_t
 MADV_COLLAPSE
 MAXTC
-MAX_LINKS
 MINIX2_SUPER_MAGIC
 MINIX2_SUPER_MAGIC2
 MINIX3_SUPER_MAGIC
@@ -637,9 +636,6 @@ malloc_usable_size
 mallopt
 mempcpy
 mq_notify
-nl_mmap_hdr
-nl_mmap_req
-nl_pktinfo
 ntp_adjtime
 ntp_gettime
 ntptimeval

libc-test/semver/linux.txt

@@ -1641,6 +1641,7 @@ MAP_TYPE
 MAXTTL
 MAX_ADDR_LEN
 MAX_IPOPTLEN
+MAX_LINKS
 MCAST_BLOCK_SOURCE
 MCAST_EXCLUDE
 MCAST_INCLUDE
@@ -4128,6 +4129,9 @@ nice
 nl_item
 nl_langinfo
 nl_langinfo_l
+nl_mmap_hdr
+nl_mmap_req
+nl_pktinfo
 nlattr
 nlmsgerr
 nlmsghdr

src/new/linux_uapi/linux/mod.rs

@@ -4,3 +4,4 @@
 
 pub(crate) mod can;
 pub(crate) mod keyctl;
+pub(crate) mod netlink;

src/new/linux_uapi/linux/netlink.rs

@@ -0,0 +1,136 @@
+//! Header: `uapi/linux/netlink.h`
+
+use crate::prelude::*;
+
+pub const NETLINK_ROUTE: c_int = 0;
+pub const NETLINK_UNUSED: c_int = 1;
+pub const NETLINK_USERSOCK: c_int = 2;
+pub const NETLINK_FIREWALL: c_int = 3;
+pub const NETLINK_SOCK_DIAG: c_int = 4;
+pub const NETLINK_NFLOG: c_int = 5;
+pub const NETLINK_XFRM: c_int = 6;
+pub const NETLINK_SELINUX: c_int = 7;
+pub const NETLINK_ISCSI: c_int = 8;
+pub const NETLINK_AUDIT: c_int = 9;
+pub const NETLINK_FIB_LOOKUP: c_int = 10;
+pub const NETLINK_CONNECTOR: c_int = 11;
+pub const NETLINK_NETFILTER: c_int = 12;
+pub const NETLINK_IP6_FW: c_int = 13;
+pub const NETLINK_DNRTMSG: c_int = 14;
+pub const NETLINK_KOBJECT_UEVENT: c_int = 15;
+pub const NETLINK_GENERIC: c_int = 16;
+pub const NETLINK_SCSITRANSPORT: c_int = 18;
+pub const NETLINK_ECRYPTFS: c_int = 19;
+pub const NETLINK_RDMA: c_int = 20;
+pub const NETLINK_CRYPTO: c_int = 21;
+
+pub const NETLINK_INET_DIAG: c_int = NETLINK_SOCK_DIAG;
+
+pub const MAX_LINKS: c_int = 32;
+
+s! {
+    pub struct sockaddr_nl {
+        pub nl_family: crate::sa_family_t,
+        nl_pad: Padding<c_ushort>,
+        pub nl_pid: u32,
+        pub nl_groups: u32,
+    }
+
+    pub struct nlmsghdr {
+        pub nlmsg_len: u32,
+        pub nlmsg_type: u16,
+        pub nlmsg_flags: u16,
+        pub nlmsg_seq: u32,
+        pub nlmsg_pid: u32,
+    }
+}
+
+pub const NLM_F_REQUEST: c_int = 1;
+pub const NLM_F_MULTI: c_int = 2;
+pub const NLM_F_ACK: c_int = 4;
+pub const NLM_F_ECHO: c_int = 8;
+pub const NLM_F_DUMP_INTR: c_int = 16;
+pub const NLM_F_DUMP_FILTERED: c_int = 32;
+
+pub const NLM_F_ROOT: c_int = 0x100;
+pub const NLM_F_MATCH: c_int = 0x200;
+pub const NLM_F_ATOMIC: c_int = 0x400;
+pub const NLM_F_DUMP: c_int = NLM_F_ROOT | NLM_F_MATCH;
+
+pub const NLM_F_REPLACE: c_int = 0x100;
+pub const NLM_F_EXCL: c_int = 0x200;
+pub const NLM_F_CREATE: c_int = 0x400;
+pub const NLM_F_APPEND: c_int = 0x800;
+
+pub const NLM_F_NONREC: c_int = 0x100;
+
+pub const NLM_F_CAPPED: c_int = 0x100;
+pub const NLM_F_ACK_TLVS: c_int = 0x200;
+
+pub const NLMSG_NOOP: c_int = 0x1;
+pub const NLMSG_ERROR: c_int = 0x2;
+pub const NLMSG_DONE: c_int = 0x3;
+pub const NLMSG_OVERRUN: c_int = 0x4;
+
+pub const NLMSG_MIN_TYPE: c_int = 0x10;
+
+s! {
+    pub struct nlmsgerr {
+        pub error: c_int,
+        pub msg: nlmsghdr,
+    }
+}
+
+pub const NETLINK_ADD_MEMBERSHIP: c_int = 1;
+pub const NETLINK_DROP_MEMBERSHIP: c_int = 2;
+pub const NETLINK_PKTINFO: c_int = 3;
+pub const NETLINK_BROADCAST_ERROR: c_int = 4;
+pub const NETLINK_NO_ENOBUFS: c_int = 5;
+pub const NETLINK_RX_RING: c_int = 6;
+pub const NETLINK_TX_RING: c_int = 7;
+pub const NETLINK_LISTEN_ALL_NSID: c_int = 8;
+pub const NETLINK_LIST_MEMBERSHIPS: c_int = 9;
+pub const NETLINK_CAP_ACK: c_int = 10;
+pub const NETLINK_EXT_ACK: c_int = 11;
+pub const NETLINK_GET_STRICT_CHK: c_int = 12;
+
+s! {
+    pub struct nl_pktinfo {
+        pub group: u32,
+    }
+
+    pub struct nl_mmap_req {
+        pub nm_block_size: c_uint,
+        pub nm_block_nr: c_uint,
+        pub nm_frame_size: c_uint,
+        pub nm_frame_nr: c_uint,
+    }
+
+    pub struct nl_mmap_hdr {
+        pub nm_status: c_uint,
+        pub nm_len: c_uint,
+        pub nm_group: u32,
+        pub nm_pid: u32,
+        pub nm_uid: u32,
+        pub nm_gid: u32,
+    }
+}
+
+s! {
+    pub struct nlattr {
+        pub nla_len: u16,
+        pub nla_type: u16,
+    }
+}
+
+pub const NLA_F_NESTED: c_int = 1 << 15;
+pub const NLA_F_NET_BYTEORDER: c_int = 1 << 14;
+pub const NLA_TYPE_MASK: c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER);
+
+pub const NLA_ALIGNTO: c_int = 4;
+
+f! {
+    pub fn NLA_ALIGN(len: c_int) -> c_int {
+        return ((len) + NLA_ALIGNTO - 1) & !(NLA_ALIGNTO - 1);
+    }
+}

src/new/mod.rs

@@ -181,6 +181,7 @@ cfg_if! {
         pub use linux::can::raw::*;
         pub use linux::can::*;
         pub use linux::keyctl::*;
+        pub use linux::netlink::*;
         #[cfg(target_env = "gnu")]
         pub use net::route::*;
     } else if #[cfg(target_vendor = "apple")] {

src/unix/linux_like/l4re/mod.rs

@@ -186,6 +186,16 @@ pub const TIOCGICOUNT: Ioctl = 0x545D;
 
 pub const BLKSSZGET: Ioctl = 0x1268;
 
+cfg_if! {
+    if #[cfg(not(target_env = "uclibc"))] {
+        pub const NLMSG_NOOP: c_int = 0x1;
+        pub const NLMSG_ERROR: c_int = 0x2;
+        pub const NLMSG_DONE: c_int = 0x3;
+        pub const NLMSG_OVERRUN: c_int = 0x4;
+        pub const NLMSG_MIN_TYPE: c_int = 0x10;
+    }
+}
+
 cfg_if! {
     if #[cfg(target_env = "uclibc")] {
         mod uclibc;

src/unix/linux_like/linux/gnu/mod.rs

@@ -133,26 +133,6 @@ s! {
         pub keepcost: size_t,
     }
 
-    pub struct nl_pktinfo {
-        pub group: u32,
-    }
-
-    pub struct nl_mmap_req {
-        pub nm_block_size: c_uint,
-        pub nm_block_nr: c_uint,
-        pub nm_frame_size: c_uint,
-        pub nm_frame_nr: c_uint,
-    }
-
-    pub struct nl_mmap_hdr {
-        pub nm_status: c_uint,
-        pub nm_len: c_uint,
-        pub nm_group: u32,
-        pub nm_pid: u32,
-        pub nm_uid: u32,
-        pub nm_gid: u32,
-    }
-
     pub struct ntptimeval {
         pub time: crate::timeval,
         pub maxerror: c_long,
@@ -810,8 +790,6 @@ pub const NDA_SRC_VNI: c_ushort = 11;
 pub const UNAME26: c_int = 0x0020000;
 pub const FDPIC_FUNCPTRS: c_int = 0x0080000;
 
-pub const MAX_LINKS: c_int = 32;
-
 pub const GENL_UNS_ADMIN_PERM: c_int = 0x10;
 
 pub const GENL_ID_VFS_DQUOT: c_int = crate::NLMSG_MIN_TYPE + 1;

src/unix/linux_like/linux/mod.rs

@@ -473,24 +473,6 @@ s! {
         pub newfd_flags: __u32,
     }
 
-    pub struct nlmsghdr {
-        pub nlmsg_len: u32,
-        pub nlmsg_type: u16,
-        pub nlmsg_flags: u16,
-        pub nlmsg_seq: u32,
-        pub nlmsg_pid: u32,
-    }
-
-    pub struct nlmsgerr {
-        pub error: c_int,
-        pub msg: nlmsghdr,
-    }
-
-    pub struct nlattr {
-        pub nla_len: u16,
-        pub nla_type: u16,
-    }
-
     pub struct in6_ifreq {
         pub ifr6_addr: crate::in6_addr,
         pub ifr6_prefixlen: u32,
@@ -1063,13 +1045,6 @@ s! {
         pub token_count: crate::__u32,
     }
 
-    pub struct sockaddr_nl {
-        pub nl_family: crate::sa_family_t,
-        nl_pad: Padding<c_ushort>,
-        pub nl_pid: u32,
-        pub nl_groups: u32,
-    }
-
     pub struct sockaddr_alg {
         pub salg_family: crate::sa_family_t,
         pub salg_type: [c_uchar; 14],
@@ -2653,70 +2628,8 @@ pub const NDA_VNI: c_ushort = 7;
 pub const NDA_IFINDEX: c_ushort = 8;
 
 // linux/netlink.h
-pub const NLA_ALIGNTO: c_int = 4;
-
-pub const NETLINK_ROUTE: c_int = 0;
-pub const NETLINK_UNUSED: c_int = 1;
-pub const NETLINK_USERSOCK: c_int = 2;
-pub const NETLINK_FIREWALL: c_int = 3;
-pub const NETLINK_SOCK_DIAG: c_int = 4;
-pub const NETLINK_NFLOG: c_int = 5;
-pub const NETLINK_XFRM: c_int = 6;
-pub const NETLINK_SELINUX: c_int = 7;
-pub const NETLINK_ISCSI: c_int = 8;
-pub const NETLINK_AUDIT: c_int = 9;
-pub const NETLINK_FIB_LOOKUP: c_int = 10;
-pub const NETLINK_CONNECTOR: c_int = 11;
-pub const NETLINK_NETFILTER: c_int = 12;
-pub const NETLINK_IP6_FW: c_int = 13;
-pub const NETLINK_DNRTMSG: c_int = 14;
-pub const NETLINK_KOBJECT_UEVENT: c_int = 15;
-pub const NETLINK_GENERIC: c_int = 16;
-pub const NETLINK_SCSITRANSPORT: c_int = 18;
-pub const NETLINK_ECRYPTFS: c_int = 19;
-pub const NETLINK_RDMA: c_int = 20;
-pub const NETLINK_CRYPTO: c_int = 21;
-pub const NETLINK_INET_DIAG: c_int = NETLINK_SOCK_DIAG;
-
-pub const NLM_F_REQUEST: c_int = 1;
-pub const NLM_F_MULTI: c_int = 2;
-pub const NLM_F_ACK: c_int = 4;
-pub const NLM_F_ECHO: c_int = 8;
-pub const NLM_F_DUMP_INTR: c_int = 16;
-pub const NLM_F_DUMP_FILTERED: c_int = 32;
-
-pub const NLM_F_ROOT: c_int = 0x100;
-pub const NLM_F_MATCH: c_int = 0x200;
-pub const NLM_F_ATOMIC: c_int = 0x400;
-pub const NLM_F_DUMP: c_int = NLM_F_ROOT | NLM_F_MATCH;
-
-pub const NLM_F_REPLACE: c_int = 0x100;
-pub const NLM_F_EXCL: c_int = 0x200;
-pub const NLM_F_CREATE: c_int = 0x400;
-pub const NLM_F_APPEND: c_int = 0x800;
-
-pub const NLM_F_NONREC: c_int = 0x100;
-pub const NLM_F_BULK: c_int = 0x200;
 
-pub const NLM_F_CAPPED: c_int = 0x100;
-pub const NLM_F_ACK_TLVS: c_int = 0x200;
-
-pub const NETLINK_ADD_MEMBERSHIP: c_int = 1;
-pub const NETLINK_DROP_MEMBERSHIP: c_int = 2;
-pub const NETLINK_PKTINFO: c_int = 3;
-pub const NETLINK_BROADCAST_ERROR: c_int = 4;
-pub const NETLINK_NO_ENOBUFS: c_int = 5;
-pub const NETLINK_RX_RING: c_int = 6;
-pub const NETLINK_TX_RING: c_int = 7;
-pub const NETLINK_LISTEN_ALL_NSID: c_int = 8;
-pub const NETLINK_LIST_MEMBERSHIPS: c_int = 9;
-pub const NETLINK_CAP_ACK: c_int = 10;
-pub const NETLINK_EXT_ACK: c_int = 11;
-pub const NETLINK_GET_STRICT_CHK: c_int = 12;
-
-pub const NLA_F_NESTED: c_int = 1 << 15;
-pub const NLA_F_NET_BYTEORDER: c_int = 1 << 14;
-pub const NLA_TYPE_MASK: c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER);
+pub const NLM_F_BULK: c_int = 0x200;
 
 // linux/rtnetlink.h
 pub const TCA_UNSPEC: c_ushort = 0;
@@ -4056,10 +3969,6 @@ pub const SI_DETHREAD: c_int = -7;
 pub const TRAP_PERF: c_int = 6;
 
 f! {
-    pub fn NLA_ALIGN(len: c_int) -> c_int {
-        return ((len) + NLA_ALIGNTO - 1) & !(NLA_ALIGNTO - 1);
-    }
-
     pub fn SCTP_PR_INDEX(policy: c_int) -> c_int {
         policy >> (4 - 1)
     }

src/unix/linux_like/linux_l4re_shared.rs

@@ -1214,12 +1214,6 @@ cfg_if! {
         pub const MFD_HUGE_16GB: c_uint = 0x88000000;
         pub const MFD_HUGE_MASK: c_uint = 63;
         pub const MFD_HUGE_SHIFT: c_uint = 26;
-
-        pub const NLMSG_NOOP: c_int = 0x1;
-        pub const NLMSG_ERROR: c_int = 0x2;
-        pub const NLMSG_DONE: c_int = 0x3;
-        pub const NLMSG_OVERRUN: c_int = 0x4;
-        pub const NLMSG_MIN_TYPE: c_int = 0x10;
     }
 }