History

Merge tag 'io_uring-6.14-20250221' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe: - Series fixing an issue with multishot read on pollable files that may return -EIOCBQUEUED from ->read_iter(). Four small patches for that, the first one deliberately done in such a way that it'd be easy to backport - Remove some dead constant definitions - Use array_index_nospec() for opcode indexing - Work-around for worker creation retries in the presence of signals * tag 'io_uring-6.14-20250221' of git://git.kernel.dk/linux: io_uring/rw: clean up mshot forced sync mode io_uring/rw: move ki_complete init into prep io_uring/rw: don't directly use ki_complete io_uring/rw: forbid multishot async reads io_uring/rsrc: remove unused constants io_uring: fix spelling error in uapi io_uring.h io_uring: prevent opcode speculation io-wq: backoff when retrying worker creation

Linus Torvalds committed 1 year ago

Commit f679ebf2 parents 7108b48 4614de75 files · +42 −21Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/io_uring.h+1−1
@@ -380,7 +380,7 @@ enum io_uring_op { · 379 unmodified lines
380 * result will be the number of buffers send, with380 * result will be the number of buffers send, with
381 * the starting buffer ID in cqe->flags as per381 * the starting buffer ID in cqe->flags as per
382 * usual for provided buffer usage. The buffers382 * usual for provided buffer usage. The buffers
383 * will be contigious from the starting buffer ID.383 * will be contiguous from the starting buffer ID.
384 */384 */
385#define IORING_RECVSEND_POLL_FIRST (1U << 0)385#define IORING_RECVSEND_POLL_FIRST (1U << 0)
386#define IORING_RECV_MULTISHOT (1U << 1)386#define IORING_RECV_MULTISHOT (1U << 1)