[GIT,PULL] Final io_uring updates for 6.15-rc1

Pull-request

git://git.kernel.dk/linux.git tags/io_uring-6.15-20250403

Message

Jens Axboe April 3, 2025, 10:23 p.m. UTC

Hi Linus,

Set of fixes/updates for io_uring that should go into this release. The
ublk bits could've gone via either tree - usually I put them in block,
but they got a bit mixed this series with the zero-copy supported that
ended up dipping into both trees.

This pull request contains:

- Fix for sendmsg zc, include in pinned pages accounting like we do for
  the other zc types.

- Series for ublk fixing request aborting, doing various little
  cleanups, fixing some zc issues, and adding queue_rqs support.

- Another ublk series doing some code cleanups.

- Series cleaning up the io_uring send path, mostly in preparation for
  registered buffers.

- Series doing little MSG_RING cleanups.

- Fix for the newly added zc rx, fixing len being 0 for the last
  invocation of the callback.

- Add vectored registered buffer support for ublk. With that, then ublk
  also supports this feature in the kernel revision where it could
  generically introduced for rw/net.

- A bunch of selftest additions for ublk. This is the majority of the
  diffstat.

- Silence a KCSAN data race warning for io-wq

- Various little cleanups and fixes.

Please pull!


The following changes since commit eff5f16bfd87ae48c56751741af41a825d5d4618:

  Merge tag 'for-6.15/io_uring-reg-vec-20250327' of git://git.kernel.dk/linux (2025-03-28 15:07:04 -0700)

are available in the Git repository at:

  git://git.kernel.dk/linux.git tags/io_uring-6.15-20250403

for you to fetch changes up to 390513642ee6763c7ada07f0a1470474986e6c1c:

  io_uring: always do atomic put from iowq (2025-04-03 08:31:57 -0600)

----------------------------------------------------------------
io_uring-6.15-20250403

----------------------------------------------------------------
Caleb Sander Mateos (7):
      ublk: remove unused cmd argument to ublk_dispatch_req()
      ublk: skip 1 NULL check in ublk_cmd_list_tw_cb() loop
      ublk: get ubq from pdu in ublk_cmd_list_tw_cb()
      ublk: avoid redundant io->cmd in ublk_queue_cmd_list()
      ublk: store req in ublk_uring_cmd_pdu for ublk_cmd_tw_cb()
      ublk: specify io_cmd_buf pointer type
      selftests: ublk: specify io_cmd_buf pointer type

David Wei (1):
      io_uring/zcrx: return early from io_zcrx_recv_skb if readlen is 0

Jens Axboe (1):
      Documentation: ublk: remove dead footnote

Ming Lei (15):
      ublk: make sure ubq->canceling is set when queue is frozen
      ublk: comment on ubq->canceling handling in ublk_queue_rq()
      ublk: remove two unused fields from 'struct ublk_queue'
      ublk: add helper of ublk_need_map_io()
      ublk: call io_uring_cmd_to_pdu to get uring_cmd pdu
      ublk: add segment parameter
      ublk: document zero copy feature
      ublk: implement ->queue_rqs()
      ublk: rename ublk_rq_task_work_cb as ublk_cmd_tw_cb
      selftests: ublk: add more tests for covering MQ
      selftests: ublk: add test for checking zero copy related parameter
      io_uring: add validate_fixed_range() for validate fixed buffer
      block: add for_each_mp_bvec()
      io_uring: support vectored kernel fixed buffer
      selftests: ublk: enable zero copy for stripe target

Pavel Begunkov (18):
      io_uring/net: account memory for zc sendmsg
      io_uring/net: open code io_sendmsg_copy_hdr()
      io_uring/net: open code io_net_vec_assign()
      io_uring/net: combine sendzc flags writes
      io_uring/net: unify sendmsg setup with zc
      io_uring/net: clusterise send vs msghdr branches
      io_uring/net: set sg_from_iter in advance
      io_uring/net: import zc ubuf earlier
      io_uring/msg: rename io_double_lock_ctx()
      io_uring/msg: initialise msg request opcode
      io_uring: don't pass ctx to tw add remote helper
      io_uring: add req flag invariant build assertion
      io_uring: make zcrx depend on CONFIG_IO_URING
      io_uring: hide caches sqes from drivers
      io_uring: cleanup {g,s]etsockopt sqe reading
      io_uring/rsrc: check size when importing reg buffer
      io_uring/net: avoid import_ubuf for regvec send
      io_uring: always do atomic put from iowq

Uday Shankar (2):
      selftests: ublk: kublk: use ioctl-encoded opcodes
      selftests: ublk: kublk: fix an error log line

 Documentation/block/ublk.rst                    |  37 ++--
 drivers/block/ublk_drv.c                        | 223 +++++++++++++++++++-----
 include/linux/bvec.h                            |   6 +
 include/linux/io_uring/cmd.h                    |   1 -
 include/uapi/linux/ublk_cmd.h                   |  25 +++
 io_uring/Kconfig                                |   1 +
 io_uring/io_uring.c                             |  18 +-
 io_uring/io_uring.h                             |   3 +-
 io_uring/msg_ring.c                             |  11 +-
 io_uring/net.c                                  | 135 ++++++--------
 io_uring/refs.h                                 |   7 +
 io_uring/rsrc.c                                 | 126 +++++++++++--
 io_uring/uring_cmd.c                            |  22 +--
 io_uring/uring_cmd.h                            |   1 +
 io_uring/zcrx.c                                 |   8 +
 tools/testing/selftests/ublk/Makefile           |   5 +
 tools/testing/selftests/ublk/kublk.c            |   8 +-
 tools/testing/selftests/ublk/kublk.h            |   4 +-
 tools/testing/selftests/ublk/null.c             |  11 +-
 tools/testing/selftests/ublk/stripe.c           |  69 ++++++--
 tools/testing/selftests/ublk/test_common.sh     |   6 +
 tools/testing/selftests/ublk/test_generic_02.sh |  44 +++++
 tools/testing/selftests/ublk/test_generic_03.sh |  28 +++
 tools/testing/selftests/ublk/test_loop_01.sh    |  14 +-
 tools/testing/selftests/ublk/test_loop_03.sh    |  14 +-
 tools/testing/selftests/ublk/test_loop_05.sh    |  28 +++
 tools/testing/selftests/ublk/test_stress_01.sh  |   6 +-
 tools/testing/selftests/ublk/test_stress_02.sh  |   6 +-
 tools/testing/selftests/ublk/test_stripe_01.sh  |  14 +-
 tools/testing/selftests/ublk/test_stripe_03.sh  |  30 ++++
 30 files changed, 673 insertions(+), 238 deletions(-)
 create mode 100755 tools/testing/selftests/ublk/test_generic_02.sh
 create mode 100755 tools/testing/selftests/ublk/test_generic_03.sh
 create mode 100755 tools/testing/selftests/ublk/test_loop_05.sh
 create mode 100755 tools/testing/selftests/ublk/test_stripe_03.sh

Comments

[e-mail] April 3, 2025, 11:17 p.m. UTC | #1

The pull request you sent on Thu, 3 Apr 2025 16:23:10 -0600:

> git://git.kernel.dk/linux.git tags/io_uring-6.15-20250403

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

Thank you!