public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: Re: [PATCH 5.12 v3] io_uring: fix rw req completion
Date: Thu, 8 Apr 2021 19:33:37 +0100	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <01f81563aacb51972dacff4f2080087c321e424a.1617906241.git.asml.silence@gmail.com>

On 08/04/2021 19:28, Pavel Begunkov wrote:
> WARNING: at fs/io_uring.c:8578 io_ring_exit_work.cold+0x0/0x18
> 
> As reissuing is now passed back by REQ_F_REISSUE and kiocb_done()
> internally uses __io_complete_rw(), it may stop after setting the flag
> so leaving a dangling request.

Jens, this one is instead of taken v1, it handles io_rw_reissue() errors.
The handling code is partially hand coded __io_complete_rw(). Obviously,
needs cleaning in the nearest future.

> 
> There are tricky edge cases, e.g. reading beyound file, boundary, so
> the easiest way is to hand code reissue in kiocb_done() as
> __io_complete_rw() was doing for us before.
> 
> Fixes: 230d50d448ac ("io_uring: move reissue into regular IO path")
> Signed-off-by: Pavel Begunkov <[email protected]>
> Link: https://lore.kernel.org/r/f602250d292f8a84cca9a01d747744d1e797be26.1617842918.git.asml.silence@gmail.com
> Signed-off-by: Jens Axboe <[email protected]>
> ---
> 
> 
> v2: io_rw_reissue() may fail, check return code
> v3: adjust commit message
> 
>  fs/io_uring.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index f1881ac0744b..f2df0569a60a 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -2762,6 +2762,7 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret,
>  {
>  	struct io_kiocb *req = container_of(kiocb, struct io_kiocb, rw.kiocb);
>  	struct io_async_rw *io = req->async_data;
> +	bool check_reissue = (kiocb->ki_complete == io_complete_rw);
>  
>  	/* add previously done IO, if any */
>  	if (io && io->bytes_done > 0) {
> @@ -2777,6 +2778,18 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret,
>  		__io_complete_rw(req, ret, 0, issue_flags);
>  	else
>  		io_rw_done(kiocb, ret);
> +
> +	if (check_reissue && req->flags & REQ_F_REISSUE) {
> +		req->flags &= ~REQ_F_REISSUE;
> +		if (!io_rw_reissue(req)) {
> +			int cflags = 0;
> +
> +			req_set_fail_links(req);
> +			if (req->flags & REQ_F_BUFFER_SELECTED)
> +				cflags = io_put_rw_kbuf(req);
> +			__io_req_complete(req, issue_flags, ret, cflags);
> +		}
> +	}
>  }
>  
>  static int io_import_fixed(struct io_kiocb *req, int rw, struct iov_iter *iter)
> 

-- 
Pavel Begunkov

  reply	other threads:[~2021-04-08 18:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-08 18:28 [PATCH 5.12 v3] io_uring: fix rw req completion Pavel Begunkov
2021-04-08 18:33 ` Pavel Begunkov [this message]
2021-04-08 19:33 ` Jens Axboe
2021-04-11  0:31 ` Pavel Begunkov
2021-04-11  2:30   ` 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 \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /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