All of lore.kernel.org
 help / color / mirror / Atom feed
From: Amir Goldstein <amir73il@gmail.com>
To: "Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Dave Chinner <david@fromorbit.com>,
	Christoph Hellwig <hch@lst.de>,
	linux-xfs@vger.kernel.org,
	Olga Kornievskaia <olga.kornievskaia@gmail.com>,
	Luis Henriques <lhenriques@suse.com>,
	Al Viro <viro@zeniv.linux.org.uk>,
	linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org,
	ceph-devel@vger.kernel.org, linux-nfs@vger.kernel.org,
	linux-cifs@vger.kernel.org, Dave Chinner <dchinner@redhat.com>
Subject: [PATCH v3 01/13] vfs: introduce generic_copy_file_range()
Date: Wed, 29 May 2019 20:43:05 +0300	[thread overview]
Message-ID: <20190529174318.22424-2-amir73il@gmail.com> (raw)
In-Reply-To: <20190529174318.22424-1-amir73il@gmail.com>

From: Dave Chinner <dchinner@redhat.com>

Right now if vfs_copy_file_range() does not use any offload
mechanism, it falls back to calling do_splice_direct(). This fails
to do basic sanity checks on the files being copied. Before we
start adding this necessarily functionality to the fallback path,
separate it out into generic_copy_file_range().

generic_copy_file_range() has the same prototype as
->copy_file_range() so that filesystems can use it in their custom
->copy_file_range() method if they so choose.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 fs/read_write.c    | 35 ++++++++++++++++++++++++++++++++---
 include/linux/fs.h |  3 +++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/fs/read_write.c b/fs/read_write.c
index c543d965e288..676b02fae589 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1565,6 +1565,36 @@ COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd,
 }
 #endif
 
+/**
+ * generic_copy_file_range - copy data between two files
+ * @file_in:	file structure to read from
+ * @pos_in:	file offset to read from
+ * @file_out:	file structure to write data to
+ * @pos_out:	file offset to write data to
+ * @len:	amount of data to copy
+ * @flags:	copy flags
+ *
+ * This is a generic filesystem helper to copy data from one file to another.
+ * It has no constraints on the source or destination file owners - the files
+ * can belong to different superblocks and different filesystem types. Short
+ * copies are allowed.
+ *
+ * This should be called from the @file_out filesystem, as per the
+ * ->copy_file_range() method.
+ *
+ * Returns the number of bytes copied or a negative error indicating the
+ * failure.
+ */
+
+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)
+{
+	return do_splice_direct(file_in, &pos_in, file_out, &pos_out,
+				len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0);
+}
+EXPORT_SYMBOL(generic_copy_file_range);
+
 /*
  * 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
@@ -1632,9 +1662,8 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
 			goto done;
 	}
 
-	ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out,
-			len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0);
-
+	ret = generic_copy_file_range(file_in, pos_in, file_out, pos_out, len,
+				      flags);
 done:
 	if (ret > 0) {
 		fsnotify_access(file_in);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f7fdfe93e25d..ea17858310ff 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1889,6 +1889,9 @@ extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
 		unsigned long, loff_t *, rwf_t);
 extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file *,
 				   loff_t, size_t, unsigned int);
+extern 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);
 extern int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 					 struct file *file_out, loff_t pos_out,
 					 loff_t *count,
-- 
2.17.1


  reply	other threads:[~2019-05-29 17:43 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-29 17:43 [PATCH v3 00/13] Fixes for major copy_file_range() issues Amir Goldstein
2019-05-29 17:43 ` Amir Goldstein [this message]
2019-05-29 17:43 ` [PATCH v3 02/13] vfs: no fallback for ->copy_file_range Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 03/13] vfs: introduce generic_file_rw_checks() Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 04/13] vfs: remove redundant checks from generic_remap_checks() Amir Goldstein
2019-05-29 18:23   ` Darrick J. Wong
2019-05-29 17:43 ` [PATCH v3 05/13] vfs: add missing checks to copy_file_range Amir Goldstein
2019-05-29 18:24   ` Darrick J. Wong
2019-05-29 17:43 ` [PATCH v3 06/13] vfs: introduce file_modified() helper Amir Goldstein
2019-05-29 18:27   ` Darrick J. Wong
2019-05-29 19:08     ` Amir Goldstein
2019-05-29 19:23       ` Amir Goldstein
2019-05-29 21:41       ` Dave Chinner
2019-05-29 17:43 ` [PATCH v3 07/13] xfs: use " Amir Goldstein
2019-05-29 18:31   ` Darrick J. Wong
2019-05-29 19:10     ` Amir Goldstein
2019-05-29 19:13       ` Darrick J. Wong
2019-05-29 17:43 ` [PATCH v3 08/13] vfs: copy_file_range needs to strip setuid bits and update timestamps Amir Goldstein
2019-05-29 18:33   ` Darrick J. Wong
2019-05-29 21:08     ` Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 09/13] ceph: " Amir Goldstein
2019-05-29 19:43   ` Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 10/13] cifs: " Amir Goldstein
2019-05-29 19:36   ` Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 11/13] fuse: " Amir Goldstein
2019-05-29 19:37   ` Amir Goldstein
2019-05-29 20:07     ` Miklos Szeredi
2019-05-29 17:43 ` [PATCH v3 12/13] nfs: " Amir Goldstein
2019-05-29 19:34   ` Amir Goldstein
2019-05-29 20:02     ` Trond Myklebust
2019-05-29 21:00       ` Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 13/13] vfs: allow copy_file_range to copy across devices Amir Goldstein
2019-05-29 20:09   ` Olga Kornievskaia
2019-05-29 21:03     ` Amir Goldstein
2019-06-03 20:39       ` Olga Kornievskaia
2019-06-04  4:11         ` Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 14/13] man-pages: copy_file_range updates 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=20190529174318.22424-2-amir73il@gmail.com \
    --to=amir73il@gmail.com \
    --cc=ceph-devel@vger.kernel.org \
    --cc=darrick.wong@oracle.com \
    --cc=david@fromorbit.com \
    --cc=dchinner@redhat.com \
    --cc=hch@lst.de \
    --cc=lhenriques@suse.com \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=olga.kornievskaia@gmail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.