Skip to content

Commit ae98edd

Browse files
tammelatgross35
tammela
authored and
tgross35
committed
linux: add socket constants up to SO_DEVMEM_DONTNEED
The devmem constants requires headers >= 6.12 on gnu libc. Musl hardcodes these constants into "sys/socket.h", which are not yet present. For reference: https://elixir.bootlin.com/linux/v6.13.5/source/include/uapi/asm-generic/socket.h#L142 Signed-off-by: Pedro Tammela <[email protected]>
1 parent 9eb5aab commit ae98edd

File tree

6 files changed

+91
-0
lines changed

6 files changed

+91
-0
lines changed

Diff for: ‎libc-test/build.rs

+27
Original file line numberDiff line numberDiff line change
@@ -4165,6 +4165,26 @@ fn test_linux(target: &str) {
41654165
{
41664166
return true;
41674167
}
4168+
// FIXME(musl): Not in musl yet
4169+
if name == "SO_NETNS_COOKIE"
4170+
|| name == "SO_BUF_LOCK"
4171+
|| name == "SO_RESERVE_MEM"
4172+
|| name == "SO_TXREHASH"
4173+
|| name == "SO_RCVMARK"
4174+
|| name == "SO_PASSPIDFD"
4175+
|| name == "SO_PEERPIDFD"
4176+
|| name == "SO_DEVMEM_LINEAR"
4177+
|| name == "SO_DEVMEM_DMABUF"
4178+
|| name == "SO_DEVMEM_DONTNEED"
4179+
{
4180+
return true;
4181+
}
4182+
// FIXME(musl): Not in musl yet
4183+
if name == "SCM_DEVMEM_LINEAR"
4184+
|| name == "SCM_DEVMEM_DMABUF"
4185+
{
4186+
return true;
4187+
}
41684188
}
41694189
match name {
41704190
// These constants are not available if gnu headers have been included
@@ -4459,6 +4479,13 @@ fn test_linux(target: &str) {
44594479
// FIXME(linux): Requires >= 6.12 kernel headers.
44604480
"SOF_TIMESTAMPING_OPT_RX_FILTER" => true,
44614481

4482+
// FIXME(linux): Requires >= 6.12 kernel headers.
4483+
"SO_DEVMEM_LINEAR"
4484+
| "SO_DEVMEM_DMABUF"
4485+
| "SO_DEVMEM_DONTNEED"
4486+
| "SCM_DEVMEM_LINEAR"
4487+
| "SCM_DEVMEM_DMABUF" => true,
4488+
44624489
_ => false,
44634490
}
44644491
});

Diff for: ‎libc-test/semver/linux.txt

+12
Original file line numberDiff line numberDiff line change
@@ -2647,6 +2647,8 @@ SCHED_OTHER
26472647
SCHED_RESET_ON_FORK
26482648
SCHED_RR
26492649
SCM_CREDENTIALS
2650+
SCM_DEVMEM_DMABUF
2651+
SCM_DEVMEM_LINEAR
26502652
SCM_J1939_DEST_ADDR
26512653
SCM_J1939_DEST_NAME
26522654
SCM_J1939_ERRQUEUE
@@ -2953,8 +2955,12 @@ SOL_X25
29532955
SOL_XDP
29542956
SOMAXCONN
29552957
SO_BINDTODEVICE
2958+
SO_BUF_LOCK
29562959
SO_BUSY_POLL
29572960
SO_BUSY_POLL_BUDGET
2961+
SO_DEVMEM_DMABUF
2962+
SO_DEVMEM_DONTNEED
2963+
SO_DEVMEM_LINEAR
29582964
SO_DOMAIN
29592965
SO_EE_OFFENDER
29602966
SO_EE_ORIGIN_ICMP
@@ -2968,20 +2974,26 @@ SO_J1939_FILTER
29682974
SO_J1939_PROMISC
29692975
SO_J1939_SEND_PRIO
29702976
SO_MARK
2977+
SO_NETNS_COOKIE
29712978
SO_ORIGINAL_DST
29722979
SO_PASSCRED
2980+
SO_PASSPIDFD
29732981
SO_PASSSEC
29742982
SO_PEEK_OFF
29752983
SO_PEERCRED
2984+
SO_PEERPIDFD
29762985
SO_PEERSEC
29772986
SO_PREFER_BUSY_POLL
29782987
SO_RCVBUFFORCE
2988+
SO_RCVMARK
2989+
SO_RESERVE_MEM
29792990
SO_REUSEPORT
29802991
SO_RXQ_OVFL
29812992
SO_SNDBUFFORCE
29822993
SO_TIMESTAMP
29832994
SO_TIMESTAMPING
29842995
SO_TIMESTAMPNS
2996+
SO_TXREHASH
29852997
SPLICE_F_GIFT
29862998
SPLICE_F_MORE
29872999
SPLICE_F_MOVE

Diff for: ‎src/unix/linux_like/linux/arch/generic/mod.rs

+13
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,16 @@ cfg_if! {
147147
}
148148
pub const SO_PREFER_BUSY_POLL: c_int = 69;
149149
pub const SO_BUSY_POLL_BUDGET: c_int = 70;
150+
pub const SO_NETNS_COOKIE: c_int = 71;
151+
pub const SO_BUF_LOCK: c_int = 72;
152+
pub const SO_RESERVE_MEM: c_int = 73;
153+
pub const SO_TXREHASH: c_int = 74;
154+
pub const SO_RCVMARK: c_int = 75;
155+
pub const SO_PASSPIDFD: c_int = 76;
156+
pub const SO_PEERPIDFD: c_int = 77;
157+
pub const SO_DEVMEM_LINEAR: c_int = 78;
158+
pub const SO_DEVMEM_DMABUF: c_int = 79;
159+
pub const SO_DEVMEM_DONTNEED: c_int = 80;
150160

151161
cfg_if! {
152162
if #[cfg(any(
@@ -169,6 +179,9 @@ cfg_if! {
169179
pub const SCM_TIMESTAMPNS: c_int = SO_TIMESTAMPNS;
170180
pub const SCM_TIMESTAMPING: c_int = SO_TIMESTAMPING;
171181

182+
pub const SCM_DEVMEM_LINEAR: c_int = SO_DEVMEM_LINEAR;
183+
pub const SCM_DEVMEM_DMABUF: c_int = SO_DEVMEM_DMABUF;
184+
172185
// Ioctl Constants
173186

174187
pub const TCGETS: Ioctl = 0x5401;

Diff for: ‎src/unix/linux_like/linux/arch/mips/mod.rs

+13
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,16 @@ cfg_if! {
120120
// pub const SO_DETACH_REUSEPORT_BPF: c_int = 68;
121121
pub const SO_PREFER_BUSY_POLL: c_int = 69;
122122
pub const SO_BUSY_POLL_BUDGET: c_int = 70;
123+
pub const SO_NETNS_COOKIE: c_int = 71;
124+
pub const SO_BUF_LOCK: c_int = 72;
125+
pub const SO_RESERVE_MEM: c_int = 73;
126+
pub const SO_TXREHASH: c_int = 74;
127+
pub const SO_RCVMARK: c_int = 75;
128+
pub const SO_PASSPIDFD: c_int = 76;
129+
pub const SO_PEERPIDFD: c_int = 77;
130+
pub const SO_DEVMEM_LINEAR: c_int = 78;
131+
pub const SO_DEVMEM_DMABUF: c_int = 79;
132+
pub const SO_DEVMEM_DONTNEED: c_int = 80;
123133

124134
pub const FICLONE: c_ulong = 0x80049409;
125135
pub const FICLONERANGE: c_ulong = 0x8020940D;
@@ -129,6 +139,9 @@ pub const FICLONERANGE: c_ulong = 0x8020940D;
129139
pub const SCM_TIMESTAMPNS: c_int = SO_TIMESTAMPNS;
130140
pub const SCM_TIMESTAMPING: c_int = SO_TIMESTAMPING;
131141

142+
pub const SCM_DEVMEM_LINEAR: c_int = SO_DEVMEM_LINEAR;
143+
pub const SCM_DEVMEM_DMABUF: c_int = SO_DEVMEM_DMABUF;
144+
132145
// Ioctl Constants
133146

134147
pub const TCGETS: Ioctl = 0x540d;

Diff for: ‎src/unix/linux_like/linux/arch/powerpc/mod.rs

+13
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ const SO_SNDTIMEO_NEW: c_int = 67;
102102
// pub const SO_DETACH_REUSEPORT_BPF: c_int = 68;
103103
pub const SO_PREFER_BUSY_POLL: c_int = 69;
104104
pub const SO_BUSY_POLL_BUDGET: c_int = 70;
105+
pub const SO_NETNS_COOKIE: c_int = 71;
106+
pub const SO_BUF_LOCK: c_int = 72;
107+
pub const SO_RESERVE_MEM: c_int = 73;
108+
pub const SO_TXREHASH: c_int = 74;
109+
pub const SO_RCVMARK: c_int = 75;
110+
pub const SO_PASSPIDFD: c_int = 76;
111+
pub const SO_PEERPIDFD: c_int = 77;
112+
pub const SO_DEVMEM_LINEAR: c_int = 78;
113+
pub const SO_DEVMEM_DMABUF: c_int = 79;
114+
pub const SO_DEVMEM_DONTNEED: c_int = 80;
105115

106116
pub const FICLONE: c_ulong = 0x80049409;
107117
pub const FICLONERANGE: c_ulong = 0x8020940D;
@@ -111,6 +121,9 @@ pub const FICLONERANGE: c_ulong = 0x8020940D;
111121
pub const SCM_TIMESTAMPNS: c_int = SO_TIMESTAMPNS;
112122
pub const SCM_TIMESTAMPING: c_int = SO_TIMESTAMPING;
113123

124+
pub const SCM_DEVMEM_LINEAR: c_int = SO_DEVMEM_LINEAR;
125+
pub const SCM_DEVMEM_DMABUF: c_int = SO_DEVMEM_DMABUF;
126+
114127
// Ioctl Constants
115128

116129
cfg_if! {

Diff for: ‎src/unix/linux_like/linux/arch/sparc/mod.rs

+13
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,25 @@ pub const SO_TIMESTAMPING: c_int = 0x0023;
9797
// pub const SO_DETACH_REUSEPORT_BPF: c_int = 0x0047;
9898
pub const SO_PREFER_BUSY_POLL: c_int = 0x0048;
9999
pub const SO_BUSY_POLL_BUDGET: c_int = 0x0049;
100+
pub const SO_NETNS_COOKIE: c_int = 0x0050;
101+
pub const SO_BUF_LOCK: c_int = 0x0051;
102+
pub const SO_RESERVE_MEM: c_int = 0x0052;
103+
pub const SO_TXREHASH: c_int = 0x0053;
104+
pub const SO_RCVMARK: c_int = 0x0054;
105+
pub const SO_PASSPIDFD: c_int = 0x0055;
106+
pub const SO_PEERPIDFD: c_int = 0x0056;
107+
pub const SO_DEVMEM_LINEAR: c_int = 0x0057;
108+
pub const SO_DEVMEM_DMABUF: c_int = 0x0058;
109+
pub const SO_DEVMEM_DONTNEED: c_int = 0x0059;
100110

101111
// Defined in unix/linux_like/mod.rs
102112
// pub const SCM_TIMESTAMP: c_int = SO_TIMESTAMP;
103113
pub const SCM_TIMESTAMPNS: c_int = SO_TIMESTAMPNS;
104114
pub const SCM_TIMESTAMPING: c_int = SO_TIMESTAMPING;
105115

116+
pub const SCM_DEVMEM_LINEAR: c_int = SO_DEVMEM_LINEAR;
117+
pub const SCM_DEVMEM_DMABUF: c_int = SO_DEVMEM_DMABUF;
118+
106119
// Ioctl Constants
107120

108121
pub const TCGETS: Ioctl = 0x40245408;

0 commit comments

Comments
 (0)