Commit b8c60012 authored by Sachin Prabhu's avatar Sachin Prabhu Committed by Steve French

Call echo service immediately after socket reconnect

Commit 4fcd1813 ("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: default avatarSachin Prabhu <sprabhu@redhat.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 5f4b5569
...@@ -412,6 +412,9 @@ cifs_reconnect(struct TCP_Server_Info *server) ...@@ -412,6 +412,9 @@ cifs_reconnect(struct TCP_Server_Info *server)
} }
} while (server->tcpStatus == CifsNeedReconnect); } while (server->tcpStatus == CifsNeedReconnect);
if (server->tcpStatus == CifsNeedNegotiate)
mod_delayed_work(cifsiod_wq, &server->echo, 0);
return rc; return rc;
} }
...@@ -421,17 +424,25 @@ cifs_echo_request(struct work_struct *work) ...@@ -421,17 +424,25 @@ cifs_echo_request(struct work_struct *work)
int rc; int rc;
struct TCP_Server_Info *server = container_of(work, struct TCP_Server_Info *server = container_of(work,
struct TCP_Server_Info, echo.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 * We cannot send an echo if it is disabled.
* NEGOTIATE_PROTOCOL request is done, which is indicated by * Also, no need to ping if we got a response recently.
* server->ops->need_neg() == true. Also, no need to ping if
* we got a response recently.
*/ */
if (server->tcpStatus == CifsNeedReconnect || 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)) || (server->ops->can_echo && !server->ops->can_echo(server)) ||
time_before(jiffies, server->lstrp + echo_interval - HZ)) time_before(jiffies, server->lstrp + echo_interval - HZ))
goto requeue_echo; goto requeue_echo;
...@@ -442,7 +453,7 @@ cifs_echo_request(struct work_struct *work) ...@@ -442,7 +453,7 @@ cifs_echo_request(struct work_struct *work)
server->hostname); server->hostname);
requeue_echo: requeue_echo:
queue_delayed_work(cifsiod_wq, &server->echo, echo_interval); queue_delayed_work(cifsiod_wq, &server->echo, server->echo_interval);
} }
static bool static bool
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment