From: Tom Talpey <tom@talpey.com>
To: David Howells <dhowells@redhat.com>,
Steve French <sfrench@samba.org>,
Paulo Alcantara <pc@manguebit.com>
Cc: Shyam Prasad N <nspmangalore@gmail.com>,
Rohith Surabattula <rohiths.msft@gmail.com>,
Jeff Layton <jlayton@kernel.org>,
linux-cifs@vger.kernel.org, netfs@lists.linux.dev,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH] cifs: Fix credit handling in cifs_io_subrequest cleanup
Date: Thu, 23 May 2024 10:41:42 -0400 [thread overview]
Message-ID: <536b0f03-db96-49a3-93de-d9ea835e8785@talpey.com> (raw)
In-Reply-To: <469451.1716418742@warthog.procyon.org.uk>
On 5/22/2024 6:59 PM, David Howells wrote:
>
> When a cifs_io_subrequest (wrapping a netfs_io_subrequest) is cleaned up in
> cifs_free_subrequest(), it releases any credits that are left in
> rdata->credits. However, this is a problem because smb2_writev_callback()
> calls add_credits() to add the new credits from the response header
> CreditRequest to the available pool.
>
> This can cause a warning to be emitted in smb2_add_credits() as
> server->in_flight gets doubly decremented and a later operation sees it
> having prematurely reached 0.
>
> Fix this by clearing the credit count after actually issuing the request on
> the assumption that we've given the credits back to the server (it will
> give us new credits in the reply).
From a protocol standpoint it's correct to reserve the credits while the
operation is in flight. But from a code standpoint it seems risky to
stop accounting for them. What if the operation is canceled, or times
out?
I'd quibble with the assertion that the server will "give us new credits
in the response". The number of granted credits is always the server's
decision, not guaranteed by the protocol (except for certain edge
conditions).
I guess I'd suggest a deeper review by someone familiar with the
mechanics of fs/smb/client credit accounting. It might be ok!
Tom.
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Steve French <sfrench@samba.org>
> cc: Paulo Alcantara <pc@manguebit.com>
> cc: Shyam Prasad N <nspmangalore@gmail.com>
> cc: Rohith Surabattula <rohiths.msft@gmail.com>
> cc: Jeff Layton <jlayton@kernel.org>
> cc: linux-cifs@vger.kernel.org
> cc: netfs@lists.linux.dev
> cc: linux-fsdevel@vger.kernel.org
> ---
> fs/smb/client/file.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
> index 9d5c2440abfc..73e2765c4d2f 100644
> --- a/fs/smb/client/file.c
> +++ b/fs/smb/client/file.c
> @@ -110,6 +110,7 @@ static void cifs_issue_write(struct netfs_io_subrequest *subreq)
> goto fail;
>
> wdata->server->ops->async_writev(wdata);
> + wdata->credits.value = 0;
> out:
> return;
>
> @@ -205,10 +206,12 @@ static void cifs_req_issue_read(struct netfs_io_subrequest *subreq)
>
> rc = adjust_credits(rdata->server, &rdata->credits, rdata->subreq.len);
> if (!rc) {
> - if (rdata->req->cfile->invalidHandle)
> + if (rdata->req->cfile->invalidHandle) {
> rc = -EAGAIN;
> - else
> + } else {
> rc = rdata->server->ops->async_readv(rdata);
> + rdata->credits.value = 0;
> + }
> }
>
> out:
>
>
>
next prev parent reply other threads:[~2024-05-23 14:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 22:59 David Howells
2024-05-23 14:41 ` Tom Talpey [this message]
2024-05-23 14:52 ` David Howells
2024-05-23 15:00 ` Tom Talpey
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=536b0f03-db96-49a3-93de-d9ea835e8785@talpey.com \
--to=tom@talpey.com \
--cc=dhowells@redhat.com \
--cc=jlayton@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netfs@lists.linux.dev \
--cc=nspmangalore@gmail.com \
--cc=pc@manguebit.com \
--cc=rohiths.msft@gmail.com \
--cc=sfrench@samba.org \
/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
all inboxes | Powered by JetHome®