Commit 4b93dab3 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Add unique trace points for posting Local Invalidate WRs 



When adding frwr_unmap_async way back when, I re-used the existing
trace_xprtrdma_post_send() trace point to record the return code
of ib_post_send.

Unfortunately there are some cases where re-using that trace point
causes a crash. Instead, construct a trace point specific to posting
Local Invalidate WRs that will always be safe to use in that context,
and will act as a trace log eye-catcher for Local Invalidation.

Fixes: 84756894 ("xprtrdma: Remove fr_state")
Fixes: d8099fed ("xprtrdma: Reduce context switching due ... ")
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarBill Baker <bill.baker@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent bf7ca707

include/trace/events/rpcrdma.h

+25 −0
Original line number Diff line number Diff line
@@ -735,6 +735,31 @@ TRACE_EVENT(xprtrdma_post_recvs, 
	)

);



TRACE_EVENT(xprtrdma_post_linv,

	TP_PROTO(

		const struct rpcrdma_req *req,

		int status

	),



	TP_ARGS(req, status),



	TP_STRUCT__entry(

		__field(const void *, req)

		__field(int, status)

		__field(u32, xid)

	),



	TP_fast_assign(

		__entry->req = req;

		__entry->status = status;

		__entry->xid = be32_to_cpu(req->rl_slot.rq_xid);

	),



	TP_printk("req=%p xid=0x%08x status=%d",

		__entry->req, __entry->xid, __entry->status

	)

);



/**

 ** Completion events

 **/

net/sunrpc/xprtrdma/frwr_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -570,7 +570,6 @@ void frwr_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req) 
	 */

	bad_wr = NULL;

	rc = ib_post_send(r_xprt->rx_ia.ri_id->qp, first, &bad_wr);

	trace_xprtrdma_post_send(req, rc);



	/* The final LOCAL_INV WR in the chain is supposed to

	 * do the wake. If it was never posted, the wake will
@@ -583,6 +582,7 @@ void frwr_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req) 


	/* Recycle MRs in the LOCAL_INV chain that did not get posted.

	 */

	trace_xprtrdma_post_linv(req, rc);

	while (bad_wr) {

		frwr = container_of(bad_wr, struct rpcrdma_frwr,

				    fr_invwr);
@@ -673,12 +673,12 @@ void frwr_unmap_async(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req) 
	 */

	bad_wr = NULL;

	rc = ib_post_send(r_xprt->rx_ia.ri_id->qp, first, &bad_wr);

	trace_xprtrdma_post_send(req, rc);

	if (!rc)

		return;



	/* Recycle MRs in the LOCAL_INV chain that did not get posted.

	 */

	trace_xprtrdma_post_linv(req, rc);

	while (bad_wr) {

		frwr = container_of(bad_wr, struct rpcrdma_frwr, fr_invwr);

		mr = container_of(frwr, struct rpcrdma_mr, frwr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE