Commit 6b147ea7 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

xprtrdma: Add an rpcrdma_mr_completion_class 



I found it confusing that the MR_EVENT class displays the mr.id but
the associated COMPLETION_EVENT class displays a cid (that happens
to contain the mr.id!). To make it a little easier on humans who
have to read and interpret these events, create an MR_COMPLETION
class that displays the mr.id in the same way as the MR_EVENT class.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 4ddd0fc3

include/trace/events/rpcrdma.h

+44 −4
Original line number Diff line number Diff line
@@ -60,6 +60,46 @@ DECLARE_EVENT_CLASS(rpcrdma_completion_class, 
				),					\

				TP_ARGS(wc, cid))



DECLARE_EVENT_CLASS(rpcrdma_mr_completion_class,

	TP_PROTO(

		const struct ib_wc *wc,

		const struct rpc_rdma_cid *cid

	),



	TP_ARGS(wc, cid),



	TP_STRUCT__entry(

		__field(u32, cq_id)

		__field(int, completion_id)

		__field(unsigned long, status)

		__field(unsigned int, vendor_err)

	),



	TP_fast_assign(

		__entry->cq_id = cid->ci_queue_id;

		__entry->completion_id = cid->ci_completion_id;

		__entry->status = wc->status;

		if (wc->status)

			__entry->vendor_err = wc->vendor_err;

		else

			__entry->vendor_err = 0;

	),



	TP_printk("cq.id=%u mr.id=%d status=%s (%lu/0x%x)",

		__entry->cq_id, __entry->completion_id,

		rdma_show_wc_status(__entry->status),

		__entry->status, __entry->vendor_err

	)

);



#define DEFINE_MR_COMPLETION_EVENT(name)				\

		DEFINE_EVENT(rpcrdma_mr_completion_class, name,		\

				TP_PROTO(				\

					const struct ib_wc *wc,		\

					const struct rpc_rdma_cid *cid	\

				),					\

				TP_ARGS(wc, cid))



DECLARE_EVENT_CLASS(rpcrdma_receive_completion_class,

	TP_PROTO(

		const struct ib_wc *wc,
@@ -886,10 +926,10 @@ TRACE_EVENT(xprtrdma_post_linv_err, 
DEFINE_RECEIVE_COMPLETION_EVENT(xprtrdma_wc_receive);



DEFINE_COMPLETION_EVENT(xprtrdma_wc_send);

DEFINE_COMPLETION_EVENT(xprtrdma_wc_fastreg);

DEFINE_COMPLETION_EVENT(xprtrdma_wc_li);

DEFINE_COMPLETION_EVENT(xprtrdma_wc_li_wake);

DEFINE_COMPLETION_EVENT(xprtrdma_wc_li_done);

DEFINE_MR_COMPLETION_EVENT(xprtrdma_wc_fastreg);

DEFINE_MR_COMPLETION_EVENT(xprtrdma_wc_li);

DEFINE_MR_COMPLETION_EVENT(xprtrdma_wc_li_wake);

DEFINE_MR_COMPLETION_EVENT(xprtrdma_wc_li_done);



TRACE_EVENT(xprtrdma_frwr_alloc,

	TP_PROTO(