Add copy_file_range support for cifs
Subsystems (2)
v2 cover Add copy_file_range support for cifs
This is used by the syscall copy_file_range() to provide server side copy facilities using the SMB2 ioctl FSCTL_SRV_COPYCHUNK_WRITE
v2:
Rename operation clone_range to copychunk_range Do not remove the ioctls which allow users to directly call FSCTL_SRV_COPYCHUNK_WRITE
Sachin Prabhu (2):
Rename clone_range to copychunk_range
Introduce cifs_copy_file_range()
fs/cifs/cifsfs.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/cifs/cifsfs.h | 5 ++++ fs/cifs/cifsglob.h | 7 +++-- fs/cifs/ioctl.c | 66 ++++------------------------------------- fs/cifs/smb2ops.c | 32 ++++++++++++-------- 5 files changed, 120 insertions(+), 77 deletions(-)
Signature · 1 line
2.9.3
A message that is not in the archive (sent off-list or not yet received): 20170210103351.10163-1-sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
PATCH v2 1/2 Rename clone_range to copychunk_range
Renaming calls to reflect the underlying smb2 ioctl called. This is similar to the name duplicate_extents used for a similar ioctl which is also used to duplicate files by reusing fs blocks. The name change is to avoid confusion.
--- fs/cifs/cifsglob.h | 3 ++- fs/cifs/ioctl.c | 16 ++++++++-------- fs/cifs/smb2ops.c | 12 ++++++------ 3 files changed, 16 insertions(+), 15 deletions(-)
fs/cifs/cifsglob.h +2 -1
@@ -405,7 +405,8 @@ struct smb_version_operations {char * (*create_lease_buf)(u8 *,u8 );/* parse lease context buffer and return oplock/epoch info */ __u8 (*parse_lease_buf)(void *,unsigned int *); -int (*clone_range)(const unsigned int ,struct cifsFileInfo *src_file, +int (*copychunk_range)(const unsigned int , +struct cifsFileInfo *src_file,struct cifsFileInfo *target_file,u64 src_off,u64 len,u64 dest_off); int (*duplicate_extents)(const unsigned int, struct cifsFileInfo *src,
fs/cifs/ioctl.c +8 -8
@@ -34,7 +34,7 @@#include "cifs_ioctl.h" #include <linux/btrfs.h> -static int cifs_file_clone_range (unsigned int xid,struct file *src_file, +static int cifs_file_copychunk_range (unsigned int xid,struct file *src_file,struct file *dst_file) {struct inode *src_inode =file_inode (src_file);
@@ -45,7 +45,7 @@ static int cifs_file_clone_range(unsigned int xid, struct file *src_file,struct cifs_tcon *target_tcon;int rc; -cifs_dbg (FYI ,"ioctl clone range\n" ); +cifs_dbg (FYI ,"ioctl copychunk range\n" );if (!src_file->private_data || !dst_file->private_data) { rc = -EBADF ;
@@ -75,8 +75,8 @@ static int cifs_file_clone_range(unsigned int xid, struct file *src_file,/* should we flush first and last page first */ truncate_inode_pages (&target_inode->i_data,0 ); -if (target_tcon->ses->server->ops->clone_range) - rc = target_tcon->ses->server->ops->clone_range (xid, +if (target_tcon->ses->server->ops->copychunk_range) + rc = target_tcon->ses->server->ops->copychunk_range (xid, smb_file_src, smb_file_target,0 , src_inode->i_size,0 );else rc = -EOPNOTSUPP ;
@@ -91,14 +91,14 @@ static int cifs_file_clone_range(unsigned int xid, struct file *src_file,return rc; } -static long cifs_ioctl_clone (unsigned int xid,struct file *dst_file, +static long cifs_ioctl_copychunk (unsigned int xid,struct file *dst_file,unsigned long srcfd) {int rc;struct fd src_file;struct inode *src_inode; -cifs_dbg (FYI ,"ioctl clone range\n" ); +cifs_dbg (FYI ,"ioctl copychunk range\n" );/* the destination must be opened for writing */ if (!(dst_file->f_mode &FMODE_WRITE )) {cifs_dbg (FYI ,"file target not open for write\n" );
@@ -129,7 +129,7 @@ static long cifs_ioctl_clone(unsigned int xid, struct file *dst_file,if (S_ISDIR (src_inode->i_mode)) goto out_fput; - rc =cifs_file_clone_range (xid, src_file.file, dst_file); + rc =cifs_file_copychunk_range (xid, src_file.file, dst_file); out_fput:fdput (src_file);
@@ -251,7 +251,7 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) }break ;case CIFS_IOC_COPYCHUNK_FILE : - rc =cifs_ioctl_clone (xid, filep, arg); + rc =cifs_ioctl_copychunk (xid, filep, arg);break ;case CIFS_IOC_SET_INTEGRITY :if (pSMBFile ==NULL )
fs/cifs/smb2ops.c +6 -6
@@ -587,7 +587,7 @@ SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon, }static int -smb2_clone_range (const unsigned int xid, +smb2_copychunk_range (const unsigned int xid,struct cifsFileInfo *srcfile,struct cifsFileInfo *trgtfile,u64 src_off,u64 len,u64 dest_off)
@@ -605,7 +605,7 @@ smb2_clone_range(const unsigned int xid,if (pcchunk ==NULL )return -ENOMEM ; -cifs_dbg (FYI ,"in smb2_clone_range - about to call request res key\n" ); +cifs_dbg (FYI ,"in smb2_copychunk_range - about to call request res key\n" );/* Request a key from the server to identify the source of the copy */ rc = SMB2_request_res_key(xid, tlink_tcon(srcfile->tlink), srcfile->fid.persistent_fid,
@@ -1620,7 +1620,7 @@ struct smb_version_operations smb20_operations = { .set_oplock_level = smb2_set_oplock_level, .create_lease_buf = smb2_create_lease_buf, .parse_lease_buf = smb2_parse_lease_buf, - .clone_range = smb2_clone_range, + .copychunk_range = smb2_copychunk_range, .wp_retry_size = smb2_wp_retry_size, .dir_needs_close = smb2_dir_needs_close, };
@@ -1700,7 +1700,7 @@ struct smb_version_operations smb21_operations = { .set_oplock_level = smb21_set_oplock_level, .create_lease_buf = smb2_create_lease_buf, .parse_lease_buf = smb2_parse_lease_buf, - .clone_range = smb2_clone_range, + .copychunk_range = smb2_copychunk_range, .wp_retry_size = smb2_wp_retry_size, .dir_needs_close = smb2_dir_needs_close, .enum_snapshots = smb3_enum_snapshots,
@@ -1784,7 +1784,7 @@ struct smb_version_operations smb30_operations = { .set_oplock_level = smb3_set_oplock_level, .create_lease_buf = smb3_create_lease_buf, .parse_lease_buf = smb3_parse_lease_buf, - .clone_range = smb2_clone_range, + .copychunk_range = smb2_copychunk_range, .duplicate_extents = smb2_duplicate_extents, .validate_negotiate = smb3_validate_negotiate, .wp_retry_size = smb2_wp_retry_size,
@@ -1872,7 +1872,7 @@ struct smb_version_operations smb311_operations = { .set_oplock_level = smb3_set_oplock_level, .create_lease_buf = smb3_create_lease_buf, .parse_lease_buf = smb3_parse_lease_buf, - .clone_range = smb2_clone_range, + .copychunk_range = smb2_copychunk_range, .duplicate_extents = smb2_duplicate_extents,/* .validate_negotiate = smb3_validate_negotiate, */ /* not used in 3.11 */ .wp_retry_size = smb2_wp_retry_size,
Signature · 1 line
2.9.3
A message that is not in the archive (sent off-list or not yet received): 20170210103351.10163-2-sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Pavel Shilovsky
Reviewed-byRe: [PATCH 1/2] Rename clone_range to copychunk_range
2017-02-10 2:33 GMT-08:00 Sachin Prabhu <[email protected]>:
Quoted 155 lines
Renaming calls to reflect the underlying smb2 ioctl called. This is similar to the name
duplicate_extentsused for a similar ioctl which is also used to duplicate files by reusing fs blocks. The name change is to avoid confusion.Signed-off-by Sachin Prabhu <[email protected]>--- fs/cifs/cifsglob.h | 3 ++- fs/cifs/ioctl.c | 16 ++++++++-------- fs/cifs/smb2ops.c | 12 ++++++------ 3 files changed, 16 insertions(+), 15 deletions(-)fs/cifs/cifsglob.h +2
-1@@ -405,7 +405,8 @@ struct smb_version_operations {char * (*create_lease_buf)(u8 *,u8 );/* parse lease context buffer and return oplock/epoch info */ __u8 (*parse_lease_buf)(void *,unsigned int *); -int (*clone_range)(const unsigned int ,struct cifsFileInfo *src_file, +int (*copychunk_range)(const unsigned int , +struct cifsFileInfo *src_file,struct cifsFileInfo *target_file,u64 src_off,u64 len,u64 dest_off); int (*duplicate_extents)(const unsigned int, struct cifsFileInfo *src,fs/cifs/ioctl.c +8
-8@@ -34,7 +34,7 @@#include "cifs_ioctl.h" #include <linux/btrfs.h> -static int cifs_file_clone_range (unsigned int xid,struct file *src_file, +static int cifs_file_copychunk_range (unsigned int xid,struct file *src_file,struct file *dst_file) {struct inode *src_inode =file_inode (src_file);@@ -45,7 +45,7 @@ static int cifs_file_clone_range(unsigned int xid, struct file *src_file,struct cifs_tcon *target_tcon;int rc; -cifs_dbg (FYI ,"ioctl clone range\n" ); +cifs_dbg (FYI ,"ioctl copychunk range\n" );if (!src_file->private_data || !dst_file->private_data) { rc = -EBADF ;@@ -75,8 +75,8 @@ static int cifs_file_clone_range(unsigned int xid, struct file *src_file,/* should we flush first and last page first */ truncate_inode_pages (&target_inode->i_data,0 ); -if (target_tcon->ses->server->ops->clone_range) - rc = target_tcon->ses->server->ops->clone_range (xid, +if (target_tcon->ses->server->ops->copychunk_range) + rc = target_tcon->ses->server->ops->copychunk_range (xid, smb_file_src, smb_file_target,0 , src_inode->i_size,0 );else rc = -EOPNOTSUPP ;@@ -91,14 +91,14 @@ static int cifs_file_clone_range(unsigned int xid, struct file *src_file,return rc; } -static long cifs_ioctl_clone (unsigned int xid,struct file *dst_file, +static long cifs_ioctl_copychunk (unsigned int xid,struct file *dst_file,unsigned long srcfd) {int rc;struct fd src_file;struct inode *src_inode; -cifs_dbg (FYI ,"ioctl clone range\n" ); +cifs_dbg (FYI ,"ioctl copychunk range\n" );/* the destination must be opened for writing */ if (!(dst_file->f_mode &FMODE_WRITE )) {cifs_dbg (FYI ,"file target not open for write\n" );@@ -129,7 +129,7 @@ static long cifs_ioctl_clone(unsigned int xid, struct file *dst_file,if (S_ISDIR (src_inode->i_mode)) goto out_fput; - rc =cifs_file_clone_range (xid, src_file.file, dst_file); + rc =cifs_file_copychunk_range (xid, src_file.file, dst_file); out_fput:fdput (src_file);@@ -251,7 +251,7 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) }break ;case CIFS_IOC_COPYCHUNK_FILE : - rc =cifs_ioctl_clone (xid, filep, arg); + rc =cifs_ioctl_copychunk (xid, filep, arg);break ;case CIFS_IOC_SET_INTEGRITY :if (pSMBFile ==NULL )fs/cifs/smb2ops.c +6
-7@@ -587,7 +587,7 @@ SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon, }static int -smb2_clone_range (const unsigned int xid, +smb2_copychunk_range (const unsigned int xid,struct cifsFileInfo *srcfile,struct cifsFileInfo *trgtfile,u64 src_off,u64 len,u64 dest_off)@@ -605,7 +605,7 @@ smb2_clone_range(const unsigned int xid,if (pcchunk ==NULL )return -ENOMEM ; -cifs_dbg (FYI ,"in smb2_clone_range - about to call request res key\n" ); +cifs_dbg (FYI ,"in smb2_copychunk_range - about to call request res key\n" );/* Request a key from the server to identify the source of the copy */ rc = SMB2_request_res_key(xid, tlink_tcon(srcfile->tlink), srcfile->fid.persistent_fid,@@ -1620,7 +1620,7 @@ struct smb_version_operations smb20_operations = { .set_oplock_level = smb2_set_oplock_level, .create_lease_buf = smb2_create_lease_buf, .parse_lease_buf = smb2_parse_lease_buf, - .clone_range = smb2_clone_range, + .copychunk_range = smb2_copychunk_range, .wp_retry_size = smb2_wp_retry_size, .dir_needs_close = smb2_dir_needs_close, };@@ -1700,7 +1700,7 @@ struct smb_version_operations smb21_operations = { .set_oplock_level = smb21_set_oplock_level, .create_lease_buf = smb2_create_lease_buf, .parse_lease_buf = smb2_parse_lease_buf, - .clone_range = smb2_clone_range, + .copychunk_range = smb2_copychunk_range, .wp_retry_size = smb2_wp_retry_size, .dir_needs_close = smb2_dir_needs_close, .enum_snapshots = smb3_enum_snapshots,@@ -1784,7 +1784,7 @@ struct smb_version_operations smb30_operations = { .set_oplock_level = smb3_set_oplock_level, .create_lease_buf = smb3_create_lease_buf, .parse_lease_buf = smb3_parse_lease_buf, - .clone_range = smb2_clone_range, + .copychunk_range = smb2_copychunk_range, .duplicate_extents = smb2_duplicate_extents, .validate_negotiate = smb3_validate_negotiate, .wp_retry_size = smb2_wp_retry_size,@@ -1872,7 +1872,7 @@ struct smb_version_operations smb311_operations = { .set_oplock_level = smb3_set_oplock_level, .create_lease_buf = smb3_create_lease_buf, .parse_lease_buf = smb3_parse_lease_buf, - .clone_range = smb2_clone_range, + .copychunk_range = smb2_copychunk_range, .duplicate_extents = smb2_duplicate_extents,/* .validate_negotiate = smb3_validate_negotiate, */ /* not used in 3.11 */ .wp_retry_size = smb2_wp_retry_size, --2.9.3
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Thank you for the cleanup!
Signature · 2 lines
Best regards, Pavel Shilovsky
PATCH v2 2/2 Introduce cifs_copy_file_range()
In reply to a message not in the archiveThe patch introduces the file_operations helper cifs_copy_file_range() which is used by the syscall copy_file_range. The new file operations helper allows us to perform server side copies for SMB2.0 and 2.1 servers as well as SMB 3.0+ servers which do not support the ioctl FSCTL_DUPLICATE_EXTENTS_TO_FILE.
The new helper uses the ioctl FSCTL_SRV_COPYCHUNK_WRITE to perform server side copies. The helper is called by vfs_copy_file_range() only once an attempt to clone the file using the ioctl FSCTL_DUPLICATE_EXTENTS_TO_FILE has failed.
--- fs/cifs/cifsfs.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/cifs/cifsfs.h | 5 ++++ fs/cifs/cifsglob.h | 6 ++-- fs/cifs/ioctl.c | 60 ++----------------------------------- fs/cifs/smb2ops.c | 20 ++++++++----- 5 files changed, 110 insertions(+), 68 deletions(-)
fs/cifs/cifsfs.c +87 -0
@@ -972,6 +972,86 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off,return rc; } +ssize_t cifs_file_copychunk_range (unsigned int xid, +struct file *src_file,loff_t off, +struct file *dst_file,loff_t destoff, +size_t len,unsigned int flags) +{ +struct inode *src_inode =file_inode (src_file); +struct inode *target_inode =file_inode (dst_file); +struct cifsFileInfo *smb_file_src; +struct cifsFileInfo *smb_file_target; +struct cifs_tcon *src_tcon; +struct cifs_tcon *target_tcon; +ssize_t rc; + +cifs_dbg (FYI ,"copychunk range\n" ); + +if (src_inode == target_inode) { + rc = -EINVAL ; + goto out; + } + +if (!src_file->private_data || !dst_file->private_data) { + rc = -EBADF ; +cifs_dbg (VFS ,"missing cifsFileInfo on copy range src file\n" ); + goto out; + } + + rc = -EXDEV ; + smb_file_target = dst_file->private_data; + smb_file_src = src_file->private_data; + src_tcon =tlink_tcon (smb_file_src->tlink); + target_tcon =tlink_tcon (smb_file_target->tlink); + +if (src_tcon->ses != target_tcon->ses) { +cifs_dbg (VFS ,"source and target of copy not on same server\n" ); + goto out; + } + +/* +* Note: cifs case is easier than btrfs since server responsible for +* checks for proper open modes and file type and if it wants +* server could even support copy of range where source = target +*/ +lock_two_nondirectories (target_inode, src_inode); + +cifs_dbg (FYI ,"about to flush pages\n" ); +/* should we flush first and last page first */ +truncate_inode_pages (&target_inode->i_data,0 ); + +if (target_tcon->ses->server->ops->copychunk_range) + rc = target_tcon->ses->server->ops->copychunk_range (xid, + smb_file_src, smb_file_target, off, len, destoff); +else + rc = -EOPNOTSUPP ; + +/* force revalidate of size and timestamps of target file now +* that target is updated on the server +*/ +CIFS_I (target_inode)->time =0 ; +/* although unlocking in the reverse order from locking is not +* strictly necessary here it is a little cleaner to be consistent +*/ +unlock_two_nondirectories (src_inode, target_inode); + +out: +return rc; +} + +ssize_t cifs_copy_file_range (struct file *src_file,loff_t off, +struct file *dst_file,loff_t destoff, +size_t len,unsigned int flags) +{ +unsigned int xid =get_xid (); +ssize_t rc; + + rc =cifs_file_copychunk_range (xid, src_file, off, dst_file, destoff, + len, flags); +free_xid (xid); +return rc; +} +const struct file_operations cifs_file_ops = { .read_iter = cifs_loose_read_iter, .write_iter = cifs_file_write_iter,
@@ -984,6 +1064,7 @@ const struct file_operations cifs_file_ops = { .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate,
@@ -1001,6 +1082,7 @@ const struct file_operations cifs_file_strict_ops = { .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate,
@@ -1018,6 +1100,7 @@ const struct file_operations cifs_file_direct_ops = { .mmap = cifs_file_mmap, .splice_read = generic_file_splice_read, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .llseek = cifs_llseek, .setlease = cifs_setlease,
@@ -1035,6 +1118,7 @@ const struct file_operations cifs_file_nobrl_ops = { .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate,
@@ -1051,6 +1135,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = { .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate,
@@ -1067,6 +1152,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { .mmap = cifs_file_mmap, .splice_read = generic_file_splice_read, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .llseek = cifs_llseek, .setlease = cifs_setlease,
@@ -1078,6 +1164,7 @@ const struct file_operations cifs_dir_ops = { .release = cifs_closedir, .read = generic_read_dir, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .llseek = generic_file_llseek, };
fs/cifs/cifsfs.h +5 -0
@@ -139,6 +139,11 @@ extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);# define cifs_listxattr NULL#endif +extern ssize_t cifs_file_copychunk_range (unsigned int xid, +struct file *src_file,loff_t off, +struct file *dst_file,loff_t destoff, +size_t len,unsigned int flags); +extern long cifs_ioctl (struct file *filep,unsigned int cmd,unsigned long arg);#ifdef CONFIG_CIFS_NFSD_EXPORT extern const struct export_operations cifs_export_ops;
fs/cifs/cifsglob.h +3 -3
@@ -405,10 +405,10 @@ struct smb_version_operations {char * (*create_lease_buf)(u8 *,u8 );/* parse lease context buffer and return oplock/epoch info */ __u8 (*parse_lease_buf)(void *,unsigned int *); -int (*copychunk_range)(const unsigned int , +ssize_t (*copychunk_range)(const unsigned int ,struct cifsFileInfo *src_file, -struct cifsFileInfo *target_file,u64 src_off,u64 len, -u64 dest_off); +struct cifsFileInfo *target_file, +u64 src_off,u64 len,u64 dest_off);int (*duplicate_extents)(const unsigned int ,struct cifsFileInfo *src,struct cifsFileInfo *target_file,u64 src_off,u64 len,u64 dest_off);
fs/cifs/ioctl.c +2 -58
72 lines not on this page · raw message
fs/cifs/smb2ops.c +13 -7
@@ -586,7 +586,7 @@ SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon,return rc; } -static int +static ssize_t smb2_copychunk_range(const unsigned int xid, struct cifsFileInfo *srcfile, struct cifsFileInfo *trgtfile, u64 src_off,
@@ -599,6 +599,7 @@ smb2_copychunk_range(const unsigned int xid,struct cifs_tcon *tcon;int chunks_copied =0 ;bool chunk_sizes_updated = false; +ssize_t bytes_written, total_bytes_written =0 ; pcchunk =kmalloc (sizeof (struct copychunk_ioctl ),GFP_KERNEL );
@@ -662,14 +663,16 @@ smb2_copychunk_range(const unsigned int xid, } chunks_copied++; - src_off +=le32_to_cpu (retbuf->TotalBytesWritten); - dest_off +=le32_to_cpu (retbuf->TotalBytesWritten); - len -=le32_to_cpu (retbuf->TotalBytesWritten); + bytes_written =le32_to_cpu (retbuf->TotalBytesWritten); + src_off += bytes_written; + dest_off += bytes_written; + len -= bytes_written; + total_bytes_written += bytes_written; -cifs_dbg (FYI ,"Chunks %d PartialChunk %d Total %d\n" , +cifs_dbg (FYI ,"Chunks %d PartialChunk %d Total %zu\n" ,le32_to_cpu (retbuf->ChunksWritten),le32_to_cpu (retbuf->ChunkBytesWritten), -le32_to_cpu (retbuf->TotalBytesWritten)); + bytes_written); }else if (rc == -EINVAL ) {if (ret_data_len !=sizeof (struct copychunk_ioctl_rsp )) goto cchunk_out;
@@ -706,7 +709,10 @@ smb2_copychunk_range(const unsigned int xid, cchunk_out:kfree (pcchunk);kfree (retbuf); -return rc; +if (rc) +return rc; +else +return total_bytes_written; } static int
Signature · 1 line
2.9.3
A message that is not in the archive (sent off-list or not yet received): 20170210103351.10163-3-sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Pavel Shilovsky
Reviewed-byRe: [PATCH 2/2] Introduce cifs_copy_file_range()
2017-02-10 2:33 GMT-08:00 Sachin Prabhu <[email protected]>:
Quoted 337 lines
The patch introduces the
file_operationshelpercifs_copy_file_range()which is used by the syscallcopy_file_range. The new file operations helper allows us to perform server side copies for SMB2.0 and 2.1 servers as well as SMB 3.0+ servers which do not support the ioctlFSCTL_DUPLICATE_EXTENTS_TO_FILE.The new helper uses the ioctl
FSCTL_SRV_COPYCHUNK_WRITEto perform server side copies. The helper is called byvfs_copy_file_range()only once an attempt to clone the file using the ioctlFSCTL_DUPLICATE_EXTENTS_TO_FILEhas failed.Signed-off-by Sachin Prabhu <[email protected]>--- fs/cifs/cifsfs.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/cifs/cifsfs.h | 5 ++++ fs/cifs/cifsglob.h | 6 ++-- fs/cifs/ioctl.c | 60 ++----------------------------------- fs/cifs/smb2ops.c | 20 ++++++++----- 5 files changed, 110 insertions(+), 68 deletions(-)fs/cifs/cifsfs.c +87
-0@@ -972,6 +972,86 @@ static int cifs_clone_file_range(struct file *src_file, loff_t off,return rc; } +ssize_t cifs_file_copychunk_range (unsigned int xid, +struct file *src_file,loff_t off, +struct file *dst_file,loff_t destoff, +size_t len,unsigned int flags) +{ +struct inode *src_inode =file_inode (src_file); +struct inode *target_inode =file_inode (dst_file); +struct cifsFileInfo *smb_file_src; +struct cifsFileInfo *smb_file_target; +struct cifs_tcon *src_tcon; +struct cifs_tcon *target_tcon; +ssize_t rc; + +cifs_dbg (FYI ,"copychunk range\n" ); + +if (src_inode == target_inode) { + rc = -EINVAL ; + goto out; + } + +if (!src_file->private_data || !dst_file->private_data) { + rc = -EBADF ; +cifs_dbg (VFS ,"missing cifsFileInfo on copy range src file\n" ); + goto out; + } + + rc = -EXDEV ; + smb_file_target = dst_file->private_data; + smb_file_src = src_file->private_data; + src_tcon =tlink_tcon (smb_file_src->tlink); + target_tcon =tlink_tcon (smb_file_target->tlink); + +if (src_tcon->ses != target_tcon->ses) { +cifs_dbg (VFS ,"source and target of copy not on same server\n" ); + goto out; + } + +/* +* Note: cifs case is easier than btrfs since server responsible for +* checks for proper open modes and file type and if it wants +* server could even support copy of range where source = target +*/ +lock_two_nondirectories (target_inode, src_inode); + +cifs_dbg (FYI ,"about to flush pages\n" ); +/* should we flush first and last page first */ +truncate_inode_pages (&target_inode->i_data,0 ); + +if (target_tcon->ses->server->ops->copychunk_range) + rc = target_tcon->ses->server->ops->copychunk_range (xid, + smb_file_src, smb_file_target, off, len, destoff); +else + rc = -EOPNOTSUPP ; + +/* force revalidate of size and timestamps of target file now +* that target is updated on the server +*/ +CIFS_I (target_inode)->time =0 ; +/* although unlocking in the reverse order from locking is not +* strictly necessary here it is a little cleaner to be consistent +*/ +unlock_two_nondirectories (src_inode, target_inode); + +out: +return rc; +} + +ssize_t cifs_copy_file_range (struct file *src_file,loff_t off, +struct file *dst_file,loff_t destoff, +size_t len,unsigned int flags) +{ +unsigned int xid =get_xid (); +ssize_t rc; + + rc =cifs_file_copychunk_range (xid, src_file, off, dst_file, destoff, + len, flags); +free_xid (xid); +return rc; +} +const struct file_operations cifs_file_ops = { .read_iter = cifs_loose_read_iter, .write_iter = cifs_file_write_iter,@@ -984,6 +1064,7 @@ const struct file_operations cifs_file_ops = { .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate,@@ -1001,6 +1082,7 @@ const struct file_operations cifs_file_strict_ops = { .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate,@@ -1018,6 +1100,7 @@ const struct file_operations cifs_file_direct_ops = { .mmap = cifs_file_mmap, .splice_read = generic_file_splice_read, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .llseek = cifs_llseek, .setlease = cifs_setlease,@@ -1035,6 +1118,7 @@ const struct file_operations cifs_file_nobrl_ops = { .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate,@@ -1051,6 +1135,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = { .splice_read = generic_file_splice_read, .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate,@@ -1067,6 +1152,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { .mmap = cifs_file_mmap, .splice_read = generic_file_splice_read, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .llseek = cifs_llseek, .setlease = cifs_setlease,@@ -1078,6 +1164,7 @@ const struct file_operations cifs_dir_ops = { .release = cifs_closedir, .read = generic_read_dir, .unlocked_ioctl = cifs_ioctl, + .copy_file_range = cifs_copy_file_range, .clone_file_range = cifs_clone_file_range, .llseek = generic_file_llseek, };fs/cifs/cifsfs.h +5
-0@@ -139,6 +139,11 @@ extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);# define cifs_listxattr NULL#endif +extern ssize_t cifs_file_copychunk_range (unsigned int xid, +struct file *src_file,loff_t off, +struct file *dst_file,loff_t destoff, +size_t len,unsigned int flags); +extern long cifs_ioctl (struct file *filep,unsigned int cmd,unsigned long arg);#ifdef CONFIG_CIFS_NFSD_EXPORT extern const struct export_operations cifs_export_ops;fs/cifs/cifsglob.h +3
-3@@ -405,10 +405,10 @@ struct smb_version_operations {char * (*create_lease_buf)(u8 *,u8 );/* parse lease context buffer and return oplock/epoch info */ __u8 (*parse_lease_buf)(void *,unsigned int *); -int (*copychunk_range)(const unsigned int , +ssize_t (*copychunk_range)(const unsigned int ,struct cifsFileInfo *src_file, -struct cifsFileInfo *target_file,u64 src_off,u64 len, -u64 dest_off); +struct cifsFileInfo *target_file, +u64 src_off,u64 len,u64 dest_off);int (*duplicate_extents)(const unsigned int ,struct cifsFileInfo *src,struct cifsFileInfo *target_file,u64 src_off,u64 len,u64 dest_off);fs/cifs/ioctl.c +2
-58@@ -34,63 +34,6 @@#include "cifs_ioctl.h" #include <linux/btrfs.h> -static int cifs_file_copychunk_range (unsigned int xid,struct file *src_file, -struct file *dst_file) -{ -struct inode *src_inode =file_inode (src_file); -struct inode *target_inode =file_inode (dst_file); -struct cifsFileInfo *smb_file_src; -struct cifsFileInfo *smb_file_target; -struct cifs_tcon *src_tcon; -struct cifs_tcon *target_tcon; -int rc; - -cifs_dbg (FYI ,"ioctl copychunk range\n" ); - -if (!src_file->private_data || !dst_file->private_data) { - rc = -EBADF ; -cifs_dbg (VFS ,"missing cifsFileInfo on copy range src file\n" ); - goto out; - } - - rc = -EXDEV ; - smb_file_target = dst_file->private_data; - smb_file_src = src_file->private_data; - src_tcon =tlink_tcon (smb_file_src->tlink); - target_tcon =tlink_tcon (smb_file_target->tlink); - -if (src_tcon->ses != target_tcon->ses) { -cifs_dbg (VFS ,"source and target of copy not on same server\n" ); - goto out; - } - -/* -* Note: cifs case is easier than btrfs since server responsible for -* checks for proper open modes and file type and if it wants -* server could even support copy of range where source = target -*/ -lock_two_nondirectories (target_inode, src_inode); - -cifs_dbg (FYI ,"about to flush pages\n" ); -/* should we flush first and last page first */ -truncate_inode_pages (&target_inode->i_data,0 ); - -if (target_tcon->ses->server->ops->copychunk_range) - rc = target_tcon->ses->server->ops->copychunk_range (xid, - smb_file_src, smb_file_target,0 , src_inode->i_size,0 ); -else - rc = -EOPNOTSUPP ; - -/* force revalidate of size and timestamps of target file now -that target is updated on the server */ -CIFS_I (target_inode)->time =0 ; -/* although unlocking in the reverse order from locking is not -strictly necessary here it is a little cleaner to be consistent */ -unlock_two_nondirectories (src_inode, target_inode); -out: -return rc; -} -static long cifs_ioctl_copychunk (unsigned int xid,struct file *dst_file,unsigned long srcfd) {@@ -129,7 +72,8 @@ static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file,if (S_ISDIR (src_inode->i_mode)) goto out_fput; - rc =cifs_file_copychunk_range (xid, src_file.file, dst_file); + rc =cifs_file_copychunk_range (xid, src_file.file,0 , dst_file,0 , + src_inode->i_size,0 ); out_fput:fdput (src_file);fs/cifs/smb2ops.c +13
-8@@ -586,7 +586,7 @@ SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon,return rc; } -static int +static ssize_t smb2_copychunk_range(const unsigned int xid, struct cifsFileInfo *srcfile, struct cifsFileInfo *trgtfile, u64 src_off,@@ -599,6 +599,7 @@ smb2_copychunk_range(const unsigned int xid,struct cifs_tcon *tcon;int chunks_copied =0 ;bool chunk_sizes_updated = false; +ssize_t bytes_written, total_bytes_written =0 ; pcchunk =kmalloc (sizeof (struct copychunk_ioctl ),GFP_KERNEL );@@ -662,14 +663,16 @@ smb2_copychunk_range(const unsigned int xid, } chunks_copied++; - src_off +=le32_to_cpu (retbuf->TotalBytesWritten); - dest_off +=le32_to_cpu (retbuf->TotalBytesWritten); - len -=le32_to_cpu (retbuf->TotalBytesWritten); + bytes_written =le32_to_cpu (retbuf->TotalBytesWritten); + src_off += bytes_written; + dest_off += bytes_written; + len -= bytes_written; + total_bytes_written += bytes_written; -cifs_dbg (FYI ,"Chunks %d PartialChunk %d Total %d\n" , +cifs_dbg (FYI ,"Chunks %d PartialChunk %d Total %zu\n" ,le32_to_cpu (retbuf->ChunksWritten),le32_to_cpu (retbuf->ChunkBytesWritten), -le32_to_cpu (retbuf->TotalBytesWritten)); + bytes_written); }else if (rc == -EINVAL ) {if (ret_data_len !=sizeof (struct copychunk_ioctl_rsp )) goto cchunk_out;@@ -706,7 +709,10 @@ smb2_copychunk_range(const unsigned int xid, cchunk_out:kfree (pcchunk);kfree (retbuf); -return rc; +if (rc) +return rc; +else +return total_bytes_written; } static int --2.9.3
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Best regards, Pavel Shilovsky