]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
smb: server: let smb_direct_disconnect_rdma_connection() turn CREATED into DISCONNECTED
authorStefan Metzmacher <metze@samba.org>
Mon, 10 Nov 2025 15:24:20 +0000 (16:24 +0100)
committerSteve French <stfrench@microsoft.com>
Tue, 11 Nov 2025 15:50:35 +0000 (09:50 -0600)
When smb_direct_disconnect_rdma_connection() turns SMBDIRECT_SOCKET_CREATED
into SMBDIRECT_SOCKET_ERROR, we'll have the situation that
smb_direct_disconnect_rdma_work() will set SMBDIRECT_SOCKET_DISCONNECTING
and call rdma_disconnect(), which likely fails as we never reached
the RDMA_CM_EVENT_ESTABLISHED. it means that
wait_event(sc->status_wait, sc->status == SMBDIRECT_SOCKET_DISCONNECTED)
in free_transport() will hang forever in SMBDIRECT_SOCKET_DISCONNECTING
never reaching SMBDIRECT_SOCKET_DISCONNECTED.

So we directly go from SMBDIRECT_SOCKET_CREATED to
SMBDIRECT_SOCKET_DISCONNECTED.

Fixes: b3fd52a0d85c ("smb: server: let smb_direct_disconnect_rdma_connection() set SMBDIRECT_SOCKET_ERROR...")
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>
fs/smb/server/transport_rdma.c

index 3d8d8cb456c1146492b86237d68797ef1e58d0fb..e2be9a496154619e0df48de92e8250be08569be0 100644 (file)
@@ -334,6 +334,9 @@ smb_direct_disconnect_rdma_connection(struct smbdirect_socket *sc)
                break;
 
        case SMBDIRECT_SOCKET_CREATED:
+               sc->status = SMBDIRECT_SOCKET_DISCONNECTED;
+               break;
+
        case SMBDIRECT_SOCKET_CONNECTED:
                sc->status = SMBDIRECT_SOCKET_ERROR;
                break;