[PATCH Yakkety SRU] Call echo service immediately after socket reconnect

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH Yakkety SRU] Call echo service immediately after socket reconnect

Tim Gardner-2
From: Sachin Prabhu <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1669941

Commit 4fcd1813e640 ("Fix reconnect to not defer smb3 session reconnect
long after socket reconnect") changes the behaviour of the SMB2 echo
service and causes it to renegotiate after a socket reconnect. However
under default settings, the echo service could take up to 120 seconds to
be scheduled.

The patch forces the echo service to be called immediately resulting a
negotiate call being made immediately on reconnect.

Signed-off-by: Sachin Prabhu <[hidden email]>
Reviewed-by: Pavel Shilovsky <[hidden email]>
Signed-off-by: Steve French <[hidden email]>
(cherry picked from commit b8c600120fc87d53642476f48c8055b38d6e14c7)
Signed-off-by: Tim Gardner <[hidden email]>
---
 fs/cifs/connect.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a178f3a..6ebf0cb 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -414,6 +414,9 @@ cifs_reconnect(struct TCP_Server_Info *server)
  }
  } while (server->tcpStatus == CifsNeedReconnect);
 
+ if (server->tcpStatus == CifsNeedNegotiate)
+ mod_delayed_work(cifsiod_wq, &server->echo, 0);
+
  return rc;
 }
 
@@ -423,17 +426,25 @@ cifs_echo_request(struct work_struct *work)
  int rc;
  struct TCP_Server_Info *server = container_of(work,
  struct TCP_Server_Info, echo.work);
- unsigned long echo_interval = server->echo_interval;
+ unsigned long echo_interval;
+
+ /*
+ * If we need to renegotiate, set echo interval to zero to
+ * immediately call echo service where we can renegotiate.
+ */
+ if (server->tcpStatus == CifsNeedNegotiate)
+ echo_interval = 0;
+ else
+ echo_interval = server->echo_interval;
 
  /*
- * We cannot send an echo if it is disabled or until the
- * NEGOTIATE_PROTOCOL request is done, which is indicated by
- * server->ops->need_neg() == true. Also, no need to ping if
- * we got a response recently.
+ * We cannot send an echo if it is disabled.
+ * Also, no need to ping if we got a response recently.
  */
 
  if (server->tcpStatus == CifsNeedReconnect ||
-    server->tcpStatus == CifsExiting || server->tcpStatus == CifsNew ||
+    server->tcpStatus == CifsExiting ||
+    server->tcpStatus == CifsNew ||
     (server->ops->can_echo && !server->ops->can_echo(server)) ||
     time_before(jiffies, server->lstrp + echo_interval - HZ))
  goto requeue_echo;
@@ -444,7 +455,7 @@ cifs_echo_request(struct work_struct *work)
  server->hostname);
 
 requeue_echo:
- queue_delayed_work(cifsiod_wq, &server->echo, echo_interval);
+ queue_delayed_work(cifsiod_wq, &server->echo, server->echo_interval);
 }
 
 static bool
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH Yakkety SRU] Call echo service immediately after socket reconnect

Seth Forshee
Clean cherry pick.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH Yakkety SRU] Call echo service immediately after socket reconnect

brad.figg
In reply to this post by Tim Gardner-2
Reply | Threaded
Open this post in threaded view
|

Applied: [PATCH Yakkety SRU] Call echo service immediately after socket reconnect

brad.figg
In reply to this post by Tim Gardner-2
Applied to the master next branch of the yakkety repo
--
Brad Figg [hidden email] http://www.canonical.com

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team