Fix __io_uring_get_cqe() for IORING_SETUP_IOPOLL
PATCH 1/1 Fix __io_uring_get_cqe() for IORING_SETUP_IOPOLL
If __io_uring_get_cqe() is called for the ring setup with IOPOLL, we must enter the kernel to get completion events. Even if that is called with wait_nr is zero.
Signed-off-by Akinobu Mita <[email protected]>
--- src/queue.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
src/queue.c +8 -4
@@ -31,6 +31,11 @@ static inline bool cq_ring_needs_flush(struct io_uring *ring)return IO_URING_READ_ONCE (*ring->sq.kflags) &IORING_SQ_CQ_OVERFLOW ; } +static inline bool cq_ring_needs_enter (struct io_uring *ring) +{ +return (ring->flags &IORING_SETUP_IOPOLL ) ||cq_ring_needs_flush (ring); +} +static int __io_uring_peek_cqe (struct io_uring *ring,struct io_uring_cqe **cqe_ptr,unsigned *nr_available)
@@ -84,7 +89,6 @@ static int _io_uring_get_cqe(struct io_uring *ring, struct io_uring_cqe **cqe_pt do { bool need_enter = false; - bool cq_overflow_flush = false; unsigned flags = 0; unsigned nr_available; int ret;
@@ -93,13 +97,13 @@ static int _io_uring_get_cqe(struct io_uring *ring, struct io_uring_cqe **cqe_ptif (err)break ;if (!cqe && !data->wait_nr && !data->submit) { -if (!cq_ring_needs_flush (ring)) { +if (!cq_ring_needs_enter (ring)) { err = -EAGAIN ;break ; } - cq_overflow_flush = true; + need_enter = true; } -if (data->wait_nr > nr_available || cq_overflow_flush) { +if (data->wait_nr > nr_available || need_enter) { flags =IORING_ENTER_GETEVENTS | data->get_flags; need_enter = true; }
Signature · 1 line
2.25.1
Quoted 4 lines · Akinobu Mita
If
__io_uring_get_cqe()is called for the ring setup with IOPOLL, we must enter the kernel to get completion events. Even if that is called withwait_nris zero.
Applied, thanks!
[1/1] Fix __io_uring_get_cqe() for IORING_SETUP_IOPOLL
commit: 333561791386112e4801b61be15feaf4044c02c6
Best regards,
Signature · 1 line
Jens Axboe <[email protected]>