From patchwork Sat Nov 27 13:01:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 361252 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oARD1lJs003235 for ; Sat, 27 Nov 2010 13:01:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752501Ab0K0NBp (ORCPT ); Sat, 27 Nov 2010 08:01:45 -0500 Received: from mail-gw0-f46.google.com ([74.125.83.46]:50265 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752284Ab0K0NBo (ORCPT ); Sat, 27 Nov 2010 08:01:44 -0500 Received: by mail-gw0-f46.google.com with SMTP id 20so1318079gwj.19 for ; Sat, 27 Nov 2010 05:01:44 -0800 (PST) Received: by 10.100.11.3 with SMTP id 3mr2442375ank.260.1290862904574; Sat, 27 Nov 2010 05:01:44 -0800 (PST) Received: from salusa.poochiereds.net (cpe-071-070-153-003.nc.res.rr.com [71.70.153.3]) by mx.google.com with ESMTPS id i10sm3280877anh.32.2010.11.27.05.01.43 (version=SSLv3 cipher=RC4-MD5); Sat, 27 Nov 2010 05:01:43 -0800 (PST) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH 12/14] cifs: reconnect unresponsive servers Date: Sat, 27 Nov 2010 08:01:24 -0500 Message-Id: <1290862886-2914-13-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1290862886-2914-1-git-send-email-jlayton@redhat.com> References: <1290862886-2914-1-git-send-email-jlayton@redhat.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 27 Nov 2010 13:01:51 +0000 (UTC) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 9c90f1d..ece7275 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -55,6 +55,9 @@ /* SMB echo every 60s -- FIXME: tunable? */ #define SMB_ECHO_INTERVAL (60 * HZ) +/* reconnect if no response from server in this time period */ +#define UNRESPONSIVE_SERVER_TIMEOUT (5 * 60 * HZ) + extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24); @@ -183,6 +186,7 @@ cifs_reconnect(struct TCP_Server_Info *server) kfree(server->session_key.response); server->session_key.response = NULL; server->session_key.len = 0; + server->lstrp = jiffies; INIT_LIST_HEAD(&dispose); spin_lock(&GlobalMid_Lock); @@ -436,6 +440,16 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) smb_msg.msg_control = NULL; smb_msg.msg_controllen = 0; pdu_length = 4; /* enough to get RFC1001 header */ + + if (time_after(jiffies, + server->lstrp + UNRESPONSIVE_SERVER_TIMEOUT)) { + cFYI(1, "Reconnecting unresponsive server %s", + server->hostname); + cifs_reconnect(server); + csocket = server->ssocket; + wake_up(&server->response_q); + continue; + } incomplete_rcv: length = kernel_recvmsg(csocket, &smb_msg, @@ -597,6 +611,8 @@ incomplete_rcv: } mid_entry = NULL; + server->lstrp = jiffies; + spin_lock(&GlobalMid_Lock); list_for_each(tmp, &server->pending_mid_q) { mid_entry = list_entry(tmp, struct mid_q_entry, qhead); @@ -647,10 +663,6 @@ multi_t2_fnd: #ifdef CONFIG_CIFS_STATS2 mid_entry->when_received = jiffies; #endif - /* so we do not time out requests to server - which is still responding (since server could - be busy but not dead) */ - server->lstrp = jiffies; break; } next_mid: @@ -1704,6 +1716,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info) volume_info->target_rfc1001_name, RFC1001_NAME_LEN_WITH_NULL); tcp_ses->session_estab = false; tcp_ses->sequence_number = 0; + tcp_ses->lstrp = jiffies; INIT_LIST_HEAD(&tcp_ses->tcp_ses_list); INIT_LIST_HEAD(&tcp_ses->smb_ses_list); INIT_DELAYED_WORK(&tcp_ses->echo, cifs_echo_request);