From patchwork Mon Sep 17 13:03:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10602711 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 00B9C15A6 for ; Mon, 17 Sep 2018 13:04:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9ACA299C8 for ; Mon, 17 Sep 2018 13:04:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD8F829B63; Mon, 17 Sep 2018 13:04:34 +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 90E87299C8 for ; Mon, 17 Sep 2018 13:04:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728319AbeIQSbs (ORCPT ); Mon, 17 Sep 2018 14:31:48 -0400 Received: from mail-qt0-f181.google.com ([209.85.216.181]:36252 "EHLO mail-qt0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728299AbeIQSbs (ORCPT ); Mon, 17 Sep 2018 14:31:48 -0400 Received: by mail-qt0-f181.google.com with SMTP id t5-v6so15140801qtn.3 for ; Mon, 17 Sep 2018 06:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PtLejsEj5kgl+8KNIPWqKWssmft3nQkgRTZeP9/zR5E=; b=hCyefZmre87B2b0I8rSaceCPUBJATcPhRAhDveFUcFLZI+9c/A7XmiOYZ4q/6jE8Lm dwT+/Y6jKbKMP5QGfkNo8eDCp0d6K1TlY7sMh1p4tYyxSBJ9+FNxGAifAvR98BDgVXpW 9oG8I/VJSttM9JFVlAomV6EhdxBa7I+duuScnQ5q6a/LRUZzgaBtF/ILsr33SGkqG1Us IbVSloNy4KWl7vmRijI3AtkN9jcbXTvIQS23W/2+EQFLuYH7q5szauS95WqSY/bD6FMN Sq4LRzu2tRQMXe8wPaBLb8dWc7aD9qim81fw77DUn1AG8hiLIFzWZ099SCw0ek/LLvFw GTBA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=PtLejsEj5kgl+8KNIPWqKWssmft3nQkgRTZeP9/zR5E=; b=TQAURdhQ02dXIrA5tz+li+/pWNs0FeWZ4lywJUTh7B4DnLJX+NZJR9Y9DchLW1C/ai B+4AW3Hau1nAKo1U3G4k/Hp8iwe+wvsqqK7plnBmZewBz5fS5TecSUyZfpOmfxDJNseQ cJrWv++Pe8RLm+QBICpwLVsBVeHJYbFve4S2Buc4sgfFj+PGEX5F1UAEfBKbPO4KNQiM C+3OHELLR9hoU4TjJnT5o7QsnCs00tmubcn1Cd5S89SpiQ56ie5lUqafTBJumBNON7Om xQS1QikVqv5wixHwKFvHs24YhSCfbJ6ua3Pgm5GcBZCZXKuwpaQbgffjSsbDqDFzKdCA iBPQ== X-Gm-Message-State: APzg51CyA1SdifY/gQ1TGjiTMsBg/MJY/BT4vwkWGODdTkZPvk49VbcB X0z32rWQQKenCRUfBa8UmZzkhtGfdA== X-Google-Smtp-Source: ANB0VdYCjMWR1TOFwEd5Ieg99JDyaWSieuc7V872ZN/R9osMP3y1919OMc7v0txgJIsnmncZW0QQfQ== X-Received: by 2002:aed:237a:: with SMTP id i55-v6mr17358145qtc.263.1537189472104; Mon, 17 Sep 2018 06:04:32 -0700 (PDT) Received: from leira.trondhjem.org.localdomain ([66.187.232.65]) by smtp.gmail.com with ESMTPSA id q1-v6sm10499607qkl.31.2018.09.17.06.04.30 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 06:04:31 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 30/44] SUNRPC: Allow soft RPC calls to time out when waiting for the XPRT_LOCK Date: Mon, 17 Sep 2018 09:03:21 -0400 Message-Id: <20180917130335.112832-31-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917130335.112832-30-trond.myklebust@hammerspace.com> References: <20180917130335.112832-1-trond.myklebust@hammerspace.com> <20180917130335.112832-2-trond.myklebust@hammerspace.com> <20180917130335.112832-3-trond.myklebust@hammerspace.com> <20180917130335.112832-4-trond.myklebust@hammerspace.com> <20180917130335.112832-5-trond.myklebust@hammerspace.com> <20180917130335.112832-6-trond.myklebust@hammerspace.com> <20180917130335.112832-7-trond.myklebust@hammerspace.com> <20180917130335.112832-8-trond.myklebust@hammerspace.com> <20180917130335.112832-9-trond.myklebust@hammerspace.com> <20180917130335.112832-10-trond.myklebust@hammerspace.com> <20180917130335.112832-11-trond.myklebust@hammerspace.com> <20180917130335.112832-12-trond.myklebust@hammerspace.com> <20180917130335.112832-13-trond.myklebust@hammerspace.com> <20180917130335.112832-14-trond.myklebust@hammerspace.com> <20180917130335.112832-15-trond.myklebust@hammerspace.com> <20180917130335.112832-16-trond.myklebust@hammerspace.com> <20180917130335.112832-17-trond.myklebust@hammerspace.com> <20180917130335.112832-18-trond.myklebust@hammerspace.com> <20180917130335.112832-19-trond.myklebust@hammerspace.com> <20180917130335.112832-20-trond.myklebust@hammerspace.com> <20180917130335.112832-21-trond.myklebust@hammerspace.com> <20180917130335.112832-22-trond.myklebust@hammerspace.com> <20180917130335.112832-23-trond.myklebust@hammerspace.com> <20180917130335.112832-24-trond.myklebust@hammerspace.com> <20180917130335.112832-25-trond.myklebust@hammerspace.com> <20180917130335.112832-26-trond.myklebust@hammerspace.com> <20180917130335.112832-27-trond.myklebust@hammerspace.com> <20180917130335.112832-28-trond.myklebust@hammerspace.com> <20180917130335.112832-29-trond.myklebust@hammerspace.com> <20180917130335.112832-30-trond.myklebust@hammerspace.com> 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 This no longer causes them to lose their place in the transmission queue. Signed-off-by: Trond Myklebust --- net/sunrpc/xprt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index ae1109c7b9b4..a523e59a074e 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -195,7 +195,7 @@ int xprt_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task) out_sleep: dprintk("RPC: %5u failed to lock transport %p\n", task->tk_pid, xprt); - task->tk_timeout = 0; + task->tk_timeout = RPC_IS_SOFT(task) ? req->rq_timeout : 0; task->tk_status = -EAGAIN; if (req == NULL) priority = RPC_PRIORITY_LOW; @@ -274,7 +274,7 @@ int xprt_reserve_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task) xprt_clear_locked(xprt); out_sleep: dprintk("RPC: %5u failed to lock transport %p\n", task->tk_pid, xprt); - task->tk_timeout = 0; + task->tk_timeout = RPC_IS_SOFT(task) ? req->rq_timeout : 0; task->tk_status = -EAGAIN; if (req == NULL) priority = RPC_PRIORITY_LOW;