android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 <longli@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
This commit is contained in:
Long Li 2017-11-22 17:38:35 -07:00 committed by Steve French
parent 2f8946464b
commit ad57b8e172
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/cifs/smbdirect.c
View File

@ -1387,6 +1387,42 @@ static void idle_connection_timer(struct work_struct *work)
info->keep_alive_interval*HZ); 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) static void destroy_caches_and_workqueue(struct smbd_connection *info)
{ {
destroy_receive_buffers(info); destroy_receive_buffers(info);

4
fs/cifs/smbdirect.h
View File

@ -247,11 +247,15 @@ struct smbd_response {
struct smbd_connection *smbd_get_connection( struct smbd_connection *smbd_get_connection(
struct TCP_Server_Info *server, struct sockaddr *dstaddr); struct TCP_Server_Info *server, struct sockaddr *dstaddr);
/* Reconnect SMBDirect session */
int smbd_reconnect(struct TCP_Server_Info *server);
#else #else
#define cifs_rdma_enabled(server) 0 #define cifs_rdma_enabled(server) 0
struct smbd_connection {}; struct smbd_connection {};
static inline void *smbd_get_connection( static inline void *smbd_get_connection(
struct TCP_Server_Info *server, struct sockaddr *dstaddr) {return NULL;} struct TCP_Server_Info *server, struct sockaddr *dstaddr) {return NULL;}
static inline int smbd_reconnect(struct TCP_Server_Info *server) {return -1; }
#endif #endif
#endif #endif