All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v2 19/21] xprtrdma: Remove pr_err() call sites from completion handlers
Date: Tue, 16 Apr 2019 09:38:32 -0400	[thread overview]
Message-ID: <20190416133832.23113.34456.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20190416133156.23113.91846.stgit@manet.1015granger.net>

Clean up: rely on the trace points instead.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 net/sunrpc/xprtrdma/frwr_ops.c |   23 ++++-------------------
 net/sunrpc/xprtrdma/verbs.c    |    9 ---------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index 1d369b6..794ba4c 100644
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -297,15 +297,6 @@ size_t frwr_maxpages(struct rpcrdma_xprt *r_xprt)
 		     (ia->ri_max_segs - 2) * ia->ri_max_frwr_depth);
 }
 
-static void
-__frwr_sendcompletion_flush(struct ib_wc *wc, const char *wr)
-{
-	if (wc->status != IB_WC_WR_FLUSH_ERR)
-		pr_err("rpcrdma: %s: %s (%u/0x%x)\n",
-		       wr, ib_wc_status_msg(wc->status),
-		       wc->status, wc->vendor_err);
-}
-
 /**
  * frwr_wc_fastreg - Invoked by RDMA provider for a flushed FastReg WC
  * @cq:	completion queue (ignored)
@@ -320,10 +311,8 @@ size_t frwr_maxpages(struct rpcrdma_xprt *r_xprt)
 			container_of(cqe, struct rpcrdma_frwr, fr_cqe);
 
 	/* WARNING: Only wr_cqe and status are reliable at this point */
-	if (wc->status != IB_WC_SUCCESS) {
+	if (wc->status != IB_WC_SUCCESS)
 		frwr->fr_state = FRWR_FLUSHED_FR;
-		__frwr_sendcompletion_flush(wc, "fastreg");
-	}
 	trace_xprtrdma_wc_fastreg(wc, frwr);
 }
 
@@ -341,10 +330,8 @@ size_t frwr_maxpages(struct rpcrdma_xprt *r_xprt)
 						 fr_cqe);
 
 	/* WARNING: Only wr_cqe and status are reliable at this point */
-	if (wc->status != IB_WC_SUCCESS) {
+	if (wc->status != IB_WC_SUCCESS)
 		frwr->fr_state = FRWR_FLUSHED_LI;
-		__frwr_sendcompletion_flush(wc, "localinv");
-	}
 	trace_xprtrdma_wc_li(wc, frwr);
 }
 
@@ -363,12 +350,10 @@ size_t frwr_maxpages(struct rpcrdma_xprt *r_xprt)
 						 fr_cqe);
 
 	/* WARNING: Only wr_cqe and status are reliable at this point */
-	if (wc->status != IB_WC_SUCCESS) {
+	if (wc->status != IB_WC_SUCCESS)
 		frwr->fr_state = FRWR_FLUSHED_LI;
-		__frwr_sendcompletion_flush(wc, "localinv");
-	}
-	complete(&frwr->fr_linv_done);
 	trace_xprtrdma_wc_li_wake(wc, frwr);
+	complete(&frwr->fr_linv_done);
 }
 
 /**
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 0d0c335..fcbcd4a 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -135,11 +135,6 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt)
 
 	/* WARNING: Only wr_cqe and status are reliable at this point */
 	trace_xprtrdma_wc_send(sc, wc);
-	if (wc->status != IB_WC_SUCCESS && wc->status != IB_WC_WR_FLUSH_ERR)
-		pr_err("rpcrdma: Send: %s (%u/0x%x)\n",
-		       ib_wc_status_msg(wc->status),
-		       wc->status, wc->vendor_err);
-
 	rpcrdma_sendctx_put_locked(sc);
 }
 
@@ -177,10 +172,6 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt)
 	return;
 
 out_flushed:
-	if (wc->status != IB_WC_WR_FLUSH_ERR)
-		pr_err("rpcrdma: Recv: %s (%u/0x%x)\n",
-		       ib_wc_status_msg(wc->status),
-		       wc->status, wc->vendor_err);
 	rpcrdma_recv_buffer_put(rep);
 }
 


  parent reply	other threads:[~2019-04-16 13:38 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-16 13:36 [PATCH v2 00/21] Proposed NFS/RDMA patches for v5.2 Chuck Lever
2019-04-16 13:36 ` [PATCH v2 01/21] SUNRPC: Avoid digging into the ATOMIC pool Chuck Lever
2019-04-16 13:37 ` [PATCH v2 02/21] xprtrdma: Fix an frwr_map recovery nit Chuck Lever
2019-04-16 13:37 ` [PATCH v2 03/21] xprtrdma: Clean up rpcrdma_create_req() Chuck Lever
2019-04-16 13:37 ` [PATCH v2 04/21] xprtrdma: Clean up rpcrdma_create_rep() and rpcrdma_destroy_rep() Chuck Lever
2019-04-16 13:37 ` [PATCH v2 05/21] xprtrdma: rpcrdma_regbuf alignment Chuck Lever
2019-04-16 13:37 ` [PATCH v2 06/21] xprtrdma: Allocate req's regbufs at xprt create time Chuck Lever
2019-04-16 13:37 ` [PATCH v2 07/21] xprtrdma: De-duplicate "allocate new, free old regbuf" Chuck Lever
2019-04-16 13:37 ` [PATCH v2 08/21] xprtrdma: Clean up regbuf helpers Chuck Lever
2019-04-16 13:37 ` [PATCH v2 09/21] xprtrdma: Backchannel can use GFP_KERNEL allocations Chuck Lever
2019-04-16 13:37 ` [PATCH v2 10/21] xprtrdma: Increase maximum number of backchannel request Chuck Lever
2019-04-16 13:37 ` [PATCH v2 11/21] xprtrdma: Trace marshaling failures Chuck Lever
2019-04-16 13:37 ` [PATCH v2 12/21] xprtrdma: Clean up sendctx functions Chuck Lever
2019-04-16 13:38 ` [PATCH v2 13/21] xprtrdma: More Send completion batching Chuck Lever
2019-04-16 13:38 ` [PATCH v2 14/21] xprtrdma: Eliminate rpcrdma_ia::ri_device Chuck Lever
2019-04-16 13:38 ` [PATCH v2 15/21] SUNRPC: Update comments based on recent changes Chuck Lever
2019-04-16 13:38 ` [PATCH v2 16/21] xprtrdma: Remove rpcrdma_create_data_internal::rsize and wsize Chuck Lever
2019-04-16 13:38 ` [PATCH v2 17/21] xprtrdma: Aggregate the inline settings in struct rpcrdma_ep Chuck Lever
2019-04-16 13:38 ` [PATCH v2 18/21] xprtrdma: Eliminate struct rpcrdma_create_data_internal Chuck Lever
2019-04-16 13:38 ` Chuck Lever [this message]
2019-04-16 13:38 ` [PATCH v2 20/21] xprtrdma: Update comments that reference ib_drain_qp Chuck Lever
2019-04-16 13:38 ` [PATCH v2 21/21] xprtrdma: Remove stale comment Chuck Lever

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190416133832.23113.34456.stgit@manet.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.