Skip to content

Commit bafbcd0

Browse files
committed
Fix io_uring changes from kernel version bump
1 parent 315bce6 commit bafbcd0

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

src/io_uring.rs

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,9 @@ pub struct io_uring_sync_cancel_reg {
11561156
pub fd: i32,
11571157
pub flags: IoringAsyncCancelFlags,
11581158
pub timeout: Timespec,
1159-
pub pad: [u64; 4],
1159+
pub opcode: u8,
1160+
pub pad: [u8; 7],
1161+
pub pad2: [u64; 3],
11601162
}
11611163

11621164
/// An io_uring Completion Queue Entry.
@@ -1220,7 +1222,7 @@ pub struct io_sqring_offsets {
12201222
pub dropped: u32,
12211223
pub array: u32,
12221224
pub resv1: u32,
1223-
pub resv2: u64,
1225+
pub user_addr: u64,
12241226
}
12251227

12261228
#[allow(missing_docs)]
@@ -1235,7 +1237,7 @@ pub struct io_cqring_offsets {
12351237
pub cqes: u32,
12361238
pub flags: u32,
12371239
pub resv1: u32,
1238-
pub resv2: u64,
1240+
pub user_addr: u64,
12391241
}
12401242

12411243
#[allow(missing_docs)]
@@ -1348,7 +1350,7 @@ pub struct io_uring_buf_reg {
13481350
pub ring_addr: u64,
13491351
pub ring_entries: u32,
13501352
pub bgid: u16,
1351-
pub pad: u16,
1353+
pub flags: u16,
13521354
pub resv: [u64; 3_usize],
13531355
}
13541356

@@ -1497,7 +1499,7 @@ fn io_uring_layouts() {
14971499
dropped,
14981500
array,
14991501
resv1,
1500-
resv2
1502+
user_addr
15011503
);
15021504
check_struct!(
15031505
io_cqring_offsets,
@@ -1509,7 +1511,7 @@ fn io_uring_layouts() {
15091511
cqes,
15101512
flags,
15111513
resv1,
1512-
resv2
1514+
user_addr
15131515
);
15141516
check_struct!(io_uring_recvmsg_out, namelen, controllen, payloadlen, flags);
15151517
check_struct!(io_uring_probe, last_op, ops_len, resv, resv2, ops);
@@ -1521,7 +1523,16 @@ fn io_uring_layouts() {
15211523
check_struct!(io_uring_getevents_arg, sigmask, sigmask_sz, pad, ts);
15221524
check_struct!(iovec, iov_base, iov_len);
15231525
check_struct!(open_how, flags, mode, resolve);
1524-
check_struct!(io_uring_buf_reg, ring_addr, ring_entries, bgid, pad, resv);
1526+
check_struct!(io_uring_buf_reg, ring_addr, ring_entries, bgid, flags, resv);
15251527
check_struct!(io_uring_buf, addr, len, bid, resv);
1526-
check_struct!(io_uring_sync_cancel_reg, addr, fd, flags, timeout, pad);
1528+
check_struct!(
1529+
io_uring_sync_cancel_reg,
1530+
addr,
1531+
fd,
1532+
flags,
1533+
timeout,
1534+
opcode,
1535+
pad,
1536+
pad2
1537+
);
15271538
}

0 commit comments

Comments
 (0)