Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f2311f5 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Remove pr_err() call sites from completion handlers 



Clean up: rely on the trace points instead.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 86c4ccd9

net/sunrpc/xprtrdma/frwr_ops.c

+4 −19
Original line number Original line Diff line number Diff line
@@ -297,15 +297,6 @@ size_t frwr_maxpages(struct rpcrdma_xprt *r_xprt) 
		     (ia->ri_max_segs - 2) * ia->ri_max_frwr_depth);

		     (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

 * frwr_wc_fastreg - Invoked by RDMA provider for a flushed FastReg WC

 * @cq:	completion queue (ignored)

 * @cq:	completion queue (ignored)
@@ -320,10 +311,8 @@ frwr_wc_fastreg(struct ib_cq *cq, struct ib_wc *wc) 
			container_of(cqe, struct rpcrdma_frwr, fr_cqe);

			container_of(cqe, struct rpcrdma_frwr, fr_cqe);





	/* WARNING: Only wr_cqe and status are reliable at this point */

	/* 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->fr_state = FRWR_FLUSHED_FR;

		__frwr_sendcompletion_flush(wc, "fastreg");

	}

	trace_xprtrdma_wc_fastreg(wc, frwr);

	trace_xprtrdma_wc_fastreg(wc, frwr);

}

}
@@ -341,10 +330,8 @@ frwr_wc_localinv(struct ib_cq *cq, struct ib_wc *wc) 
						 fr_cqe);

						 fr_cqe);





	/* WARNING: Only wr_cqe and status are reliable at this point */

	/* 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->fr_state = FRWR_FLUSHED_LI;

		__frwr_sendcompletion_flush(wc, "localinv");

	}

	trace_xprtrdma_wc_li(wc, frwr);

	trace_xprtrdma_wc_li(wc, frwr);

}

}
@@ -363,12 +350,10 @@ frwr_wc_localinv_wake(struct ib_cq *cq, struct ib_wc *wc) 
						 fr_cqe);

						 fr_cqe);





	/* WARNING: Only wr_cqe and status are reliable at this point */

	/* 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->fr_state = FRWR_FLUSHED_LI;

		__frwr_sendcompletion_flush(wc, "localinv");

	}

	complete(&frwr->fr_linv_done);

	trace_xprtrdma_wc_li_wake(wc, frwr);

	trace_xprtrdma_wc_li_wake(wc, frwr);

	complete(&frwr->fr_linv_done);

}

}





/**

/**

net/sunrpc/xprtrdma/verbs.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -135,11 +135,6 @@ rpcrdma_wc_send(struct ib_cq *cq, struct ib_wc *wc) 




	/* WARNING: Only wr_cqe and status are reliable at this point */

	/* WARNING: Only wr_cqe and status are reliable at this point */

	trace_xprtrdma_wc_send(sc, wc);

	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);

	rpcrdma_sendctx_put_locked(sc);

}

}
@@ -177,10 +172,6 @@ rpcrdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc) 
	return;

	return;





out_flushed:

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);

	rpcrdma_recv_buffer_put(rep);

}

}