[GIT,PULL] io_uring fixes for 6.2-rc3

Pull-request

git://git.kernel.dk/linux.git tags/io_uring-2023-01-06

Message

Jens Axboe Jan. 6, 2023, 4:25 p.m. UTC

Hi Linus,

A few minor fixes that should go into the 6.2 release:

- Fix for a memory leak in io-wq worker creation, if we ultimately end
  up canceling the worker creation before it gets created (me)

- lockdep annotations for the CQ locking (Pavel)

- A regression fix for CQ timeout handling (Pavel)

- Ring pinning around deferred task_work fix (Pavel)

- A trivial member move in struct io_ring_ctx, saving us some memory
  (me)

Please pull!


The following changes since commit 9eb803402a2a83400c6c6afd900e3b7c87c06816:

  uapi:io_uring.h: allow linux/time_types.h to be skipped (2022-12-27 07:32:51 -0700)

are available in the Git repository at:

  git://git.kernel.dk/linux.git tags/io_uring-2023-01-06

for you to fetch changes up to 12521a5d5cb7ff0ad43eadfc9c135d86e1131fa8:

  io_uring: fix CQ waiting timeout handling (2023-01-05 08:04:47 -0700)

----------------------------------------------------------------
io_uring-2023-01-06

----------------------------------------------------------------
Jens Axboe (2):
      io_uring/io-wq: free worker if task_work creation is canceled
      io_uring: move 'poll_multi_queue' bool in io_ring_ctx

Pavel Begunkov (3):
      io_uring: pin context while queueing deferred tw
      io_uring: lockdep annotate CQ locking
      io_uring: fix CQ waiting timeout handling

 include/linux/io_uring_types.h |  3 ++-
 io_uring/io-wq.c               |  1 +
 io_uring/io_uring.c            | 19 ++++++++++++-------
 io_uring/io_uring.h            | 15 +++++++++++++++
 4 files changed, 30 insertions(+), 8 deletions(-)

Comments

[e-mail] Jan. 6, 2023, 9:19 p.m. UTC | #1

The pull request you sent on Fri, 6 Jan 2023 09:25:13 -0700:

> git://git.kernel.dk/linux.git tags/io_uring-2023-01-06

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

Thank you!