[GIT PULL] io_uring fixes for 6.0-rc3

* [GIT PULL] io_uring fixes for 6.0-rc3
@ 2022-08-26 16:36 Jens Axboe
  2022-08-26 18:10 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Jens Axboe @ 2022-08-26 16:36 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: io-uring

Hi Linus,

Set of fixes for io_uring that should go into this release:

- Add missing header file to the MAINTAINERS entry for io_uring (Ammar)

- liburing and the kernel ship the same io_uring.h header, but one
  change we've had for a long time only in liburing is to ensure it's
  C++ safe. Add extern C around it, so we can more easily sync them in
  the future (Ammar)

- Fix an off-by-one in the sync cancel added in this merge window (me)

- Error handling fix for passthrough (Kanchan)

- Fix for address saving for async execution for the zc tx support
  (Pavel)

- Fix ordering for TCP zc notifications, so we always have them ordered
  correctly between "data was sent" and "data was acked". This isn't
  strictly needed with the notification slots, but we've been pondering
  disabling the slot support for 6.0 - and if we do, then we do require
  the ordering to be sane. Regardless of that, it's the sane thing to do
  in terms of API (Pavel)

- Minor cleanup for indentation and lockdep annotation (Pavel)

Please pull!

The following changes since commit 3f743e9bbb8fe20f4c477e4bf6341c4187a4a264:

  io_uring/net: use right helpers for async_data (2022-08-18 07:27:20 -0600)

are available in the Git repository at:

  git://git.kernel.dk/linux-block.git tags/io_uring-6.0-2022-08-26

for you to fetch changes up to 581711c46612c1fd7f98960f9ad53f04fdb89853:

  io_uring/net: save address for sendzc async execution (2022-08-25 07:52:30 -0600)

----------------------------------------------------------------
io_uring-6.0-2022-08-26

----------------------------------------------------------------
Ammar Faizi (2):
      MAINTAINERS: Add `include/linux/io_uring_types.h`
      io_uring: uapi: Add `extern "C"` in io_uring.h for liburing

Jens Axboe (1):
      io_uring: fix off-by-one in sync cancelation file check

Kanchan Joshi (1):
      io_uring: fix submission-failure handling for uring-cmd

Pavel Begunkov (6):
      io_uring/net: fix must_hold annotation
      io_uring/net: fix zc send link failing
      io_uring/net: fix indentation
      io_uring/notif: order notif vs send CQEs
      io_uring: conditional ->async_data allocation
      io_uring/net: save address for sendzc async execution

 MAINTAINERS                   |  1 +
 include/uapi/linux/io_uring.h |  8 +++++++
 io_uring/cancel.c             |  2 +-
 io_uring/io_uring.c           |  7 +++---
 io_uring/net.c                | 56 ++++++++++++++++++++++++++++++++++++-------
 io_uring/net.h                |  1 +
 io_uring/notif.c              |  8 ++++---
 io_uring/opdef.c              |  4 +++-
 io_uring/opdef.h              |  2 ++
 io_uring/uring_cmd.c          |  2 +-
 10 files changed, 74 insertions(+), 17 deletions(-)

-- 
Jens Axboe

^ permalink raw reply	[flat|nested] 2+ messages in thread