Skip to contentSkip to conversation

io_uring fixes for 6.16-rc1

GIT PULL Merged Jens Axboe 2 participants 2 messages Jun 6, 2025 io_uring

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

Hi Linus,

Followup small batch of fixes for io_uring that should go into the 6.16-rc1 kernel. This pull request contains:

- Fix for a regression introduced in this merge window, where the 'id' passed to xa_find() for ifq lookup is uninitialized.

- Fix for zcrx release on registration failure. From 6.15, going to stable.

- Tweak for recv bundles, where msg_inq should be > 1 before being used to gate a retry event.

- Pavel doesnt want to be a maintainer anymore, remove him from the MAINTAINERS entry.

- Limit legacy kbuf registrations to 64k, which is the size of the buffer ID field anyway. Hence it's nonsensical to support more than that, and the only purpose that serves is to have syzbot trigger long exit delays for heavily configured debug kernels.

- Fix for the io_uring futex handling, which got broken for FUTEX2_PRIVATE by a generic futex commit adding private hashes.

Please pull!

The following changes since commit 44ed0f35df343d00b8d38006854f96e333104a66:

Merge tag 'irq-msi-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2025-05-27 08:15:26 -0700)

are available in the Git repository at:

git://git.kernel.dk/linux.git tags/io_uring-6.16-20250606

for you to fetch changes up to 079afb081c4288e94d5e4223d3eb6306d853c68b:

io_uring/futex: mark wait requests as inflight (2025-06-04 10:50:14 -0600)

----------------------------------------------------------------
io_uring-6.16-20250606

----------------------------------------------------------------
Jens Axboe (4):
io_uring/net: only consider msg_inq if larger than 1 io_uring/kbuf: limit legacy provided buffer lists to USHRT_MAX io_uring/futex: get rid of struct io_futex addr union io_uring/futex: mark wait requests as inflight

Pavel Begunkov (3):
io_uring/zcrx: init id for xa_find io_uring/zcrx: fix area release on registration failure
MAINTAINERS: remove myself from io_uring

 MAINTAINERS         |  1 -
 io_uring/futex.c    | 11 ++++++-----
 io_uring/io_uring.c |  7 ++++++-
 io_uring/io_uring.h |  1 +
 io_uring/kbuf.c     | 17 +++++++++++++++--
 io_uring/kbuf.h     |  3 +++
 io_uring/net.c      |  4 ++--
 io_uring/zcrx.c     |  6 ++++--
 8 files changed, 37 insertions(+), 13 deletions(-)
Signature · 1 line
Jens Axboe