From: Pavel Begunkov <asml.silence@gmail.com>
To: Jens Axboe <axboe@kernel.dk>, io-uring@vger.kernel.org
Cc: "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>
Subject: Re: [PATCH] io_uring: fixup a few spots where link failure isn't flagged
Date: Wed, 6 Nov 2019 21:44:54 +0300 [thread overview]
Message-ID: <ee474592-8e97-eb11-0f95-84607bed033d@gmail.com> (raw)
In-Reply-To: <b10f96d7-ecc4-e835-555e-739f22d3e505@kernel.dk>
[-- Attachment #1.1: Type: text/plain, Size: 2554 bytes --]
On 06/11/2019 06:32, Jens Axboe wrote:
> If a request fails, we need to ensure we set REQ_F_FAIL_LINK on it if
> REQ_F_LINK is set. Any failure in the chain should break the chain.
>
> We were missing a few spots where this should be done. It might be nice
> to generalize this somewhat at some point, as long as we factor in the
> fact that failure looks different for each request type.
>
The completion path also starts to get complicated, especially
non-uniform handling of links there.
i.e. io_put_req() -> io_put_req_find_next() ->
io_free_req() -> __io_free_req()
Plus, io_free_req_many(), which can be used only in some cases.
My compiler didn't even inlined it, so there are 4 CALLs.
Though, still in TODO list.
> Signed-off-by: Jens Axboe <axboe@kernel.dk>
>
> --
>
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index bda27b52fd5b..4edc94aab17e 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -1672,6 +1672,8 @@ static int io_send_recvmsg(struct io_kiocb *req, const struct io_uring_sqe *sqe,
> }
>
> io_cqring_add_event(req->ctx, sqe->user_data, ret);
> + if (ret < 0 && (req->flags & REQ_F_LINK))
> + req->flags |= REQ_F_FAIL_LINK;
> io_put_req(req, nxt);
> return 0;
> }
> @@ -1787,6 +1789,8 @@ static int io_poll_remove(struct io_kiocb *req, const struct io_uring_sqe *sqe)
> spin_unlock_irq(&ctx->completion_lock);
>
> io_cqring_add_event(req->ctx, sqe->user_data, ret);
> + if (ret < 0 && (req->flags & REQ_F_LINK))
> + req->flags |= REQ_F_FAIL_LINK;
> io_put_req(req, NULL);
> return 0;
> }
> @@ -1994,6 +1998,8 @@ static enum hrtimer_restart io_timeout_fn(struct hrtimer *timer)
> spin_unlock_irqrestore(&ctx->completion_lock, flags);
>
> io_cqring_ev_posted(ctx);
> + if (req->flags & REQ_F_LINK)
> + req->flags |= REQ_F_FAIL_LINK;
> io_put_req(req, NULL);
> return HRTIMER_NORESTART;
> }
> @@ -2035,6 +2041,8 @@ static int io_timeout_remove(struct io_kiocb *req,
> io_commit_cqring(ctx);
> spin_unlock_irq(&ctx->completion_lock);
> io_cqring_ev_posted(ctx);
> + if (req->flags & REQ_F_LINK)
> + req->flags |= REQ_F_FAIL_LINK;
> io_put_req(req, NULL);
> return 0;
> }
> @@ -2328,6 +2336,8 @@ static void io_wq_submit_work(struct io_wq_work **workptr)
> io_put_req(req, NULL);
>
> if (ret) {
> + if (req->flags & REQ_F_LINK)
> + req->flags |= REQ_F_FAIL_LINK;
> io_cqring_add_event(ctx, sqe->user_data, ret);
> io_put_req(req, NULL);
> }
>
--
Pavel Begunkov
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-11-06 18:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 3:32 [PATCH] io_uring: fixup a few spots where link failure isn't flagged Jens Axboe
2019-11-06 18:44 ` Pavel Begunkov [this message]
2019-11-07 0:03 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ee474592-8e97-eb11-0f95-84607bed033d@gmail.com \
--to=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).