Skip to contentSkip to conversation

Followup io_uring fixes for 6.12-rc1

GIT PULL Merged Jens Axboe 2 participants 2 messages Sep 22, 2024 – Sep 24, 2024 io_uring

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

Hi Linus,

Mostly just a set of fixes in here, or little changes that didn't get included in the initial pull request. This pull request contains:

- Move the SQPOLL napi polling outside the submission lock (Olivier)

- Rename of the "copy buffers" API that got added in the 6.12 merge window. There's really no copying going on, it's just referencing the buffers. After a bit of consideration, decided that it was better to simply rename this to avoid potential confusion (me)

- Shrink struct io_mapped_ubuf from 48 to 32 bytes, by changing it to start + len tracking rather than having start / end in there, and by removing the caching of folio_mask when we can just calculate it from folio_shift when we need it (me)

- Fixes for the SQPOLL affinity checking (me, Felix)

- Fix for how cqring waiting checks for the presence of task_work. Just check it directly rather than check for a specific notification mechanism (me)

- Tweak to how request linking is represented in tracing (me)

- Fix a syzbot report that deliberately sets up a huge list of overflow entries, and then hits rcu stalls when flushing this list. Just check for the need to preempt, and drop/reacquire locks in the loop. There's no state maintained over the loop itself, and each entry is yanked from head-of-list (me)

Please pull!

The following changes since commit 7cc2a6eadcd7a5aa36ac63e6659f5c6138c7f4d2:

io_uring: add IORING_REGISTER_COPY_BUFFERS method (2024-09-12 10:14:15 -0600)

are available in the Git repository at:

git://git.kernel.dk/linux.git tags/for-6.12/io_uring-20240922

for you to fetch changes up to eac2ca2d682f94f46b1973bdf5e77d85d77b8e53:

io_uring: check if we need to reschedule during overflow flush (2024-09-20 02:51:20 -0600)

----------------------------------------------------------------
for-6.12/io_uring-20240922

----------------------------------------------------------------
Dan Carpenter (1):
io_uring: clean up a type in io_uring_register_get_file()

Felix Moessbauer (1):
io_uring/sqpoll: do not put cpumask on stack

Jens Axboe (7):
io_uring: rename "copy buffers" to "clone buffers" io_uring/rsrc: get rid of io_mapped_ubuf->folio_mask io_uring/rsrc: change ubuf->ubuf_end to length tracking io_uring/sqpoll: retain test for whether the CPU is valid
io_uring: check for presence of task_work rather than TIF_NOTIFY_SIGNAL
io_uring: improve request linking trace
io_uring: check if we need to reschedule during overflow flush

Olivier Langlois (1):
io_uring/sqpoll: do the napi busy poll outside the submission block

 include/uapi/linux/io_uring.h |  6 +++---
 io_uring/fdinfo.c             |  3 +--
 io_uring/io_uring.c           | 21 ++++++++++++++++++---
 io_uring/register.c           |  6 +++---
 io_uring/register.h           |  2 +-
 io_uring/rsrc.c               | 23 ++++++++++-------------
 io_uring/rsrc.h               |  7 +++----
 io_uring/sqpoll.c             | 22 ++++++++++++++++------
 8 files changed, 55 insertions(+), 35 deletions(-)
Signature · 1 line
Jens Axboe