Merge pull request #3917 from tammela/patch-1

Add SO_PREFER_BUSY_POLL and SO_BUSY_POLL_BUDGET

Author: tgross35

libc-test/build.rs

@@ -3989,6 +3989,12 @@ fn test_linux(target: &str) {
             if loongarch64 && (name == "MFD_NOEXEC_SEAL" || name == "MFD_EXEC") {
                 return true;
             }
+            // FIXME(musl): Requires musl >= 1.2
+            if name == "SO_PREFER_BUSY_POLL"
+                || name == "SO_BUSY_POLL_BUDGET"
+            {
+                return true;
+            }
         }
         match name {
             // These constants are not available if gnu headers have been included

libc-test/semver/linux.txt

@@ -2954,6 +2954,7 @@ SOL_XDP
 SOMAXCONN
 SO_BINDTODEVICE
 SO_BUSY_POLL
+SO_BUSY_POLL_BUDGET
 SO_DOMAIN
 SO_EE_OFFENDER
 SO_EE_ORIGIN_ICMP
@@ -2973,6 +2974,7 @@ SO_PASSSEC
 SO_PEEK_OFF
 SO_PEERCRED
 SO_PEERSEC
+SO_PREFER_BUSY_POLL
 SO_RCVBUFFORCE
 SO_REUSEPORT
 SO_RXQ_OVFL

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

@@ -130,6 +130,11 @@ cfg_if! {
             target_arch = "csky",
             target_arch = "loongarch64"
         ),
+        // FIXME(musl):
+        // Musl hardcodes the SO_* constants instead
+        // of inheriting them from the kernel headers.
+        // For new constants you might need consider updating
+        // musl in the CI as well.
         not(any(target_env = "musl", target_env = "ohos"))
     ))] {
         pub const SO_TIMESTAMP_NEW: c_int = 63;
@@ -140,8 +145,8 @@ cfg_if! {
         pub const SO_DETACH_REUSEPORT_BPF: c_int = 68;
     }
 }
-// pub const SO_PREFER_BUSY_POLL: c_int = 69;
-// pub const SO_BUSY_POLL_BUDGET: c_int = 70;
+pub const SO_PREFER_BUSY_POLL: c_int = 69;
+pub const SO_BUSY_POLL_BUDGET: c_int = 70;
 
 cfg_if! {
     if #[cfg(any(

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

@@ -118,8 +118,8 @@ cfg_if! {
     }
 }
 // pub const SO_DETACH_REUSEPORT_BPF: c_int = 68;
-// pub const SO_PREFER_BUSY_POLL: c_int = 69;
-// pub const SO_BUSY_POLL_BUDGET: c_int = 70;
+pub const SO_PREFER_BUSY_POLL: c_int = 69;
+pub const SO_BUSY_POLL_BUDGET: c_int = 70;
 
 pub const FICLONE: c_ulong = 0x80049409;
 pub const FICLONERANGE: c_ulong = 0x8020940D;

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

@@ -100,8 +100,8 @@ const SO_TIMESTAMPING_NEW: c_int = 65;
 const SO_RCVTIMEO_NEW: c_int = 66;
 const SO_SNDTIMEO_NEW: c_int = 67;
 // pub const SO_DETACH_REUSEPORT_BPF: c_int = 68;
-// pub const SO_PREFER_BUSY_POLL: c_int = 69;
-// pub const SO_BUSY_POLL_BUDGET: c_int = 70;
+pub const SO_PREFER_BUSY_POLL: c_int = 69;
+pub const SO_BUSY_POLL_BUDGET: c_int = 70;
 
 pub const FICLONE: c_ulong = 0x80049409;
 pub const FICLONERANGE: c_ulong = 0x8020940D;

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

@@ -95,8 +95,8 @@ pub const SO_TIMESTAMPING: c_int = 0x0023;
 // pub const SO_RCVTIMEO_NEW: c_int = 0x0044;
 // pub const SO_SNDTIMEO_NEW: c_int = 0x0045;
 // pub const SO_DETACH_REUSEPORT_BPF: c_int = 0x0047;
-// pub const SO_PREFER_BUSY_POLL: c_int = 0x0048;
-// pub const SO_BUSY_POLL_BUDGET: c_int = 0x0049;
+pub const SO_PREFER_BUSY_POLL: c_int = 0x0048;
+pub const SO_BUSY_POLL_BUDGET: c_int = 0x0049;
 
 // Defined in unix/linux_like/mod.rs
 // pub const SCM_TIMESTAMP: c_int = SO_TIMESTAMP;