提交 9da01386 编写于 作者: A Amir Goldstein 提交者: sanglipeng

vfs: fix copy_file_range() averts filesystem freeze protection

stable inclusion
from stable-v5.10.160
commit 965d93fb39b99348d6c327853afd4708b610e132
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7P7OH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=965d93fb39b99348d6c327853afd4708b610e132

--------------------------------

commit 10bc8e4a upstream.

[backport comments for pre v5.15:
- ksmbd mentions are irrelevant - ksmbd hunks were dropped
- sb_write_started() is missing - assert was dropped
]

Commit 868f9f2f ("vfs: fix copy_file_range() regression in cross-fs
copies") removed fallback to generic_copy_file_range() for cross-fs
cases inside vfs_copy_file_range().

To preserve behavior of nfsd and ksmbd server-side-copy, the fallback to
generic_copy_file_range() was added in nfsd and ksmbd code, but that
call is missing sb_start_write(), fsnotify hooks and more.

Ideally, nfsd and ksmbd would pass a flag to vfs_copy_file_range() that
will take care of the fallback, but that code would be subtle and we got
vfs_copy_file_range() logic wrong too many times already.

Instead, add a flag to explicitly request vfs_copy_file_range() to
perform only generic_copy_file_range() and let nfsd and ksmbd use this
flag only in the fallback path.

This choise keeps the logic changes to minimum in the non-nfsd/ksmbd code
paths to reduce the risk of further regressions.

Fixes: 868f9f2f ("vfs: fix copy_file_range() regression in cross-fs copies")
Tested-by: NNamjae Jeon <linkinjeon@kernel.org>
Tested-by: NLuis Henriques <lhenriques@suse.de>
Signed-off-by: NAmir Goldstein <amir73il@gmail.com>
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NAmir Goldstein <amir73il@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 6c8b3f1b
...@@ -584,8 +584,8 @@ ssize_t nfsd_copy_file_range(struct file *src, u64 src_pos, struct file *dst, ...@@ -584,8 +584,8 @@ ssize_t nfsd_copy_file_range(struct file *src, u64 src_pos, struct file *dst,
ret = vfs_copy_file_range(src, src_pos, dst, dst_pos, count, 0); ret = vfs_copy_file_range(src, src_pos, dst, dst_pos, count, 0);
if (ret == -EOPNOTSUPP || ret == -EXDEV) if (ret == -EOPNOTSUPP || ret == -EXDEV)
ret = generic_copy_file_range(src, src_pos, dst, dst_pos, ret = vfs_copy_file_range(src, src_pos, dst, dst_pos, count,
count, 0); COPY_FILE_SPLICE);
return ret; return ret;
} }
......
...@@ -1416,7 +1416,9 @@ static int generic_copy_file_checks(struct file *file_in, loff_t pos_in, ...@@ -1416,7 +1416,9 @@ static int generic_copy_file_checks(struct file *file_in, loff_t pos_in,
* and several different sets of file_operations, but they all end up * and several different sets of file_operations, but they all end up
* using the same ->copy_file_range() function pointer. * using the same ->copy_file_range() function pointer.
*/ */
if (file_out->f_op->copy_file_range) { if (flags & COPY_FILE_SPLICE) {
/* cross sb splice is allowed */
} else if (file_out->f_op->copy_file_range) {
if (file_in->f_op->copy_file_range != if (file_in->f_op->copy_file_range !=
file_out->f_op->copy_file_range) file_out->f_op->copy_file_range)
return -EXDEV; return -EXDEV;
...@@ -1466,8 +1468,9 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, ...@@ -1466,8 +1468,9 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
size_t len, unsigned int flags) size_t len, unsigned int flags)
{ {
ssize_t ret; ssize_t ret;
bool splice = flags & COPY_FILE_SPLICE;
if (flags != 0) if (flags & ~COPY_FILE_SPLICE)
return -EINVAL; return -EINVAL;
ret = generic_copy_file_checks(file_in, pos_in, file_out, pos_out, &len, ret = generic_copy_file_checks(file_in, pos_in, file_out, pos_out, &len,
...@@ -1493,14 +1496,14 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, ...@@ -1493,14 +1496,14 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
* same sb using clone, but for filesystems where both clone and copy * same sb using clone, but for filesystems where both clone and copy
* are supported (e.g. nfs,cifs), we only call the copy method. * are supported (e.g. nfs,cifs), we only call the copy method.
*/ */
if (file_out->f_op->copy_file_range) { if (!splice && file_out->f_op->copy_file_range) {
ret = file_out->f_op->copy_file_range(file_in, pos_in, ret = file_out->f_op->copy_file_range(file_in, pos_in,
file_out, pos_out, file_out, pos_out,
len, flags); len, flags);
goto done; goto done;
} }
if (file_in->f_op->remap_file_range && if (!splice && file_in->f_op->remap_file_range &&
file_inode(file_in)->i_sb == file_inode(file_out)->i_sb) { file_inode(file_in)->i_sb == file_inode(file_out)->i_sb) {
ret = file_in->f_op->remap_file_range(file_in, pos_in, ret = file_in->f_op->remap_file_range(file_in, pos_in,
file_out, pos_out, file_out, pos_out,
...@@ -1520,6 +1523,8 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, ...@@ -1520,6 +1523,8 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
* consistent story about which filesystems support copy_file_range() * consistent story about which filesystems support copy_file_range()
* and which filesystems do not, that will allow userspace tools to * and which filesystems do not, that will allow userspace tools to
* make consistent desicions w.r.t using copy_file_range(). * make consistent desicions w.r.t using copy_file_range().
*
* We also get here if caller (e.g. nfsd) requested COPY_FILE_SPLICE.
*/ */
ret = generic_copy_file_range(file_in, pos_in, file_out, pos_out, len, ret = generic_copy_file_range(file_in, pos_in, file_out, pos_out, len,
flags); flags);
...@@ -1574,6 +1579,10 @@ SYSCALL_DEFINE6(copy_file_range, int, fd_in, loff_t __user *, off_in, ...@@ -1574,6 +1579,10 @@ SYSCALL_DEFINE6(copy_file_range, int, fd_in, loff_t __user *, off_in,
pos_out = f_out.file->f_pos; pos_out = f_out.file->f_pos;
} }
ret = -EINVAL;
if (flags != 0)
goto out;
ret = vfs_copy_file_range(f_in.file, pos_in, f_out.file, pos_out, len, ret = vfs_copy_file_range(f_in.file, pos_in, f_out.file, pos_out, len,
flags); flags);
if (ret > 0) { if (ret > 0) {
......
...@@ -1861,6 +1861,14 @@ struct dir_context { ...@@ -1861,6 +1861,14 @@ struct dir_context {
*/ */
#define REMAP_FILE_ADVISORY (REMAP_FILE_CAN_SHORTEN) #define REMAP_FILE_ADVISORY (REMAP_FILE_CAN_SHORTEN)
/*
* These flags control the behavior of vfs_copy_file_range().
* They are not available to the user via syscall.
*
* COPY_FILE_SPLICE: call splice direct instead of fs clone/copy ops
*/
#define COPY_FILE_SPLICE (1 << 0)
struct iov_iter; struct iov_iter;
struct file_operations { struct file_operations {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册