Commit 1d2a4f57 authored by Long Li's avatar Long Li Committed by Steve French
Browse files

cifs:smbd When reconnecting to server, call smbd_destroy() after all MIDs have been called 



commit 214bab44 ("cifs: Call MID callback before destroying transport")
assumes that the MID callback should not take srv_mutex, this may not always
be true. SMB Direct requires the MID callback completed before calling
transport so all pending memory registration can be freed. So restore the
original calling sequence so TCP transport will use the same code, but moving
smbd_destroy() after all MID has been called.

fixes: 214bab44 ("cifs: Call MID callback before destroying transport")
Signed-off-by: default avatarLong Li <longli@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
parent 14e25977

fs/cifs/connect.c

+20 −17
Original line number Diff line number Diff line
@@ -528,6 +528,21 @@ cifs_reconnect(struct TCP_Server_Info *server) 
	/* do not want to be sending data on a socket we are freeing */

	cifs_dbg(FYI, "%s: tearing down socket\n", __func__);

	mutex_lock(&server->srv_mutex);

	if (server->ssocket) {

		cifs_dbg(FYI, "State: 0x%x Flags: 0x%lx\n",

			 server->ssocket->state, server->ssocket->flags);

		kernel_sock_shutdown(server->ssocket, SHUT_WR);

		cifs_dbg(FYI, "Post shutdown state: 0x%x Flags: 0x%lx\n",

			 server->ssocket->state, server->ssocket->flags);

		sock_release(server->ssocket);

		server->ssocket = NULL;

	}

	server->sequence_number = 0;

	server->session_estab = false;

	kfree(server->session_key.response);

	server->session_key.response = NULL;

	server->session_key.len = 0;

	server->lstrp = jiffies;



	/* mark submitted MIDs for retry and issue callback */

	INIT_LIST_HEAD(&retry_list);
@@ -540,6 +555,7 @@ cifs_reconnect(struct TCP_Server_Info *server) 
		list_move(&mid_entry->qhead, &retry_list);

	}

	spin_unlock(&GlobalMid_Lock);

	mutex_unlock(&server->srv_mutex);



	cifs_dbg(FYI, "%s: issuing mid callbacks\n", __func__);

	list_for_each_safe(tmp, tmp2, &retry_list) {
@@ -548,24 +564,11 @@ cifs_reconnect(struct TCP_Server_Info *server) 
		mid_entry->callback(mid_entry);

	}



	if (server->ssocket) {

		cifs_dbg(FYI, "State: 0x%x Flags: 0x%lx\n",

			 server->ssocket->state, server->ssocket->flags);

		kernel_sock_shutdown(server->ssocket, SHUT_WR);

		cifs_dbg(FYI, "Post shutdown state: 0x%x Flags: 0x%lx\n",

			 server->ssocket->state, server->ssocket->flags);

		sock_release(server->ssocket);

		server->ssocket = NULL;

	} else if (cifs_rdma_enabled(server))

	if (cifs_rdma_enabled(server)) {

		mutex_lock(&server->srv_mutex);

		smbd_destroy(server);

	server->sequence_number = 0;

	server->session_estab = false;

	kfree(server->session_key.response);

	server->session_key.response = NULL;

	server->session_key.len = 0;

	server->lstrp = jiffies;



		mutex_unlock(&server->srv_mutex);

	}



	do {

		try_to_freeze();

CRA Git | Maintained and supported by SUSTech CRA and CCSE