]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
smb: client: return an error if rdma_connect does not return within 5 seconds
authorStefan Metzmacher <metze@samba.org>
Thu, 7 Aug 2025 16:12:11 +0000 (18:12 +0200)
committerSteve French <stfrench@microsoft.com>
Thu, 7 Aug 2025 17:40:11 +0000 (12:40 -0500)
This matches the timeout for tcp connections.

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Fixes: f198186aa9bb ("CIFS: SMBD: Establish SMB Direct connection")
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/smb/client/smbdirect.c

index 6c2af00be44cf3b69f85c1e936b89c70e309a7fa..181349eda7a3268bb1a0e954a633bfccc8c8d077 100644 (file)
@@ -1653,8 +1653,10 @@ static struct smbd_connection *_smbd_get_connection(
                goto rdma_connect_failed;
        }
 
-       wait_event_interruptible(
-               info->conn_wait, sc->status != SMBDIRECT_SOCKET_CONNECTING);
+       wait_event_interruptible_timeout(
+               info->conn_wait,
+               sc->status != SMBDIRECT_SOCKET_CONNECTING,
+               msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT));
 
        if (sc->status != SMBDIRECT_SOCKET_CONNECTED) {
                log_rdma_event(ERR, "rdma_connect failed port=%d\n", port);