From: Steve French <smfrench@gmail.com>
To: Pavel Shilovsky <piastryyy@gmail.com>
Cc: Ronnie Sahlberg <lsahlber@redhat.com>,
linux-cifs <linux-cifs@vger.kernel.org>,
Pavel Shilovsky <pshilov@microsoft.com>
Subject: Re: [PATCH 5/6] cifs: add a timeout argument to wait_for_free_credits
Date: Sat, 9 Mar 2019 20:21:48 -0600 [thread overview]
Message-ID: <CAH2r5mtKwfg74HXmp0TDy0TV8nkhYhUrwPXKukvnor1AAdG0YA@mail.gmail.com> (raw)
In-Reply-To: <CAKywueRQwi1qxmtO3q9v_sCHB+tQxVY1uba9mi468-y9=18H_w@mail.gmail.com>
How about this to add the trace point you requested (I will send out a
patch for it on the list)
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index b3d04018195c..8731cfa66026 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -527,6 +527,8 @@ wait_for_free_credits(struct TCP_Server_Info
*server, const int num_credits,
has_credits(server, credits, num_credits), t);
cifs_num_waiters_dec(server);
if (!rc) {
+ trace_smb3_credit_timeout(server->CurrentMid,
+ server->hostname, num_credits);
cifs_dbg(VFS, "wait timed out after %d ms\n",
timeout);
return -ENOTSUPP;
@@ -565,6 +567,9 @@ wait_for_free_credits(struct TCP_Server_Info
*server, const int num_credits,
t);
cifs_num_waiters_dec(server);
if (!rc) {
+ trace_smb3_credit_timeout(
+ server->CurrentMid,
+ server->hostname, num_credits);
cifs_dbg(VFS, "wait timed out
after %d ms\n",
timeout);
return -ENOTSUPP;
On Fri, Mar 8, 2019 at 6:58 PM Pavel Shilovsky <piastryyy@gmail.com> wrote:
>
> чт, 7 мар. 2019 г. в 19:35, Ronnie Sahlberg <lsahlber@redhat.com>:
> >
> > A negative timeout is the same as the current behaviour, i.e. no timeout.
> >
> > Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> > ---
> > fs/cifs/transport.c | 40 ++++++++++++++++++++++++++++++----------
> > 1 file changed, 30 insertions(+), 10 deletions(-)
> >
> > diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
> > index f4ec9635dab2..62c58ce80123 100644
> > --- a/fs/cifs/transport.c
> > +++ b/fs/cifs/transport.c
> > @@ -478,11 +478,18 @@ smb_send(struct TCP_Server_Info *server, struct smb_hdr *smb_buffer,
> >
> > static int
> > wait_for_free_credits(struct TCP_Server_Info *server, const int num_credits,
> > - const int flags, unsigned int *instance)
> > + const int timeout, const int flags,
> > + unsigned int *instance)
> > {
> > int rc;
> > int *credits;
> > int optype;
> > + long int t;
> > +
> > + if (timeout < 0)
> > + t = MAX_JIFFY_OFFSET;
> > + else
> > + t = msecs_to_jiffies(timeout);
> >
> > optype = flags & CIFS_OP_MASK;
> >
> > @@ -507,11 +514,16 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int num_credits,
> > if (*credits < num_credits) {
> > spin_unlock(&server->req_lock);
> > cifs_num_waiters_inc(server);
> > - rc = wait_event_killable(server->request_q,
> > - has_credits(server, credits, num_credits));
> > + rc = wait_event_killable_timeout(server->request_q,
> > + has_credits(server, credits, num_credits), t);
> > cifs_num_waiters_dec(server);
> > - if (rc)
> > - return rc;
> > + if (!rc) {
> > + cifs_dbg(VFS, "wait timed out after %d ms\n",
> > + timeout);
> > + return -ENOTSUPP;
> > + }
> > + if (rc == -ERESTARTSYS)
> > + return -ERESTARTSYS;
> > spin_lock(&server->req_lock);
> > } else {
> > if (server->tcpStatus == CifsExiting) {
> > @@ -537,12 +549,19 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int num_credits,
> > *credits <= MAX_COMPOUND) {
> > spin_unlock(&server->req_lock);
> > cifs_num_waiters_inc(server);
> > - rc = wait_event_killable(server->request_q,
> > + rc = wait_event_killable_timeout(
> > + server->request_q,
> > has_credits(server, credits,
> > - MAX_COMPOUND + 1));
> > + MAX_COMPOUND + 1),
> > + t);
> > cifs_num_waiters_dec(server);
> > - if (rc)
> > - return rc;
> > + if (!rc) {
> > + cifs_dbg(VFS, "wait timed out after %d ms\n",
> > + timeout);
> > + return -ENOTSUPP;
> > + }
> > + if (rc == -ERESTARTSYS)
> > + return -ERESTARTSYS;
> > spin_lock(&server->req_lock);
> > continue;
> > }
> > @@ -569,7 +588,8 @@ static int
> > wait_for_free_request(struct TCP_Server_Info *server, const int flags,
> > unsigned int *instance)
> > {
> > - return wait_for_free_credits(server, 1, flags, instance);
> > + return wait_for_free_credits(server, 1, -1, flags,
> > + instance);
> > }
> >
> > int
> > --
> > 2.13.6
> >
>
> We may consider adding trace points for cases where we timed out.
>
> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
>
> --
> Best regards,
> Pavel Shilovsky
--
Thanks,
Steve
next prev parent reply other threads:[~2019-03-10 2:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-08 2:58 [PATCH 0/6] cifs: simplify handling of credits for compounds Ronnie Sahlberg
2019-03-08 2:58 ` [PATCH 1/6] cifs: change wait_for_free_request() to take flags as argument Ronnie Sahlberg
2019-03-09 0:53 ` Pavel Shilovsky
2019-03-08 2:58 ` [PATCH 2/6] cifs: pass flags down into wait_for_free_credits() Ronnie Sahlberg
2019-03-09 0:54 ` Pavel Shilovsky
2019-03-08 2:58 ` [PATCH 3/6] cifs: wait_for_free_credits() make it possible to wait for >=1 credits Ronnie Sahlberg
2019-03-09 0:54 ` Pavel Shilovsky
2019-03-08 2:58 ` [PATCH 4/6] cifs: prevent starvation in wait_for_free_credits for multi-credit requests Ronnie Sahlberg
2019-03-09 0:55 ` Pavel Shilovsky
2019-03-08 2:58 ` [PATCH 5/6] cifs: add a timeout argument to wait_for_free_credits Ronnie Sahlberg
2019-03-09 0:58 ` Pavel Shilovsky
[not found] ` <CAH2r5ms3METKgX9sMet44r0RKdVAEe_x=vuB_6JZobJn95x4_Q@mail.gmail.com>
2019-03-09 1:06 ` Pavel Shilovsky
2019-03-10 2:21 ` Steve French [this message]
2019-03-08 2:58 ` [PATCH 6/6] cifs: simplify how we handle credits in compond_send_recv() Ronnie Sahlberg
2019-03-09 0:53 ` Pavel Shilovsky
2019-03-09 22:04 ` Steve French
-- strict thread matches above, loose matches on Subject: below --
2019-03-06 4:15 [PATCH 0/6] cifs: simplify handling of credits for compounds Ronnie Sahlberg
2019-03-06 4:15 ` [PATCH 5/6] cifs: add a timeout argument to wait_for_free_credits Ronnie Sahlberg
2019-03-06 17:32 ` Pavel Shilovsky
2019-03-08 2:39 ` ronnie sahlberg
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=CAH2r5mtKwfg74HXmp0TDy0TV8nkhYhUrwPXKukvnor1AAdG0YA@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=linux-cifs@vger.kernel.org \
--cc=lsahlber@redhat.com \
--cc=piastryyy@gmail.com \
--cc=pshilov@microsoft.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 NNTP newsgroup(s).