From: Anna Schumaker <schumaker.anna@gmail.com>
To: Dave Chinner <david@fromorbit.com>,
linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org
Cc: olga.kornievskaia@gmail.com, linux-nfs@vger.kernel.org,
linux-unionfs@vger.kernel.org, ceph-devel@vger.kernel.org,
linux-cifs@vger.kernel.org
Subject: Re: [PATCH 03/11] vfs: no fallback for ->copy_file_range
Date: Mon, 03 Dec 2018 13:23:20 -0500 [thread overview]
Message-ID: <59b1b9df94be7f8c9716a906dca4254749cd9be8.camel@gmail.com> (raw)
In-Reply-To: <20181203083416.28978-4-david@fromorbit.com>
Hi Dave,
On Mon, 2018-12-03 at 19:34 +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Now that we have generic_copy_file_range(), remove it as a fallback
> case when offloads fail. This puts the responsibility for executing
> fallbacks on the filesystems that implement ->copy_file_range and
> allows us to add operational validity checks to
> generic_copy_file_range().
>
> Rework vfs_copy_file_range() to call a new do_copy_file_range()
> helper to exceute the copying callout, and move calls to
> generic_file_copy_range() into filesystem methods where they
> currently return failures.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/ceph/file.c | 17 ++++++++++++++++-
> fs/cifs/cifsfs.c | 4 ++++
> fs/fuse/file.c | 17 ++++++++++++++++-
> fs/nfs/nfs4file.c | 4 ++++
The NFS bits look okay to me:
Acked-by: Anna Schumaker <Anna.Schumaker@Netapp.com
> fs/overlayfs/file.c | 9 ++++++++-
> fs/read_write.c | 24 +++++++++++++++---------
> 6 files changed, 63 insertions(+), 12 deletions(-)
>
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index 189df668b6a0..cf29f0410dcb 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -1885,7 +1885,7 @@ static int is_file_size_ok(struct inode *src_inode,
> struct inode *dst_inode,
> return 0;
> }
>
> -static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off,
> +static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,
> struct file *dst_file, loff_t dst_off,
> size_t len, unsigned int flags)
> {
> @@ -2096,6 +2096,21 @@ static ssize_t ceph_copy_file_range(struct file
> *src_file, loff_t src_off,
> return ret;
> }
>
> +static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off,
> + struct file *dst_file, loff_t dst_off,
> + size_t len, unsigned int flags)
> +{
> + ssize_t ret;
> +
> + ret = __ceph_copy_file_range(src_file, src_off, dst_file, dst_off,
> + len, flags);
> +
> + if (ret == -EOPNOTSUPP)
> + ret = generic_copy_file_range(src_file, src_off, dst_file,
> + dst_off, len, flags);
> + return ret;
> +}
> +
> const struct file_operations ceph_file_fops = {
> .open = ceph_open,
> .release = ceph_release,
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index 865706edb307..5ef4baec6234 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -1141,6 +1141,10 @@ static ssize_t cifs_copy_file_range(struct file
> *src_file, loff_t off,
> rc = cifs_file_copychunk_range(xid, src_file, off, dst_file, destoff,
> len, flags);
> free_xid(xid);
> +
> + if (rc == -EOPNOTSUPP)
> + rc = generic_copy_file_range(src_file, off, dst_file,
> + destoff, len, flags);
> return rc;
> }
>
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index b52f9baaa3e7..b86fb0298739 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -3024,7 +3024,7 @@ static long fuse_file_fallocate(struct file *file, int
> mode, loff_t offset,
> return err;
> }
>
> -static ssize_t fuse_copy_file_range(struct file *file_in, loff_t pos_in,
> +static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in,
> struct file *file_out, loff_t pos_out,
> size_t len, unsigned int flags)
> {
> @@ -3100,6 +3100,21 @@ static ssize_t fuse_copy_file_range(struct file
> *file_in, loff_t pos_in,
> return err;
> }
>
> +static ssize_t fuse_copy_file_range(struct file *src_file, loff_t src_off,
> + struct file *dst_file, loff_t dst_off,
> + size_t len, unsigned int flags)
> +{
> + ssize_t ret;
> +
> + ret = __fuse_copy_file_range(src_file, src_off, dst_file, dst_off,
> + len, flags);
> +
> + if (ret == -EOPNOTSUPP)
> + ret = generic_copy_file_range(src_file, src_off, dst_file,
> + dst_off, len, flags);
> + return ret;
> +}
> +
> static const struct file_operations fuse_file_operations = {
> .llseek = fuse_file_llseek,
> .read_iter = fuse_file_read_iter,
> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
> index 46d691ba04bc..d7766a6eb0f4 100644
> --- a/fs/nfs/nfs4file.c
> +++ b/fs/nfs/nfs4file.c
> @@ -141,6 +141,10 @@ static ssize_t nfs4_copy_file_range(struct file *file_in,
> loff_t pos_in,
> ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);
> if (ret == -EAGAIN)
> goto retry;
> +
> + if (ret == -EOPNOTSUPP)
> + ret = generic_copy_file_range(file_in, pos_in, file_out,
> + pos_out, count, flags);
> return ret;
> }
>
> diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
> index 84dd957efa24..68736e5d6a56 100644
> --- a/fs/overlayfs/file.c
> +++ b/fs/overlayfs/file.c
> @@ -486,8 +486,15 @@ static ssize_t ovl_copy_file_range(struct file *file_in,
> loff_t pos_in,
> struct file *file_out, loff_t pos_out,
> size_t len, unsigned int flags)
> {
> - return ovl_copyfile(file_in, pos_in, file_out, pos_out, len, flags,
> + ssize_t ret;
> +
> + ret = ovl_copyfile(file_in, pos_in, file_out, pos_out, len, flags,
> OVL_COPY);
> +
> + if (ret == -EOPNOTSUPP)
> + ret = generic_copy_file_range(file_in, pos_in, file_out,
> + pos_out, len, flags);
> + return ret;
> }
>
> static loff_t ovl_remap_file_range(struct file *file_in, loff_t pos_in,
> diff --git a/fs/read_write.c b/fs/read_write.c
> index 50114694c98b..44339b44accc 100644
> --- a/fs/read_write.c
> +++ b/fs/read_write.c
> @@ -1570,6 +1570,18 @@ ssize_t generic_copy_file_range(struct file *file_in,
> loff_t pos_in,
> }
> EXPORT_SYMBOL(generic_copy_file_range);
>
> +static ssize_t do_copy_file_range(struct file *file_in, loff_t pos_in,
> + struct file *file_out, loff_t pos_out,
> + size_t len, unsigned int flags)
> +{
> + if (file_out->f_op->copy_file_range)
> + return file_out->f_op->copy_file_range(file_in, pos_in,
> file_out,
> + pos_out, len, flags);
> +
> + return generic_copy_file_range(file_in, &pos_in, file_out, &pos_out,
> + len, flags);
> +}
> +
> /*
> * copy_file_range() differs from regular file read and write in that it
> * specifically allows return partial success. When it does so is up to
> @@ -1634,15 +1646,9 @@ ssize_t vfs_copy_file_range(struct file *file_in,
> loff_t pos_in,
> }
> }
>
> - if (file_out->f_op->copy_file_range) {
> - ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out,
> - pos_out, len, flags);
> - if (ret != -EOPNOTSUPP)
> - goto done;
> - }
> -
> - ret = generic_copy_file_range(file_in, &pos_in, file_out, &pos_out,
> - len, flags);
> + ret = do_copy_file_range(file_in, pos_in, file_out, pos_out, len,
> + flags);
> + WARN_ON_ONCE(ret == -EOPNOTSUPP);
> done:
> if (ret > 0) {
> fsnotify_access(file_in);
next prev parent reply other threads:[~2018-12-03 18:23 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 8:34 [PATCH 0/11] fs: fixes for major copy_file_range() issues Dave Chinner
2018-12-03 8:34 ` [PATCH 01/11] vfs: copy_file_range source range over EOF should fail Dave Chinner
2018-12-03 12:46 ` Amir Goldstein
2018-12-04 15:13 ` Christoph Hellwig
2018-12-04 21:29 ` Dave Chinner
2018-12-04 21:47 ` Olga Kornievskaia
2018-12-04 22:31 ` Dave Chinner
2018-12-05 16:51 ` J. Bruce Fields
2019-05-20 9:10 ` Amir Goldstein
2019-05-20 13:12 ` Olga Kornievskaia
2019-05-20 13:36 ` Amir Goldstein
2019-05-20 13:58 ` Olga Kornievskaia
2019-05-20 14:02 ` Amir Goldstein
2018-12-05 14:12 ` Christoph Hellwig
2018-12-05 21:08 ` Dave Chinner
2018-12-05 21:30 ` Christoph Hellwig
2018-12-03 8:34 ` [PATCH 02/11] vfs: introduce generic_copy_file_range() Dave Chinner
2018-12-03 10:03 ` Amir Goldstein
2018-12-03 23:00 ` Dave Chinner
2018-12-04 15:14 ` Christoph Hellwig
2018-12-03 8:34 ` [PATCH 03/11] vfs: no fallback for ->copy_file_range Dave Chinner
2018-12-03 10:22 ` Amir Goldstein
2018-12-03 23:02 ` Dave Chinner
2018-12-06 4:16 ` Amir Goldstein
2018-12-06 21:30 ` Dave Chinner
2018-12-07 5:38 ` Amir Goldstein
2018-12-03 18:23 ` Anna Schumaker [this message]
2018-12-04 15:16 ` Christoph Hellwig
2018-12-03 8:34 ` [PATCH 04/11] vfs: add missing checks to copy_file_range Dave Chinner
2018-12-03 12:42 ` Amir Goldstein
2018-12-03 19:04 ` Darrick J. Wong
2018-12-03 21:33 ` Olga Kornievskaia
2018-12-03 23:04 ` Dave Chinner
2018-12-04 15:18 ` Christoph Hellwig
2018-12-12 11:31 ` Luis Henriques
2018-12-12 16:42 ` Darrick J. Wong
2018-12-12 18:55 ` Olga Kornievskaia
2018-12-12 19:42 ` Matthew Wilcox
2018-12-12 20:22 ` Olga Kornievskaia
2018-12-13 10:29 ` Luis Henriques
2018-12-03 8:34 ` [PATCH 05/11] vfs: use inode_permission in copy_file_range() Dave Chinner
2018-12-03 12:47 ` Amir Goldstein
2018-12-03 18:18 ` Darrick J. Wong
2018-12-03 23:55 ` Dave Chinner
2018-12-05 17:28 ` J. Bruce Fields
2018-12-03 18:53 ` Eric Biggers
2018-12-04 15:19 ` Christoph Hellwig
2018-12-03 8:34 ` [PATCH 06/11] vfs: copy_file_range needs to strip setuid bits Dave Chinner
2018-12-03 12:51 ` Amir Goldstein
2018-12-04 15:21 ` Christoph Hellwig
2018-12-03 8:34 ` [PATCH 07/11] vfs: copy_file_range should update file timestamps Dave Chinner
2018-12-03 10:47 ` Amir Goldstein
2018-12-03 17:33 ` Olga Kornievskaia
2018-12-03 18:22 ` Darrick J. Wong
2018-12-03 23:19 ` Dave Chinner
2018-12-04 15:24 ` Christoph Hellwig
2018-12-03 8:34 ` [PATCH 08/11] vfs: push EXDEV check down into ->remap_file_range Dave Chinner
2018-12-03 11:04 ` Amir Goldstein
2018-12-03 19:11 ` Darrick J. Wong
2018-12-03 23:37 ` Dave Chinner
2018-12-03 23:58 ` Darrick J. Wong
2018-12-04 9:17 ` Amir Goldstein
2018-12-03 23:34 ` Dave Chinner
2018-12-03 18:24 ` Darrick J. Wong
2018-12-04 8:18 ` Olga Kornievskaia
2018-12-03 8:34 ` [PATCH 09/11] vfs: push copy_file_ranges -EXDEV checks down Dave Chinner
2018-12-03 12:36 ` Amir Goldstein
2018-12-03 17:58 ` Olga Kornievskaia
2018-12-03 18:53 ` Anna Schumaker
2018-12-03 19:27 ` Olga Kornievskaia
2018-12-03 23:40 ` Dave Chinner
2018-12-04 15:43 ` Christoph Hellwig
2018-12-04 22:18 ` Dave Chinner
2018-12-04 23:33 ` Olga Kornievskaia
2018-12-05 14:09 ` Christoph Hellwig
2018-12-05 17:01 ` Olga Kornievskaia
2018-12-03 8:34 ` [PATCH 10/11] vfs: allow generic_copy_file_range to copy across devices Dave Chinner
2018-12-03 12:54 ` Amir Goldstein
2018-12-03 8:34 ` [PATCH 11/11] ovl: allow cross-device copy_file_range calls Dave Chinner
2018-12-03 12:55 ` Amir Goldstein
2018-12-03 8:39 ` [PATCH 12/11] man-pages: copy_file_range updates Dave Chinner
2018-12-03 13:05 ` Amir Goldstein
2019-05-21 5:52 ` 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=59b1b9df94be7f8c9716a906dca4254749cd9be8.camel@gmail.com \
--to=schumaker.anna@gmail.com \
--cc=ceph-devel@vger.kernel.org \
--cc=david@fromorbit.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=olga.kornievskaia@gmail.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).