forked from Minki/linux
io_uring: add a helper failing not issued requests
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:
parent
dafecf19e2
commit
f41db2732d
@ -1584,6 +1584,13 @@ static inline void io_req_complete(struct io_kiocb *req, long res)
|
||||
__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)
|
||||
{
|
||||
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);
|
||||
}
|
||||
} else {
|
||||
req_set_fail_links(req);
|
||||
io_put_req(req);
|
||||
io_req_complete(req, ret);
|
||||
io_req_complete_failed(req, ret);
|
||||
}
|
||||
if (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 != -EIOCBQUEUED) {
|
||||
fail_req:
|
||||
req_set_fail_links(req);
|
||||
io_put_req(req);
|
||||
io_req_complete(req, ret);
|
||||
io_req_complete_failed(req, ret);
|
||||
}
|
||||
} else if (req->flags & REQ_F_FORCE_ASYNC) {
|
||||
ret = io_req_defer_prep(req);
|
||||
@ -6485,12 +6488,10 @@ fail_req:
|
||||
if (link->head) {
|
||||
/* fail even hard links since we don't submit */
|
||||
link->head->flags |= REQ_F_FAIL_LINK;
|
||||
io_put_req(link->head);
|
||||
io_req_complete(link->head, -ECANCELED);
|
||||
io_req_complete_failed(link->head, -ECANCELED);
|
||||
link->head = NULL;
|
||||
}
|
||||
io_put_req(req);
|
||||
io_req_complete(req, ret);
|
||||
io_req_complete_failed(req, ret);
|
||||
return ret;
|
||||
}
|
||||
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)) {
|
||||
de = list_first_entry(&list, struct io_defer_entry, list);
|
||||
list_del_init(&de->list);
|
||||
req_set_fail_links(de->req);
|
||||
io_put_req(de->req);
|
||||
io_req_complete(de->req, -ECANCELED);
|
||||
io_req_complete_failed(de->req, -ECANCELED);
|
||||
kfree(de);
|
||||
}
|
||||
return true;
|
||||
|
Loading…
Reference in New Issue
Block a user