From patchwork Thu Sep 15 14:57:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9333961 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 0717A607FD for ; Thu, 15 Sep 2016 14:57:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0688298E6 for ; Thu, 15 Sep 2016 14:57:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5626298EF; Thu, 15 Sep 2016 14:57:48 +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 E8553298E6 for ; Thu, 15 Sep 2016 14:57:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752262AbcIOO5n (ORCPT ); Thu, 15 Sep 2016 10:57:43 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:35325 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751731AbcIOO5m (ORCPT ); Thu, 15 Sep 2016 10:57:42 -0400 Received: by mail-it0-f68.google.com with SMTP id e20so4696723itc.2; Thu, 15 Sep 2016 07:57:42 -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-transfer-encoding; bh=FpBM2PSDoUxUOver3zW0CpZYTKHO+46iuZZ4H3QC4hc=; b=BmFoQ/By7J9XfsMeVfoE1iGlgpE6np9beuCkzq1MGTpjtLl+anIJwa/7PG9r6JZk4U 81wCCmCs2QzMhKbEC4y/k6ky7hiDx9DvN3fbNEz/UWJFw4ai5JKxSscTT6IMxQYL8UlW MeHY9biUz2B5ql/IalhaTHSI/sy/ewZx6V8cTE258NFZFair+yH0LCQvddX3C79DZk7D V9wcwrXcCvgQrMzAiXHyck34T/YkUbgg9pWTmLmeYU9KwckrfKvzHic4HZgUwxzPMG+c 5GnKl47QKu59VFPapf9DEqDLHkKsc544+9tVw7n67j4me6Z8zsBj/l0qdgyJfIg/Tr5W yAjw== 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:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=FpBM2PSDoUxUOver3zW0CpZYTKHO+46iuZZ4H3QC4hc=; b=FyMgY5Jf2p+oS4B96F0Nd1Rg6RFwhosTpebFgUObke2NaJnWXbANI6ABsQjZc5DHF2 vF8KEGtLCVmuIYMTykVIk8UyrJfLZGGXBGsW/U5l9J2VZeWK8BtG3vD96lcXLKPBM3h7 Xzt1HhTahrzDVjiW3HPeMVr50iUNy9WqdIdg+3QceXC0VRIyPigzXW/nZa6+C1rixDPa etVTC8dYBTxJcAScPJF+2riGQ+VeZq6FadMbkYbPd/3Zq8l98co0GU7xxx7nczmxEG/2 Op0tGsEfoYjkwbki3LgYkKhLUAuDxQDdMFB073R+yXFz5RVX7HoEQzjJoRbG6S4eaeU4 zgoQ== X-Gm-Message-State: AE9vXwN6tsb8EDPgcfM4z1w2FNq24NH+0Y/J8WIieW/6W4Do2qZG28N2QGtWQv3U8b3uJw== X-Received: by 10.107.26.210 with SMTP id a201mr17597536ioa.23.1473951461875; Thu, 15 Sep 2016 07:57:41 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:1dce]) by smtp.gmail.com with ESMTPSA id o188sm1066537itg.11.2016.09.15.07.57.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Sep 2016 07:57:41 -0700 (PDT) Subject: [PATCH v3 20/22] xprtrmda: Report address of frmr, not mw From: Chuck Lever To: anna.schumaker@netapp.com Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Thu, 15 Sep 2016 10:57:40 -0400 Message-ID: <20160915145740.11080.38297.stgit@manet.1015granger.net> In-Reply-To: <20160915143440.11080.89241.stgit@manet.1015granger.net> References: <20160915143440.11080.89241.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 Tie frwr debugging messages together by always reporting the address of the frwr. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/frwr_ops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 e82d5cf..ad70a87 100644 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@ -163,7 +163,7 @@ __frwr_reset_mr(struct rpcrdma_ia *ia, struct rpcrdma_mw *r) return PTR_ERR(f->fr_mr); } - dprintk("RPC: %s: recovered FRMR %p\n", __func__, r); + dprintk("RPC: %s: recovered FRMR %p\n", __func__, f); f->fr_state = FRMR_IS_INVALID; return 0; } @@ -397,7 +397,7 @@ frwr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, goto out_mapmr_err; dprintk("RPC: %s: Using frmr %p to map %u segments (%u bytes)\n", - __func__, mw, mw->mw_nents, mr->length); + __func__, frmr, mw->mw_nents, mr->length); key = (u8)(mr->rkey & 0x000000FF); ib_update_fast_reg_key(mr, ++key); @@ -450,6 +450,8 @@ __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; @@ -532,6 +534,8 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req) */ unmap: list_for_each_entry_safe(mw, tmp, &req->rl_registered, mw_list) { + dprintk("RPC: %s: unmapping frmr %p\n", + __func__, &mw->frmr); list_del_init(&mw->mw_list); ib_dma_unmap_sg(ia->ri_device, mw->mw_sg, mw->mw_nents, mw->mw_dir);