linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: <linux-nfs@vger.kernel.org>, <linux-btrfs@vger.kernel.org>,
	<linux-fsdevel@vger.kernel.org>, <linux-api@vger.kernel.org>,
	<zab@zabbo.net>, <viro@zeniv.linux.org.uk>, <clm@fb.com>,
	<darrick.wong@oracle.com>, <mtk.manpages@gmail.com>,
	<andros@netapp.com>, <hch@infradead.org>
Subject: [PATCH v5 8/9] vfs: Add vfs_copy_file_range() support for pagecache copies
Date: Wed, 30 Sep 2015 13:26:52 -0400	[thread overview]
Message-ID: <1443634014-3026-9-git-send-email-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <1443634014-3026-1-git-send-email-Anna.Schumaker@Netapp.com>

This allows us to have an in-kernel copy mechanism that avoids frequent
switches between kernel and user space.  This is especially useful so
NFSD can support server-side copies.

I make pagecache copies configurable by adding three new (exclusive)
flags:
- COPY_FR_REFLINK tells vfs_copy_file_range() to only create a reflink.
- COPY_FR_COPY does a full data copy, but may be filesystem accelerated.
- COPY_FR_DEDUP creates a reflink, but only if the contents of both
  ranges are identical.

The default (flags=0) means to first attempt a reflink, but use the pagecache
if that fails.

I moved the rw_verify_area() calls into the fallback code since some
filesystems can handle reflinking a large range.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Padraig Brady <P@draigBrady.com>
---
 fs/read_write.c           | 61 +++++++++++++++++++++++++++++++----------------
 include/linux/copy.h      |  6 +++++
 include/uapi/linux/Kbuild |  1 +
 include/uapi/linux/copy.h |  8 +++++++
 4 files changed, 56 insertions(+), 20 deletions(-)
 create mode 100644 include/linux/copy.h
 create mode 100644 include/uapi/linux/copy.h

diff --git a/fs/read_write.c b/fs/read_write.c
index ee9fa37..4fb9b8e 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -7,6 +7,7 @@
 #include <linux/slab.h> 
 #include <linux/stat.h>
 #include <linux/fcntl.h>
+#include <linux/copy.h>
 #include <linux/file.h>
 #include <linux/uio.h>
 #include <linux/fsnotify.h>
@@ -1329,6 +1330,29 @@ COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd,
 }
 #endif
 
+static ssize_t vfs_copy_file_pagecache(struct file *file_in, loff_t pos_in,
+				       struct file *file_out, loff_t pos_out,
+				       size_t len)
+{
+	ssize_t ret;
+
+	ret = rw_verify_area(READ, file_in, &pos_in, len);
+	if (ret >= 0) {
+		len = ret;
+		ret = rw_verify_area(WRITE, file_out, &pos_out, len);
+		if (ret >= 0)
+			len = ret;
+	}
+	if (ret < 0)
+		return ret;
+
+	file_start_write(file_out);
+	ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out, len, 0);
+	file_end_write(file_out);
+
+	return ret;
+}
+
 /*
  * 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
@@ -1338,34 +1362,26 @@ 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;
-	struct inode *inode_out;
 	ssize_t ret;
 
-	if (flags)
+	/* Flags should only be used exclusively. */
+	if ((flags & COPY_FR_COPY) && (flags & ~COPY_FR_COPY))
+		return -EINVAL;
+	if ((flags & COPY_FR_REFLINK) && (flags & ~COPY_FR_REFLINK))
+		return -EINVAL;
+	if ((flags & COPY_FR_DEDUP) && (flags & ~COPY_FR_DEDUP))
 		return -EINVAL;
 
-	/* copy_file_range allows full ssize_t len, ignoring MAX_RW_COUNT  */
-	ret = rw_verify_area(READ, file_in, &pos_in, len);
-	if (ret >= 0)
-		ret = rw_verify_area(WRITE, file_out, &pos_out, len);
-	if (ret < 0)
-		return ret;
+	/* Default behavior is to try both. */
+	if (flags == 0)
+		flags = COPY_FR_COPY | COPY_FR_REFLINK;
 
 	if (!(file_in->f_mode & FMODE_READ) ||
 	    !(file_out->f_mode & FMODE_WRITE) ||
 	    (file_out->f_flags & O_APPEND) ||
-	    !file_out->f_op || !file_out->f_op->copy_file_range)
+	    !file_out->f_op)
 		return -EBADF;
 
-	inode_in = file_inode(file_in);
-	inode_out = file_inode(file_out);
-
-	/* make sure offsets don't wrap and the input is inside i_size */
-	if (pos_in + len < pos_in || pos_out + len < pos_out ||
-	    pos_in + len > i_size_read(inode_in))
-		return -EINVAL;
-
 	if (len == 0)
 		return 0;
 
@@ -1373,8 +1389,13 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
 	if (ret)
 		return ret;
 
-	ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out, pos_out,
-					      len, flags);
+	ret = -EOPNOTSUPP;
+	if (file_out->f_op->copy_file_range && (file_in->f_op == file_out->f_op))
+		ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out,
+						      pos_out, len, flags);
+	if ((ret < 0) && (flags & COPY_FR_COPY))
+		ret = vfs_copy_file_pagecache(file_in, pos_in, file_out,
+					      pos_out, len);
 	if (ret > 0) {
 		fsnotify_access(file_in);
 		add_rchar(current, ret);
diff --git a/include/linux/copy.h b/include/linux/copy.h
new file mode 100644
index 0000000..fd54543
--- /dev/null
+++ b/include/linux/copy.h
@@ -0,0 +1,6 @@
+#ifndef _LINUX_COPY_H
+#define _LINUX_COPY_H
+
+#include <uapi/linux/copy.h>
+
+#endif /* _LINUX_COPY_H */
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index f7b2db4..faafd67 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -90,6 +90,7 @@ header-y += coda_psdev.h
 header-y += coff.h
 header-y += connector.h
 header-y += const.h
+header-y += copy.h
 header-y += cramfs_fs.h
 header-y += cuda.h
 header-y += cyclades.h
diff --git a/include/uapi/linux/copy.h b/include/uapi/linux/copy.h
new file mode 100644
index 0000000..b807dcd
--- /dev/null
+++ b/include/uapi/linux/copy.h
@@ -0,0 +1,8 @@
+#ifndef _UAPI_LINUX_COPY_H
+#define _UAPI_LINUX_COPY_H
+
+#define COPY_FR_COPY		(1 << 0)  /* Only do a pagecache copy.  */
+#define COPY_FR_REFLINK		(1 << 1)  /* Only make a reflink.       */
+#define COPY_FR_DEDUP		(1 << 2)  /* Deduplicate file data.     */
+
+#endif /* _UAPI_LINUX_COPY_H */
-- 
2.6.0


  parent reply	other threads:[~2015-09-30 17:27 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-30 17:26 [PATCH v5 0/9] VFS: In-kernel copy system call Anna Schumaker
2015-09-30 17:26 ` [PATCH v5 1/9] vfs: add copy_file_range syscall and vfs helper Anna Schumaker
2015-09-30 17:26 ` [PATCH v5 2/9] x86: add sys_copy_file_range to syscall tables Anna Schumaker
2015-09-30 17:26 ` [PATCH v5 3/9] btrfs: add .copy_file_range file operation Anna Schumaker
2015-09-30 17:26 ` [PATCH v5 4/9] vfs: Copy should check len after file open mode Anna Schumaker
2015-10-11 14:22   ` Christoph Hellwig
2015-09-30 17:26 ` [PATCH v5 5/9] vfs: Copy shouldn't forbid ranges inside the same file Anna Schumaker
2015-10-11 14:22   ` Christoph Hellwig
2015-10-14 17:37     ` Anna Schumaker
2015-10-14 18:25       ` Christoph Hellwig
2015-10-14 18:27         ` Anna Schumaker
2015-09-30 17:26 ` [PATCH v5 6/9] vfs: Copy should use file_out rather than file_in Anna Schumaker
2015-10-11 14:24   ` Christoph Hellwig
2015-09-30 17:26 ` [PATCH v5 7/9] vfs: Remove copy_file_range mountpoint checks Anna Schumaker
2015-10-11 14:23   ` Christoph Hellwig
2015-10-14 17:41     ` Anna Schumaker
2015-10-14 18:25       ` Christoph Hellwig
2015-09-30 17:26 ` Anna Schumaker [this message]
2015-10-08  1:40   ` [PATCH v5 8/9] vfs: Add vfs_copy_file_range() support for pagecache copies Neil Brown
2015-10-09 11:15     ` Pádraig Brady
2015-10-13 20:25       ` Anna Schumaker
2015-10-14  7:41         ` Christoph Hellwig
2015-10-13 19:45     ` Anna Schumaker
2015-10-11 14:22   ` Christoph Hellwig
2015-10-12 23:17     ` Darrick J. Wong
2015-10-13  3:36       ` Trond Myklebust
2015-10-13  7:19         ` Darrick J. Wong
2015-10-13  7:30         ` Christoph Hellwig
2015-10-13  7:27       ` Christoph Hellwig
2015-11-10  6:24         ` Darrick J. Wong
2015-10-14 17:59       ` Anna Schumaker
2015-10-14 18:08         ` Andy Lutomirski
2015-10-14 18:27           ` Christoph Hellwig
2015-10-14 18:38             ` Andy Lutomirski
2015-10-14 18:49               ` Christoph Hellwig
2015-10-14 18:53                 ` Andy Lutomirski
2015-10-14 19:14                   ` Austin S Hemmelgarn
2015-10-14 19:39                     ` Pádraig Brady
2015-10-15  5:56                   ` Christoph Hellwig
2015-10-14 19:08             ` Austin S Hemmelgarn
2015-10-15  6:36               ` Christoph Hellwig
2015-10-15 12:24                 ` Austin S Hemmelgarn
2015-10-16  5:38                   ` Christoph Hellwig
2015-10-16 11:46                     ` Austin S Hemmelgarn
2015-10-16 12:02                       ` Pádraig Brady
2015-10-16 12:24                         ` Christoph Hellwig
2015-10-16 12:46                           ` Austin S Hemmelgarn
2015-10-16 12:21                       ` Christoph Hellwig
2015-10-16 12:50                         ` Austin S Hemmelgarn
2015-10-16 13:12                           ` Christoph Hellwig
2015-10-16 14:11                             ` Austin S Hemmelgarn
2015-10-14 18:11         ` Darrick J. Wong
2015-10-14 18:26           ` Andy Lutomirski
2015-09-30 17:26 ` [PATCH v5 9/9] btrfs: btrfs_copy_file_range() only supports reflinks Anna Schumaker
2015-10-11 14:29   ` Christoph Hellwig
2015-10-12 10:23     ` Pádraig Brady
2015-10-12 14:34       ` Christoph Hellwig
2015-10-12 23:41         ` Darrick J. Wong
2015-10-13  7:29           ` Christoph Hellwig
2015-10-14 18:46             ` Darrick J. Wong
2015-10-15  6:00               ` Christoph Hellwig
2015-10-16 11:49                 ` Chris Mason
2015-10-16 12:25                   ` Christoph Hellwig
2015-10-16 13:19                     ` Chris Mason
2015-10-16 21:44                       ` Dave Chinner
2015-10-17 13:44                         ` Chris Mason
2015-10-15  8:35               ` Dave Chinner
2015-09-30 17:26 ` [PATCH v5 10/9] copy_file_range.2: New page documenting copy_file_range() Anna Schumaker

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=1443634014-3026-9-git-send-email-Anna.Schumaker@Netapp.com \
    --to=anna.schumaker@netapp.com \
    --cc=andros@netapp.com \
    --cc=clm@fb.com \
    --cc=darrick.wong@oracle.com \
    --cc=hch@infradead.org \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=mtk.manpages@gmail.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=zab@zabbo.net \
    /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).