cifs: fix mid leak during reconnection after timeout threshold
Subsystems (2)
PATCH 1/2 cifs: fix mid leak during reconnection after timeout threshold
When the number of responses with status of STATUS_IO_TIMEOUT exceeds a specified threshold (NUM_STATUS_IO_TIMEOUT), we reconnect the connection. But we do not return the mid, or the credits returned for the mid, or reduce the number of in-flight requests.
This bug could result in the server->in_flight count to go bad, and also cause a leak in the mids.
This change moves the check to a few lines below where the response is decrypted, even of the response is read from the transform header. This way, the code for returning the mids can be reused.
Also, the cifs_reconnect was reconnecting just the transport connection before. In case of multi-channel, this may not be what we want to do after several timeouts. Changed that to reconnect the session and the tree too.
Also renamed NUM_STATUS_IO_TIMEOUT to a more appropriate name MAX_STATUS_IO_TIMEOUT.
--- fs/smb/client/connect.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
fs/smb/client/connect.c +15 -4
@@ -60,7 +60,7 @@ extern bool disable_legacy_dialects;#define TLINK_IDLE_EXPIRE (600 * HZ)/* Drop the connection to not overload the server */ -#define NUM_STATUS_IO_TIMEOUT 5 +#define MAX_STATUS_IO_TIMEOUT 5static int ip_connect (struct TCP_Server_Info *server);static int generic_ip_connect (struct TCP_Server_Info *server);
@@ -1118,6 +1118,7 @@ cifs_demultiplex_thread(void *p)struct mid_q_entry *mids[MAX_COMPOUND ];char *bufs[MAX_COMPOUND ];unsigned int noreclaim_flag, num_io_timeout =0 ; +bool pending_reconnect = false; noreclaim_flag =memalloc_noreclaim_save ();cifs_dbg (FYI ,"Demultiplex PID: %d\n" ,task_pid_nr (current));
@@ -1157,6 +1158,8 @@ cifs_demultiplex_thread(void *p)cifs_dbg (FYI ,"RFC1002 header 0x%x\n" , pdu_length);if (!is_smb_response (server, buf[0 ]))continue ; + + pending_reconnect = false; next_pdu: server->pdu_size = pdu_length;
@@ -1214,10 +1217,13 @@ cifs_demultiplex_thread(void *p)if (server->ops->is_status_io_timeout && server->ops->is_status_io_timeout (buf)) { num_io_timeout++; -if (num_io_timeout >NUM_STATUS_IO_TIMEOUT ) { -cifs_reconnect (server, false); +if (num_io_timeout >MAX_STATUS_IO_TIMEOUT ) { +cifs_server_dbg (VFS , +"Number of request timeouts exceeded %d. Reconnecting" , +MAX_STATUS_IO_TIMEOUT ); + + pending_reconnect = true; num_io_timeout =0 ; -continue ; } }
@@ -1264,6 +1270,11 @@ cifs_demultiplex_thread(void *p) buf = server->smallbuf; goto next_pdu; } + +/* do this reconnect at the very end after processing all MIDs */ +if (pending_reconnect) +cifs_reconnect (server, true); + }/* end while !EXITING */ /* buffer usually freed in free_mid - need to free it here on exit */
Signature · 1 line
2.34.1
PATCH 2/2 cifs: is_network_name_deleted should return a bool
Currently, is_network_name_deleted and it's implementations do not return anything if the network name did get deleted. So the function doesn't fully achieve what it advertizes.
Changed the function to return a bool instead. It will now return true if the error returned is STATUS_NETWORK_NAME_DELETED and the share (tree id) was found to be connected. It returns false otherwise.
--- fs/smb/client/cifsglob.h | 2 +- fs/smb/client/connect.c | 11 ++++++++--- fs/smb/client/smb2ops.c | 8 +++++--- 3 files changed, 14 insertions(+), 7 deletions(-)
fs/smb/client/cifsglob.h +1 -1
@@ -532,7 +532,7 @@ struct smb_version_operations {/* Check for STATUS_IO_TIMEOUT */ bool (*is_status_io_timeout)(char *buf);/* Check for STATUS_NETWORK_NAME_DELETED */ -void (*is_network_name_deleted)(char *buf,struct TCP_Server_Info *srv); +bool (*is_network_name_deleted)(char *buf,struct TCP_Server_Info *srv); };struct smb_version_values {
fs/smb/client/connect.c +8 -3
@@ -1233,9 +1233,14 @@ cifs_demultiplex_thread(void *p)if (mids[i] !=NULL ) { mids[i]->resp_buf_size = server->pdu_size; -if (bufs[i] && server->ops->is_network_name_deleted) - server->ops->is_network_name_deleted (bufs[i], - server); +if (bufs[i] !=NULL ) { +if (server->ops->is_network_name_deleted && + server->ops->is_network_name_deleted (bufs[i], + server)) { +cifs_server_dbg (FYI , +"Share deleted. Reconnect needed" ); + } + }if (!mids[i]->multiRsp || mids[i]->multiEnd) mids[i]->callback (mids[i]);
fs/smb/client/smb2ops.c +5 -3
@@ -2391,7 +2391,7 @@ smb2_is_status_io_timeout(char *buf)return false; } -static void +static bool smb2_is_network_name_deleted (char *buf,struct TCP_Server_Info *server) {struct smb2_hdr *shdr = (struct smb2_hdr *)buf;
@@ -2400,7 +2400,7 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server)struct cifs_tcon *tcon;if (shdr->Status !=STATUS_NETWORK_NAME_DELETED ) -return ; +return false;/* If server is a channel, select the primary channel */ pserver =CIFS_SERVER_IS_CHAN (server) ? server->primary_server : server;
@@ -2415,11 +2415,13 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server)spin_unlock (&cifs_tcp_ses_lock);pr_warn_once ("Server share %s deleted.\n" , tcon->tree_name); -return ; +return true; } } }spin_unlock (&cifs_tcp_ses_lock); + +return false; } static int
Signature · 1 line
2.34.1
Re: [PATCH 2/2] cifs: is_network_name_deleted should return a bool
should we have a dynamic trace point for this event as well?
Quoted 92 lines · Shyam Prasad N
Currently,
is_network_name_deletedand it's implementations do not return anything if the network name did get deleted. So the function doesn't fully achieve what it advertizes.Changed the function to return a bool instead. It will now return true if the error returned is
STATUS_NETWORK_NAME_DELETEDand the share (tree id) was found to be connected. It returns false otherwise.Signed-off-by Shyam Prasad N <[email protected]>--- fs/smb/client/cifsglob.h | 2 +- fs/smb/client/connect.c | 11 ++++++++--- fs/smb/client/smb2ops.c | 8 +++++--- 3 files changed, 14 insertions(+), 7 deletions(-)fs/smb/client/cifsglob.h +1
-1@@ -532,7 +532,7 @@ struct smb_version_operations {/* Check for STATUS_IO_TIMEOUT */ bool (*is_status_io_timeout)(char *buf);/* Check for STATUS_NETWORK_NAME_DELETED */ -void (*is_network_name_deleted)(char *buf,struct TCP_Server_Info *srv); +bool (*is_network_name_deleted)(char *buf,struct TCP_Server_Info *srv); };struct smb_version_values {fs/smb/client/connect.c +8
-3@@ -1233,9 +1233,14 @@ cifs_demultiplex_thread(void *p)if (mids[i] !=NULL ) { mids[i]->resp_buf_size = server->pdu_size; -if (bufs[i] && server->ops->is_network_name_deleted) - server->ops->is_network_name_deleted (bufs[i], - server); +if (bufs[i] !=NULL ) { +if (server->ops->is_network_name_deleted && + server->ops->is_network_name_deleted (bufs[i], + server)) { +cifs_server_dbg (FYI , +"Share deleted. Reconnect needed" ); + } + }if (!mids[i]->multiRsp || mids[i]->multiEnd) mids[i]->callback (mids[i]);fs/smb/client/smb2ops.c +5
-4@@ -2391,7 +2391,7 @@ smb2_is_status_io_timeout(char *buf)return false; } -static void +static bool smb2_is_network_name_deleted (char *buf,struct TCP_Server_Info *server) {struct smb2_hdr *shdr = (struct smb2_hdr *)buf;@@ -2400,7 +2400,7 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server)struct cifs_tcon *tcon;if (shdr->Status !=STATUS_NETWORK_NAME_DELETED ) -return ; +return false;/* If server is a channel, select the primary channel */ pserver =CIFS_SERVER_IS_CHAN (server) ? server->primary_server : server;@@ -2415,11 +2415,13 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server)spin_unlock (&cifs_tcp_ses_lock);pr_warn_once ("Server share %s deleted.\n" , tcon->tree_name); -return ; +return true; } } }spin_unlock (&cifs_tcp_ses_lock); + +return false; } static int --2.34.1
Signature · 3 lines
Thanks, Steve
Re: [PATCH 2/2] cifs: is_network_name_deleted should return a bool
Quoted 2 lines · Steve French
should we have a dynamic trace point for this event as well?
We do print the status returned from the server in smb3_cmd_err. So strictly speaking we don't loose this info.
But we can have a tracepoint to make it jump out.
Quoted 100 lines · Shyam Prasad N
Quoted 90 lines
Currently,
is_network_name_deletedand it's implementations do not return anything if the network name did get deleted. So the function doesn't fully achieve what it advertizes.Changed the function to return a bool instead. It will now return true if the error returned is
STATUS_NETWORK_NAME_DELETEDand the share (tree id) was found to be connected. It returns false otherwise.Signed-off-by Shyam Prasad N <[email protected]>--- fs/smb/client/cifsglob.h | 2 +- fs/smb/client/connect.c | 11 ++++++++--- fs/smb/client/smb2ops.c | 8 +++++--- 3 files changed, 14 insertions(+), 7 deletions(-)fs/smb/client/cifsglob.h +1
-1@@ -532,7 +532,7 @@ struct smb_version_operations {/* Check for STATUS_IO_TIMEOUT */ bool (*is_status_io_timeout)(char *buf);/* Check for STATUS_NETWORK_NAME_DELETED */ -void (*is_network_name_deleted)(char *buf,struct TCP_Server_Info *srv); +bool (*is_network_name_deleted)(char *buf,struct TCP_Server_Info *srv); };struct smb_version_values {fs/smb/client/connect.c +8
-3@@ -1233,9 +1233,14 @@ cifs_demultiplex_thread(void *p)if (mids[i] !=NULL ) { mids[i]->resp_buf_size = server->pdu_size; -if (bufs[i] && server->ops->is_network_name_deleted) - server->ops->is_network_name_deleted (bufs[i], - server); +if (bufs[i] !=NULL ) { +if (server->ops->is_network_name_deleted && + server->ops->is_network_name_deleted (bufs[i], + server)) { +cifs_server_dbg (FYI , +"Share deleted. Reconnect needed" ); + } + }if (!mids[i]->multiRsp || mids[i]->multiEnd) mids[i]->callback (mids[i]);fs/smb/client/smb2ops.c +5
-4@@ -2391,7 +2391,7 @@ smb2_is_status_io_timeout(char *buf)return false; } -static void +static bool smb2_is_network_name_deleted (char *buf,struct TCP_Server_Info *server) {struct smb2_hdr *shdr = (struct smb2_hdr *)buf;@@ -2400,7 +2400,7 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server)struct cifs_tcon *tcon;if (shdr->Status !=STATUS_NETWORK_NAME_DELETED ) -return ; +return false;/* If server is a channel, select the primary channel */ pserver =CIFS_SERVER_IS_CHAN (server) ? server->primary_server : server;@@ -2415,11 +2415,13 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server)spin_unlock (&cifs_tcp_ses_lock);pr_warn_once ("Server share %s deleted.\n" , tcon->tree_name); -return ; +return true; } } }spin_unlock (&cifs_tcp_ses_lock); + +return false; } static int --Quoted 2 lines
2.34.1
--
Thanks,Steve
Signature · 2 lines
Regards, Shyam
Re: [PATCH 2/2] cifs: is_network_name_deleted should return a bool
In reply to Shyam Prasad Ntentatively merged into cifs-2.6.git for-next pending testing (e.g.
http://smb311-linux-testing.southcentralus.cloudapp.azure.com/#/builders/1/builds/72)
Quoted 92 lines · Shyam Prasad N
Currently,
is_network_name_deletedand it's implementations do not return anything if the network name did get deleted. So the function doesn't fully achieve what it advertizes.Changed the function to return a bool instead. It will now return true if the error returned is
STATUS_NETWORK_NAME_DELETEDand the share (tree id) was found to be connected. It returns false otherwise.Signed-off-by Shyam Prasad N <[email protected]>--- fs/smb/client/cifsglob.h | 2 +- fs/smb/client/connect.c | 11 ++++++++--- fs/smb/client/smb2ops.c | 8 +++++--- 3 files changed, 14 insertions(+), 7 deletions(-)fs/smb/client/cifsglob.h +1
-1@@ -532,7 +532,7 @@ struct smb_version_operations {/* Check for STATUS_IO_TIMEOUT */ bool (*is_status_io_timeout)(char *buf);/* Check for STATUS_NETWORK_NAME_DELETED */ -void (*is_network_name_deleted)(char *buf,struct TCP_Server_Info *srv); +bool (*is_network_name_deleted)(char *buf,struct TCP_Server_Info *srv); };struct smb_version_values {fs/smb/client/connect.c +8
-3@@ -1233,9 +1233,14 @@ cifs_demultiplex_thread(void *p)if (mids[i] !=NULL ) { mids[i]->resp_buf_size = server->pdu_size; -if (bufs[i] && server->ops->is_network_name_deleted) - server->ops->is_network_name_deleted (bufs[i], - server); +if (bufs[i] !=NULL ) { +if (server->ops->is_network_name_deleted && + server->ops->is_network_name_deleted (bufs[i], + server)) { +cifs_server_dbg (FYI , +"Share deleted. Reconnect needed" ); + } + }if (!mids[i]->multiRsp || mids[i]->multiEnd) mids[i]->callback (mids[i]);fs/smb/client/smb2ops.c +5
-4@@ -2391,7 +2391,7 @@ smb2_is_status_io_timeout(char *buf)return false; } -static void +static bool smb2_is_network_name_deleted (char *buf,struct TCP_Server_Info *server) {struct smb2_hdr *shdr = (struct smb2_hdr *)buf;@@ -2400,7 +2400,7 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server)struct cifs_tcon *tcon;if (shdr->Status !=STATUS_NETWORK_NAME_DELETED ) -return ; +return false;/* If server is a channel, select the primary channel */ pserver =CIFS_SERVER_IS_CHAN (server) ? server->primary_server : server;@@ -2415,11 +2415,13 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server)spin_unlock (&cifs_tcp_ses_lock);pr_warn_once ("Server share %s deleted.\n" , tcon->tree_name); -return ; +return true; } } }spin_unlock (&cifs_tcp_ses_lock); + +return false; } static int --2.34.1
Signature · 3 lines
Thanks, Steve