Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: add a helper failing not issued requests

Browse Source 
Add a simple helper doing CQE posting, marking request for link-failure,
and putting both submission and completion references.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-02-28 22:35:12 +00:00 committed by Jens Axboe
parent dafecf19e2
commit f41db2732d
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/io_uring.c
View File

@ -1584,6 +1584,13 @@ static inline void io_req_complete(struct io_kiocb *req, long res)
__io_req_complete(req, 0, res, 0); __io_req_complete(req, 0, res, 0);
} }
static void io_req_complete_failed(struct io_kiocb *req, long res)
{
req_set_fail_links(req);
io_put_req(req);
io_req_complete_post(req, res, 0);
}
static bool io_flush_cached_reqs(struct io_ring_ctx *ctx) static bool io_flush_cached_reqs(struct io_ring_ctx *ctx)
{ {
struct io_submit_state *state = &ctx->submit_state; struct io_submit_state *state = &ctx->submit_state;
@ -6346,9 +6353,7 @@ static void __io_queue_sqe(struct io_kiocb *req)
io_put_req(req); io_put_req(req);
} }
} else { } else {
req_set_fail_links(req); io_req_complete_failed(req, ret);
io_put_req(req);
io_req_complete(req, ret);
} }
if (linked_timeout) if (linked_timeout)
io_queue_linked_timeout(linked_timeout); io_queue_linked_timeout(linked_timeout);
@ -6362,9 +6367,7 @@ static void io_queue_sqe(struct io_kiocb *req)
if (ret) { if (ret) {
if (ret != -EIOCBQUEUED) { if (ret != -EIOCBQUEUED) {
fail_req: fail_req:
req_set_fail_links(req); io_req_complete_failed(req, ret);
io_put_req(req);
io_req_complete(req, ret);
} }
} else if (req->flags & REQ_F_FORCE_ASYNC) { } else if (req->flags & REQ_F_FORCE_ASYNC) {
ret = io_req_defer_prep(req); ret = io_req_defer_prep(req);
@ -6485,12 +6488,10 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
if (link->head) { if (link->head) {
/* fail even hard links since we don't submit */ /* fail even hard links since we don't submit */
link->head->flags |= REQ_F_FAIL_LINK; link->head->flags |= REQ_F_FAIL_LINK;
io_put_req(link->head); io_req_complete_failed(link->head, -ECANCELED);
io_req_complete(link->head, -ECANCELED);
link->head = NULL; link->head = NULL;
} }
io_put_req(req); io_req_complete_failed(req, ret);
io_req_complete(req, ret);
return ret; return ret;
} }
ret = io_req_prep(req, sqe); ret = io_req_prep(req, sqe);
@ -8716,9 +8717,7 @@ static bool io_cancel_defer_files(struct io_ring_ctx *ctx,
while (!list_empty(&list)) { while (!list_empty(&list)) {
de = list_first_entry(&list, struct io_defer_entry, list); de = list_first_entry(&list, struct io_defer_entry, list);
list_del_init(&de->list); list_del_init(&de->list);
req_set_fail_links(de->req); io_req_complete_failed(de->req, -ECANCELED);
io_put_req(de->req);
io_req_complete(de->req, -ECANCELED);
kfree(de); kfree(de);
} }
return true; return true;