From patchwork Tue Mar 5 01:30:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10838847 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 974CD1390 for ; Tue, 5 Mar 2019 01:31:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85D2C2B783 for ; Tue, 5 Mar 2019 01:31:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A1292B79D; Tue, 5 Mar 2019 01:31:25 +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 238932B783 for ; Tue, 5 Mar 2019 01:31:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726434AbfCEBbY (ORCPT ); Mon, 4 Mar 2019 20:31:24 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:40088 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726095AbfCEBbY (ORCPT ); Mon, 4 Mar 2019 20:31:24 -0500 Received: by mail-it1-f196.google.com with SMTP id l139so1880445ita.5 for ; Mon, 04 Mar 2019 17:31:23 -0800 (PST) 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=nZRhqCSGAmuqPoKC3r6VvDIcMWODu7nvIwDgDx3PHGU=; b=XyWbUYLRF+jrk5TBB19U2x0WaVYpD0I92D4hpknETYgn0Hc5bBCf2L+2jiNjaAaiwH f8XuWZXObWWVliukZe0JzT4XMlmCRNTbzuZ/BZvFMrLhIaas3PrYaAoHLC67aCPrq6Ml +v9KrXdmuiFdybkttJPPI2V6prLJ1obmekUa0TjdJJid9wlFETnr56dM11V0NVZhnypW XyY7gxEuiqcBnADVCsiNcQnNeCAdZHcqitUnEVU6t05Ogkdu+UGydqtXl6FhxDkXP69O 4mXR+wyMR5NDOBJQAYVhDekEMHR7/y64UBm1Wssqr3WkTPE1aOhPqlLW2Wb8qTvQpw59 qptA== 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=nZRhqCSGAmuqPoKC3r6VvDIcMWODu7nvIwDgDx3PHGU=; b=GC1UD41k9hkEDxYfQ76Au1xCCoUvnlf/7ULbiOnys0x6WtZhdmkm26G0nRsikQsoFg Qqw8DO3n6d4QBzrZJO6llK+UAsfzIhW0Y2iZp7/mpsj+W8lednP4WXNm/4tzUaHHFQgB 7X0yBRWfCLqskMPlaTc4wHoYO1zcWZ3q4K+KUigY11fwn7f8ZteNrHLn+iswlnRmtyy7 dGHTpVRvyV+LNfFLVsQcziLizY1lxab1IpAtGhODBIVQX+3e4Fkgwin0GQjSY57kaVNx KUTegJpbVOk5hVSjRH1RkLrV71p8cPAplpvwVqIGkuqHho5I0GWVLfbHyX/CJP8JZIAG Cpgw== X-Gm-Message-State: APjAAAX5pW0i/IMgP1TW0Luob4GfJ5wO4vZVb0vh0YL1bpMOslR27H7G EZfOSeN8XLJl9uULMpwNJuDUNHw= X-Google-Smtp-Source: APXvYqwq5hK+N14TwCsKPYYkK3byMJQbwiiQIXmtsmht9IW8YhGhzvy9QCgmzbkZ9qUao0JavPdmdg== X-Received: by 2002:a24:73c5:: with SMTP id y188mr1325577itb.147.1551749482884; Mon, 04 Mar 2019 17:31:22 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id f26sm2901058ioh.1.2019.03.04.17.31.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Mar 2019 17:31:22 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] SUNRPC: Prevent thundering herd when the socket is not connected Date: Mon, 4 Mar 2019 20:30:14 -0500 Message-Id: <20190305013015.30109-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 socket is not connected, then we want to initiate a reconnect rather that trying to transmit requests. If there is a large number of requests queued and waiting for the lock in call_transmit(), then it can take a while for one of the to loop back and retake the lock in call_connect. Fixes: 89f90fe1ad8b ("SUNRPC: Allow calls to xprt_transmit() to drain...") Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 241e8423fd0c..e7ae75a045c9 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2003,6 +2003,12 @@ call_transmit(struct rpc_task *task) if (test_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate)) { if (!xprt_prepare_transmit(task)) return; + /* Check that the connection is OK */ + if (!xprt_connected(task->tk_xprt) || + !xprt_bound(task->tk_xprt)) { + task->tk_action = call_bind; + return; + } xprt_transmit(task); } task->tk_action = call_transmit_status; From patchwork Tue Mar 5 01:30:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10838849 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 48C44180E for ; Tue, 5 Mar 2019 01:31:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 363182B783 for ; Tue, 5 Mar 2019 01:31:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A81F2B79D; Tue, 5 Mar 2019 01:31:26 +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 CBFBF2B783 for ; Tue, 5 Mar 2019 01:31:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726522AbfCEBbZ (ORCPT ); Mon, 4 Mar 2019 20:31:25 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:41985 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726095AbfCEBbZ (ORCPT ); Mon, 4 Mar 2019 20:31:25 -0500 Received: by mail-io1-f66.google.com with SMTP id p196so5628659iod.9 for ; Mon, 04 Mar 2019 17:31:24 -0800 (PST) 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=GT2NTjVieipaYxdj4Jm8L8IE5XDhQwWkWagSf1ZCfWc=; b=AK84iRrxdc61An6HwQv1XPZWWg6HQRbDZdn8raiGwjzdBi/PeaSJY02w5BOQhXuVys f1eVAbBfYrpRPQvnqTMlKVB5AqAZ0TW7iPQ8GWkW/NqAPsKjwK8q2/uRNGVRU8umhjat wXVVHuskk/lcjy5jLslB83mvmxZgjyo5f2GrJ4FvkXmn5ItAsCKtJ8q9bCqolD/iWxXn JENtAIufcfin979DeTR7uLMIgjPDJn7gr+wdFM85aSx+5I184bG4jJSttl57/X34zxNk uA1A9ZzTtPQn/yo7OoHp6rPJ99q7IVeNvL7CoS04LWOL7AFVQwwxcdauz3NeVhPfDjL0 xkLg== 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=GT2NTjVieipaYxdj4Jm8L8IE5XDhQwWkWagSf1ZCfWc=; b=WGMQNKF+EIssyl+dMhYFSsGYr52oWy7vebAaPlcW4LnqZ2ItPsQVchAGCxVhEgfKqO J7F5CmDpMxE/q98LZByVBPNwyTLDV64QC7RqBQeKhsmd3R31wVV52dWOi1q0FjLYAVFz c86OMNSd88C7otfeP1oZhvtcTdNiaIHKco3FaiTagK9ELYEvNPFPUjX8vRG+BmXlFYp2 c9JNRXI+OeHUjyvxTH8VunU0JWmeCOEt140YxV8h84bjUR1zfsGAoUzg5cmKiuQf4VM7 nN88t0OyDyZ/Vh3dCZ92QediYYCS/b+bFB9CMQuYy+IaP77earY6O8kviFrkf2arf3Oa CzCg== X-Gm-Message-State: APjAAAXDHjLxjKJZbA8kILxxXX4+Ou9mw1nfnW7et0sgu10x5PQi1GRT 1/MlwBOzAnHutdWgbotSGTLuwNk= X-Google-Smtp-Source: APXvYqy0T0OJQrFAENuKHYvL1qTa2/087tumIHT9DInHYzZ9Ju9YiDWMJUNqlgg9b56yiwT/Wl16og== X-Received: by 2002:a6b:cf0b:: with SMTP id o11mr11606124ioa.227.1551749483921; Mon, 04 Mar 2019 17:31:23 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id f26sm2901058ioh.1.2019.03.04.17.31.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Mar 2019 17:31:23 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] SUNRPC: Micro-optimisation to avoid call_bind+call_commit Date: Mon, 4 Mar 2019 20:30:15 -0500 Message-Id: <20190305013015.30109-2-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305013015.30109-1-trond.myklebust@hammerspace.com> References: <20190305013015.30109-1-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 Most tasks should not have to deal with disconnected or unbound socket states, so let's move them out of the common state machine path. Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index e7ae75a045c9..8678a05192d3 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1807,7 +1807,7 @@ call_encode(struct rpc_task *task) xprt_request_enqueue_receive(task); xprt_request_enqueue_transmit(task); out: - task->tk_action = call_bind; + task->tk_action = call_transmit; } /*