summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2022-11-23 12:33:42 +0100
committerJens Axboe <axboe@kernel.dk>2022-11-23 18:47:07 +0100
commit2dac1a159216b39ced8d78dba590c5d2f4249586 (patch)
treeee289bae4bc384f6faa8ea9a3834400de51f4956
parentio_uring: iopoll protect complete_post (diff)
downloadlinux-2dac1a159216b39ced8d78dba590c5d2f4249586.tar.xz
linux-2dac1a159216b39ced8d78dba590c5d2f4249586.zip
io_uring: remove iopoll spinlock
This reverts commit 2ccc92f4effcfa1c51c4fcf1e34d769099d3cad4 io_req_complete_post() should now behave well even in case of IOPOLL, we can remove completion_lock locking. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/7e171c8b530656b14a671c59100ca260e46e7f2a.1669203009.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--io_uring/rw.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/io_uring/rw.c b/io_uring/rw.c
index 61c326831949..1ce065709724 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -1049,7 +1049,6 @@ int io_do_iopoll(struct io_ring_ctx *ctx, bool force_nonspin)
else if (!pos)
return 0;
- spin_lock(&ctx->completion_lock);
prev = start;
wq_list_for_each_resume(pos, prev) {
struct io_kiocb *req = container_of(pos, struct io_kiocb, comp_list);
@@ -1064,11 +1063,11 @@ int io_do_iopoll(struct io_ring_ctx *ctx, bool force_nonspin)
req->cqe.flags = io_put_kbuf(req, 0);
__io_fill_cqe_req(req->ctx, req);
}
- io_commit_cqring(ctx);
- spin_unlock(&ctx->completion_lock);
+
if (unlikely(!nr_events))
return 0;
+ io_commit_cqring(ctx);
io_cqring_ev_posted_iopoll(ctx);
pos = start ? start->next : ctx->iopoll_list.first;
wq_list_cut(&ctx->iopoll_list, prev, start);