From: Pavel Shilovsky <piastryyy@gmail.com>
To: Long Li <longli@microsoft.com>
Cc: Steve French <sfrench@samba.org>,
linux-cifs <linux-cifs@vger.kernel.org>,
samba-technical <samba-technical@lists.samba.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [Patch v2 2/2] CIFS: Fix an issue with re-sending rdata when transport returning -EAGAIN
Date: Sat, 16 Mar 2019 11:03:33 -0700 [thread overview]
Message-ID: <CAKywueTOHQq8iEiQRHer7yGstvKEF7SrSgNqmETYV73uEgqA+A@mail.gmail.com> (raw)
In-Reply-To: <20190315075500.27747-2-longli@linuxonhyperv.com>
пт, 15 мар. 2019 г. в 00:56, Long Li <longli@linuxonhyperv.com>:
>
> From: Long Li <longli@microsoft.com>
>
> When sending a rdata, transport may return -EAGAIN. In this case
> we should re-obtain credits because the session may have been
> reconnected.
>
> Change in v2: adjust_credits before re-sending
>
> Signed-off-by: Long Li <longli@microsoft.com>
> ---
> fs/cifs/file.c | 71 +++++++++++++++++++++++++++++++++-------------------------
> 1 file changed, 41 insertions(+), 30 deletions(-)
>
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index 321df1d27422..9d90cc07e38b 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -3347,44 +3347,55 @@ static int cifs_resend_rdata(struct cifs_readdata *rdata,
> struct TCP_Server_Info *server =
> tlink_tcon(rdata->cfile->tlink)->ses->server;
>
> - /*
> - * Wait for credits to resend this rdata.
> - * Note: we are attempting to resend the whole rdata not in segments
> - */
> do {
> - rc = server->ops->wait_mtu_credits(server, rdata->bytes,
> + if (rdata->cfile->invalidHandle) {
> + rc = cifs_reopen_file(rdata->cfile, true);
> + if (rc == -EAGAIN)
> + continue;
> + else if (rc)
> + break;
> + }
> +
> + /*
> + * Wait for credits to resend this rdata.
> + * Note: we are attempting to resend the whole rdata not in
> + * segments
> + */
> + do {
> + rc = server->ops->wait_mtu_credits(server, rdata->bytes,
> &rsize, &credits);
>
> - if (rc)
> - goto out;
> + if (rc)
> + goto fail;
>
> - if (rsize < rdata->bytes) {
> - add_credits_and_wake_if(server, &credits, 0);
> - msleep(1000);
> - }
> - } while (rsize < rdata->bytes);
> + if (rsize < rdata->bytes) {
> + add_credits_and_wake_if(server, &credits, 0);
> + msleep(1000);
> + }
> + } while (rsize < rdata->bytes);
> + rdata->credits = credits;
>
> - rdata->credits = credits;
> - rc = -EAGAIN;
> - while (rc == -EAGAIN) {
> - rc = 0;
> - if (rdata->cfile->invalidHandle)
> - rc = cifs_reopen_file(rdata->cfile, true);
> - if (!rc)
> - rc = server->ops->async_readv(rdata);
> - }
> + rc = adjust_credits(server, &rdata->credits, rdata->bytes);
> + if (!rc) {
> + if (rdata->cfile->invalidHandle)
> + rc = -EAGAIN;
> + else
> + rc = server->ops->async_readv(rdata);
> + }
>
> - if (!rc) {
> - /* Add to aio pending list */
> - list_add_tail(&rdata->list, rdata_list);
> - return 0;
> - }
> + /* If the read was successfully sent, we are done */
> + if (!rc) {
> + /* Add to aio pending list */
> + list_add_tail(&rdata->list, rdata_list);
> + return 0;
> + }
>
> - add_credits_and_wake_if(server, &rdata->credits, 0);
> -out:
> - kref_put(&rdata->refcount,
> - cifs_uncached_readdata_release);
> + /* Roll back credits and retry if needed */
> + add_credits_and_wake_if(server, &rdata->credits, 0);
> + } while (rc == -EAGAIN);
>
> +fail:
> + kref_put(&rdata->refcount, cifs_uncached_readdata_release);
> return rc;
> }
>
> --
> 2.14.1
>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
--
Best regards,
Pavel Shilovsky
next prev parent reply other threads:[~2019-03-16 18:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-15 7:54 [Patch v2 1/2] CIFS: Fix an issue with re-sending wdata when transport returning -EAGAIN Long Li
2019-03-15 7:55 ` [Patch v2 2/2] CIFS: Fix an issue with re-sending rdata " Long Li
2019-03-16 18:03 ` Pavel Shilovsky [this message]
2019-03-16 18:01 ` [Patch v2 1/2] CIFS: Fix an issue with re-sending wdata " Pavel Shilovsky
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=CAKywueTOHQq8iEiQRHer7yGstvKEF7SrSgNqmETYV73uEgqA+A@mail.gmail.com \
--to=piastryyy@gmail.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longli@microsoft.com \
--cc=samba-technical@lists.samba.org \
--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;
as well as URLs for NNTP newsgroup(s).