From patchwork Sat Mar 23 15:59:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10866869 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 48CB4139A for ; Sat, 23 Mar 2019 16:02:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 243DB296F2 for ; Sat, 23 Mar 2019 16:02:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1247729C3E; Sat, 23 Mar 2019 16:02:40 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 9BED8296F2 for ; Sat, 23 Mar 2019 16:02:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727526AbfCWQCi (ORCPT ); Sat, 23 Mar 2019 12:02:38 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:55615 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727298AbfCWQCi (ORCPT ); Sat, 23 Mar 2019 12:02:38 -0400 Received: by mail-it1-f196.google.com with SMTP id z126so7905503itd.5 for ; Sat, 23 Mar 2019 09:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uJyEfztZDd1sv3Ok/PqOr9k1S8uMgnBCG5cZDPOhzkI=; b=kuo/KB4+OZ6E/q6VvuUGPay9bvPm+cEYfi4f4yYiGyWoZi3hqUageLzOev3zuFEs+3 NEzh3p0MqEcXhE2mxXpeA9KU0RHNV0hfzrPpmxUnETh+iQmVO33vtHCjLyYptFNRIL7g bTozNQf04ce4lCO9VOkw0Zn/A53R2mWl6zQfcpo4flA9ZN//7UeBWBc00ULVUw6B4t66 Kc8/Kvox094hZD/GhbT57H7b1Py9xEOO3IhbI/WCzwpBHjSnlVbKPHFDjd8cBGL/fClm 8VwAQ4xq5u1ownziVJ4NlhmVGQCSXwmruzyZdgSNXB+Zjl7/I++1+C0reE+YoraLXueh 2+aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uJyEfztZDd1sv3Ok/PqOr9k1S8uMgnBCG5cZDPOhzkI=; b=LUxpNcWJVAh71VUlGlhVz2nHwx8I3VXjE6jswM7n/6ANtOIj3JmF8rRHO5l8FOM2U6 /t6d0/savXSRaZugTRHCN3t8VXlYNwTwA89p9cKhFqw0XDKajFO2AGlg18UAZnwaQ8Wm zadNzuHKF4M9IoDwX+LlVy/N2dq5WcnVs6FUbEpo2FF22QOuWgCcoT8tuefn4GgYh2B6 CPJomSusjD5B94zi67S5mwoD8EacgG0c63rWitnovELZwgtMo64Wgt4B3HbbGYP0p5LK UpyQ5fPGJuQaBFFCxL4MHBqMEZdX+7GYY4tSQUNMIGChnNCOVfXN+HaDgJgtkWmuCtdk wShg== X-Gm-Message-State: APjAAAWtD+SsdxWvGDXJVJ9tGUfHG6pC6eI1BsrndZHhIURK5/OC77Bd QCdKZzWl3x1i8vQaO523UPdXeb8= X-Google-Smtp-Source: APXvYqxXlqyhhPaSIiJXVmxXH/tY2GcGsOk9ZxtWY2SUF4Tn1JcvCsjeld+NNipdNWi8kde7N8/NlQ== X-Received: by 2002:a24:4355:: with SMTP id s82mr5062945itb.176.1553356957047; Sat, 23 Mar 2019 09:02:37 -0700 (PDT) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id u13sm4272473iog.80.2019.03.23.09.02.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Mar 2019 09:02:36 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2] SUNRPC: Don't let RPC_SOFTCONN tasks time out if the transport is connected Date: Sat, 23 Mar 2019 11:59:10 -0400 Message-Id: <20190323155910.23092-1-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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 If the transport is still connected, then we do want to allow RPC_SOFTCONN tasks to retry. They should time out if and only if the connection is broken. Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 228970e6e52b..187d10443a15 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2311,6 +2311,15 @@ call_status(struct rpc_task *task) rpc_exit(task, status); } +static bool +rpc_check_connected(const struct rpc_rqst *req) +{ + /* No allocated request or transport? return true */ + if (!req || !req->rq_xprt) + return true; + return xprt_connected(req->rq_xprt); +} + static void rpc_check_timeout(struct rpc_task *task) { @@ -2322,10 +2331,11 @@ rpc_check_timeout(struct rpc_task *task) dprintk("RPC: %5u call_timeout (major)\n", task->tk_pid); task->tk_timeouts++; - if (RPC_IS_SOFTCONN(task)) { + if (RPC_IS_SOFTCONN(task) && !rpc_check_connected(task->tk_rqstp)) { rpc_exit(task, -ETIMEDOUT); return; } + if (RPC_IS_SOFT(task)) { if (clnt->cl_chatty) { printk(KERN_NOTICE "%s: server %s not responding, timed out\n",