Skip to content

Commit 88aa42a

Browse files
arctic-alpacaarctic-alpaca
committed
move changes to src/unix/linux_like/linux/mod.rs 
1 parent 6bc41c9 commit 88aa42a

File tree

6 files changed

+37
-64
lines changed

6 files changed

+37
-64
lines changed

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

-5
Original file line numberDiff line numberDiff line change
@@ -489,17 +489,12 @@ XDP_RING_NEED_WAKEUP
489489
XDP_RX_RING
490490
XDP_SHARED_UMEM
491491
XDP_STATISTICS
492-
XDP_TXMD_FLAGS_CHECKSUM
493-
XDP_TXMD_FLAGS_TIMESTAMP
494-
XDP_TX_METADATA
495492
XDP_TX_RING
496493
XDP_UMEM_COMPLETION_RING
497494
XDP_UMEM_FILL_RING
498495
XDP_UMEM_PGOFF_COMPLETION_RING
499496
XDP_UMEM_PGOFF_FILL_RING
500497
XDP_UMEM_REG
501-
XDP_UMEM_TX_METADATA_LEN
502-
XDP_UMEM_TX_SW_CSUM
503498
XDP_UMEM_UNALIGNED_CHUNK_FLAG
504499
XDP_USE_NEED_WAKEUP
505500
XDP_USE_SG

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

-5
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,12 @@ XDP_RING_NEED_WAKEUP
4848
XDP_RX_RING
4949
XDP_SHARED_UMEM
5050
XDP_STATISTICS
51-
XDP_TXMD_FLAGS_CHECKSUM
52-
XDP_TXMD_FLAGS_TIMESTAMP
53-
XDP_TX_METADATA
5451
XDP_TX_RING
5552
XDP_UMEM_COMPLETION_RING
5653
XDP_UMEM_FILL_RING
5754
XDP_UMEM_PGOFF_COMPLETION_RING
5855
XDP_UMEM_PGOFF_FILL_RING
5956
XDP_UMEM_REG
60-
XDP_UMEM_TX_METADATA_LEN
61-
XDP_UMEM_TX_SW_CSUM
6257
XDP_UMEM_UNALIGNED_CHUNK_FLAG
6358
XDP_USE_NEED_WAKEUP
6459
XDP_USE_SG

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

+5
Original file line numberDiff line numberDiff line change
@@ -3387,6 +3387,11 @@ W_EXITCODE
33873387
W_STOPCODE
33883388
XATTR_CREATE
33893389
XATTR_REPLACE
3390+
XDP_TXMD_FLAGS_CHECKSUM
3391+
XDP_TXMD_FLAGS_TIMESTAMP
3392+
XDP_TX_METADATA
3393+
XDP_UMEM_TX_METADATA_LEN
3394+
XDP_UMEM_TX_SW_CSUM
33903395
XTABS
33913396
YESEXPR
33923397
YESSTR

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

-27
Original file line numberDiff line numberDiff line change
@@ -436,15 +436,6 @@ s! {
436436
pub options: ::__u32,
437437
}
438438

439-
pub struct xsk_tx_metadata_completion {
440-
pub tx_timestamp: ::__u64,
441-
}
442-
443-
pub struct xsk_tx_metadata_request {
444-
pub csum_start: ::__u16,
445-
pub csum_offset: ::__u16,
446-
}
447-
448439
pub struct iocb {
449440
pub aio_data: ::__u64,
450441
#[cfg(target_endian = "little")]
@@ -666,18 +657,6 @@ s_no_extra_traits! {
666657
pub ut_addr_v6: [i32; 4],
667658
__glibc_reserved: [::c_char; 20],
668659
}
669-
670-
#[allow(missing_debug_implementations)]
671-
pub struct xsk_tx_metadata {
672-
pub flags: ::__u64,
673-
pub xsk_tx_metadata_union: __c_anonymous_xsk_tx_metadata_union,
674-
}
675-
676-
#[allow(missing_debug_implementations)]
677-
pub union __c_anonymous_xsk_tx_metadata_union {
678-
pub request: xsk_tx_metadata_request,
679-
pub completion: xsk_tx_metadata_completion,
680-
}
681660
}
682661

683662
cfg_if! {
@@ -1109,8 +1088,6 @@ pub const XDP_USE_NEED_WAKEUP: ::__u16 = 1 << 3;
11091088
pub const XDP_USE_SG: ::__u16 = 1 << 4;
11101089

11111090
pub const XDP_UMEM_UNALIGNED_CHUNK_FLAG: ::__u32 = 1 << 0;
1112-
pub const XDP_UMEM_TX_SW_CSUM: ::__u32 = 1 << 1;
1113-
pub const XDP_UMEM_TX_METADATA_LEN: ::__u32 = 1 << 2;
11141091

11151092
pub const XDP_RING_NEED_WAKEUP: ::__u32 = 1 << 0;
11161093

@@ -1133,11 +1110,7 @@ pub const XDP_UMEM_PGOFF_COMPLETION_RING: ::c_ulonglong = 0x180000000;
11331110
pub const XSK_UNALIGNED_BUF_OFFSET_SHIFT: ::c_int = 48;
11341111
pub const XSK_UNALIGNED_BUF_ADDR_MASK: ::c_ulonglong = (1 << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1;
11351112

1136-
pub const XDP_TXMD_FLAGS_TIMESTAMP: ::__u32 = 1 << 0;
1137-
pub const XDP_TXMD_FLAGS_CHECKSUM: ::__u32 = 1 << 1;
1138-
11391113
pub const XDP_PKT_CONTD: ::__u32 = 1 << 0;
1140-
pub const XDP_TX_METADATA: ::__u32 = 1 << 1;
11411114

11421115
pub const ELFOSABI_ARM_AEABI: u8 = 64;
11431116

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

+32
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,16 @@ s! {
11941194
pub chan: ::c_uint,
11951195
pub rsv: [::c_uint; 5],
11961196
}
1197+
1198+
// linux/if_xdp.h
1199+
pub struct xsk_tx_metadata_completion {
1200+
pub tx_timestamp: ::__u64,
1201+
}
1202+
1203+
pub struct xsk_tx_metadata_request {
1204+
pub csum_start: ::__u16,
1205+
pub csum_offset: ::__u16,
1206+
}
11971207
}
11981208

11991209
cfg_if! {
@@ -1648,6 +1658,19 @@ s_no_extra_traits! {
16481658
pub flags: ::c_uint,
16491659
pub anonymous_2: __c_anonymous_ptp_perout_request_2,
16501660
}
1661+
1662+
// linux/if_xdp.h
1663+
#[allow(missing_debug_implementations)]
1664+
pub struct xsk_tx_metadata {
1665+
pub flags: ::__u64,
1666+
pub xsk_tx_metadata_union: __c_anonymous_xsk_tx_metadata_union,
1667+
}
1668+
1669+
#[allow(missing_debug_implementations)]
1670+
pub union __c_anonymous_xsk_tx_metadata_union {
1671+
pub request: xsk_tx_metadata_request,
1672+
pub completion: xsk_tx_metadata_completion,
1673+
}
16511674
}
16521675

16531676
cfg_if! {
@@ -5592,6 +5615,15 @@ pub const SCHED_FLAG_KEEP_PARAMS: ::c_int = 0x10;
55925615
pub const SCHED_FLAG_UTIL_CLAMP_MIN: ::c_int = 0x20;
55935616
pub const SCHED_FLAG_UTIL_CLAMP_MAX: ::c_int = 0x40;
55945617

5618+
// linux/if_xdp.h
5619+
pub const XDP_UMEM_TX_SW_CSUM: ::__u32 = 1 << 1;
5620+
pub const XDP_UMEM_TX_METADATA_LEN: ::__u32 = 1 << 2;
5621+
5622+
pub const XDP_TXMD_FLAGS_TIMESTAMP: ::__u32 = 1 << 0;
5623+
pub const XDP_TXMD_FLAGS_CHECKSUM: ::__u32 = 1 << 1;
5624+
5625+
pub const XDP_TX_METADATA: ::__u32 = 1 << 1;
5626+
55955627
// elf.h
55965628
pub const NT_PRSTATUS: ::c_int = 1;
55975629
pub const NT_PRFPREG: ::c_int = 2;

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

-27
Original file line numberDiff line numberDiff line change
@@ -346,15 +346,6 @@ s! {
346346
pub options: ::__u32,
347347
}
348348

349-
pub struct xsk_tx_metadata_completion {
350-
pub tx_timestamp: ::__u64,
351-
}
352-
353-
pub struct xsk_tx_metadata_request {
354-
pub csum_start: ::__u16,
355-
pub csum_offset: ::__u16,
356-
}
357-
358349
// netinet/tcp.h
359350

360351
pub struct tcp_info {
@@ -492,18 +483,6 @@ s_no_extra_traits! {
492483
pub ut_addr_v6: [::c_uint; 4],
493484
__unused: [::c_char; 20],
494485
}
495-
496-
#[allow(missing_debug_implementations)]
497-
pub struct xsk_tx_metadata {
498-
pub flags: ::__u64,
499-
pub xsk_tx_metadata_union: __c_anonymous_xsk_tx_metadata_union,
500-
}
501-
502-
#[allow(missing_debug_implementations)]
503-
pub union __c_anonymous_xsk_tx_metadata_union {
504-
pub request: xsk_tx_metadata_request,
505-
pub completion: xsk_tx_metadata_completion,
506-
}
507486
}
508487

509488
cfg_if! {
@@ -909,8 +888,6 @@ pub const XDP_USE_NEED_WAKEUP: ::__u16 = 1 << 3;
909888
pub const XDP_USE_SG: ::__u16 = 1 << 4;
910889

911890
pub const XDP_UMEM_UNALIGNED_CHUNK_FLAG: ::__u32 = 1 << 0;
912-
pub const XDP_UMEM_TX_SW_CSUM: ::__u32 = 1 << 1;
913-
pub const XDP_UMEM_TX_METADATA_LEN: ::__u32 = 1 << 2;
914891

915892
pub const XDP_RING_NEED_WAKEUP: ::__u32 = 1 << 0;
916893

@@ -933,11 +910,7 @@ pub const XDP_UMEM_PGOFF_COMPLETION_RING: ::c_ulonglong = 0x180000000;
933910
pub const XSK_UNALIGNED_BUF_OFFSET_SHIFT: ::c_int = 48;
934911
pub const XSK_UNALIGNED_BUF_ADDR_MASK: ::c_ulonglong = (1 << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1;
935912

936-
pub const XDP_TXMD_FLAGS_TIMESTAMP: ::__u32 = 1 << 0;
937-
pub const XDP_TXMD_FLAGS_CHECKSUM: ::__u32 = 1 << 1;
938-
939913
pub const XDP_PKT_CONTD: ::__u32 = 1 << 0;
940-
pub const XDP_TX_METADATA: ::__u32 = 1 << 1;
941914

942915
pub const _CS_V6_ENV: ::c_int = 1148;
943916
pub const _CS_V7_ENV: ::c_int = 1149;

0 commit comments

Comments
 (0)