From patchwork Thu Aug 4 13:01:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9263605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5F58F6048F for ; Thu, 4 Aug 2016 13:01:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50FB528330 for ; Thu, 4 Aug 2016 13:01:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4558A28405; Thu, 4 Aug 2016 13:01:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9AEE28406 for ; Thu, 4 Aug 2016 13:01:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933562AbcHDNBv (ORCPT ); Thu, 4 Aug 2016 09:01:51 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:35147 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933543AbcHDNBu (ORCPT ); Thu, 4 Aug 2016 09:01:50 -0400 Received: by mail-it0-f66.google.com with SMTP id f6so19589352ith.2 for ; Thu, 04 Aug 2016 06:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=mJw8QIEtwJQapUMamgo0Yi+62cQ6W7WaCkvglfVH4aw=; b=p2I17TL36TQ7utCsO4hyX78R2HgTPg+KW+ah5zcAsPPAFsbqZhqBsDh9201wuQBfNe RljL+hbPu4fThsy1Vr83hL3zie5kjXQV8Itd0v2zlgtn8hGST29Aak2WTyQq3Y6bnv73 9qDscmkGO4qGcGgfNDFIfS2J3eAOiNR1DYAGotAxZWbYsPMrRLgQvg6KCRNnX6pGnPrm aLbbyNhPjfzJI4pgaN9WXwPvHVJE4HECvkBonfYkVrqgcx2h/E1Xlye04o5Yc/SDdnQp MD7GdnqrWKnYu01fdukumSTXh0gzzdqwhYRF78eLw3ApyiuKfEmZbbyOqF/ch1sNUs7g 0hEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=mJw8QIEtwJQapUMamgo0Yi+62cQ6W7WaCkvglfVH4aw=; b=c6eeDzwf/T/0mIUjCXJbZoYZ78K5IebdtEnDhXscfm0sCpeOf3U6j7UWCROldHLvqZ /b6c3fq0b7wlX4ZprfcpHCoZIdGDhVm2i1Md/U25nJ7HjHM7AdZZqGHHtrE33kaOIPLV uO7OB9fuwEBnfAZ5rBBc9SCCwJH9Khbjp6P3djCXs+z3VUXVdBAb04ro8SroSrPxQy1N CKkk66HSCmYn45LvkekpUO+Zrh/wLJZycZsLpYeLaS9+sjBFMbTaY4afQN/50xMNkxkX z1+/db9AQ5/mXmtL4B8lcadgWPKy0iSY/OPJ0/AUAiBOVIpitZl7xTSz03DloDpAouyx JKVA== X-Gm-Message-State: AEkoousp9TL9jpLAeiiQY1VFbyY7dqgajUninSoKU9pnbm8EJ+l4ZstoHSGFQk6FKEDM5Q== X-Received: by 10.36.104.146 with SMTP id v140mr77177011itb.12.1470315709525; Thu, 04 Aug 2016 06:01:49 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id t68sm1560243ita.1.2016.08.04.06.01.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Aug 2016 06:01:48 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] SUNRPC: Limit the reconnect backoff timer to the max RPC message timeout Date: Thu, 4 Aug 2016 09:01:00 -0400 Message-Id: <1470315660-37206-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470315660-37206-1-git-send-email-trond.myklebust@primarydata.com> References: <1470315660-37206-1-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 5eebf48cffa0..b828695cc647 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2385,6 +2385,17 @@ static unsigned long xs_reconnect_delay(const struct rpc_xprt *xprt) return 0; } +static void xs_reconnect_backoff(struct rpc_xprt *xprt) +{ + xprt->reestablish_timeout <<= 1; + if (xprt->reestablish_timeout > xprt->timeout->to_maxval) + xprt->reestablish_timeout = xprt->timeout->to_maxval; + if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO) + xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO; + if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO) + xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; +} + /** * xs_connect - connect a socket to a remote endpoint * @xprt: pointer to transport structure @@ -2415,12 +2426,8 @@ static void xs_connect(struct rpc_xprt *xprt, struct rpc_task *task) xs_reset_transport(transport); delay = xs_reconnect_delay(xprt); + xs_reconnect_backoff(xprt); - xprt->reestablish_timeout <<= 1; - if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO) - xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; - if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO) - xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO; } else dprintk("RPC: xs_connect scheduled xprt %p\n", xprt);