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 09/11] vfs: push copy_file_ranges -EXDEV checks down
Date: Mon, 03 Dec 2018 13:53:35 -0500 [thread overview]
Message-ID: <679f1cda1b43fc4cfcd6cdf6dbac223b42db24c2.camel@gmail.com> (raw)
In-Reply-To: <20181203083416.28978-10-david@fromorbit.com>
On Mon, 2018-12-03 at 19:34 +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> We want to enable cross-filesystem copy_file_range functionality
> where possible, so push the "same superblock only" checks down to
> the individual filesystem callouts so they can make their own
> decisions about cross-superblock copy offload.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/ceph/file.c | 4 +++-
> fs/cifs/cifsfs.c | 8 +++++++-
> fs/fuse/file.c | 5 ++++-
> fs/nfs/nfs4file.c | 16 ++++++++++------
> fs/overlayfs/file.c | 10 +++++++++-
> fs/read_write.c | 10 ++++------
> 6 files changed, 37 insertions(+), 16 deletions(-)
>
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index cf29f0410dcb..eb876e19c1dc 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -1905,6 +1905,8 @@ static ssize_t __ceph_copy_file_range(struct file
> *src_file, loff_t src_off,
>
> if (src_inode == dst_inode)
> return -EINVAL;
> + if (src_inode->i_sb != dst_inode->i_sb)
> + return -EXDEV;
> if (ceph_snap(dst_inode) != CEPH_NOSNAP)
> return -EROFS;
>
> @@ -2105,7 +2107,7 @@ static ssize_t ceph_copy_file_range(struct file
> *src_file, loff_t src_off,
> ret = __ceph_copy_file_range(src_file, src_off, dst_file, dst_off,
> len, flags);
>
> - if (ret == -EOPNOTSUPP)
> + if (ret == -EOPNOTSUPP || ret == -EXDEV)
> ret = generic_copy_file_range(src_file, src_off, dst_file,
> dst_off, len, flags);
> return ret;
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index 5ef4baec6234..03e4b9eacbd1 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -1072,6 +1072,12 @@ ssize_t cifs_file_copychunk_range(unsigned int xid,
> goto out;
> }
>
> + if (src_inode->i_sb != target_inode->i_sb) {
> + rc = -EXDEV;
> + goto out;
> + }
> +
> +
> if (!src_file->private_data || !dst_file->private_data) {
> rc = -EBADF;
> cifs_dbg(VFS, "missing cifsFileInfo on copy range src file\n");
> @@ -1142,7 +1148,7 @@ static ssize_t cifs_copy_file_range(struct file
> *src_file, loff_t off,
> len, flags);
> free_xid(xid);
>
> - if (rc == -EOPNOTSUPP)
> + if (rc == -EOPNOTSUPP || rc == -EXDEV)
> 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 b86fb0298739..0758f831a4eb 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -3053,6 +3053,9 @@ static ssize_t __fuse_copy_file_range(struct file
> *file_in, loff_t pos_in,
> if (fc->no_copy_file_range)
> return -EOPNOTSUPP;
>
> + if (file_inode(file_in)->i_sb != file_inode(file_out)->i_sb)
> + return -EXDEV;
> +
> inode_lock(inode_out);
>
> if (fc->writeback_cache) {
> @@ -3109,7 +3112,7 @@ static ssize_t fuse_copy_file_range(struct file
> *src_file, loff_t src_off,
> ret = __fuse_copy_file_range(src_file, src_off, dst_file, dst_off,
> len, flags);
>
> - if (ret == -EOPNOTSUPP)
> + if (ret == -EOPNOTSUPP || ret == -EXDEV)
> ret = generic_copy_file_range(src_file, src_off, dst_file,
> dst_off, len, flags);
> return ret;
> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
> index d7766a6eb0f4..4783c0c1c49e 100644
> --- a/fs/nfs/nfs4file.c
> +++ b/fs/nfs/nfs4file.c
> @@ -133,16 +133,20 @@ static ssize_t nfs4_copy_file_range(struct file
> *file_in, loff_t pos_in,
> struct file *file_out, loff_t pos_out,
> size_t count, unsigned int flags)
> {
> - ssize_t ret;
> + ssize_t ret = -EXDEV;
>
> if (file_inode(file_in) == file_inode(file_out))
> return -EINVAL;
> -retry:
> - ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);
> - if (ret == -EAGAIN)
> - goto retry;
>
> - if (ret == -EOPNOTSUPP)
> + /* only offload copy if superblock is the same */
> + if (file_inode(file_in)->i_sb == file_inode(file_out)->i_sb) {
> + do {
> + ret = nfs42_proc_copy(file_in, pos_in, file_out,
> + pos_out, count);
> + } while (ret == -EAGAIN);
I'm not convinced we can actually return -EAGAIN from nfs42_proc_copy(). The
nfs_get_lock_context() function doesn't return it, and if _nfs42_proc_copy()
returns -EAGAIN it's immediately retried by nfs42_proc_copy() instead of
returning.
Olga, am I missing something here?
Anna
> + }
> +
> + if (ret == -EOPNOTSUPP || ret == -EXDEV)
> 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 68736e5d6a56..34fb0398d016 100644
> --- a/fs/overlayfs/file.c
> +++ b/fs/overlayfs/file.c
> @@ -443,6 +443,14 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t
> pos_in,
> const struct cred *old_cred;
> loff_t ret;
>
> + /*
> + * Temporary. Cross device copy checks should be left to the copy file
> + * call on the real inodes, but existing behaviour checks the upper
> + * files only.
> + */
> + if (file_inode(file_in)->i_sb != file_inode(file_out)->i_sb)
> + return -EXDEV;
> +
> ret = ovl_real_fdget(file_out, &real_out);
> if (ret)
> return ret;
> @@ -491,7 +499,7 @@ static ssize_t ovl_copy_file_range(struct file *file_in,
> loff_t pos_in,
> ret = ovl_copyfile(file_in, pos_in, file_out, pos_out, len, flags,
> OVL_COPY);
>
> - if (ret == -EOPNOTSUPP)
> + if (ret == -EOPNOTSUPP || ret == -EXDEV)
> ret = generic_copy_file_range(file_in, pos_in, file_out,
> pos_out, len, flags);
> return ret;
> diff --git a/fs/read_write.c b/fs/read_write.c
> index 174cf92eea1d..4e0666de0d69 100644
> --- a/fs/read_write.c
> +++ b/fs/read_write.c
> @@ -1565,6 +1565,10 @@ ssize_t generic_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)
> {
> + /* Temporary, do_splice_direct supports cross-sb copies */
> + if (file_inode(file_in)->i_sb != file_inode(file_out)->i_sb)
> + return -EXDEV;
> +
> return do_splice_direct(file_in, &pos_in, file_out, &pos_out,
> len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0);
> }
> @@ -1611,17 +1615,11 @@ ssize_t vfs_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)
> {
> - struct inode *inode_in = file_inode(file_in);
> - struct inode *inode_out = file_inode(file_out);
> ssize_t ret;
>
> if (flags != 0)
> return -EINVAL;
>
> - /* this could be relaxed once a method supports cross-fs copies */
> - if (inode_in->i_sb != inode_out->i_sb)
> - return -EXDEV;
> -
> ret = generic_copy_file_checks(file_in, pos_in, file_out, pos_out, &len,
> flags);
> if (ret < 0)
next prev parent reply other threads:[~2018-12-03 18:53 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
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 [this message]
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=679f1cda1b43fc4cfcd6cdf6dbac223b42db24c2.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).