* [PATCH v2 1/1] NFSv4.1 fix incorrect return value in copy_file_range
@ 2019-04-11 18:34 Olga Kornievskaia
2019-04-11 18:44 ` Trond Myklebust
0 siblings, 1 reply; 4+ messages in thread
From: Olga Kornievskaia @ 2019-04-11 18:34 UTC (permalink / raw)
To: trond.myklebust, anna.schumaker; +Cc: linux-nfs
From: Olga Kornievskaia <kolga@netapp.com>
According to the NFSv4.2 spec if the input and output file is the
same file, operation should fail with EINVAL. However, linux
copy_file_range() system call has no such restrictions. Therefore,
in such case let's return EOPNOTSUPP and allow VFS to fallback
to doing do_splice_direct(). Also when copy_file_range is called
on an NFSv4.0 or 4.1 mount (ie., a server that doesn't support
COPY functionality), we also need to return EOPNOTSUPP and
fallback to a regular copy.
Fixes xfstest generic/075, generic/091, generic/112, generic/263
for all NFSv4.x versions.
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---
fs/nfs/nfs42proc.c | 3 ---
fs/nfs/nfs4file.c | 4 +++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index ff6f85f..5196bfa 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -329,9 +329,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
};
ssize_t err, err2;
- if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY))
- return -EOPNOTSUPP;
-
src_lock = nfs_get_lock_context(nfs_file_open_context(src));
if (IS_ERR(src_lock))
return PTR_ERR(src_lock);
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 45b2322..00d1719 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -133,8 +133,10 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out,
size_t count, unsigned int flags)
{
+ if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))
+ return -EOPNOTSUPP;
if (file_inode(file_in) == file_inode(file_out))
- return -EINVAL;
+ return -EOPNOTSUPP;
return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] NFSv4.1 fix incorrect return value in copy_file_range
2019-04-11 18:34 [PATCH v2 1/1] NFSv4.1 fix incorrect return value in copy_file_range Olga Kornievskaia
@ 2019-04-11 18:44 ` Trond Myklebust
0 siblings, 0 replies; 4+ messages in thread
From: Trond Myklebust @ 2019-04-11 18:44 UTC (permalink / raw)
To: anna.schumaker, olga.kornievskaia; +Cc: linux-nfs
On Thu, 2019-04-11 at 14:34 -0400, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@netapp.com>
>
> According to the NFSv4.2 spec if the input and output file is the
> same file, operation should fail with EINVAL. However, linux
> copy_file_range() system call has no such restrictions. Therefore,
> in such case let's return EOPNOTSUPP and allow VFS to fallback
> to doing do_splice_direct(). Also when copy_file_range is called
> on an NFSv4.0 or 4.1 mount (ie., a server that doesn't support
> COPY functionality), we also need to return EOPNOTSUPP and
> fallback to a regular copy.
>
> Fixes xfstest generic/075, generic/091, generic/112, generic/263
> for all NFSv4.x versions.
>
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> ---
> fs/nfs/nfs42proc.c | 3 ---
> fs/nfs/nfs4file.c | 4 +++-
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
> index ff6f85f..5196bfa 100644
> --- a/fs/nfs/nfs42proc.c
> +++ b/fs/nfs/nfs42proc.c
> @@ -329,9 +329,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t
> pos_src,
> };
> ssize_t err, err2;
>
> - if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY))
> - return -EOPNOTSUPP;
> -
> src_lock = nfs_get_lock_context(nfs_file_open_context(src));
> if (IS_ERR(src_lock))
> return PTR_ERR(src_lock);
> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
> index 45b2322..00d1719 100644
> --- a/fs/nfs/nfs4file.c
> +++ b/fs/nfs/nfs4file.c
> @@ -133,8 +133,10 @@ static ssize_t nfs4_copy_file_range(struct file
> *file_in, loff_t pos_in,
> struct file *file_out, loff_t
> pos_out,
> size_t count, unsigned int flags)
> {
> + if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))
> + return -EOPNOTSUPP;
> if (file_inode(file_in) == file_inode(file_out))
> - return -EINVAL;
> + return -EOPNOTSUPP;
> return nfs42_proc_copy(file_in, pos_in, file_out, pos_out,
> count);
> }
>
That looks good. Thanks Olga!
--
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@hammerspace.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] NFSv4.1 fix incorrect return value in copy_file_range
2020-01-02 21:28 Olga Kornievskaia
@ 2020-01-02 22:08 ` Olga Kornievskaia
0 siblings, 0 replies; 4+ messages in thread
From: Olga Kornievskaia @ 2020-01-02 22:08 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker; +Cc: linux-nfs
Apologizes please ignore this was trying to submit v2 of the ACL patch
and sent the wrong file.
On Thu, Jan 2, 2020 at 4:28 PM Olga Kornievskaia
<olga.kornievskaia@gmail.com> wrote:
>
> From: Olga Kornievskaia <kolga@netapp.com>
>
> According to the NFSv4.2 spec if the input and output file is the
> same file, operation should fail with EINVAL. However, linux
> copy_file_range() system call has no such restrictions. Therefore,
> in such case let's return EOPNOTSUPP and allow VFS to fallback
> to doing do_splice_direct(). Also when copy_file_range is called
> on an NFSv4.0 or 4.1 mount (ie., a server that doesn't support
> COPY functionality), we also need to return EOPNOTSUPP and
> fallback to a regular copy.
>
> Fixes xfstest generic/075, generic/091, generic/112, generic/263
> for all NFSv4.x versions.
>
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> ---
> fs/nfs/nfs42proc.c | 3 ---
> fs/nfs/nfs4file.c | 4 +++-
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
> index ff6f85f..5196bfa 100644
> --- a/fs/nfs/nfs42proc.c
> +++ b/fs/nfs/nfs42proc.c
> @@ -329,9 +329,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
> };
> ssize_t err, err2;
>
> - if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY))
> - return -EOPNOTSUPP;
> -
> src_lock = nfs_get_lock_context(nfs_file_open_context(src));
> if (IS_ERR(src_lock))
> return PTR_ERR(src_lock);
> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
> index 45b2322..00d1719 100644
> --- a/fs/nfs/nfs4file.c
> +++ b/fs/nfs/nfs4file.c
> @@ -133,8 +133,10 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
> struct file *file_out, loff_t pos_out,
> size_t count, unsigned int flags)
> {
> + if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))
> + return -EOPNOTSUPP;
> if (file_inode(file_in) == file_inode(file_out))
> - return -EINVAL;
> + return -EOPNOTSUPP;
> return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);
> }
>
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/1] NFSv4.1 fix incorrect return value in copy_file_range
@ 2020-01-02 21:28 Olga Kornievskaia
2020-01-02 22:08 ` Olga Kornievskaia
0 siblings, 1 reply; 4+ messages in thread
From: Olga Kornievskaia @ 2020-01-02 21:28 UTC (permalink / raw)
To: trond.myklebust, anna.schumaker; +Cc: linux-nfs
From: Olga Kornievskaia <kolga@netapp.com>
According to the NFSv4.2 spec if the input and output file is the
same file, operation should fail with EINVAL. However, linux
copy_file_range() system call has no such restrictions. Therefore,
in such case let's return EOPNOTSUPP and allow VFS to fallback
to doing do_splice_direct(). Also when copy_file_range is called
on an NFSv4.0 or 4.1 mount (ie., a server that doesn't support
COPY functionality), we also need to return EOPNOTSUPP and
fallback to a regular copy.
Fixes xfstest generic/075, generic/091, generic/112, generic/263
for all NFSv4.x versions.
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---
fs/nfs/nfs42proc.c | 3 ---
fs/nfs/nfs4file.c | 4 +++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index ff6f85f..5196bfa 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -329,9 +329,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
};
ssize_t err, err2;
- if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY))
- return -EOPNOTSUPP;
-
src_lock = nfs_get_lock_context(nfs_file_open_context(src));
if (IS_ERR(src_lock))
return PTR_ERR(src_lock);
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 45b2322..00d1719 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -133,8 +133,10 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out,
size_t count, unsigned int flags)
{
+ if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))
+ return -EOPNOTSUPP;
if (file_inode(file_in) == file_inode(file_out))
- return -EINVAL;
+ return -EOPNOTSUPP;
return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-02 22:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-11 18:34 [PATCH v2 1/1] NFSv4.1 fix incorrect return value in copy_file_range Olga Kornievskaia
2019-04-11 18:44 ` Trond Myklebust
2020-01-02 21:28 Olga Kornievskaia
2020-01-02 22:08 ` Olga Kornievskaia
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).