diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-12-06 22:22:45 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-12-09 12:04:02 -0700 |
| commit | 59850d226e4907a6f37c1d2fe5ba97546a8691a4 (patch) | |
| tree | ab4b0f5b0a36d9ea12090bad43cb6ee973c612bb | |
| parent | 634578f800652035debba3098d8ab0d21af7c7a5 (diff) | |
io_uring: fix io_cqring_events()'s noflushfor-5.11/io_uring-2020-12-14
Checking !list_empty(&ctx->cq_overflow_list) around noflush in
io_cqring_events() is racy, because if it fails but a request overflowed
just after that, io_cqring_overflow_flush() still will be called.
Remove the second check, it shouldn't be a problem for performance,
because there is cq_check_overflow bit check just above.
Cc: <stable@vger.kernel.org> # 5.5+
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index c0306f77211a..f53356ced5ab 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2329,7 +2329,7 @@ static unsigned io_cqring_events(struct io_ring_ctx *ctx, bool noflush) * we wake up the task, and the next invocation will flush the * entries. We cannot safely to it from here. */ - if (noflush && !list_empty(&ctx->cq_overflow_list)) + if (noflush) return -1U; io_cqring_overflow_flush(ctx, false, NULL, NULL); |