History

Merge tag 'io_uring-6.17-20250808' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe: - Allow vectorized payloads for send/send-zc - like sendmsg, but without the hassle of a msghdr. - Fix for an integer wrap that should go to stable, spotted by syzbot. Nothing alarming here, as you need to be root to hit this. Nevertheless, it should get fixed. FWIW, kudos to the syzbot crew for having much nicer reproducers now, and with nicely annotated source code as well. This is particularly useful as syzbot uses the raw interface rather than liburing, historically it's been difficult to turn a syzbot reproducer into a meaningful test case. With the recent changes, not true anymore! * tag 'io_uring-6.17-20250808' of git://git.kernel.dk/linux: io_uring/memmap: cast nr_pages to size_t before shifting io_uring/net: Allow to do vectorized send

Linus Torvalds committed 1 year ago

Commit 24bbfb82 parents 71a0760 33503c03 files · +12 −3Browse files

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

Unified · Split

include/uapi/linux/io_uring.h+4−0
@@ -392,12 +392,16 @@ enum io_uring_op { · 391 unmodified lines
392392 * the starting buffer ID in cqe->flags as per
393393 * usual for provided buffer usage. The buffers
394394 * will be contiguous from the starting buffer ID.
395+ *
396+ * IORING_SEND_VECTORIZED If set, SEND[_ZC] will take a pointer to a io_vec
397+ * to allow vectorized send operations.
395398 */
396399 #define IORING_RECVSEND_POLL_FIRST (1U << 0)
397400 #define IORING_RECV_MULTISHOT (1U << 1)
398401 #define IORING_RECVSEND_FIXED_BUF (1U << 2)
399402 #define IORING_SEND_ZC_REPORT_USAGE (1U << 3)
400403 #define IORING_RECVSEND_BUNDLE (1U << 4)
404+#define IORING_SEND_VECTORIZED (1U << 5)
401405
402406 /*
403407 * cqe.res for IORING_CQE_F_NOTIF if