Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

CIFS: SMBD: Implement function to reconnect to a SMB Direct transport 



Add function to implement a reconnect to SMB Direct. This involves tearing down
the current connection and establishing/negotiating a new connection.

Signed-off-by: default avatarLong Li <longli@microsoft.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
parent 2f894646

fs/cifs/smbdirect.c

+36 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,42 @@ static void idle_connection_timer(struct work_struct *work) 
			info->keep_alive_interval*HZ);

}



/*

 * Reconnect this SMBD connection, called from upper layer

 * return value: 0 on success, or actual error code

 */

int smbd_reconnect(struct TCP_Server_Info *server)

{

	log_rdma_event(INFO, "reconnecting rdma session\n");



	if (!server->smbd_conn) {

		log_rdma_event(ERR, "rdma session already destroyed\n");

		return -EINVAL;

	}



	/*

	 * This is possible if transport is disconnected and we haven't received

	 * notification from RDMA, but upper layer has detected timeout

	 */

	if (server->smbd_conn->transport_status == SMBD_CONNECTED) {

		log_rdma_event(INFO, "disconnecting transport\n");

		smbd_disconnect_rdma_connection(server->smbd_conn);

	}



	/* wait until the transport is destroyed */

	wait_event(server->smbd_conn->wait_destroy,

		server->smbd_conn->transport_status == SMBD_DESTROYED);



	destroy_workqueue(server->smbd_conn->workqueue);

	kfree(server->smbd_conn);



	log_rdma_event(INFO, "creating rdma session\n");

	server->smbd_conn = smbd_get_connection(

		server, (struct sockaddr *) &server->dstaddr);



	return server->smbd_conn ? 0 : -ENOENT;

}



static void destroy_caches_and_workqueue(struct smbd_connection *info)

{

	destroy_receive_buffers(info);

fs/cifs/smbdirect.h

+4 −0
Original line number Diff line number Diff line
@@ -247,11 +247,15 @@ struct smbd_response { 
struct smbd_connection *smbd_get_connection(

	struct TCP_Server_Info *server, struct sockaddr *dstaddr);



/* Reconnect SMBDirect session */

int smbd_reconnect(struct TCP_Server_Info *server);



#else

#define cifs_rdma_enabled(server)	0

struct smbd_connection {};

static inline void *smbd_get_connection(

	struct TCP_Server_Info *server, struct sockaddr *dstaddr) {return NULL;}

static inline int smbd_reconnect(struct TCP_Server_Info *server) {return -1; }

#endif



#endif