Skip to content

5.20 cleanups and poll optimisations

Pavel Begunkov io-uring llvm 3 versions – Applied

Status from this message: Applied, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest16 patches 4 repliesApplied
  2. v225 patches 18 repliesSuperseded
  3. v125 patches 4 repliesSuperseded

Changes in v3 from the cover letter

clarify locking expectation around ->uring_lock hashing don't complete by hand in io_read/write (see 1/16)

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/16io_uring: rw: delegate sync completions to core io_uringio_uring/rw.c+19 -220 replies
2/16io_uring: kill REQ_F_COMPLETE_INLINEio_uring/io_uring.c io_uring/io_uring.h io_uring/io_uring_types.h+7 -190 replies
3/16io_uring: refactor io_req_task_complete()io_uring/io_uring.c+10 -60 replies
4/16io_uring: don't inline io_put_kbufio_uring/kbuf.c io_uring/kbuf.h+39 -320 replies
5/16io_uring: poll: remove unnecessary req->ref setio_uring/poll.c+0 -10 replies
6/16io_uring: switch cancel_hash to use per entry spinlockio_uring/cancel.c io_uring/cancel.h io_uring/fdinfo.c +3 more+80 -400 replies
7/16io_uring: pass poll_find lock backio_uring/poll.c+26 -200 replies
8/16io_uring: clean up io_try_cancelio_uring/cancel.c+2 -20 replies
9/16io_uring: limit the number of cancellation bucketsio_uring/io_uring.c+5 -50 replies
10/16io_uring: clean up io_ring_ctx_allocio_uring/io_uring.c+6 -40 replies
11/16io_uring: use state completion infra for poll reqsio_uring/poll.c+2 -60 replies
12/16io_uring: add IORING_SETUP_SINGLE_ISSUERinclude/uapi/linux/io_uring.h io_uring/io_uring.c io_uring/io_uring_types.h +2 more+36 -80 replies
13/16io_uring: pass hash table into poll_findio_uring/poll.c+14 -60 replies
14/16io_uring: introduce a struct for hash tableio_uring/cancel.c io_uring/cancel.h io_uring/fdinfo.c +3 more+56 -430 replies
15/16io_uring: propagate locking state to poll cancelio_uring/cancel.c io_uring/cancel.h io_uring/poll.c +2 more+12 -70 replies
16/16io_uring: mutex locked poll hashingio_uring/io_uring.c io_uring/io_uring_types.h io_uring/poll.c+108 -222 replies

Reviews trailers per patch

None of the 16 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchHao Xu
SeriesR-b
1/16
2/16
3/16
4/16
5/16
6/16
7/16
8/16
9/16
10/16
11/16
12/16
13/16
14/16
15/16
16/16

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH for-next v3 00/16] 5.20 cleanups and poll optimisations

1-4 kills REQ_F_COMPLETE_INLINE as we're out of bits.

Patch 5 from Hao should remove some overhead from poll requests

Patch 6 from Hao adds per-bucket spinlocks, and 16-19 do a little bit of cleanup. The downside of per-bucket spinlocks is that it adds additional spinlock/unlock pair in the poll request completion side, which shouldn't matter much with 20/25.

Patch 11 uses inline completion infra for poll requests, this nicely improves perf when there is a good tw batching.

Patch 12 implements the userspace visible side of IORING_SETUP_SINGLE_ISSUER, it'll be used for poll requests and later for spinlock optimisations.

13-16 introduces ->uring_lock protected cancellation hashing. It requires us to grab ->uring_lock in the completion side, but saves two spin lock/unlock pairs. We apply it automatically in cases the mutex is already likely to be held (see 25/25 description), so there is no additional mutex overhead and potential latency problemes.

Numbers:

The used poll benchmark each iteration queues a batch of 32 POLLIN poll requests and triggers all of them with read (+write).

baseline (patches 1-10):

    11720 K req/s
base + 11 (+ inline completion infra)
    12419 K req/s, ~+6%
base + 11-16 (+ uring_lock hashing):
    12804 K req/s, +9.2% from the baseline, or +3.2% relative to patch 19.

Note that patch 11 only helps performance of poll-add requests, whenever 16/16 also improves apoll.

v2:
don't move ->cancel_seq out of iowq work struct
fix up single-issuer

v3:
clarify locking expectation around ->uring_lock hashing don't complete by hand in io_read/write (see 1/16)

Hao Xu (2):
io_uring: poll: remove unnecessary req->ref set
io_uring: switch cancel_hash to use per entry spinlock

Pavel Begunkov (14):
io_uring: rw: delegate sync completions to core io_uring
io_uring: kill REQ_F_COMPLETE_INLINE
io_uring: refactor io_req_task_complete()
io_uring: don't inline io_put_kbuf
io_uring: pass poll_find lock back
io_uring: clean up io_try_cancel
io_uring: limit the number of cancellation buckets
io_uring: clean up io_ring_ctx_alloc
io_uring: use state completion infra for poll reqs
io_uring: add IORING_SETUP_SINGLE_ISSUER
io_uring: pass hash table into poll_find
io_uring: introduce a struct for hash table
io_uring: propagate locking state to poll cancel
io_uring: mutex locked poll hashing

 include/uapi/linux/io_uring.h |   5 +-
 io_uring/cancel.c             |  23 +++-
 io_uring/cancel.h             |   4 +-
 io_uring/fdinfo.c             |  11 +-
 io_uring/io_uring.c           |  84 ++++++++-----
 io_uring/io_uring.h           |   5 -
 io_uring/io_uring_types.h     |  21 +++-
 io_uring/kbuf.c               |  33 +++++
 io_uring/kbuf.h               |  38 +-----
 io_uring/poll.c               | 225 +++++++++++++++++++++++++---------
 io_uring/poll.h               |   3 +-
 io_uring/rw.c                 |  41 +++----
 io_uring/tctx.c               |  27 +++-
 io_uring/tctx.h               |   4 +-
 io_uring/timeout.c            |   3 +-
 15 files changed, 353 insertions(+), 174 deletions(-)
Signature · 1 line
2.36.1