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

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

xprtrdma: Add trace points in reply decoder path 



This includes decoding Write and Reply chunks, and fixing up inline
payloads.

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

include/trace/events/rpcrdma.h

+93 −0
Original line number Diff line number Diff line
@@ -453,6 +453,99 @@ DEFINE_REPLY_EVENT(xprtrdma_reply_rqst); 
DEFINE_REPLY_EVENT(xprtrdma_reply_short);

DEFINE_REPLY_EVENT(xprtrdma_reply_hdr);



TRACE_EVENT(xprtrdma_fixup,

	TP_PROTO(

		const struct rpc_rqst *rqst,

		int len,

		int hdrlen

	),



	TP_ARGS(rqst, len, hdrlen),



	TP_STRUCT__entry(

		__field(unsigned int, task_id)

		__field(unsigned int, client_id)

		__field(const void *, base)

		__field(int, len)

		__field(int, hdrlen)

	),



	TP_fast_assign(

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

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

		__entry->base = rqst->rq_rcv_buf.head[0].iov_base;

		__entry->len = len;

		__entry->hdrlen = hdrlen;

	),



	TP_printk("task:%u@%u base=%p len=%d hdrlen=%d",

		__entry->task_id, __entry->client_id,

		__entry->base, __entry->len, __entry->hdrlen

	)

);



TRACE_EVENT(xprtrdma_fixup_pg,

	TP_PROTO(

		const struct rpc_rqst *rqst,

		int pageno,

		const void *pos,

		int len,

		int curlen

	),



	TP_ARGS(rqst, pageno, pos, len, curlen),



	TP_STRUCT__entry(

		__field(unsigned int, task_id)

		__field(unsigned int, client_id)

		__field(const void *, pos)

		__field(int, pageno)

		__field(int, len)

		__field(int, curlen)

	),



	TP_fast_assign(

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

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

		__entry->pos = pos;

		__entry->pageno = pageno;

		__entry->len = len;

		__entry->curlen = curlen;

	),



	TP_printk("task:%u@%u pageno=%d pos=%p len=%d curlen=%d",

		__entry->task_id, __entry->client_id,

		__entry->pageno, __entry->pos, __entry->len, __entry->curlen

	)

);



TRACE_EVENT(xprtrdma_decode_seg,

	TP_PROTO(

		u32 handle,

		u32 length,

		u64 offset

	),



	TP_ARGS(handle, length, offset),



	TP_STRUCT__entry(

		__field(u32, handle)

		__field(u32, length)

		__field(u64, offset)

	),



	TP_fast_assign(

		__entry->handle = handle;

		__entry->length = length;

		__entry->offset = offset;

	),



	TP_printk("%u@0x%016llx:0x%08x",

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

		__entry->handle

	)

);



#endif /* _TRACE_RPCRDMA_H */



#include <trace/define_trace.h>

net/sunrpc/xprtrdma/rpc_rdma.c

+9 −20
Original line number Diff line number Diff line
@@ -914,8 +914,7 @@ rpcrdma_inline_fixup(struct rpc_rqst *rqst, char *srcp, int copy_len, int pad) 
	curlen = rqst->rq_rcv_buf.head[0].iov_len;

	if (curlen > copy_len)

		curlen = copy_len;

	dprintk("RPC:       %s: srcp 0x%p len %d hdrlen %d\n",

		__func__, srcp, copy_len, curlen);

	trace_xprtrdma_fixup(rqst, copy_len, curlen);

	srcp += curlen;

	copy_len -= curlen;
@@ -935,9 +934,8 @@ rpcrdma_inline_fixup(struct rpc_rqst *rqst, char *srcp, int copy_len, int pad) 
			if (curlen > pagelist_len)

				curlen = pagelist_len;



			dprintk("RPC:       %s: page %d"

				" srcp 0x%p len %d curlen %d\n",

				__func__, i, srcp, copy_len, curlen);

			trace_xprtrdma_fixup_pg(rqst, i, srcp,

						copy_len, curlen);

			destp = kmap_atomic(ppages[i]);

			memcpy(destp + page_base, srcp, curlen);

			flush_dcache_page(ppages[i]);
@@ -1028,26 +1026,19 @@ rpcrdma_is_bcall(struct rpcrdma_xprt *r_xprt, struct rpcrdma_rep *rep) 


static int decode_rdma_segment(struct xdr_stream *xdr, u32 *length)

{

	u32 handle;

	u64 offset;

	__be32 *p;



	p = xdr_inline_decode(xdr, 4 * sizeof(*p));

	if (unlikely(!p))

		return -EIO;



	ifdebug(FACILITY) {

		u64 offset;

		u32 handle;



	handle = be32_to_cpup(p++);

	*length = be32_to_cpup(p++);

	xdr_decode_hyper(p, &offset);

		dprintk("RPC:       %s:   segment %u@0x%016llx:0x%08x\n",

			__func__, *length, (unsigned long long)offset,

			handle);

	} else {

		*length = be32_to_cpup(p + 1);

	}



	trace_xprtrdma_decode_seg(handle, *length, offset);

	return 0;

}
@@ -1068,8 +1059,6 @@ static int decode_write_chunk(struct xdr_stream *xdr, u32 *length) 
		*length += seglength;

	}



	dprintk("RPC:       %s: segcount=%u, %u bytes\n",

		__func__, be32_to_cpup(p), *length);

	return 0;

}