From: Amir Goldstein <amir73il@gmail.com>
To: Goldwyn Rodrigues <rgoldwyn@suse.de>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>,
overlayfs <linux-unionfs@vger.kernel.org>,
Dave Chinner <david@fromorbit.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: Re: [PATCH 3/4] copy_file_range: splice with holes
Date: Thu, 10 May 2018 07:42:50 +0300 [thread overview]
Message-ID: <CAOQ4uxhMH8onqs0H5zZoptD0pLf8jk6JUtHR6EgVZkDembYQGA@mail.gmail.com> (raw)
In-Reply-To: <20180510015820.17700-4-rgoldwyn@suse.de>
On Thu, May 10, 2018 at 4:58 AM, Goldwyn Rodrigues <rgoldwyn@suse.de> wrote:
> From: Goldwyn Rodrigues <rgoldwyn@suse.com>
>
> copy_file_range calls do_splice_direct() if fs->clone_file_range
> or fs->copy_file_range() is not available. However, do_splice_direct()
> converts holes to zeros. Detect holes in the file_in range, and
> create them in the corresponding file_out range.
>
> If there is already data present at the offset in file_out, attempt
> to punch a hole there. If the operation is not supported, fall
> back to performing splice on the whole range.
>
> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
> Reviewed-by: Amir Goldstein <amir73il@gmail.com>
> ---
> fs/read_write.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 58 insertions(+), 4 deletions(-)
>
> diff --git a/fs/read_write.c b/fs/read_write.c
> index 1b8fc9eada69..e765fec656af 100644
> --- a/fs/read_write.c
> +++ b/fs/read_write.c
> @@ -20,6 +20,7 @@
> #include <linux/compat.h>
> #include <linux/mount.h>
> #include <linux/fs.h>
> +#include <linux/falloc.h>
> #include "internal.h"
>
> #include <linux/uaccess.h>
> @@ -1547,7 +1548,8 @@ static ssize_t do_copy_file_range(struct file *file_in, loff_t pos_in,
> {
> struct inode *inode_in = file_inode(file_in);
> struct inode *inode_out = file_inode(file_out);
> - ssize_t ret = 0;
> + ssize_t ret = 0, total = 0;
> + loff_t size, end;
>
> if (len == 0)
> return 0;
> @@ -1572,10 +1574,62 @@ static ssize_t do_copy_file_range(struct file *file_in, loff_t pos_in,
> if (ret != -EOPNOTSUPP)
> return ret;
> }
> +
> splice:
> - ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out,
> - len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0);
> - return ret;
> + while (total < len) {
> + end = vfs_llseek(file_in, pos_in, SEEK_HOLE);
> +
> + /* Starting position is already in a hole */
> + if (end == pos_in)
> + goto hole;
> + size = end - pos_in;
> +do_splice:
> + if (size > len - total)
> + size = len - total;
> + ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out,
> + size, 0);
I wonder, can do_splice_direct() return short copy (< size)?
If so, code below will try to punch a zero length hole.
Best put some protection here, don't you think?
> + if (ret < 0)
> + goto out;
> + total += ret;
> + if (total == len)
> + break;
> +hole:
> + end = vfs_llseek(file_in, pos_in, SEEK_DATA);
> + if (end < 0) {
> + ret = end;
> + goto out;
> + }
> + size = end - pos_in;
> + if (size > len - total)
> + size = len - total;
> + /* Data on offset, punch holes */
> + if (i_size_read(file_out->f_inode) > pos_out) {
> + ret = vfs_fallocate(file_out,
> + FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
> + pos_out, size);
I'm afraid you have more re-factoring to do vfs_fallocate() does
file_start_write() -
you probably need do_fallocate().
> + if (ret < 0) {
> + /*
> + * The filesystem does not support punching
> + * holes. Perform splice on the remaining range.
> + */
> + if (ret == -EOPNOTSUPP) {
> + size = len - total;
> + goto do_splice;
> + }
> + goto out;
> + }
> + }
> + if (ret < 0) {
> + ret = end;
> + goto out;
> + }
> + pos_out += size;
> + pos_in = end;
> + total += size;
> + }
> +
> +out:
> + return total ? total : ret;
> }
>
> /*
> --
> 2.16.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-05-10 4:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-10 1:58 [PATCH v2 0/4] Enable holes in copy_file_range() Goldwyn Rodrigues
2018-05-10 1:58 ` [PATCH 1/4] copy_file_range: refactor vfs_copy_file_range Goldwyn Rodrigues
2018-05-10 1:58 ` [PATCH 2/4] copy_file_range: Perform splice if in/out SB are not same Goldwyn Rodrigues
2018-05-10 1:58 ` [PATCH 3/4] copy_file_range: splice with holes Goldwyn Rodrigues
2018-05-10 4:42 ` Amir Goldstein [this message]
2018-05-10 5:49 ` Amir Goldstein
2018-05-10 1:58 ` [PATCH 4/4] ovl: Use do_copy_file_range() in copy_up_data() Goldwyn Rodrigues
2018-05-10 4:47 ` [PATCH v2 0/4] Enable holes in copy_file_range() Amir Goldstein
2018-05-10 10:45 ` Anna Schumaker
-- strict thread matches above, loose matches on Subject: below --
2018-06-14 15:12 [PATCH RESEND v3 " Goldwyn Rodrigues
2018-06-14 15:12 ` [PATCH 3/4] copy_file_range: splice with holes Goldwyn Rodrigues
2018-06-30 18:01 ` Steve French
2018-05-14 14:56 [PATCH v3 0/4] Enable holes in copy_file_range() Goldwyn Rodrigues
2018-05-14 14:56 ` [PATCH 3/4] copy_file_range: splice with holes Goldwyn Rodrigues
2018-05-08 21:24 [PATCH v1 0/5] Enable holes on copy_file_range() Goldwyn Rodrigues
2018-05-08 21:24 ` [PATCH 3/4] copy_file_range: splice with holes Goldwyn Rodrigues
2018-05-08 21:59 ` Florian Weimer
2018-05-08 23:43 ` Dave Chinner
2018-05-09 5:47 ` Amir Goldstein
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=CAOQ4uxhMH8onqs0H5zZoptD0pLf8jk6JUtHR6EgVZkDembYQGA@mail.gmail.com \
--to=amir73il@gmail.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=rgoldwyn@suse.com \
--cc=rgoldwyn@suse.de \
--cc=viro@zeniv.linux.org.uk \
/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).