From patchwork Mon Jun 23 22:40:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 4405271 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 60E6F9F387 for ; Mon, 23 Jun 2014 22:40:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67D212018E for ; Mon, 23 Jun 2014 22:40:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F15C20218 for ; Mon, 23 Jun 2014 22:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751583AbaFWWkJ (ORCPT ); Mon, 23 Jun 2014 18:40:09 -0400 Received: from mail-ig0-f169.google.com ([209.85.213.169]:60630 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbaFWWkJ (ORCPT ); Mon, 23 Jun 2014 18:40:09 -0400 Received: by mail-ig0-f169.google.com with SMTP id c1so3716995igq.2 for ; Mon, 23 Jun 2014 15:40:08 -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-type:content-transfer-encoding; bh=MKSFBviBYd3H0g/uef8Spv1uVZCjdwz+/uIY4uBEWoU=; b=PG6ryfSIkSBh4wo4ZTk9W62pPlhp+87KxilJFg+UhzfKThO6BG3a7VrL86tf7EF8pV tr6pfNMEU5xgfeZoQWFYRAnPey4Oyw3mcMR90WbKmt6j7ebXzbVA4uq8ONmImy4E/dSI vO5vX3LSLVWVAveE/EwlpAv8bD+enPCDB0f/GOVSEZZteh7fS/j13lyiouI/j+Fsi4D/ B21j/gJfh+6HVuiR1kSPnbNk5bX0E2UjQajRSeBA4XuGUh3mU4q01MlfH1aqplQ0guDK 2TVqFkGkGS3fnjPyYQoWZ60atAx37JhwZdVq5gzhd3a6zTN/lFJTwSu4JrJN8b8l5pUE 7tzw== X-Received: by 10.42.98.145 with SMTP id s17mr5796653icn.73.1403563208118; Mon, 23 Jun 2014 15:40:08 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:82ee:73ff:fe43:d64f]) by mx.google.com with ESMTPSA id pm8sm8798955igb.2.2014.06.23.15.40.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2014 15:40:07 -0700 (PDT) Subject: [PATCH v1 08/13] xprtrdma: Back off rkey when FAST_REG_MR fails From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Mon, 23 Jun 2014 18:40:07 -0400 Message-ID: <20140623224007.1634.55636.stgit@manet.1015granger.net> In-Reply-To: <20140623223201.1634.83888.stgit@manet.1015granger.net> References: <20140623223201.1634.83888.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-3-g7d0f MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If posting a FAST_REG_MR Work Reqeust fails, or the FAST_REG WR flushes, revert the rkey update to avoid subsequent IB_WC_MW_BIND_ERR completions. Suggested-by: Steve Wise Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" 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 cef67fd..3efc007 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -61,6 +61,8 @@ # define RPCDBG_FACILITY RPCDBG_TRANS #endif +static void rpcrdma_decrement_frmr_rkey(struct rpcrdma_mw *); + /* * internal functions */ @@ -154,13 +156,17 @@ rpcrdma_sendcq_process_wc(struct ib_wc *wc) if (wrid == 0) return; - if (wc->status != IB_WC_SUCCESS) - return; fastreg = test_and_clear_bit(RPCRDMA_BIT_FASTREG, &wrid); mw = (struct rpcrdma_mw *)wrid; - mw->r.frmr.fr_state = fastreg ? FRMR_IS_VALID : FRMR_IS_INVALID; + if (wc->status == IB_WC_SUCCESS) { + mw->r.frmr.fr_state = fastreg ? + FRMR_IS_VALID : FRMR_IS_INVALID; + } else { + if (fastreg) + rpcrdma_decrement_frmr_rkey(mw); + } } static int @@ -1480,6 +1486,24 @@ rpcrdma_unmap_one(struct rpcrdma_ia *ia, struct rpcrdma_mr_seg *seg) seg->mr_dma, seg->mr_dmalen, seg->mr_dir); } +static void +rpcrdma_increment_frmr_rkey(struct rpcrdma_mw *mw) +{ + struct ib_mr *frmr = mw->r.frmr.fr_mr; + u8 key = frmr->rkey & 0x000000FF; + + ib_update_fast_reg_key(frmr, ++key); +} + +static void +rpcrdma_decrement_frmr_rkey(struct rpcrdma_mw *mw) +{ + struct ib_mr *frmr = mw->r.frmr.fr_mr; + u8 key = frmr->rkey & 0x000000FF; + + ib_update_fast_reg_key(frmr, --key); +} + static int rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, int *nsegs, int writing, struct rpcrdma_ia *ia, @@ -1487,8 +1511,6 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, { struct rpcrdma_mr_seg *seg1 = seg; struct ib_send_wr invalidate_wr, frmr_wr, *bad_wr, *post_wr; - - u8 key; int len, pageoff; int i, rc; int seg_len; @@ -1552,14 +1574,10 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, rc = -EIO; goto out_err; } - - /* Bump the key */ - key = (u8)(seg1->mr_chunk.rl_mw->r.frmr.fr_mr->rkey & 0x000000FF); - ib_update_fast_reg_key(seg1->mr_chunk.rl_mw->r.frmr.fr_mr, ++key); - frmr_wr.wr.fast_reg.access_flags = (writing ? IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE : IB_ACCESS_REMOTE_READ); + rpcrdma_increment_frmr_rkey(seg1->mr_chunk.rl_mw); frmr_wr.wr.fast_reg.rkey = seg1->mr_chunk.rl_mw->r.frmr.fr_mr->rkey; DECR_CQCOUNT(&r_xprt->rx_ep); @@ -1568,6 +1586,7 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, if (rc) { dprintk("RPC: %s: failed ib_post_send for register," " status %i\n", __func__, rc); + rpcrdma_decrement_frmr_rkey(seg1->mr_chunk.rl_mw); goto out_err; } else { seg1->mr_rkey = seg1->mr_chunk.rl_mw->r.frmr.fr_mr->rkey;