From patchwork Tue Aug 23 17:53:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9296081 X-Patchwork-Delegate: Trond.Myklebust@netapp.com 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 9A4D160CF6 for ; Tue, 23 Aug 2016 17:55:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EFEC28A4D for ; Tue, 23 Aug 2016 17:55:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83EE328C95; Tue, 23 Aug 2016 17:55:13 +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=unavailable 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 3699628A4D for ; Tue, 23 Aug 2016 17:55:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754566AbcHWRzH (ORCPT ); Tue, 23 Aug 2016 13:55:07 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:36361 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752910AbcHWRy3 (ORCPT ); Tue, 23 Aug 2016 13:54:29 -0400 Received: by mail-it0-f68.google.com with SMTP id j124so8825756ith.3; Tue, 23 Aug 2016 10:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=td9+K0aDIv0/ZFNDQHaPNA96JBkqtFwG9aYZ8bfZTbo=; b=u3Gc0HVNJB55xh9Bk/NUYwspJ1tC3nUNKxmeADEBNhJ3TAmxqWG/6HFWAZnKoTLNd3 NV2tM6O7eFq758UGGJk1iSLVg62lLuSq/j08eS8Tzga6+rC+1Fbc1IVq0psW+p0IBPiN CpqEL06Rx1fK2KroJONOeL/2xj8Apm4SYNuyfuOcyDOTW0FSaIVMI0BFCsv2Mgjh353K YfhdCiWdG51jBR7v4Jj60UXZCX+77+2bkNhoWmdAgsJvYM50kdyxae+VucFq6lc7ePeL ILBT6k4muarCPfmb34pI3pJRCVRJ0YyauQCyZENrLU7Zk3xH2JyWgRp5OJgDmnbc2Xeh vDkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=td9+K0aDIv0/ZFNDQHaPNA96JBkqtFwG9aYZ8bfZTbo=; b=eSfBG9U4FnZ2vEjjY6eb2wfdS6qdrBblmHKn02d0w9qMJYEhC9jHoWpgEVyhLIFi3m 123xtGPq339EBeUAH7goWBeRy2gfLK0p4tA943V9SbdHnpBh2q5ZOgAPwIfZJoELd8iY eX9Q2BNofuVPLlgyAOhJ87vUIrQ3/fFuEaS0HNkBUQ7tx57ktPt2cNPhJuwjQi5IEIQ6 B373iXf9rXzAyQ+fDLUN6aVBQHMG7Cja9bF8GkZ6w9xKLH2Nv/UNJIgjmBn6aWMvECiv iLlx9xDvEZYFZmIayZtuK1eOW9ieZSmYE6I/WmcDpHGv/jjijrDC/3okHWVKUrs1iQkU A5OA== X-Gm-Message-State: AEkoouuqMH+Qix/Fy92JRJ5/0S/CxSI0UJddOTrV7VbYYj/9ieNc1QczCLlvuv3GQD1Wjg== X-Received: by 10.107.159.147 with SMTP id i141mr29943104ioe.29.1471974839443; Tue, 23 Aug 2016 10:53:59 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:1dce]) by smtp.gmail.com with ESMTPSA id n190sm1752799ion.42.2016.08.23.10.53.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Aug 2016 10:53:59 -0700 (PDT) Subject: [PATCH v2 14/22] xprtrdma: Move recv_wr to struct rpcrdma_rep From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 23 Aug 2016 13:53:58 -0400 Message-ID: <20160823175358.13038.86278.stgit@manet.1015granger.net> In-Reply-To: <20160823174402.13038.84561.stgit@manet.1015granger.net> References: <20160823174402.13038.84561.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty 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 Clean up: The fields in the recv_wr do not vary. There is no need to initialize them before each ib_post_recv(). This removes a large-ish data structure from the stack. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 13 ++++++------- net/sunrpc/xprtrdma/xprt_rdma.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index d5e88ee..edc81ac 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -879,6 +879,10 @@ rpcrdma_create_rep(struct rpcrdma_xprt *r_xprt) rep->rr_cqe.done = rpcrdma_receive_wc; rep->rr_rxprt = r_xprt; INIT_WORK(&rep->rr_work, rpcrdma_receive_worker); + rep->rr_recv_wr.next = NULL; + rep->rr_recv_wr.wr_cqe = &rep->rr_cqe; + rep->rr_recv_wr.sg_list = &rep->rr_rdmabuf->rg_iov; + rep->rr_recv_wr.num_sge = 1; return rep; out_free: @@ -1283,17 +1287,12 @@ int rpcrdma_ep_post_recv(struct rpcrdma_ia *ia, struct rpcrdma_rep *rep) { - struct ib_recv_wr recv_wr, *recv_wr_fail; + struct ib_recv_wr *recv_wr_fail; int rc; - recv_wr.next = NULL; - recv_wr.wr_cqe = &rep->rr_cqe; - recv_wr.sg_list = &rep->rr_rdmabuf->rg_iov; - recv_wr.num_sge = 1; - if (!rpcrdma_dma_map_regbuf(ia, rep->rr_rdmabuf)) goto out_map; - rc = ib_post_recv(ia->ri_id->qp, &recv_wr, &recv_wr_fail); + rc = ib_post_recv(ia->ri_id->qp, &rep->rr_recv_wr, &recv_wr_fail); if (rc) goto out_postrecv; return 0; diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h index a6a0336..4ca9cf5 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h @@ -189,6 +189,7 @@ struct rpcrdma_rep { struct rpcrdma_xprt *rr_rxprt; struct work_struct rr_work; struct list_head rr_list; + struct ib_recv_wr rr_recv_wr; struct rpcrdma_regbuf *rr_rdmabuf; };