Commit 4a0a7a18 authored by Jens Axboe's avatar Jens Axboe

io_uring: run next sqe inline if possible

One major use case of linked commands is the ability to run the next
link inline, if at all possible. This is done correctly for async
offload, but somewhere along the line we lost the ability to do so when
we were able to complete a request without having to punt it. Ensure
that we do so correctly.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 392edb45
...@@ -3224,13 +3224,14 @@ static struct io_kiocb *io_prep_linked_timeout(struct io_kiocb *req) ...@@ -3224,13 +3224,14 @@ static struct io_kiocb *io_prep_linked_timeout(struct io_kiocb *req)
static void __io_queue_sqe(struct io_kiocb *req) static void __io_queue_sqe(struct io_kiocb *req)
{ {
struct io_kiocb *linked_timeout = io_prep_linked_timeout(req); struct io_kiocb *linked_timeout;
struct io_kiocb *nxt = NULL; struct io_kiocb *nxt = NULL;
int ret; int ret;
again:
linked_timeout = io_prep_linked_timeout(req);
ret = io_issue_sqe(req, &nxt, true); ret = io_issue_sqe(req, &nxt, true);
if (nxt)
io_queue_async_work(nxt);
/* /*
* We async punt it if the file wasn't marked NOWAIT, or if the file * We async punt it if the file wasn't marked NOWAIT, or if the file
...@@ -3249,7 +3250,7 @@ static void __io_queue_sqe(struct io_kiocb *req) ...@@ -3249,7 +3250,7 @@ static void __io_queue_sqe(struct io_kiocb *req)
* submit reference when the iocb is actually submitted. * submit reference when the iocb is actually submitted.
*/ */
io_queue_async_work(req); io_queue_async_work(req);
return; goto done_req;
} }
err: err:
...@@ -3269,6 +3270,12 @@ static void __io_queue_sqe(struct io_kiocb *req) ...@@ -3269,6 +3270,12 @@ static void __io_queue_sqe(struct io_kiocb *req)
req_set_fail_links(req); req_set_fail_links(req);
io_put_req(req); io_put_req(req);
} }
done_req:
if (nxt) {
req = nxt;
nxt = NULL;
goto again;
}
} }
static void io_queue_sqe(struct io_kiocb *req) static void io_queue_sqe(struct io_kiocb *req)
......
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