From patchwork Wed Aug 26 08:16:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 7075131 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9A14CC05AC for ; Wed, 26 Aug 2015 08:19:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8459D208EB for ; Wed, 26 Aug 2015 08:18:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6754C208E8 for ; Wed, 26 Aug 2015 08:18:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756358AbbHZISy (ORCPT ); Wed, 26 Aug 2015 04:18:54 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34586 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756311AbbHZISm (ORCPT ); Wed, 26 Aug 2015 04:18:42 -0400 Received: by pabzx8 with SMTP id zx8so62567978pab.1 for ; Wed, 26 Aug 2015 01:18:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=j2WeXY/uj9n5vSj/QqH0WGzAQ5IKSdBpQ3Rdj4CZv2k=; b=ZZpPtJz8vN17onB/7vEjixXodtGi1UOyeflMkdLkw594UEZia+DVc90usmUu17kPuM RXV6+o838spA7pWbwpI1QhulaT25zpkidBMQFEUUQUmTSA6Ueu1SUB7Z8hMIy7WE+8UG j60KzxRTUX9Q6rBSubyAsoxbF9Vt9r2As6mYm1TsB6XYyZwf6wwe5u/N70lGiwAflQUB ljKk5WwR5PU6CytPzIynYOkTXp2l1SIbipYTi9bRzr0TahF23hJpuoLeEaIiGJs+b6e7 KpJr+s/TcztgYR6ZXNlAPQsDZDfY8gtv1X2vpAF42amKgpLM1hZwa71U+OCD3tZtd5OH aNFA== X-Gm-Message-State: ALoCoQlz/1GKqy1MxZ3EOqM4IFbZNCZeLB2DZ+rEp4pFLfueNp0IyATpoJBrBaWw11dr3uoT2NFk X-Received: by 10.68.117.77 with SMTP id kc13mr67264604pbb.92.1440577122100; Wed, 26 Aug 2015 01:18:42 -0700 (PDT) Received: from lear.localdomain (ec2-54-65-164-9.ap-northeast-1.compute.amazonaws.com. [54.65.164.9]) by smtp.gmail.com with ESMTPSA id a2sm23689455pbu.41.2015.08.26.01.18.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Aug 2015 01:18:41 -0700 (PDT) From: Peng Tao To: linux-fsdevel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Zach Brown , Darren Hart , bfields@fieldses.org, Jeff Layton , linux-nfs@vger.kernel.org, "Darrick J. Wong" , linux-btrfs@vger.kernel.org, Peng Tao Subject: [PATCH-RFC-RESEND 1/9] vfs: pull btrfs clone API to vfs layer Date: Wed, 26 Aug 2015 16:16:42 +0800 Message-Id: <1440577010-122867-2-git-send-email-tao.peng@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1440577010-122867-1-git-send-email-tao.peng@primarydata.com> References: <1440577010-122867-1-git-send-email-tao.peng@primarydata.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Now that a few file systems are adding clone functionality, namingly btrfs, NFS (later in the series) and XFS (ttp://oss.sgi.com/archives/xfs/2015-06/msg00407.html), it makes sense to pull the ioctl to common code. Add vfs_file_clone_range() helper and .clone_range file operation interface to allow underlying filesystems to clone between regular files. The change in do_vfs_ioctl() is defered to next patch where btrfs .clone_range is added, just so that we don't break btrfs CLONE ioctl with this patch. Signed-off-by: Peng Tao --- fs/ioctl.c | 24 ++++++++++++++++++++++++ fs/read_write.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 4 ++++ include/uapi/linux/fs.h | 9 +++++++++ 4 files changed, 82 insertions(+) diff --git a/fs/ioctl.c b/fs/ioctl.c index 5d01d26..726c5d7 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -215,6 +215,30 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg) return error; } +static long ioctl_file_clone(struct file *dst_file, unsigned long srcfd, + u64 off, u64 olen, u64 destoff) +{ + struct fd src_file = fdget(srcfd); + int ret; + + if (!src_file.file) + return -EBADF; + ret = vfs_file_clone_range(src_file.file, dst_file, off, olen, destoff); + + fdput(src_file); + return ret; +} + +static long ioctl_file_clone_range(struct file *file, void __user *argp) +{ + struct file_clone_range args; + + if (copy_from_user(&args, argp, sizeof(args))) + return -EFAULT; + return ioctl_file_clone(file, args.src_fd, args.src_offset, + args.src_length, args.dest_offset); +} + #ifdef CONFIG_BLOCK static inline sector_t logical_to_blk(struct inode *inode, loff_t offset) diff --git a/fs/read_write.c b/fs/read_write.c index 819ef3f..beaad2c 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "internal.h" #include @@ -1327,3 +1328,47 @@ COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd, return do_sendfile(out_fd, in_fd, NULL, count, 0); } #endif + +int vfs_file_clone_range(struct file *src_file, struct file *dst_file, + loff_t off, size_t len, loff_t dstoff) +{ + struct inode *src_ino; + struct inode *dst_ino; + ssize_t ret; + + if (!(src_file->f_mode & FMODE_READ) || + !(dst_file->f_mode & FMODE_WRITE) || + (dst_file->f_flags & O_APPEND) || + !src_file->f_op || !src_file->f_op->clone_range) + return -EINVAL; + + src_ino = file_inode(src_file); + dst_ino = file_inode(dst_file); + + if (S_ISDIR(src_ino->i_mode) || S_ISDIR(dst_ino->i_mode)) + return -EISDIR; + + /* sanity check on offsets and length */ + if (off + len < off || dstoff + len < dstoff || + off + len > i_size_read(src_ino)) + return -EINVAL; + + if (src_ino->i_sb != dst_ino->i_sb || + src_file->f_path.mnt != dst_file->f_path.mnt) + return -EXDEV; + + ret = mnt_want_write_file(dst_file); + if (ret) + return ret; + + ret = src_file->f_op->clone_range(src_file, dst_file, off, len, dstoff); + if (!ret) { + fsnotify_access(src_file); + fsnotify_modify(dst_file); + } + + mnt_drop_write_file(dst_file); + + return ret; +} +EXPORT_SYMBOL(vfs_file_clone_range); diff --git a/include/linux/fs.h b/include/linux/fs.h index cc008c3..612d7f4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1628,6 +1628,8 @@ struct file_operations { long (*fallocate)(struct file *file, int mode, loff_t offset, loff_t len); void (*show_fdinfo)(struct seq_file *m, struct file *f); + int (*clone_range)(struct file *src_file, struct file *dst_file, + loff_t off, size_t len, loff_t dstoff); #ifndef CONFIG_MMU unsigned (*mmap_capabilities)(struct file *); #endif @@ -2678,6 +2680,8 @@ int __dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t, int dax_pfn_mkwrite(struct vm_area_struct *, struct vm_fault *); #define dax_mkwrite(vma, vmf, gb, iod) dax_fault(vma, vmf, gb, iod) #define __dax_mkwrite(vma, vmf, gb, iod) __dax_fault(vma, vmf, gb, iod) +int vfs_file_clone_range(struct file *src_file, struct file *dst_file, + loff_t off, size_t len, loff_t dstoff); #ifdef CONFIG_BLOCK typedef void (dio_submit_t)(int rw, struct bio *bio, struct inode *inode, diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 9b964a5..ac7f1c5 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -39,6 +39,13 @@ #define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */ #define RENAME_WHITEOUT (1 << 2) /* Whiteout source */ +struct file_clone_range { + __s64 src_fd; + __u64 src_offset; + __u64 src_length; + __u64 dest_offset; +}; + struct fstrim_range { __u64 start; __u64 len; @@ -159,6 +166,8 @@ struct inodes_stat_t { #define FIFREEZE _IOWR('X', 119, int) /* Freeze */ #define FITHAW _IOWR('X', 120, int) /* Thaw */ #define FITRIM _IOWR('X', 121, struct fstrim_range) /* Trim */ +#define FICLONE _IOW(0x94, 9, int) /* Clone */ +#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) /* Clone range */ #define FS_IOC_GETFLAGS _IOR('f', 1, long) #define FS_IOC_SETFLAGS _IOW('f', 2, long)