Commit fba38c27 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: request cancellations should break links 



We currently don't explicitly break links if a request is cancelled, but
we should. Add explicitly link breakage for all types of request
cancellations that we support.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b0dd8a41

fs/io_uring.c

+6 −0
Original line number Diff line number Diff line
@@ -2118,6 +2118,8 @@ static void io_poll_complete_work(struct io_wq_work **workptr) 


	io_cqring_ev_posted(ctx);



	if (ret < 0 && req->flags & REQ_F_LINK)

		req->flags |= REQ_F_FAIL_LINK;

	io_put_req_find_next(req, &nxt);

	if (nxt)

		*workptr = &nxt->work;
@@ -2331,6 +2333,8 @@ static int io_timeout_cancel(struct io_ring_ctx *ctx, __u64 user_data) 
	if (ret == -1)

		return -EALREADY;



	if (req->flags & REQ_F_LINK)

		req->flags |= REQ_F_FAIL_LINK;

	io_cqring_fill_event(req, -ECANCELED);

	io_put_req(req);

	return 0;
@@ -2841,6 +2845,8 @@ static enum hrtimer_restart io_link_timeout_fn(struct hrtimer *timer) 
	spin_unlock_irqrestore(&ctx->completion_lock, flags);



	if (prev) {

		if (prev->flags & REQ_F_LINK)

			prev->flags |= REQ_F_FAIL_LINK;

		io_async_find_and_cancel(ctx, req, prev->user_data, NULL,

						-ETIME);

		io_put_req(prev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE