[for-6.4,00/10] some rsrc fixes and clean ups

Message

Pavel Begunkov April 13, 2023, 2:28 p.m. UTC

Patch 1 is a simple fix for using indexes w/o array_index_nospec()
protection.

Patches 2-5 are fixing a file / buffer table unregistration issue
when the ring is configured with DEFER_TASKRUN.

The rest are clean ups on top.


Pavel Begunkov (10):
  io_uring/rsrc: use nospec'ed indexes
  io_uring/rsrc: remove io_rsrc_node::done
  io_uring/rsrc: refactor io_rsrc_ref_quiesce
  io_uring/rsrc: use wq for quiescing
  io_uring/rsrc: fix DEFER_TASKRUN rsrc quiesce
  io_uring/rsrc: remove rsrc_data refs
  io_uring/rsrc: inline switch_start fast path
  io_uring/rsrc: clean up __io_sqe_buffers_update()
  io_uring/rsrc: simplify single file node switching
  io_uring/rsrc: refactor io_queue_rsrc_removal

 include/linux/io_uring_types.h |  2 +
 io_uring/filetable.c           | 11 ++---
 io_uring/io_uring.c            |  5 +-
 io_uring/rsrc.c                | 90 ++++++++++++++--------------------
 io_uring/rsrc.h                | 13 +++--
 5 files changed, 53 insertions(+), 68 deletions(-)

Comments

Jens Axboe April 15, 2023, 8:46 p.m. UTC | #1

On Thu, 13 Apr 2023 15:28:04 +0100, Pavel Begunkov wrote:
> Patch 1 is a simple fix for using indexes w/o array_index_nospec()
> protection.
> 
> Patches 2-5 are fixing a file / buffer table unregistration issue
> when the ring is configured with DEFER_TASKRUN.
> 
> The rest are clean ups on top.
> 
> [...]

Applied, thanks!

[01/10] io_uring/rsrc: use nospec'ed indexes
        commit: 953c37e066f05a3dca2d74643574b8dfe8a83983
[02/10] io_uring/rsrc: remove io_rsrc_node::done
        commit: c732ea242d565c8281c4b017929fc62a246d81b9
[03/10] io_uring/rsrc: refactor io_rsrc_ref_quiesce
        commit: eef81fcaa61e1bc6b7735be65f41bbf1a8efd133
[04/10] io_uring/rsrc: use wq for quiescing
        commit: 4ea15b56f0810f0d8795d475db1bb74b3a7c1b2f
[05/10] io_uring/rsrc: fix DEFER_TASKRUN rsrc quiesce
        commit: 7d481e0356334eb2de254414769b4bed4b2a8827
[06/10] io_uring/rsrc: remove rsrc_data refs
        commit: 0b222eeb6514ba6c3457b667fa4f3645032e1fc9
[07/10] io_uring/rsrc: inline switch_start fast path
        commit: 2f2af35f8e5a1ed552ed02e47277d50092a2b9f6
[08/10] io_uring/rsrc: clean up __io_sqe_buffers_update()
        commit: 9a57fffedc0ee078418a7793ab29cd3864205340
[09/10] io_uring/rsrc: simplify single file node switching
        commit: c87fd583f3b5ef770af33893394ea37c7a10b5b8
[10/10] io_uring/rsrc: refactor io_queue_rsrc_removal
        commit: c899a5d7d0eca054546b63e95c94b1e609516f84

Best regards,