Skip to content

Commit 855982a

Browse files
pcacjrsmfrench
authored andcommitted
smb: client: relax session and tcon reconnect attempts
When the client re-establishes connection to the server, it will queue a worker thread that will attempt to reconnect sessions and tcons on every two seconds, which is kinda overkill as it is a very common scenario when having expired passwords or KRB5 TGT tickets, or deleted shares. Use an exponential backoff strategy to handle session/tcon reconnect attempts in the worker thread to prevent the client from overloading the system when it is very unlikely to re-establish any session/tcon soon while client is idle. Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.org> Reviewed-by: David Howells <dhowells@redhat.com> Cc: Pierguido Lambri <plambri@redhat.com> Cc: linux-cifs@vger.kernel.org Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 4ae4dde commit 855982a

3 files changed

Lines changed: 26 additions & 5 deletions

File tree

fs/smb/client/cifsglob.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,7 @@ struct TCP_Server_Info {
745745
struct session_key session_key;
746746
unsigned long lstrp; /* when we got last response from this server */
747747
unsigned long neg_start; /* when negotiate started (jiffies) */
748+
unsigned long reconn_delay; /* when resched session and tcon reconnect */
748749
struct cifs_secmech secmech; /* crypto sec mech functs, descriptors */
749750
#define CIFS_NEGFLAVOR_UNENCAP 1 /* wct == 17, but no ext_sec */
750751
#define CIFS_NEGFLAVOR_EXTENDED 2 /* wct == 17, ext_sec bit set */
@@ -2292,4 +2293,24 @@ struct cifs_calc_sig_ctx {
22922293
struct shash_desc *shash;
22932294
};
22942295

2296+
#define CIFS_RECONN_DELAY_SECS 30
2297+
#define CIFS_MAX_RECONN_DELAY (4 * CIFS_RECONN_DELAY_SECS)
2298+
2299+
static inline void cifs_queue_server_reconn(struct TCP_Server_Info *server)
2300+
{
2301+
if (!delayed_work_pending(&server->reconnect)) {
2302+
WRITE_ONCE(server->reconn_delay, 0);
2303+
mod_delayed_work(cifsiod_wq, &server->reconnect, 0);
2304+
}
2305+
}
2306+
2307+
static inline void cifs_requeue_server_reconn(struct TCP_Server_Info *server)
2308+
{
2309+
unsigned long delay = READ_ONCE(server->reconn_delay);
2310+
2311+
delay = umin(delay + CIFS_RECONN_DELAY_SECS, CIFS_MAX_RECONN_DELAY);
2312+
WRITE_ONCE(server->reconn_delay, delay);
2313+
queue_delayed_work(cifsiod_wq, &server->reconnect, delay * HZ);
2314+
}
2315+
22952316
#endif /* _CIFS_GLOB_H */

fs/smb/client/connect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ static int __cifs_reconnect(struct TCP_Server_Info *server,
425425
spin_unlock(&server->srv_lock);
426426
cifs_swn_reset_server_dstaddr(server);
427427
cifs_server_unlock(server);
428-
mod_delayed_work(cifsiod_wq, &server->reconnect, 0);
428+
cifs_queue_server_reconn(server);
429429
}
430430
} while (server->tcpStatus == CifsNeedReconnect);
431431

@@ -564,7 +564,7 @@ static int reconnect_dfs_server(struct TCP_Server_Info *server)
564564
spin_unlock(&server->srv_lock);
565565
cifs_swn_reset_server_dstaddr(server);
566566
cifs_server_unlock(server);
567-
mod_delayed_work(cifsiod_wq, &server->reconnect, 0);
567+
cifs_queue_server_reconn(server);
568568
} while (server->tcpStatus == CifsNeedReconnect);
569569

570570
dfs_cache_noreq_update_tgthint(ref_path, target_hint);

fs/smb/client/smb2pdu.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon,
497497
spin_unlock(&ses->ses_lock);
498498

499499
if (smb2_command != SMB2_INTERNAL_CMD)
500-
mod_delayed_work(cifsiod_wq, &server->reconnect, 0);
500+
cifs_queue_server_reconn(server);
501501

502502
atomic_inc(&tconInfoReconnectCount);
503503
out:
@@ -4316,7 +4316,7 @@ void smb2_reconnect_server(struct work_struct *work)
43164316
done:
43174317
cifs_dbg(FYI, "Reconnecting tcons and channels finished\n");
43184318
if (resched)
4319-
queue_delayed_work(cifsiod_wq, &server->reconnect, 2 * HZ);
4319+
cifs_requeue_server_reconn(server);
43204320
mutex_unlock(&pserver->reconnect_mutex);
43214321

43224322
/* now we can safely release srv struct */
@@ -4340,7 +4340,7 @@ SMB2_echo(struct TCP_Server_Info *server)
43404340
server->ops->need_neg(server)) {
43414341
spin_unlock(&server->srv_lock);
43424342
/* No need to send echo on newly established connections */
4343-
mod_delayed_work(cifsiod_wq, &server->reconnect, 0);
4343+
cifs_queue_server_reconn(server);
43444344
return rc;
43454345
}
43464346
spin_unlock(&server->srv_lock);

0 commit comments

Comments
 (0)