[PATCH] Call echo service immediately after socket reconnect

[PATCH] Call echo service immediately after socket reconnect

[Pavel Shilovsky]

From: Sachin Prabhu <sprabhu@redhat.com>

Commit b8c600120fc8 ("Call echo service immediately after socket
reconnect") upstream.

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 <sprabhu@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Acked-by: Sachin Prabhu <sprabhu@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
---
 fs/cifs/connect.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 156bc18..53a827c 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -412,6 +412,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;
 }
 
@@ -421,18 +424,27 @@ 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;
+
+	/*
+	 * 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 = SMB_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 + SMB_ECHO_INTERVAL - HZ))
+	    time_before(jiffies, server->lstrp + echo_interval - HZ))
 		goto requeue_echo;
 
 	rc = server->ops->echo ? server->ops->echo(server) : -ENOSYS;
-- 
2.7.4

[PATCH] Call echo service immediately after socket reconnect

[Pavel Shilovsky]

From: Sachin Prabhu <sprabhu@redhat.com>

Commit b8c600120fc8 ("Call echo service immediately after socket
reconnect") upstream.

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 <sprabhu@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Acked-by: Sachin Prabhu <sprabhu@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
---
 fs/cifs/connect.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 156bc18..53a827c 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -412,6 +412,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;
 }
 
@@ -421,18 +424,27 @@ 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;
+
+	/*
+	 * 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 = SMB_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 + SMB_ECHO_INTERVAL - HZ))
+	    time_before(jiffies, server->lstrp + echo_interval - HZ))
 		goto requeue_echo;
 
 	rc = server->ops->echo ? server->ops->echo(server) : -ENOSYS;
-- 
2.7.4

Re: [PATCH] Call echo service immediately after socket reconnect

[Greg KH]

On Mon, Jun 05, 2017 at 12:15:21PM -0700, Pavel Shilovsky wrote:
> From: Sachin Prabhu <sprabhu@redhat.com>
> 
> Commit b8c600120fc8 ("Call echo service immediately after socket
> reconnect") upstream.
> 
> 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 <sprabhu@redhat.com>
> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
> Signed-off-by: Steve French <smfrench@gmail.com>
> Acked-by: Sachin Prabhu <sprabhu@redhat.com>
> Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
> ---
>  fs/cifs/connect.c | 24 ++++++++++++++++++------
>  1 file changed, 18 insertions(+), 6 deletions(-)

What stable tree(s) do you want this applied to?  Please be specific
like the documentation tells you to do :)

And CIFS maintainers, come on, your subject lines for patches suck,
please use a prefix like _everyone_ else does to make it more obvious
what part of the kernel is being touched.

thanks,

greg k-h

RE: [PATCH] Call echo service immediately after socket reconnect

[Pavel Shilovskiy]

2017-06-12 5:30 GMT-07:00 Greg KH <gregkh@linuxfoundation.org>:
> On Mon, Jun 05, 2017 at 12:15:21PM -0700, Pavel Shilovsky wrote:
>> From: Sachin Prabhu <sprabhu@redhat.com>
>>
>> Commit b8c600120fc8 ("Call echo service immediately after socket
>> reconnect") upstream.
>>
>> 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 <sprabhu@redhat.com>
>> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
>> Signed-off-by: Steve French <smfrench@gmail.com>
>> Acked-by: Sachin Prabhu <sprabhu@redhat.com>
>> Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
>> ---
>>  fs/cifs/connect.c | 24 ++++++++++++++++++------
>>  1 file changed, 18 insertions(+), 6 deletions(-)
>
> What stable tree(s) do you want this applied to?  Please be specific
> like the documentation tells you to do :)
>
> And CIFS maintainers, come on, your subject lines for patches suck,
> please use a prefix like _everyone_ else does to make it more obvious
> what part of the kernel is being touched.

This patch is targeted for kernels below v4.9, in particular - for v4.4 and v3.18 stable kernels. Do you want me to re-send the patch to comply with the documentation?

--
Best regards,
Pavel Shilovsky

Re: [PATCH] Call echo service immediately after socket reconnect

[Greg KH]

On Mon, Jun 12, 2017 at 07:08:51PM +0000, Pavel Shilovskiy wrote:
> 2017-06-12 5:30 GMT-07:00 Greg KH <gregkh@linuxfoundation.org>:
> > On Mon, Jun 05, 2017 at 12:15:21PM -0700, Pavel Shilovsky wrote:
> >> From: Sachin Prabhu <sprabhu@redhat.com>
> >>
> >> Commit b8c600120fc8 ("Call echo service immediately after socket
> >> reconnect") upstream.
> >>
> >> 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 <sprabhu@redhat.com>
> >> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
> >> Signed-off-by: Steve French <smfrench@gmail.com>
> >> Acked-by: Sachin Prabhu <sprabhu@redhat.com>
> >> Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
> >> ---
> >>  fs/cifs/connect.c | 24 ++++++++++++++++++------
> >>  1 file changed, 18 insertions(+), 6 deletions(-)
> >
> > What stable tree(s) do you want this applied to?  Please be specific
> > like the documentation tells you to do :)
> >
> > And CIFS maintainers, come on, your subject lines for patches suck,
> > please use a prefix like _everyone_ else does to make it more obvious
> > what part of the kernel is being touched.
> 
> This patch is targeted for kernels below v4.9, in particular - for
> v4.4 and v3.18 stable kernels. Do you want me to re-send the patch to
> comply with the documentation?

Please do.

RE: [PATCH] Call echo service immediately after socket reconnect

[Pavel Shilovskiy]

2017-06-12 12:16 GMT-07:00 Greg KH <gregkh@linuxfoundation.org>:
> On Mon, Jun 12, 2017 at 07:08:51PM +0000, Pavel Shilovskiy wrote:
>> 2017-06-12 5:30 GMT-07:00 Greg KH <gregkh@linuxfoundation.org>:
>> > On Mon, Jun 05, 2017 at 12:15:21PM -0700, Pavel Shilovsky wrote:
>> >> From: Sachin Prabhu <sprabhu@redhat.com>
>> >>
>> >> Commit b8c600120fc8 ("Call echo service immediately after socket
>> >> reconnect") upstream.
>> >>
>> >> 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 <sprabhu@redhat.com>
>> >> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
>> >> Signed-off-by: Steve French <smfrench@gmail.com>
>> >> Acked-by: Sachin Prabhu <sprabhu@redhat.com>
>> >> Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
>> >> ---
>> >>  fs/cifs/connect.c | 24 ++++++++++++++++++------
>> >>  1 file changed, 18 insertions(+), 6 deletions(-)
>> >
>> > What stable tree(s) do you want this applied to?  Please be specific
>> > like the documentation tells you to do :)
>> >
>> > And CIFS maintainers, come on, your subject lines for patches suck,
>> > please use a prefix like _everyone_ else does to make it more obvious
>> > what part of the kernel is being touched.
>>
>> This patch is targeted for kernels below v4.9, in particular - for
>> v4.4 and v3.18 stable kernels. Do you want me to re-send the patch to
>> comply with the documentation?
>
> Please do.

Done. I specified the targeted kernels as a range (Cc: <stable@vger.kernel.org> # 3.18.x-4.4.x). Please let me know if I need to be more specific and specify particular versions instead.

--
Best regards,
Pavel Shilovsky