Commit fdee946d authored by Jens Axboe's avatar Jens Axboe

io_uring: don't bounce block based -EAGAIN retry off task_work

These events happen inline from submission, so there's no need to
bounce them through the original task. Just set them up for retry
and issue retry directly instead of going over task_work.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent eefdf30f
...@@ -2295,22 +2295,6 @@ static bool io_resubmit_prep(struct io_kiocb *req, int error) ...@@ -2295,22 +2295,6 @@ static bool io_resubmit_prep(struct io_kiocb *req, int error)
io_req_complete(req, ret); io_req_complete(req, ret);
return false; return false;
} }
static void io_rw_resubmit(struct callback_head *cb)
{
struct io_kiocb *req = container_of(cb, struct io_kiocb, task_work);
struct io_ring_ctx *ctx = req->ctx;
int err;
err = io_sq_thread_acquire_mm(ctx, req);
if (io_resubmit_prep(req, err)) {
refcount_inc(&req->refs);
io_queue_async_work(req);
}
percpu_ref_put(&ctx->refs);
}
#endif #endif
static bool io_rw_reissue(struct io_kiocb *req, long res) static bool io_rw_reissue(struct io_kiocb *req, long res)
...@@ -2321,12 +2305,14 @@ static bool io_rw_reissue(struct io_kiocb *req, long res) ...@@ -2321,12 +2305,14 @@ static bool io_rw_reissue(struct io_kiocb *req, long res)
if ((res != -EAGAIN && res != -EOPNOTSUPP) || io_wq_current_is_worker()) if ((res != -EAGAIN && res != -EOPNOTSUPP) || io_wq_current_is_worker())
return false; return false;
init_task_work(&req->task_work, io_rw_resubmit); ret = io_sq_thread_acquire_mm(req->ctx, req);
percpu_ref_get(&req->ctx->refs);
ret = io_req_task_work_add(req, &req->task_work, true); if (io_resubmit_prep(req, ret)) {
if (!ret) refcount_inc(&req->refs);
io_queue_async_work(req);
return true; return true;
}
#endif #endif
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment