Skip to contentSkip to conversation

io_uring fixes for 6.16-rc2

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

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

Hi Linus,

A few fixes for io_uring that should go into this release. This pull request contains:

- Fix for a race between SQPOLL exit and fdinfo reading. It's slim and I was only able to reproduce this with an artificial delay in the kernel. Followup sparse fix as well to unify the access to ->thread.

- Fix for multiple buffer peeking, avoiding truncation if possible.

- Run local task_work for IOPOLL reaping when the ring is exiting. This currently isn't done due to an assumption that polled IO will never need task_work, but a fix on the block side is going to change that.

Please pull!

The following changes since commit 079afb081c4288e94d5e4223d3eb6306d853c68b:

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

are available in the Git repository at:

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

for you to fetch changes up to b62e0efd8a8571460d05922862a451855ebdf3c6:

io_uring: run local task_work from ring exit IOPOLL reaping (2025-06-13 15:26:17 -0600)

----------------------------------------------------------------
io_uring-6.16-20250614

----------------------------------------------------------------
Jens Axboe (2):
io_uring/kbuf: don't truncate end buffer for multiple buffer peeks
io_uring: run local task_work from ring exit IOPOLL reaping

Keith Busch (1):
io_uring: consistently use rcu semantics with sqpoll thread

Penglei Jiang (1):

      io_uring: fix use-after-free of sq->thread in __io_uring_show_fdinfo()
 io_uring/fdinfo.c   | 12 ++++++++++--
 io_uring/io_uring.c |  7 +++++--
 io_uring/kbuf.c     |  5 ++++-
 io_uring/register.c |  7 +++++--
 io_uring/sqpoll.c   | 43 ++++++++++++++++++++++++++++---------------
 io_uring/sqpoll.h   |  8 +++++++-
 6 files changed, 59 insertions(+), 23 deletions(-)
Signature · 1 line
Jens Axboe