From patchwork Wed May 28 14:34:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 4256091 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B91109F1E7 for ; Wed, 28 May 2014 14:34:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9CFF20279 for ; Wed, 28 May 2014 14:34:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CC0E20212 for ; Wed, 28 May 2014 14:34:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932145AbaE1Oen (ORCPT ); Wed, 28 May 2014 10:34:43 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:42629 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932133AbaE1Oen (ORCPT ); Wed, 28 May 2014 10:34:43 -0400 Received: by mail-ie0-f180.google.com with SMTP id tp5so10408822ieb.11 for ; Wed, 28 May 2014 07:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=1gsLq8wclxYa7Vn1rYmgxLiVFh+u+YPsOV53IcaZuag=; b=oW32Jgyc4/QyfKfSq6a2wmxkxBJdT12zyOvZyIpN+2TKAC95My1rgybFagnvFk3R/S /mHgbk0tpHBpuwae+hmu0Z5fnO0veYl1CBzeOgBHiZXOovDMIvbAryruXpcDgrbaGIIa iEJvxUbi4+UP3cuSKwUSZltRZrvSVsEeDWR9MRJ/NTgegDQKuBuQ/mknQnpqcZDJq7sJ 3XB7JUIy5La6JwasO7wQJoxpVi5KkzsjXOTJ+TZHrYwNn6xA5DDL+zp4EsUZI/mn6b40 GSQZYDJKus/Oke534915jd/c+0LAW7/3PhKBi8JZJDA98lF4wy/4rhaL8E3egXwUW2gG pPIg== X-Received: by 10.50.79.194 with SMTP id l2mr29457441igx.23.1401287682428; Wed, 28 May 2014 07:34:42 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:82ee:73ff:fe43:d64f]) by mx.google.com with ESMTPSA id 2sm16211788igs.17.2014.05.28.07.34.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 May 2014 07:34:41 -0700 (PDT) From: Chuck Lever Subject: [PATCH v5 20/24] xprtrdma: Reset connection timeout after successful reconnect To: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org Cc: Anna.Schumaker@netapp.com Date: Wed, 28 May 2014 10:34:41 -0400 Message-ID: <20140528143441.23214.36316.stgit@manet.1015granger.net> In-Reply-To: <20140528142521.23214.39655.stgit@manet.1015granger.net> References: <20140528142521.23214.39655.stgit@manet.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the new connection is able to make forward progress, reset the re-establish timeout. Otherwise it keeps growing even if disconnect events are rare. The same behavior as TCP is adopted: reconnect immediately if the transport instance has been able to make some forward progress. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/rpc_rdma.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index dc4a826..ac65b0c 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -770,6 +770,7 @@ repost: /* from here on, the reply is no longer an orphan */ req->rl_reply = rep; + xprt->reestablish_timeout = 0; /* check for expected message types */ /* The order of some of these tests is important. */