From: "Andreas Grünbacher" <andreas.gruenbacher@gmail.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Amir Goldstein <amir73il@gmail.com>,
Dave Chinner <david@fromorbit.com>,
jencce.kernel@gmail.com, linux-xfs <linux-xfs@vger.kernel.org>,
overlayfs <linux-unionfs@vger.kernel.org>,
Zorro Lang <zlang@redhat.com>, fstests <fstests@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Christoph Hellwig <hch@infradead.org>,
cluster-devel <cluster-devel@redhat.com>
Subject: Re: [PATCH v2 2/2] iomap: partially revert 4721a601099 (simulated directio short read on EFAULT)
Date: Thu, 29 Aug 2019 13:49:29 +0200 [thread overview]
Message-ID: <CAHpGcM+Aq+BxD0_TPx9sqTCt8N6X3Q+UO6CkyfV3NZMaN8AU8w@mail.gmail.com> (raw)
In-Reply-To: <20190829031216.GW1037422@magnolia>
Hi Darrick,
Am Do., 29. Aug. 2019 um 05:12 Uhr schrieb Darrick J. Wong
<darrick.wong@oracle.com>:
> Hm, so I made an xfstest out of the program you sent me, and indeed
> reverting that chunk makes the failure go away, but that got me
> wondering -- that iomap kludge was a workaround for the splice code
> telling iomap to try to stuff XXXX bytes into a pipe that only has X
> bytes of free buffer space. We fixed splice_direct_to_actor to clamp
> the length parameter to the available pipe space, but we never did the
> same to do_splice:
>
> /* Don't try to read more the pipe has space for. */
> read_len = min_t(size_t, len,
> (pipe->buffers - pipe->nrbufs) << PAGE_SHIFT);
> ret = do_splice_to(in, &pos, pipe, read_len, flags);
>
> Applying similar logic to the two (opipe != NULL) cases of do_splice()
> seem to make the EAGAIN problem go away too. So why don't we teach
> do_splice to only ask for as many bytes as the pipe has space here too?
>
> Does the following patch fix it for you?
Yes, that works, thank you.
> From: Darrick J. Wong <darrick.wong@oracle.com>
> Subject: [PATCH] splice: only read in as much information as there is pipe buffer space
>
> Andreas Gruenbacher reports that on the two filesystems that support
> iomap directio, it's possible for splice() to return -EAGAIN (instead of
> a short splice) if the pipe being written to has less space available in
> its pipe buffers than the length supplied by the calling process.
>
> Months ago we fixed splice_direct_to_actor to clamp the length of the
> read request to the size of the splice pipe. Do the same to do_splice.
Can you add a reference to that commit here (17614445576b6)?
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/splice.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/fs/splice.c b/fs/splice.c
> index 98412721f056..50335515d7c1 100644
> --- a/fs/splice.c
> +++ b/fs/splice.c
> @@ -1101,6 +1101,7 @@ static long do_splice(struct file *in, loff_t __user *off_in,
> struct pipe_inode_info *ipipe;
> struct pipe_inode_info *opipe;
> loff_t offset;
> + unsigned int pipe_pages;
> long ret;
>
> ipipe = get_pipe_info(in);
> @@ -1123,6 +1124,10 @@ static long do_splice(struct file *in, loff_t __user *off_in,
> if ((in->f_flags | out->f_flags) & O_NONBLOCK)
> flags |= SPLICE_F_NONBLOCK;
>
> + /* Don't try to read more the pipe has space for. */
> + pipe_pages = opipe->buffers - opipe->nrbufs;
> + len = min_t(size_t, len, pipe_pages << PAGE_SHIFT);
This should probably be min(len, (size_t)pipe_pages << PAGE_SHIFT).
Same for the second min_t here and the one added by commit
17614445576b6.
> +
> return splice_pipe_to_pipe(ipipe, opipe, len, flags);
> }
>
> @@ -1180,8 +1185,13 @@ static long do_splice(struct file *in, loff_t __user *off_in,
>
> pipe_lock(opipe);
> ret = wait_for_space(opipe, flags);
> - if (!ret)
> + if (!ret) {
> + /* Don't try to read more the pipe has space for. */
> + pipe_pages = opipe->buffers - opipe->nrbufs;
> + len = min_t(size_t, len, pipe_pages << PAGE_SHIFT);
> +
> ret = do_splice_to(in, &offset, opipe, len, flags);
> + }
> pipe_unlock(opipe);
> if (ret > 0)
> wakeup_pipe_readers(opipe);
Thanks,
Andreas
next prev parent reply other threads:[~2019-08-29 11:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-02 18:08 [PATCH v2 1/2] splice: don't read more than available pipe space Darrick J. Wong
2018-12-02 18:10 ` [PATCH v2 2/2] iomap: partially revert 4721a601099 (simulated directio short read on EFAULT) Darrick J. Wong
2018-12-02 19:37 ` Amir Goldstein
2019-08-21 20:23 ` Andreas Grünbacher
2019-08-28 14:23 ` Darrick J. Wong
2019-08-28 14:37 ` Andreas Grünbacher
2019-08-29 3:12 ` Darrick J. Wong
2019-08-29 11:49 ` Andreas Grünbacher [this message]
2019-08-29 1:36 ` Zorro Lang
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=CAHpGcM+Aq+BxD0_TPx9sqTCt8N6X3Q+UO6CkyfV3NZMaN8AU8w@mail.gmail.com \
--to=andreas.gruenbacher@gmail.com \
--cc=amir73il@gmail.com \
--cc=cluster-devel@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=hch@infradead.org \
--cc=jencce.kernel@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=zlang@redhat.com \
/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).