Message ID | 20180917130335.112832-25-trond.myklebust@hammerspace.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-nfs-owner@kernel.org> 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 444E115A6 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39DEE29B38 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E4D629B66; Mon, 17 Sep 2018 13:04:28 +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 D189029B63 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 17 Sep 2018 13:04:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728293AbeIQSbl (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Mon, 17 Sep 2018 14:31:41 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:33518 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728229AbeIQSbl (ORCPT <rfc822;linux-nfs@vger.kernel.org>); Mon, 17 Sep 2018 14:31:41 -0400 Received: by mail-qt0-f195.google.com with SMTP id r37-v6so15164216qtc.0 for <linux-nfs@vger.kernel.org>; Mon, 17 Sep 2018 06:04:26 -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=j1k48d6eo8E770xad837blPVBanXmiruAB8SEO2Bm3A=; b=Qh/FcjDuoLi/It+2R+5jhkDlQswF2uYDXBGzDu1wrdaeY3ToFm5JIxBtoXxbXiKFTK 1+vUNiZVXI2LsCUPPWGvMCZomyGTKfogXK2v4TZFlMofSYHkyCECn2EiPVWf5rY9xiOc q4e6bNq6sZkGyj8BSm2KjQTX/m9ELlpKM6GieIqdLHE4YodRp29sTNLfvStKgPB9C9O5 tfV5v0t4DefZ+BMJYlP3QZ+FWhTX0BBBe5AuuU6cbvB6JFHLYVcP1PsOorrmYIDTQ8uh XXluMl546jtteUmpFBtroG+dLZXWhE95FJWN+3yR/EfCjRIGeRqjIboi4iXNfpRsC4gL h0VA== 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=j1k48d6eo8E770xad837blPVBanXmiruAB8SEO2Bm3A=; b=gebzzkCEQWIKuC5dwTaENzcEe5hhpEQ4XvkK5BIF6gyPGt5g0Vg+lo8tqL3pgNv7Ay ynyAa7/y8xA+54UbGqYyLse3br5+MgrlLJyDIvGzYnIrJBd8H+OjscQ99k3Eh0WM23Xk ZJbC0lmmkViDDxLdd5O3O1Zkkc10oniSHKc9JfznF8sXwWy8uNkzqx1ro9GmHSsQG2Zc xjjKc/bl7zs6mkBeyeLX0q26+6oJ/ify+HFiM37Nmezlnaf3bRo+5X6ITxWAvqZquowk dsdjWgq5kTD8uxkZUH/1s8YA5nTuQ6/4VYONOwX9lXKktVTMS34+ug/VP5+o3DEqTzo8 O1Fw== X-Gm-Message-State: APzg51DKUN1aMda5kI37RWYGlUXEgaXY7WmWrZpvlZDvmt2+3tJXBQsM BYEJvAx1EWDQH5fyqwoFTr0QacJ3Cg== X-Google-Smtp-Source: ANB0VdZJh2GdLTozLEzg/Gqq452UUhpgsmcYFdNPKNLSjJyn8FBsW/ENd4LWsfAkddAY3p91ZHnfgg== X-Received: by 2002:a0c:ade9:: with SMTP id x38-v6mr17524531qvc.81.1537189465727; Mon, 17 Sep 2018 06:04:25 -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.24 for <linux-nfs@vger.kernel.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 06:04:24 -0700 (PDT) From: Trond Myklebust <trondmy@gmail.com> X-Google-Original-From: Trond Myklebust <trond.myklebust@hammerspace.com> To: linux-nfs@vger.kernel.org Subject: [PATCH v3 24/44] SUNRPC: Simplify xprt_prepare_transmit() Date: Mon, 17 Sep 2018 09:03:15 -0400 Message-Id: <20180917130335.112832-25-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917130335.112832-24-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: <linux-nfs.vger.kernel.org> X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Convert RPC client transmission to a queued model
|
expand
|
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 3b31830ef851..385ee9f64353 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1122,27 +1122,18 @@ bool xprt_prepare_transmit(struct rpc_task *task) { struct rpc_rqst *req = task->tk_rqstp; struct rpc_xprt *xprt = req->rq_xprt; - bool ret = false; dprintk("RPC: %5u xprt_prepare_transmit\n", task->tk_pid); - spin_lock_bh(&xprt->transport_lock); - if (!req->rq_bytes_sent) { - if (req->rq_reply_bytes_recvd) { - task->tk_status = req->rq_reply_bytes_recvd; - goto out_unlock; - } + if (!xprt_lock_write(xprt, task)) { + /* Race breaker: someone may have transmitted us */ if (!test_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate)) - goto out_unlock; - } - if (!xprt->ops->reserve_xprt(xprt, task)) { - task->tk_status = -EAGAIN; - goto out_unlock; + rpc_wake_up_queued_task_set_status(&xprt->sending, + task, 0); + return false; + } - ret = true; -out_unlock: - spin_unlock_bh(&xprt->transport_lock); - return ret; + return true; } void xprt_end_transmit(struct rpc_task *task)
Remove the checks for whether or not we need to transmit, and whether or not a reply has been received. Those are already handled in call_transmit() itself. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> --- net/sunrpc/xprt.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)