[0/7] random fixes and cleanups

Message

Pavel Begunkov Aug. 11, 2023, 12:53 p.m. UTC

Patch 1 and 2 don't allow multishot recv and accept to overflow
cqes indefinitely, the concept we're always trying to stick to is
that the request should complete, then userspace have to empty
the CQ and reissue.

Note, it breaks test/recv-multishot, I consider the test being
in the wrong, it should not rely on the overflow behaviour, and
I'm going to fix it.

Patch 3-7 are simple intermediate cleanups on top.

Pavel Begunkov (7):
  io_uring/net: don't overflow multishot accept
  io_uring/net: don't overflow multishot recv
  io_uring: open code io_fill_cqe_req()
  io_uring: remove return from io_req_cqe_overflow()
  io_uring: never overflow io_aux_cqe
  io_uring/rsrc: keep one global dummy_ubuf
  io_uring: simplify io_run_task_work_sig return

 io_uring/io_uring.c | 40 ++++++++++++++++++----------------------
 io_uring/io_uring.h | 16 +++-------------
 io_uring/net.c      |  8 ++++----
 io_uring/poll.c     |  4 ++--
 io_uring/rsrc.c     | 14 ++++++++++----
 io_uring/rw.c       |  2 +-
 io_uring/timeout.c  |  4 ++--
 7 files changed, 40 insertions(+), 48 deletions(-)

Comments

Jens Axboe Aug. 11, 2023, 4:43 p.m. UTC | #1

On Fri, 11 Aug 2023 13:53:40 +0100, Pavel Begunkov wrote:
> Patch 1 and 2 don't allow multishot recv and accept to overflow
> cqes indefinitely, the concept we're always trying to stick to is
> that the request should complete, then userspace have to empty
> the CQ and reissue.
> 
> Note, it breaks test/recv-multishot, I consider the test being
> in the wrong, it should not rely on the overflow behaviour, and
> I'm going to fix it.
> 
> [...]

Applied, thanks!

[1/7] io_uring/net: don't overflow multishot accept
      commit: 1bfed23349716a7811645336a7ce42c4b8f250bc
[2/7] io_uring/net: don't overflow multishot recv
      commit: b2e74db55dd93d6db22a813c9a775b5dbf87c560
[3/7] io_uring: open code io_fill_cqe_req()
      commit: 00b0db562485fbb259cd4054346208ad0885d662
[4/7] io_uring: remove return from io_req_cqe_overflow()
      commit: 056695bffa4beed5668dd4aa11efb696eacb3ed9
[5/7] io_uring: never overflow io_aux_cqe
      commit: b6b2bb58a75407660f638a68e6e34a07036146d0
[6/7] io_uring/rsrc: keep one global dummy_ubuf
      commit: 19a63c4021702e389a559726b16fcbf07a8a05f9
[7/7] io_uring: simplify io_run_task_work_sig return
      commit: d246c759c47eafe4688613e89b337e48c39c5968

Best regards,