Commit 7703db97 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Display the task ID when reporting MR events 



Tie each MR event to the requesting rpc_task to make it easier to
follow MR ownership and control flow.

MR unmapping and recycling can happen in the background, after an
MR's mr_req field is stale, so set up a separate tracepoint class
for those events.

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

include/trace/events/rpcrdma.h

+58 −38
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ TRACE_DEFINE_ENUM(DMA_NONE); 
				{ DMA_FROM_DEVICE, "FROM_DEVICE" },	\

				{ DMA_NONE, "NONE" })



DECLARE_EVENT_CLASS(xprtrdma_mr,

DECLARE_EVENT_CLASS(xprtrdma_mr_class,

	TP_PROTO(

		const struct rpcrdma_mr *mr

	),
@@ -282,6 +282,8 @@ DECLARE_EVENT_CLASS(xprtrdma_mr, 
	TP_ARGS(mr),



	TP_STRUCT__entry(

		__field(unsigned int, task_id)

		__field(unsigned int, client_id)

		__field(u32, mr_id)

		__field(int, nents)

		__field(u32, handle)
@@ -291,6 +293,11 @@ DECLARE_EVENT_CLASS(xprtrdma_mr, 
	),



	TP_fast_assign(

		const struct rpcrdma_req *req = mr->mr_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->mr_id  = mr->frwr.fr_mr->res.id;

		__entry->nents  = mr->mr_nents;

		__entry->handle = mr->mr_handle;
@@ -299,7 +306,8 @@ DECLARE_EVENT_CLASS(xprtrdma_mr, 
		__entry->dir    = mr->mr_dir;

	),



	TP_printk("mr.id=%u nents=%d %u@0x%016llx:0x%08x (%s)",

	TP_printk("task:%u@%u mr.id=%u nents=%d %u@0x%016llx:0x%08x (%s)",

		__entry->task_id, __entry->client_id,

		__entry->mr_id, __entry->nents, __entry->length,

		(unsigned long long)__entry->offset, __entry->handle,

		xprtrdma_show_direction(__entry->dir)
@@ -307,7 +315,48 @@ DECLARE_EVENT_CLASS(xprtrdma_mr, 
);



#define DEFINE_MR_EVENT(name)						\

		DEFINE_EVENT(xprtrdma_mr, xprtrdma_mr_##name, \

		DEFINE_EVENT(xprtrdma_mr_class,				\

				xprtrdma_mr_##name,			\

				TP_PROTO(				\

					const struct rpcrdma_mr *mr	\

				),					\

				TP_ARGS(mr))



DECLARE_EVENT_CLASS(xprtrdma_anonymous_mr_class,

	TP_PROTO(

		const struct rpcrdma_mr *mr

	),



	TP_ARGS(mr),



	TP_STRUCT__entry(

		__field(u32, mr_id)

		__field(int, nents)

		__field(u32, handle)

		__field(u32, length)

		__field(u64, offset)

		__field(u32, dir)

	),



	TP_fast_assign(

		__entry->mr_id  = mr->frwr.fr_mr->res.id;

		__entry->nents  = mr->mr_nents;

		__entry->handle = mr->mr_handle;

		__entry->length = mr->mr_length;

		__entry->offset = mr->mr_offset;

		__entry->dir    = mr->mr_dir;

	),



	TP_printk("mr.id=%u nents=%d %u@0x%016llx:0x%08x (%s)",

		__entry->mr_id, __entry->nents, __entry->length,

		(unsigned long long)__entry->offset, __entry->handle,

		xprtrdma_show_direction(__entry->dir)

	)

);



#define DEFINE_ANON_MR_EVENT(name)					\

		DEFINE_EVENT(xprtrdma_anonymous_mr_class,		\

				xprtrdma_mr_##name,			\

				TP_PROTO(				\

					const struct rpcrdma_mr *mr	\

				),					\
@@ -516,35 +565,6 @@ TRACE_EVENT(xprtrdma_createmrs, 
	)

);



TRACE_EVENT(xprtrdma_mr_get,

	TP_PROTO(

		const struct rpcrdma_req *req

	),



	TP_ARGS(req),



	TP_STRUCT__entry(

		__field(const void *, req)

		__field(unsigned int, task_id)

		__field(unsigned int, client_id)

		__field(u32, xid)

	),



	TP_fast_assign(

		const struct rpc_rqst *rqst = &req->rl_slot;



		__entry->req = req;

		__entry->task_id = rqst->rq_task->tk_pid;

		__entry->client_id = rqst->rq_task->tk_client->cl_clid;

		__entry->xid = be32_to_cpu(rqst->rq_xid);

	),



	TP_printk("task:%u@%u xid=0x%08x req=%p",

		__entry->task_id, __entry->client_id, __entry->xid,

		__entry->req

	)

);



TRACE_EVENT(xprtrdma_nomrs_err,

	TP_PROTO(

		const struct rpcrdma_xprt *r_xprt,
@@ -946,9 +966,9 @@ TRACE_EVENT(xprtrdma_frwr_maperr, 


DEFINE_MR_EVENT(localinv);

DEFINE_MR_EVENT(map);

DEFINE_MR_EVENT(unmap);

DEFINE_MR_EVENT(reminv);

DEFINE_MR_EVENT(recycle);



DEFINE_ANON_MR_EVENT(unmap);

DEFINE_ANON_MR_EVENT(recycle);



TRACE_EVENT(xprtrdma_dma_maperr,

	TP_PROTO(

net/sunrpc/xprtrdma/frwr_ops.c

+0 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ void frwr_reminv(struct rpcrdma_rep *rep, struct list_head *mrs) 
	list_for_each_entry(mr, mrs, mr_list)

		if (mr->mr_handle == rep->rr_inv_rkey) {

			list_del_init(&mr->mr_list);

			trace_xprtrdma_mr_reminv(mr);

			rpcrdma_mr_put(mr);

			break;	/* only one invalidated MR per RPC */

		}

net/sunrpc/xprtrdma/rpc_rdma.c

+0 −1
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ static struct rpcrdma_mr_seg *rpcrdma_mr_prepare(struct rpcrdma_xprt *r_xprt, 
		*mr = rpcrdma_mr_get(r_xprt);

		if (!*mr)

			goto out_getmr_err;

		trace_xprtrdma_mr_get(req);

		(*mr)->mr_req = req;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE