Preston_PLB
/
kernel-aes67
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

io_uring: remove iopoll spinlock 

This reverts commit 2ccc92f4ef

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>
This commit is contained in:
Pavel Begunkov 2022-11-23 11:33:42 +00:00 committed by Jens Axboe
parent 1bec951c38
commit 2dac1a1592
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
io_uring/rw.c
View File

@ -1049,7 +1049,6 @@ int io_do_iopoll(struct io_ring_ctx *ctx, bool force_nonspin)
else if (!pos) else if (!pos)
return 0; return 0;
spin_lock(&ctx->completion_lock);
prev = start; prev = start;
wq_list_for_each_resume(pos, prev) { wq_list_for_each_resume(pos, prev) {
struct io_kiocb *req = container_of(pos, struct io_kiocb, comp_list); 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); req->cqe.flags = io_put_kbuf(req, 0);
__io_fill_cqe_req(req->ctx, req); __io_fill_cqe_req(req->ctx, req);
} }
io_commit_cqring(ctx);
spin_unlock(&ctx->completion_lock);
if (unlikely(!nr_events)) if (unlikely(!nr_events))
return 0; return 0;
io_commit_cqring(ctx);
io_cqring_ev_posted_iopoll(ctx); io_cqring_ev_posted_iopoll(ctx);
pos = start ? start->next : ctx->iopoll_list.first; pos = start ? start->next : ctx->iopoll_list.first;
wq_list_cut(&ctx->iopoll_list, prev, start); wq_list_cut(&ctx->iopoll_list, prev, start);