smb: server: make use of smbdirect_socket_parameters.negotiate_timeout_msec and chang...

The server negotiations timer is just 5 seconds in Windows, so use the
same. See [MS-SMBD] 3.1.7.2 Connection Arrival.

Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c
index 0367db232ea89024d1e620d723466526a57fa3a6..7d3cf1d22af08b9b02d55fbe25bcb7181ed1acf8 100644 (file)
--- a/fs/smb/server/transport_rdma.c
+++ b/fs/smb/server/transport_rdma.c
@@ -33,8 +33,8 @@
 
 #define SMB_DIRECT_VERSION_LE          cpu_to_le16(SMBDIRECT_V1)
 
-/* SMB_DIRECT negotiation timeout in seconds */
-#define SMB_DIRECT_NEGOTIATE_TIMEOUT           120
+/* SMB_DIRECT negotiation timeout (for the server) in seconds */
+#define SMB_DIRECT_NEGOTIATE_TIMEOUT           5
 
 /*
  * Default maximum number of RDMA read/write outstanding on this connection
@@ -300,6 +300,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)
 
        INIT_WORK(&sc->disconnect_work, smb_direct_disconnect_rdma_work);
 
+       sp->negotiate_timeout_msec = SMB_DIRECT_NEGOTIATE_TIMEOUT * 1000;
        sp->recv_credit_max = smb_direct_receive_credit_max;
        sp->send_credit_target = smb_direct_send_credit_target;
        sp->max_send_size = smb_direct_max_send_size;
@@ -2022,7 +2023,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t)
                                        sc->status != SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED &&
                                        sc->status != SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING &&
                                        sc->status != SMBDIRECT_SOCKET_NEGOTIATE_NEEDED,
-                                       SMB_DIRECT_NEGOTIATE_TIMEOUT * HZ);
+                                       msecs_to_jiffies(sp->negotiate_timeout_msec));
        if (ret <= 0 || sc->status != SMBDIRECT_SOCKET_NEGOTIATE_RUNNING)
                return ret < 0 ? ret : -ETIMEDOUT;