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

xprtrdma: Rename CQE field in Receive trace points



Make the field name the same for all trace points that handle
pointers to struct rpcrdma_rep. That makes it easy to grep for
matching rep points in trace output.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent aeaed484
Loading
Loading
Loading
Loading
+11 −10
Original line number Diff line number Diff line
@@ -623,21 +623,21 @@ TRACE_EVENT(xprtrdma_post_send,

TRACE_EVENT(xprtrdma_post_recv,
	TP_PROTO(
		const struct ib_cqe *cqe
		const struct rpcrdma_rep *rep
	),

	TP_ARGS(cqe),
	TP_ARGS(rep),

	TP_STRUCT__entry(
		__field(const void *, cqe)
		__field(const void *, rep)
	),

	TP_fast_assign(
		__entry->cqe = cqe;
		__entry->rep = rep;
	),

	TP_printk("cqe=%p",
		__entry->cqe
	TP_printk("rep=%p",
		__entry->rep
	)
);

@@ -715,14 +715,15 @@ TRACE_EVENT(xprtrdma_wc_receive,
	TP_ARGS(wc),

	TP_STRUCT__entry(
		__field(const void *, cqe)
		__field(const void *, rep)
		__field(u32, byte_len)
		__field(unsigned int, status)
		__field(u32, vendor_err)
	),

	TP_fast_assign(
		__entry->cqe = wc->wr_cqe;
		__entry->rep = container_of(wc->wr_cqe, struct rpcrdma_rep,
					    rr_cqe);
		__entry->status = wc->status;
		if (wc->status) {
			__entry->byte_len = 0;
@@ -733,8 +734,8 @@ TRACE_EVENT(xprtrdma_wc_receive,
		}
	),

	TP_printk("cqe=%p %u bytes: %s (%u/0x%x)",
		__entry->cqe, __entry->byte_len,
	TP_printk("rep=%p %u bytes: %s (%u/0x%x)",
		__entry->rep, __entry->byte_len,
		rdma_show_wc_status(__entry->status),
		__entry->status, __entry->vendor_err
	)
+1 −1
Original line number Diff line number Diff line
@@ -1531,7 +1531,7 @@ rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, bool temp)
		if (!rpcrdma_regbuf_dma_map(r_xprt, rep->rr_rdmabuf))
			goto release_wrs;

		trace_xprtrdma_post_recv(rep->rr_recv_wr.wr_cqe);
		trace_xprtrdma_post_recv(rep);
		++count;
	}