From patchwork Fri Sep 4 20:17:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 7126231 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0A6199F32B for ; Fri, 4 Sep 2015 20:27:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 245FC208A2 for ; Fri, 4 Sep 2015 20:27:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A27F208AF for ; Fri, 4 Sep 2015 20:27:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933454AbbIDU1b (ORCPT ); Fri, 4 Sep 2015 16:27:31 -0400 Received: from mx142.netapp.com ([216.240.21.19]:18920 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933432AbbIDU12 (ORCPT ); Fri, 4 Sep 2015 16:27:28 -0400 X-IronPort-AV: E=Sophos;i="5.17,470,1437462000"; d="scan'208";a="63671532" Received: from vmwexchts04-prd.hq.netapp.com ([10.122.105.32]) by mx142-out.netapp.com with ESMTP; 04 Sep 2015 13:17:21 -0700 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS04-PRD.hq.netapp.com (10.122.105.32) with Microsoft SMTP Server id 15.0.1076.9; Fri, 4 Sep 2015 13:17:21 -0700 Received: from davros.com ([10.63.224.137]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id t84KH4ku024651; Fri, 4 Sep 2015 13:17:19 -0700 (PDT) From: Anna Schumaker To: , , , , , , , , , , Subject: [PATCH v1 8/8] vfs: Fall back on splice if no copy function defined Date: Fri, 4 Sep 2015 16:17:02 -0400 Message-ID: <1441397823-1203-9-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441397823-1203-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1441397823-1203-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The NFS server will need a fallback for filesystems that don't have any kind of copy acceleration yet, and it should be generally useful to have an in-kernel copy to avoid lots of switches between kernel and user space. Users who only want a reflink can pass the COPY_REFLINK flag to disable the fallback. Signed-off-by: Anna Schumaker --- fs/read_write.c | 16 ++++++++++++---- include/linux/copy.h | 6 ++++++ include/uapi/linux/Kbuild | 1 + include/uapi/linux/copy.h | 6 ++++++ 4 files changed, 25 insertions(+), 4 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 9dafb7f..bd7e7e2 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -1342,7 +1343,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, struct inode *inode_out; ssize_t ret; - if (flags) + if (!((flags == 0) || (flags == COPY_REFLINK))) return -EINVAL; /* copy_file_range allows full ssize_t len, ignoring MAX_RW_COUNT */ @@ -1355,7 +1356,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 || !file_out->f_op->copy_file_range) + !file_in->f_op) return -EBADF; inode_in = file_inode(file_in); @@ -1377,8 +1378,15 @@ 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 < 0) && !(flags & COPY_REFLINK)) { + file_start_write(file_out); + ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out, len, 0); + file_end_write(file_out); + } 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 + +#endif /* _LINUX_COPY_H */ diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 1ff9942..b6109f3 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..68f3d65 --- /dev/null +++ b/include/uapi/linux/copy.h @@ -0,0 +1,6 @@ +#ifndef _UAPI_LINUX_COPY_H +#define _UAPI_LINUX_COPY_H + +#define COPY_REFLINK 1 /* only perform a reflink */ + +#endif /* _UAPI_LINUX_COPY_H */