Skip to content

Commit

Permalink
CIFS: SMBD: Implement function to reconnect to a SMB Direct transport
Browse files Browse the repository at this point in the history
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: Long Li <[email protected]>
Signed-off-by: Steve French <[email protected]>
Reviewed-by: Pavel Shilovsky <[email protected]>
Reviewed-by: Ronnie Sahlberg <[email protected]>
  • Loading branch information
longlimsft authored and smfrench committed Jan 25, 2018
1 parent 2f89464 commit ad57b8e
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
36 changes: 36 additions & 0 deletions fs/cifs/smbdirect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions fs/cifs/smbdirect.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ad57b8e

Please sign in to comment.