Commit 36a55edf authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Clean up trace_xprtrdma_post_linv 



- Replace the display of kernel memory addresses
- Add "_err" to the end of its name to indicate that it's a
  tracepoint that fires only when there's an error

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

include/trace/events/rpcrdma.h

+9 −7
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ TRACE_EVENT(xprtrdma_post_recvs, 
	)

);



TRACE_EVENT(xprtrdma_post_linv,

TRACE_EVENT(xprtrdma_post_linv_err,

	TP_PROTO(

		const struct rpcrdma_req *req,

		int status
@@ -793,19 +793,21 @@ TRACE_EVENT(xprtrdma_post_linv, 
	TP_ARGS(req, status),



	TP_STRUCT__entry(

		__field(const void *, req)

		__field(unsigned int, task_id)

		__field(unsigned int, client_id)

		__field(int, status)

		__field(u32, xid)

	),



	TP_fast_assign(

		__entry->req = req;

		const struct rpc_task *task = req->rl_slot.rq_task;



		__entry->task_id = task->tk_pid;

		__entry->client_id = task->tk_client->cl_clid;

		__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

	TP_printk("task:%u@%u status=%d",

		__entry->task_id, __entry->client_id, __entry->status

	)

);

net/sunrpc/xprtrdma/frwr_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -560,7 +560,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);

	trace_xprtrdma_post_linv_err(req, rc);

	while (bad_wr) {

		frwr = container_of(bad_wr, struct rpcrdma_frwr,

				    fr_invwr);
@@ -660,7 +660,7 @@ void frwr_unmap_async(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);

	trace_xprtrdma_post_linv_err(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