io_uring: use state completion infra for poll reqs 5.15-stable
authorPavel Begunkov <asml.silence@gmail.com>
Fri, 27 Jan 2023 17:01:56 +0000 (10:01 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 27 Jan 2023 17:05:17 +0000 (10:05 -0700)
commit 0ec6dca223195aca2f7df6e432c4205b5f63305b upstream.

Use io_req_task_complete() for poll request completions, so it can
utilise state completions and save lots of unnecessary locking.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/ced94cb5a728d8e386c640d052fd3da3f5d6891a.1655371007.git.asml.silence@gmail.com
Reviewed-by: Hao Xu <howeyxu@tencent.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/io_uring.c

index 0422975b5fac372058946919f4cdc12fb0949eeb..5281b164ee2e9208505c671a99f2cd806d050d6b 100644 (file)
@@ -5666,7 +5666,7 @@ static void io_poll_task_func(struct io_kiocb *req, bool *locked)
        spin_lock(&ctx->completion_lock);
        hash_del(&req->hash_node);
        spin_unlock(&ctx->completion_lock);
-       io_req_complete_post(req, req->result, 0);
+       io_req_task_complete(req, locked);
 }
 
 static void io_apoll_task_func(struct io_kiocb *req, bool *locked)