From patchwork Wed Nov 9 19:06:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9420085 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 A7F196048E for ; Wed, 9 Nov 2016 19:06:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99A22292D6 for ; Wed, 9 Nov 2016 19:06:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D116293C4; Wed, 9 Nov 2016 19:06: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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 20896292D6 for ; Wed, 9 Nov 2016 19:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753309AbcKITGi (ORCPT ); Wed, 9 Nov 2016 14:06:38 -0500 Received: from mail-it0-f67.google.com ([209.85.214.67]:34162 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752325AbcKITGi (ORCPT ); Wed, 9 Nov 2016 14:06:38 -0500 Received: by mail-it0-f67.google.com with SMTP id q124so23819097itd.1; Wed, 09 Nov 2016 11:06:37 -0800 (PST) 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=4IYtjKQSiybxddDF4yr/vU0uPgDl5YFwzNprDi3PHyM=; b=upKclFg1esJN6+8HuE1onlbG06oihie5coZkcB8tVOCckkSwCwm/XCb2auoTuPqYsb LrRYw76hllFvD5YApzrDuBmCM5V2OPFdW2y1g0jpZ8kwzJSc2PNRlO23YXocfLbstzei mzMRkiOwlNOnvV5KBfGJfZOX3rJQfnO0IQ6gy0No4lZfRAlBpI8L5XV+szZj/+pBXvVj ksXuQJvNrTlMReiNOf/tmuCc/TbM/vdqggCELYfMKSJ3eheCngvIaCIlUaOgvFC4BiMJ HwEhlYRDXh4Xi3RYOnUlR0nAylG5/T0+bpQNOEcNRNuS5MIf5zt+HtIyJ3sY9LcRqC0T +PyQ== 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=4IYtjKQSiybxddDF4yr/vU0uPgDl5YFwzNprDi3PHyM=; b=i8l0h7GdcGeUCWBh12A3DKYTAFLypD+K0QGeF+rol2oz4MlXaYJ7GqW8wOpmln1GYI KIfCvfARd4J9mWq85L9n/O2rBv3IsGngIIc3Qqz/e2RpRD8JeQG31vVx1KsqgY5N0vIB AooqV0wdU3mtWnrlNTlK28/oD5SIFdvtPNKm9T6udGsz82DcPHtoPUCHbCVdQjlapnG5 tpgjuHO9jp0Cx+qTJ/JOge9R4n2YOv7vnGS5anMeg0YI505zpWdk17KNFW1apNFiQcqe AOGpsfufhwOdA0xqfFLP6G3Irwit6pZAeN/79x/lpm9zt8V6yUoFu+K2kyNuae1RSa96 UPBw== X-Gm-Message-State: ABUngve9Y+yCUNmIkco5QQdWT1ROEWTgiHT89iggStgMzy4eYX6pyJpL87ufaT4MREYr9g== X-Received: by 10.36.0.17 with SMTP id 17mr1333192ita.85.1478718397096; Wed, 09 Nov 2016 11:06:37 -0800 (PST) Received: from manet.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:1dce]) by smtp.gmail.com with ESMTPSA id v74sm577693ioi.2.2016.11.09.11.06.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Nov 2016 11:06:36 -0800 (PST) Subject: [PATCH v1 13/14] xprtrdma: Refactor FRMR invalidation From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Wed, 09 Nov 2016 14:06:36 -0500 Message-ID: <20161109190636.15007.70567.stgit@manet.1015granger.net> In-Reply-To: <20161109184735.15007.96507.stgit@manet.1015granger.net> References: <20161109184735.15007.96507.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: After some recent updates, clarifications can be made to the FRMR invalidation logic. - Both the remote and local invalidation case mark the frmr INVALID, so make that a common path. - Manage the WR list more "tastefully" by replacing the conditional that discriminates between the list head and ->next pointers. - Use mw->mw_handle in all cases, since that has the same value as f->fr_mr->rkey, and is already in cache. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/frwr_ops.c | 57 +++++++++++++++------------------------- 1 file changed, 21 insertions(+), 36 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/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c index e99bf61..900dc40 100644 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@ -457,26 +457,6 @@ return -ENOTCONN; } -static struct ib_send_wr * -__frwr_prepare_linv_wr(struct rpcrdma_mw *mw) -{ - struct rpcrdma_frmr *f = &mw->frmr; - struct ib_send_wr *invalidate_wr; - - dprintk("RPC: %s: invalidating frmr %p\n", __func__, f); - - f->fr_state = FRMR_IS_INVALID; - invalidate_wr = &f->fr_invwr; - - memset(invalidate_wr, 0, sizeof(*invalidate_wr)); - f->fr_cqe.done = frwr_wc_localinv; - invalidate_wr->wr_cqe = &f->fr_cqe; - invalidate_wr->opcode = IB_WR_LOCAL_INV; - invalidate_wr->ex.invalidate_rkey = f->fr_mr->rkey; - - return invalidate_wr; -} - /* Invalidate all memory regions that were registered for "req". * * Sleeps until it is safe for the host CPU to access the @@ -487,7 +467,7 @@ static void frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req) { - struct ib_send_wr *invalidate_wrs, *pos, *prev, *bad_wr; + struct ib_send_wr *first, **prev, *last, *bad_wr; struct rpcrdma_rep *rep = req->rl_reply; struct rpcrdma_ia *ia = &r_xprt->rx_ia; struct rpcrdma_mw *mw, *tmp; @@ -503,23 +483,28 @@ */ f = NULL; count = 0; - invalidate_wrs = pos = prev = NULL; + prev = &first; list_for_each_entry(mw, &req->rl_registered, mw_list) { + mw->frmr.fr_state = FRMR_IS_INVALID; + if ((rep->rr_wc_flags & IB_WC_WITH_INVALIDATE) && - (mw->mw_handle == rep->rr_inv_rkey)) { - mw->frmr.fr_state = FRMR_IS_INVALID; + (mw->mw_handle == rep->rr_inv_rkey)) continue; - } - pos = __frwr_prepare_linv_wr(mw); + f = &mw->frmr; + dprintk("RPC: %s: invalidating frmr %p\n", + __func__, f); + + f->fr_cqe.done = frwr_wc_localinv; + last = &f->fr_invwr; + memset(last, 0, sizeof(*last)); + last->wr_cqe = &f->fr_cqe; + last->opcode = IB_WR_LOCAL_INV; + last->ex.invalidate_rkey = mw->mw_handle; count++; - if (!invalidate_wrs) - invalidate_wrs = pos; - else - prev->next = pos; - prev = pos; - f = &mw->frmr; + *prev = last; + prev = &last->next; } if (!f) goto unmap; @@ -528,7 +513,7 @@ * last WR in the chain completes, all WRs in the chain * are complete. */ - f->fr_invwr.send_flags = IB_SEND_SIGNALED; + last->send_flags = IB_SEND_SIGNALED; f->fr_cqe.done = frwr_wc_localinv_wake; reinit_completion(&f->fr_linv_done); @@ -543,7 +528,7 @@ * unless ri_id->qp is a valid pointer. */ r_xprt->rx_stats.local_inv_needed++; - rc = ib_post_send(ia->ri_id->qp, invalidate_wrs, &bad_wr); + rc = ib_post_send(ia->ri_id->qp, first, &bad_wr); if (rc) goto reset_mrs; @@ -554,7 +539,7 @@ */ unmap: list_for_each_entry_safe(mw, tmp, &req->rl_registered, mw_list) { - dprintk("RPC: %s: unmapping frmr %p\n", + dprintk("RPC: %s: DMA unmapping frmr %p\n", __func__, &mw->frmr); list_del_init(&mw->mw_list); ib_dma_unmap_sg(ia->ri_device, @@ -572,7 +557,7 @@ */ list_for_each_entry(mw, &req->rl_registered, mw_list) { f = &mw->frmr; - if (mw->frmr.fr_mr->rkey == bad_wr->ex.invalidate_rkey) { + if (mw->mw_handle == bad_wr->ex.invalidate_rkey) { __frwr_reset_mr(ia, mw); bad_wr = bad_wr->next; }