Skip to contentSkip to conversation

io_uring fixes for 6.18-rc3

GIT PULL Merged Jens Axboe 2 participants 2 messages Oct 24, 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 the 6.18-rc3 kernel release. This pull request contains:

- Add MAINTAINERS entry for zcrx, mostly so that netdev gets automatically CC'ed by default on any changes there too.

- Fix for the SQPOLL busy vs work time accounting. It was using getrusage(), which was both broken from a thread point of view (we only care about the SQPOLL thread itself), and vastly overkill as only the systime was used. On top of that, also be abit smarter in when it's queried. It used excessive CPU before this change. Marked for stable as well.

- Fix provided ring buffer auto commit for uring_cmd.

- Fix a few style issues and sparse annotation for a lock.

Please pull!

The following changes since commit 18d6b1743eafeb3fb1e0ea5a2b7fd0a773d525a8:

io_uring/rw: check for NULL io_br_sel when putting a buffer (2025-10-15 13:38:53 -0600)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git tags/io_uring-6.18-20251023

for you to fetch changes up to 6f1cbf6d6fd13fc169dde14e865897924cdc4bbd:

io_uring: fix buffer auto-commit for multishot uring_cmd (2025-10-23 19:41:31 -0600)

----------------------------------------------------------------
io_uring-6.18-20251023

----------------------------------------------------------------
Alok Tiwari (2):
io_uring: fix incorrect unlikely() usage in io_waitid_prep()
io_uring: correct __must_hold annotation in io_install_fixed_file

David Wei (1):
io_uring zcrx: add MAINTAINERS entry

Jens Axboe (2):
io_uring/sqpoll: switch away from getrusage() for CPU accounting io_uring/sqpoll: be smarter on when to update the stime usage

Ming Lei (1):
io_uring: fix buffer auto-commit for multishot uring_cmd

Ranganath V N (1):
io_uring: Fix code indentation error

 MAINTAINERS          |  9 ++++++++
 io_uring/fdinfo.c    |  8 +++----
 io_uring/filetable.c |  2 +-
 io_uring/io_uring.c  |  2 +-
 io_uring/kbuf.c      | 33 +++++++++++++++++---------
 io_uring/net.c       |  2 +-
 io_uring/sqpoll.c    | 65 ++++++++++++++++++++++++++++++++++++----------------
 io_uring/sqpoll.h    |  1 +
 io_uring/waitid.c    |  2 +-
 9 files changed, 85 insertions(+), 39 deletions(-)
Signature · 1 line
Jens Axboe
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 24 Oct 2025 07:58:09 -0600:

The pull request you sent on Fri, 24 Oct 2025 07:58:09 -0600:

Quoted 1 line

https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git tags/io_uring-6.18-20251023

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/812e7eb2b0741bb4a94f2b8c9b789ba5d693eedf

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html