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 v9 4/4] vfs: Add vfs_copy_file_range() support for pagecache copies Date: Tue, 10 Nov 2015 16:53:33 -0500 [thread overview] Message-ID: <1447192413-15376-5-git-send-email-Anna.Schumaker@Netapp.com> (raw) In-Reply-To: <1447192413-15376-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. The default (flags=0) means to first attempt copy acceleration, but use the pagecache if that fails. 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> Reviewed-by: Christoph Hellwig <hch@lst.de> --- v9: - Don't remove call to rw_verify_area() --- fs/read_write.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 97c15ca..6f73af1 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1354,8 +1354,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, if (!(file_in->f_mode & FMODE_READ) || !(file_out->f_mode & FMODE_WRITE) || - (file_out->f_flags & O_APPEND) || - !file_out->f_op->copy_file_range) + (file_out->f_flags & O_APPEND)) return -EBADF; /* this could be relaxed once a method supports cross-fs copies */ @@ -1369,8 +1368,14 @@ 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) + ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out, + pos_out, len, flags); + if (ret == -EOPNOTSUPP) + ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out, + len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0); + if (ret > 0) { fsnotify_access(file_in); add_rchar(current, ret); -- 2.6.2
WARNING: multiple messages have this Message-ID (diff)
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 v9 4/4] vfs: Add vfs_copy_file_range() support for pagecache copies Date: Tue, 10 Nov 2015 16:53:33 -0500 [thread overview] Message-ID: <1447192413-15376-5-git-send-email-Anna.Schumaker@Netapp.com> (raw) In-Reply-To: <1447192413-15376-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. The default (flags=0) means to first attempt copy acceleration, but use the pagecache if that fails. 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> Reviewed-by: Christoph Hellwig <hch@lst.de> --- v9: - Don't remove call to rw_verify_area() --- fs/read_write.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 97c15ca..6f73af1 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1354,8 +1354,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, if (!(file_in->f_mode & FMODE_READ) || !(file_out->f_mode & FMODE_WRITE) || - (file_out->f_flags & O_APPEND) || - !file_out->f_op->copy_file_range) + (file_out->f_flags & O_APPEND)) return -EBADF; /* this could be relaxed once a method supports cross-fs copies */ @@ -1369,8 +1368,14 @@ 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) + ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out, + pos_out, len, flags); + if (ret == -EOPNOTSUPP) + ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out, + len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0); + if (ret > 0) { fsnotify_access(file_in); add_rchar(current, ret); -- 2.6.2
next prev parent reply other threads:[~2015-11-10 21:53 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-10 21:53 [PATCH v9 0/4] VFS: In-kernel copy system call Anna Schumaker 2015-11-10 21:53 ` Anna Schumaker 2015-11-10 21:53 ` Anna Schumaker 2015-11-10 21:53 ` [PATCH v9 1/4] vfs: add copy_file_range syscall and vfs helper Anna Schumaker 2015-11-10 21:53 ` Anna Schumaker 2015-11-10 21:53 ` [PATCH v9 2/4] x86: add sys_copy_file_range to syscall tables Anna Schumaker 2015-11-10 21:53 ` Anna Schumaker 2015-11-10 21:53 ` Anna Schumaker 2015-11-10 21:53 ` [PATCH v9 3/4] btrfs: add .copy_file_range file operation Anna Schumaker 2015-11-10 21:53 ` Anna Schumaker 2015-11-10 21:53 ` Anna Schumaker [this message] 2015-11-10 21:53 ` [PATCH v9 4/4] vfs: Add vfs_copy_file_range() support for pagecache copies Anna Schumaker 2015-11-11 3:38 ` [PATCH v9 0/4] VFS: In-kernel copy system call Al Viro 2015-11-11 14:00 ` Anna Schumaker 2015-11-11 14:00 ` Anna Schumaker 2015-11-11 14:00 ` Anna Schumaker 2015-11-11 14:53 ` Eric Biggers 2015-11-11 14:53 ` Eric Biggers 2015-11-12 12:39 ` Austin S Hemmelgarn
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=1447192413-15376-5-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: linkBe 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.