diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2022-02-11 00:29:24 +0900 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-02-11 15:03:32 -0700 |
| commit | 333561791386112e4801b61be15feaf4044c02c6 (patch) | |
| tree | d38878b697f55654a45dfdaa6263bc2f1bd49c17 | |
| parent | 90a4da4d51f137229a2ef39b25880d81adfcb487 (diff) | |
| download | liburing-333561791386112e4801b61be15feaf4044c02c6.tar.gz liburing-333561791386112e4801b61be15feaf4044c02c6.tar.bz2 | |
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 <akinobu.mita@gmail.com>
Link: https://lore.kernel.org/r/20220210152924.14413-1-akinobu.mita@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | src/queue.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/queue.c b/src/queue.c index eb0c736..f8384d1 100644 --- a/src/queue.c +++ b/src/queue.c @@ -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_pt if (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; } |