Skip to content

Commit 8cfd26e

Browse files
a-gavina-gavin
committed
Update to Linux 6.18
1 parent e730548 commit 8cfd26e

File tree

154 files changed

+4045
-437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+4045
-437
lines changed

‎gen/build_logs.txt‎

Lines changed: 1496 additions & 0 deletions
Large diffs are not rendered by default.

‎gen/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::process::Command;
1010
use std::{env, fs};
1111

1212
#[allow(unused_doc_comments)]
13-
const LINUX_VERSION: &str = "v6.17";
13+
const LINUX_VERSION: &str = "v6.18";
1414

1515
/// Some commonly used features.
1616
const DEFAULT_FEATURES: &str = "\"general\", \"errno\"";

‎src/aarch64/btrfs.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ pub str_: __IncompleteArrayField<crate::ctypes::c_char>,
176176
#[derive(Debug, Copy, Clone)]
177177
pub struct mnt_id_req {
178178
pub size: __u32,
179-
pub spare: __u32,
179+
pub mnt_ns_fd: __u32,
180180
pub mnt_id: __u64,
181181
pub param: __u64,
182182
pub mnt_ns_id: __u64,
@@ -741,7 +741,7 @@ pub dirid: __u64,
741741
#[repr(C)]
742742
#[derive(Debug, Copy, Clone)]
743743
pub struct btrfs_ioctl_encoded_io_args {
744-
pub iov: *const iovec,
744+
pub iov: *mut iovec,
745745
pub iovcnt: crate::ctypes::c_ulong,
746746
pub offset: __s64,
747747
pub flags: __u64,

‎src/aarch64/general.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ pub str_: __IncompleteArrayField<crate::ctypes::c_char>,
290290
#[derive(Debug, Copy, Clone)]
291291
pub struct mnt_id_req {
292292
pub size: __u32,
293-
pub spare: __u32,
293+
pub mnt_ns_fd: __u32,
294294
pub mnt_id: __u64,
295295
pub param: __u64,
296296
pub mnt_ns_id: __u64,
@@ -1059,9 +1059,9 @@ pub sa_flags: crate::ctypes::c_ulong,
10591059
pub sa_restorer: __sigrestore_t,
10601060
pub sa_mask: kernel_sigset_t,
10611061
}
1062-
pub const LINUX_VERSION_CODE: u32 = 397568;
1062+
pub const LINUX_VERSION_CODE: u32 = 397824;
10631063
pub const LINUX_VERSION_MAJOR: u32 = 6;
1064-
pub const LINUX_VERSION_PATCHLEVEL: u32 = 17;
1064+
pub const LINUX_VERSION_PATCHLEVEL: u32 = 18;
10651065
pub const LINUX_VERSION_SUBLEVEL: u32 = 0;
10661066
pub const __BITS_PER_LONG_LONG: u32 = 64;
10671067
pub const __FD_SETSIZE: u32 = 1024;
@@ -1232,6 +1232,7 @@ pub const AT_FDCWD: i32 = -100;
12321232
pub const PIDFD_SELF_THREAD: i32 = -10000;
12331233
pub const PIDFD_SELF_THREAD_GROUP: i32 = -10001;
12341234
pub const FD_PIDFS_ROOT: i32 = -10002;
1235+
pub const FD_NSFS_ROOT: i32 = -10003;
12351236
pub const FD_INVALID: i32 = -10009;
12361237
pub const AT_SYMLINK_NOFOLLOW: u32 = 256;
12371238
pub const AT_SYMLINK_FOLLOW: u32 = 1024;

‎src/aarch64/if_arp.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,8 @@ pub const IFLA_GRO_IPV4_MAX_SIZE: _bindgen_ty_4 = _bindgen_ty_4::IFLA_GRO_IPV4_M
11171117
pub const IFLA_DPLL_PIN: _bindgen_ty_4 = _bindgen_ty_4::IFLA_DPLL_PIN;
11181118
pub const IFLA_MAX_PACING_OFFLOAD_HORIZON: _bindgen_ty_4 = _bindgen_ty_4::IFLA_MAX_PACING_OFFLOAD_HORIZON;
11191119
pub const IFLA_NETNS_IMMUTABLE: _bindgen_ty_4 = _bindgen_ty_4::IFLA_NETNS_IMMUTABLE;
1120+
pub const IFLA_HEADROOM: _bindgen_ty_4 = _bindgen_ty_4::IFLA_HEADROOM;
1121+
pub const IFLA_TAILROOM: _bindgen_ty_4 = _bindgen_ty_4::IFLA_TAILROOM;
11201122
pub const __IFLA_MAX: _bindgen_ty_4 = _bindgen_ty_4::__IFLA_MAX;
11211123
pub const IFLA_PROTO_DOWN_REASON_UNSPEC: _bindgen_ty_5 = _bindgen_ty_5::IFLA_PROTO_DOWN_REASON_UNSPEC;
11221124
pub const IFLA_PROTO_DOWN_REASON_MASK: _bindgen_ty_5 = _bindgen_ty_5::IFLA_PROTO_DOWN_REASON_MASK;
@@ -1452,6 +1454,7 @@ pub const IFLA_BOND_SLAVE_AD_AGGREGATOR_ID: _bindgen_ty_31 = _bindgen_ty_31::IFL
14521454
pub const IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE: _bindgen_ty_31 = _bindgen_ty_31::IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE;
14531455
pub const IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE: _bindgen_ty_31 = _bindgen_ty_31::IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE;
14541456
pub const IFLA_BOND_SLAVE_PRIO: _bindgen_ty_31 = _bindgen_ty_31::IFLA_BOND_SLAVE_PRIO;
1457+
pub const IFLA_BOND_SLAVE_ACTOR_PORT_PRIO: _bindgen_ty_31 = _bindgen_ty_31::IFLA_BOND_SLAVE_ACTOR_PORT_PRIO;
14551458
pub const __IFLA_BOND_SLAVE_MAX: _bindgen_ty_31 = _bindgen_ty_31::__IFLA_BOND_SLAVE_MAX;
14561459
pub const IFLA_VF_INFO_UNSPEC: _bindgen_ty_32 = _bindgen_ty_32::IFLA_VF_INFO_UNSPEC;
14571460
pub const IFLA_VF_INFO: _bindgen_ty_32 = _bindgen_ty_32::IFLA_VF_INFO;
@@ -1812,7 +1815,9 @@ IFLA_GRO_IPV4_MAX_SIZE = 64,
18121815
IFLA_DPLL_PIN = 65,
18131816
IFLA_MAX_PACING_OFFLOAD_HORIZON = 66,
18141817
IFLA_NETNS_IMMUTABLE = 67,
1815-
__IFLA_MAX = 68,
1818+
IFLA_HEADROOM = 68,
1819+
IFLA_TAILROOM = 69,
1820+
__IFLA_MAX = 70,
18161821
}
18171822
#[repr(u32)]
18181823
#[non_exhaustive]
@@ -2392,7 +2397,8 @@ IFLA_BOND_SLAVE_AD_AGGREGATOR_ID = 6,
23922397
IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE = 7,
23932398
IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE = 8,
23942399
IFLA_BOND_SLAVE_PRIO = 9,
2395-
__IFLA_BOND_SLAVE_MAX = 10,
2400+
IFLA_BOND_SLAVE_ACTOR_PORT_PRIO = 10,
2401+
__IFLA_BOND_SLAVE_MAX = 11,
23962402
}
23972403
#[repr(u32)]
23982404
#[non_exhaustive]

‎src/aarch64/io_uring.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ pub str_: __IncompleteArrayField<crate::ctypes::c_char>,
178178
#[derive(Debug, Copy, Clone)]
179179
pub struct mnt_id_req {
180180
pub size: __u32,
181-
pub spare: __u32,
181+
pub mnt_ns_fd: __u32,
182182
pub mnt_id: __u64,
183183
pub param: __u64,
184184
pub mnt_ns_id: __u64,
@@ -1006,8 +1006,10 @@ pub const IORING_SETUP_NO_MMAP: u32 = 16384;
10061006
pub const IORING_SETUP_REGISTERED_FD_ONLY: u32 = 32768;
10071007
pub const IORING_SETUP_NO_SQARRAY: u32 = 65536;
10081008
pub const IORING_SETUP_HYBRID_IOPOLL: u32 = 131072;
1009+
pub const IORING_SETUP_CQE_MIXED: u32 = 262144;
10091010
pub const IORING_URING_CMD_FIXED: u32 = 1;
1010-
pub const IORING_URING_CMD_MASK: u32 = 1;
1011+
pub const IORING_URING_CMD_MULTISHOT: u32 = 2;
1012+
pub const IORING_URING_CMD_MASK: u32 = 3;
10111013
pub const IORING_FSYNC_DATASYNC: u32 = 1;
10121014
pub const IORING_TIMEOUT_ABS: u32 = 1;
10131015
pub const IORING_TIMEOUT_UPDATE: u32 = 2;
@@ -1047,11 +1049,14 @@ pub const IORING_NOP_FILE: u32 = 2;
10471049
pub const IORING_NOP_FIXED_FILE: u32 = 4;
10481050
pub const IORING_NOP_FIXED_BUFFER: u32 = 8;
10491051
pub const IORING_NOP_TW: u32 = 16;
1052+
pub const IORING_NOP_CQE32: u32 = 32;
10501053
pub const IORING_CQE_F_BUFFER: u32 = 1;
10511054
pub const IORING_CQE_F_MORE: u32 = 2;
10521055
pub const IORING_CQE_F_SOCK_NONEMPTY: u32 = 4;
10531056
pub const IORING_CQE_F_NOTIF: u32 = 8;
10541057
pub const IORING_CQE_F_BUF_MORE: u32 = 16;
1058+
pub const IORING_CQE_F_SKIP: u32 = 32;
1059+
pub const IORING_CQE_F_32: u32 = 32768;
10551060
pub const IORING_CQE_BUFFER_SHIFT: u32 = 16;
10561061
pub const IORING_OFF_SQ_RING: u32 = 0;
10571062
pub const IORING_OFF_CQ_RING: u32 = 134217728;
@@ -1258,7 +1263,8 @@ IORING_REGISTER_SEND_MSG_RING = 31,
12581263
IORING_REGISTER_ZCRX_IFQ = 32,
12591264
IORING_REGISTER_RESIZE_RINGS = 33,
12601265
IORING_REGISTER_MEM_REGION = 34,
1261-
IORING_REGISTER_LAST = 35,
1266+
IORING_REGISTER_QUERY = 35,
1267+
IORING_REGISTER_LAST = 36,
12621268
IORING_REGISTER_USE_REGISTERED_RING = 2147483648,
12631269
}
12641270
#[repr(u32)]

‎src/aarch64/net.rs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,15 @@ pub tcpi_rehash: __u32,
450450
pub tcpi_total_rto: __u16,
451451
pub tcpi_total_rto_recoveries: __u16,
452452
pub tcpi_total_rto_time: __u32,
453+
pub tcpi_received_ce: __u32,
454+
pub tcpi_delivered_e1_bytes: __u32,
455+
pub tcpi_delivered_e0_bytes: __u32,
456+
pub tcpi_delivered_ce_bytes: __u32,
457+
pub tcpi_received_e1_bytes: __u32,
458+
pub tcpi_received_e0_bytes: __u32,
459+
pub tcpi_received_ce_bytes: __u32,
460+
pub tcpi_accecn_fail_mode: __u16,
461+
pub tcpi_accecn_opt_seen: __u16,
453462
}
454463
#[repr(C)]
455464
#[derive(Copy, Clone)]

0 commit comments

Comments
 (0)