[GIT,PULL] Final io_uring changes for 6.13-rc1

Pull-request

git://git.kernel.dk/linux.git tags/io_uring-6.13-20242901

Message

Jens Axboe Nov. 29, 2024, 4:27 p.m. UTC

Hi Linus,

Various fixes and changes for io_uring that should go into the 6.13
merge window. This pull request contains:

- Remove a leftover struct from when the cqwait registered waiting was
  transitioned to regions.

- Fix for an issue introduced in this merge window, where nop->fd might
  be used uninitialized. Ensure it's always set.

- Add capping of the task_work run in local task_work mode, to prevent
  bursty and long chains from adding too much latency.

- Work around xa_store() leaving ->head non-NULL if it encounters an
  allocation error during storing. Just a debug trigger, and can go away
  once xa_store() behaves in a more expected way for this condition. Not
  a major thing as it basically requires fault injection to trigger it.

- Fix a few mapping corner cases

- Fix KCSAN complaint on reading the table size post unlock. Again not a
  "real" issue, but it's easy to silence by just keeping the reading
  inside the lock that protects it.

Please pull!


The following changes since commit a652958888fb1ada3e4f6b548576c2d2c1b60d66:

  io_uring/region: fix error codes after failed vmap (2024-11-17 09:01:35 -0700)

are available in the Git repository at:

  git://git.kernel.dk/linux.git tags/io_uring-6.13-20242901

for you to fetch changes up to 7eb75ce7527129d7f1fee6951566af409a37a1c4:

  io_uring/tctx: work around xa_store() allocation error issue (2024-11-29 07:20:28 -0700)

----------------------------------------------------------------
io_uring-6.13-20242901

----------------------------------------------------------------
Dan Carpenter (1):
      io_uring/region: return negative -E2BIG in io_create_region()

David Wei (2):
      io_uring: add io_local_work_pending()
      io_uring: limit local tw done

Jens Axboe (3):
      io_uring/nop: ensure nop->fd is always initialized
      io_uring: fix task_work cap overshooting
      io_uring/tctx: work around xa_store() allocation error issue

Pavel Begunkov (4):
      io_uring: remove io_uring_cqwait_reg_arg
      io_uring: protect register tracing
      io_uring: check for overflows in io_pin_pages
      io_uring: fix corner case forgetting to vunmap

 include/linux/io_uring_types.h |  1 +
 include/uapi/linux/io_uring.h  | 14 --------
 io_uring/io_uring.c            | 75 ++++++++++++++++++++++++++++--------------
 io_uring/io_uring.h            |  9 +++--
 io_uring/memmap.c              | 13 ++++++--
 io_uring/nop.c                 |  6 +++-
 io_uring/register.c            |  3 +-
 io_uring/tctx.c                | 13 +++++++-
 8 files changed, 87 insertions(+), 47 deletions(-)

Comments

[e-mail] Nov. 30, 2024, 11:53 p.m. UTC | #1

The pull request you sent on Fri, 29 Nov 2024 09:27:36 -0700:

> git://git.kernel.dk/linux.git tags/io_uring-6.13-20242901

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

Thank you!