[GIT,PULL] io_uring fixes for 6.6-rc1

Pull-request

git://git.kernel.dk/linux.git tags/io_uring-6.6-2023-09-08

Message

Jens Axboe Sept. 8, 2023, 3:02 p.m. UTC

Hi Linus,

A few fixes that should go into the 6.6-rc merge window:

- Fix for a regression this merge window caused by the SQPOLL affinity
  patch, where we can race with SQPOLL thread shutdown and cause an oops
  when trying to set affinity (Gabriel)

- Fix for a regression this merge window where fdinfo reading with for a
  ring setup with IORING_SETUP_NO_SQARRAY will attempt to deference the
  non-existing SQ ring array (me)

- Add the patch that allows more finegrained control over who can use
  io_uring (Matteo)

- Locking fix for a regression added this merge window for IOPOLL
  overflow (Pavel)

- IOPOLL fix for stable, breaking our loop if helper threads are exiting
  (Pavel)

Also had a fix for unreaped iopoll requests from io-wq from Ming, but we
found an issue with that and hence it got reverted. Will get this sorted
for a future rc.

Please pull!


The following changes since commit 6c1b980a7e79e55e951b4b2c47eefebc75071209:

  Merge tag 'dma-mapping-6.6-2023-08-29' of git://git.infradead.org/users/hch/dma-mapping (2023-08-29 20:32:10 -0700)

are available in the Git repository at:

  git://git.kernel.dk/linux.git tags/io_uring-6.6-2023-09-08

for you to fetch changes up to 023464fe33a53d7e3fa0a1967a2adcb17e5e40e3:

  Revert "io_uring: fix IO hang in io_wq_put_and_exit from do_exit()" (2023-09-07 09:41:49 -0600)

----------------------------------------------------------------
io_uring-6.6-2023-09-08

----------------------------------------------------------------
Gabriel Krisman Bertazi (1):
      io_uring: Don't set affinity on a dying sqpoll thread

Jens Axboe (2):
      io_uring/fdinfo: only print ->sq_array[] if it's there
      Revert "io_uring: fix IO hang in io_wq_put_and_exit from do_exit()"

Matteo Rizzo (1):
      io_uring: add a sysctl to disable io_uring system-wide

Ming Lei (1):
      io_uring: fix IO hang in io_wq_put_and_exit from do_exit()

Pavel Begunkov (2):
      io_uring: break out of iowq iopoll on teardown
      io_uring: fix unprotected iopoll overflow

 Documentation/admin-guide/sysctl/kernel.rst | 29 +++++++++++++++
 io_uring/fdinfo.c                           |  2 ++
 io_uring/io-wq.c                            | 10 ++++++
 io_uring/io-wq.h                            |  1 +
 io_uring/io_uring.c                         | 56 +++++++++++++++++++++++++++--
 io_uring/sqpoll.c                           |  4 ++-
 6 files changed, 99 insertions(+), 3 deletions(-)

Comments

[e-mail] Sept. 9, 2023, 5:05 a.m. UTC | #1

The pull request you sent on Fri, 8 Sep 2023 09:02:25 -0600:

> git://git.kernel.dk/linux.git tags/io_uring-6.6-2023-09-08

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

Thank you!