From: Benjamin Coddington <bcodding@redhat.com>
To: Anna Schumaker <anna@kernel.org>
Cc: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com
Subject: Re: [PATCH] NFS: Fix READ_PLUS when server doesn't support OP_READ_PLUS
Date: Fri, 26 Apr 2024 07:43:26 -0400 [thread overview]
Message-ID: <A9C3D12F-3E5E-4DE5-9A56-ECB7EDDB0AD0@redhat.com> (raw)
In-Reply-To: <20240425202429.439014-1-anna@kernel.org>
On 25 Apr 2024, at 16:24, Anna Schumaker wrote:
> From: Anna Schumaker <Anna.Schumaker@Netapp.com>
>
> Olga showed me a case where the client was sending multiple READ_PLUS
> calls to the server in parallel, and the server replied
> NFS4ERR_OPNOTSUPP to each. The client would fall back to READ for the
> first reply, but fail to retry the other calls.
>
> I fix this by removing the test for NFS_CAP_READ_PLUS in
> nfs4_read_plus_not_supported(). This allows us to reschedule any
> READ_PLUS call that has a NFS4ERR_OPNOTSUPP return value, even after the
> capability has been cleared.
>
> Reported-by: Olga Kornievskaia <kolga@netapp.com>
> Fixes: c567552612ec ("NFS: Add READ_PLUS data segment support")
> Cc: stable@vger.kernel.org # v5.10+
> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Ben
> ---
> fs/nfs/nfs4proc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index ea390db94b62..c93c12063b3a 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -5456,7 +5456,7 @@ static bool nfs4_read_plus_not_supported(struct rpc_task *task,
> struct rpc_message *msg = &task->tk_msg;
>
> if (msg->rpc_proc == &nfs4_procedures[NFSPROC4_CLNT_READ_PLUS] &&
> - server->caps & NFS_CAP_READ_PLUS && task->tk_status == -ENOTSUPP) {
> + task->tk_status == -ENOTSUPP) {
> server->caps &= ~NFS_CAP_READ_PLUS;
> msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ];
> rpc_restart_call_prepare(task);
> --
> 2.44.0
prev parent reply other threads:[~2024-04-26 11:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 20:24 [PATCH] NFS: Fix READ_PLUS when server doesn't support OP_READ_PLUS Anna Schumaker
2024-04-26 11:43 ` Benjamin Coddington [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=A9C3D12F-3E5E-4DE5-9A56-ECB7EDDB0AD0@redhat.com \
--to=bcodding@redhat.com \
--cc=anna@kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).