Pull io_uring updates from Jens Axboe: "This contains the core io_uring updates, of which there are not many, and adds support for using WAITID through io_uring and hence not needing to block on these kinds of events. Outside of that, tweaks to the legacy provided buffer handling and some cleanups related to cancelations for uring_cmd support" * tag 'for-6.7/io_uring-2023-10-30' of git://git.kernel.dk/linux: io_uring/poll: use IOU_F_TWQ_LAZY_WAKE for wakeups io_uring/kbuf: Use slab for struct io_buffer objects io_uring/kbuf: Allow the full buffer id space for provided buffers io_uring/kbuf: Fix check of BID wrapping in provided buffers io_uring/rsrc: cleanup io_pin_pages() io_uring: cancelable uring_cmd io_uring: retain top 8bits of uring_cmd flags for kernel internal use io_uring: add IORING_OP_WAITID support exit: add internal include file with helpers exit: add kernel_waitid_prepare() helper exit: move core of do_wait() into helper exit: abstract out should_wake helper for child_wait_callback() io_uring/rw: add support for IORING_OP_READ_MULTISHOT io_uring/rw: mark readv/writev as vectored in the opcode definition io_uring/rw: split io_read() into a helper
Showing the changes to include/uapi/linux (1 of 19 files). Show all
Unified · Split
| @@ -65,6 +65,7 @@ struct io_uring_sqe { · 64 unmodified lines | ||
| 65 | 65 | __u32 xattr_flags; |
| 66 | 66 | __u32 msg_ring_flags; |
| 67 | 67 | __u32 uring_cmd_flags; |
| 68 | + __u32 waitid_flags; | |
| 68 | 69 | }; |
| 69 | 70 | __u64 user_data; /* data to be passed back at completion time */ |
| 70 | 71 | /* pack this to avoid bogus arm OABI complaints */ |
| @@ -240,19 +241,20 @@ enum io_uring_op { · 169 unmodified lines | ||
| 240 | 241 | IORING_OP_URING_CMD, |
| 241 | 242 | IORING_OP_SEND_ZC, |
| 242 | 243 | IORING_OP_SENDMSG_ZC, |
| 244 | + IORING_OP_READ_MULTISHOT, | |
| 245 | + IORING_OP_WAITID, | |
| 243 | 246 | |
| 244 | 247 | /* this goes last, obviously */ |
| 245 | 248 | IORING_OP_LAST, |
| 246 | 249 | }; |
| 247 | 250 | |
| 248 | 251 | /* |
| 249 | − * sqe->uring_cmd_flags | |
| 252 | + * sqe->uring_cmd_flags top 8bits aren't available for userspace | |
| 250 | 253 | * IORING_URING_CMD_FIXED use registered buffer; pass this flag |
| 251 | 254 | * along with setting sqe->buf_index. |
| 252 | − * IORING_URING_CMD_POLLED driver use only | |
| 253 | 255 | */ |
| 254 | 256 | #define IORING_URING_CMD_FIXED (1U << 0) |
| 255 | −#define IORING_URING_CMD_POLLED (1U << 31) | |
| 257 | +#define IORING_URING_CMD_MASK IORING_URING_CMD_FIXED | |
| 256 | 258 | |
| 257 | 259 | |
| 258 | 260 | /* |