From patchwork Tue Jul 22 14:52:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 4603431 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CBA78C0514 for ; Tue, 22 Jul 2014 14:52:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44A11200F0 for ; Tue, 22 Jul 2014 14:52:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99F4020158 for ; Tue, 22 Jul 2014 14:52:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755362AbaGVOwM (ORCPT ); Tue, 22 Jul 2014 10:52:12 -0400 Received: from mail-ie0-f171.google.com ([209.85.223.171]:55448 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753974AbaGVOwL (ORCPT ); Tue, 22 Jul 2014 10:52:11 -0400 Received: by mail-ie0-f171.google.com with SMTP id at1so8171677iec.16 for ; Tue, 22 Jul 2014 07:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=1siVj3EVgxFZ7//kmuXhx66HVi4vC3DHyXshUnnJmf0=; b=WseLWC7xu1ou27AkFPKUvKWvOO+RZbmGA9CvbfJ5rlecebTzGHkcWqPXXxTWiyCVkO yYKj7WZlGOgdMPnTILinPTZK5p5xEaK/QnwDYYODaA18fvBS0aPwpF3kshQE2ICk96I5 MQ3W2r6AcbFBAdntHtFw83PRYnZ5kJuhj/3Hb9OCO54TJDBlN5cfqmQbFr5e28RTwPSN JDdk7zBvZBePQislmo931ZXuKRFp4TSCUUUZoj4i5cA6iny8rcJAXP2Kl3lxph6Dz9rk e5kF3qH8vkUgiKy7M5TX4QoH6soEzn13TIhV6LRQTHURmdeZ2boUjum6cngoGIOKojwZ uctw== X-Received: by 10.50.43.234 with SMTP id z10mr17280630igl.28.1406040730196; Tue, 22 Jul 2014 07:52:10 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:82ee:73ff:fe43:d64f]) by mx.google.com with ESMTPSA id j5sm49750632ige.12.2014.07.22.07.52.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jul 2014 07:52:09 -0700 (PDT) Subject: [PATCH v4 08/21] xprtrdma: Back off rkey when FAST_REG_MR fails From: Chuck Lever To: Anna.Schumaker@netapp.com Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 22 Jul 2014 10:52:08 -0400 Message-ID: <20140722145208.6010.76678.stgit@manet.1015granger.net> In-Reply-To: <20140722144459.6010.99389.stgit@manet.1015granger.net> References: <20140722144459.6010.99389.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-3-g7d0f MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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, revert the rkey update to avoid subsequent IB_WC_MW_BIND_ERR completions. Suggested-by: Steve Wise Signed-off-by: Chuck Lever Tested-by: Shirley Ma Tested-by: Devesh Sharma --- include/rdma/ib_verbs.h | 11 +++++++++++ net/sunrpc/xprtrdma/verbs.c | 12 +++++------- 2 files changed, 16 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/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 7ccef34..c5c7ec6 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -2479,6 +2479,17 @@ static inline u32 ib_inc_rkey(u32 rkey) } /** + * ib_dec_rkey - decrements the key portion of the given rkey. Can be used + * when recovering from a local immediate error. + * @rkey - the rkey to decrement. + */ +static inline u32 ib_dec_rkey(u32 rkey) +{ + const u32 mask = 0x000000ff; + return ((rkey - 1) & mask) | (rkey & ~mask); +} + +/** * ib_alloc_mw - Allocates a memory window. * @pd: The protection domain associated with the memory window. * @type: The type of the memory window (1 or 2). diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 8bb7945..394b13f 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -1497,13 +1497,12 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, struct rpcrdma_frmr *frmr = &mw->r.frmr; struct ib_mr *mr = frmr->fr_mr; struct ib_send_wr invalidate_wr, frmr_wr, *bad_wr, *post_wr; - - u8 key; int len, pageoff; int i, rc; int seg_len; u64 pa; int page_no; + u32 rkey; pageoff = offset_in_page(seg1->mr_offset); seg1->mr_offset -= pageoff; /* start of page */ @@ -1558,14 +1557,11 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, rc = -EIO; goto out_err; } - - /* Bump the key */ - key = (u8)(mr->rkey & 0x000000FF); - ib_update_fast_reg_key(mr, ++key); - frmr_wr.wr.fast_reg.access_flags = (writing ? IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE : IB_ACCESS_REMOTE_READ); + rkey = ib_inc_rkey(mr->rkey); + ib_update_fast_reg_key(mr, rkey); frmr_wr.wr.fast_reg.rkey = mr->rkey; DECR_CQCOUNT(&r_xprt->rx_ep); @@ -1574,6 +1570,8 @@ 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); + rkey = ib_dec_rkey(mr->rkey); + ib_update_fast_reg_key(mr, rkey); goto out_err; } else { seg1->mr_rkey = mr->rkey;