cifs: smbd: Make upper layer decide when to destroy the transport
Subsystems (3)
PATCH v2 1/7 cifs: smbd: Make upper layer decide when to destroy the transport
From: Long Li <[email protected]>
On transport recoonect, upper layer CIFS code destroys the current transport and then recoonect. This code path is not used by SMBD, in that SMBD destroys its transport on RDMA disconnect notification independent of CIFS upper layer behavior.
This approach adds some costs to SMBD layer to handle transport shutdown and restart, and to deal with several racing conditions on reconnecting transport.
Re-work this code path by introducing a new smbd_destroy. This function is called form upper layer to ask SMBD to destroy the transport. SMBD will no longer need to destroy the transport by itself while worrying about data transfer is in progress. The upper layer guarantees the transport is locked.
change log:
v2: fix build errors when CONFIG_CIFS_SMB_DIRECT is not configured
--- fs/cifs/connect.c | 9 ++--- fs/cifs/smbdirect.c | 114 +++++++++++++++++++++++++++++++++++++++++++--------- fs/cifs/smbdirect.h | 5 ++- 3 files changed, 101 insertions(+), 27 deletions(-)
fs/cifs/connect.c +4 -5
@@ -377,7 +377,8 @@ cifs_reconnect(struct TCP_Server_Info *server) server->ssocket->state, server->ssocket->flags);sock_release (server->ssocket); server->ssocket =NULL ; - } + }else if (cifs_rdma_enabled (server)) +smbd_destroy (server); server->sequence_number =0 ; server->session_estab = false;kfree (server->session_key.response);
@@ -710,10 +711,8 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server)wake_up_all (&server->request_q);/* give those requests time to exit */ msleep (125 ); -if (cifs_rdma_enabled (server) && server->smbd_conn) { -smbd_destroy (server->smbd_conn); - server->smbd_conn =NULL ; - } +if (cifs_rdma_enabled (server)) +smbd_destroy (server);if (server->ssocket) {sock_release (server->ssocket); server->ssocket =NULL ;
fs/cifs/smbdirect.c +94 -20
161 lines not on this page · raw message
fs/cifs/smbdirect.h +3 -2
@@ -71,6 +71,7 @@ struct smbd_connection {struct completion ri_done;wait_queue_head_t conn_wait;wait_queue_head_t wait_destroy; +wait_queue_head_t disconn_wait;struct completion negotiate_completion;bool negotiate_done;
@@ -288,7 +289,7 @@ struct smbd_connection *smbd_get_connection(/* Reconnect SMBDirect session */ int smbd_reconnect (struct TCP_Server_Info *server);/* Destroy SMBDirect session */ -void smbd_destroy (struct smbd_connection *info); +void smbd_destroy (struct TCP_Server_Info *server);/* Interface for carrying upper layer I/O through send/recv */ int smbd_recv (struct smbd_connection *info,struct msghdr *msg);
@@ -330,7 +331,7 @@ 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 ; } -static inline void smbd_destroy (struct smbd_connection *info) {} +static inline void smbd_destroy (struct TCP_Server_Info *server) {}static inline int smbd_recv (struct smbd_connection *info,struct msghdr *msg) {return -1 ; }static inline int smbd_send (struct smbd_connection *info,struct smb_rqst *rqst) {return -1 ; }#endif
Signature · 1 line
2.7.4