tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xprtrdma: Rename CQE field in Receive trace points

Browse Source 
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: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Chuck Lever
2019-08-19 18:41:44 -04:00
committed by Anna Schumaker
parent aeaed48482
commit 2dfdcd88cf
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/trace/events/rpcrdma.h
+11 -10
View File
@@ -623,21 +623,21 @@ TRACE_EVENT(xprtrdma_post_send,
TRACE_EVENT(xprtrdma_post_recv, TRACE_EVENT(xprtrdma_post_recv,
TP_PROTO( TP_PROTO(
const struct ib_cqe *cqe const struct rpcrdma_rep *rep
), ),
TP_ARGS(cqe), TP_ARGS(rep),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, cqe) __field(const void *, rep)
), ),
TP_fast_assign( TP_fast_assign(
__entry->cqe = cqe; __entry->rep = rep;
), ),
TP_printk("cqe=%p", TP_printk("rep=%p",
__entry->cqe __entry->rep
) )
); );
@@ -715,14 +715,15 @@ TRACE_EVENT(xprtrdma_wc_receive,
TP_ARGS(wc), TP_ARGS(wc),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, cqe) __field(const void *, rep)
__field(u32, byte_len) __field(u32, byte_len)
__field(unsigned int, status) __field(unsigned int, status)
__field(u32, vendor_err) __field(u32, vendor_err)
), ),
TP_fast_assign( TP_fast_assign(
__entry->cqe = wc->wr_cqe; __entry->rep = container_of(wc->wr_cqe, struct rpcrdma_rep,
rr_cqe);
__entry->status = wc->status; __entry->status = wc->status;
if (wc->status) { if (wc->status) {
__entry->byte_len = 0; __entry->byte_len = 0;
@@ -733,8 +734,8 @@ TRACE_EVENT(xprtrdma_wc_receive,
} }
), ),
TP_printk("cqe=%p %u bytes: %s (%u/0x%x)", TP_printk("rep=%p %u bytes: %s (%u/0x%x)",
__entry->cqe, __entry->byte_len, __entry->rep, __entry->byte_len,
rdma_show_wc_status(__entry->status), rdma_show_wc_status(__entry->status),
__entry->status, __entry->vendor_err __entry->status, __entry->vendor_err
) )
net/sunrpc/xprtrdma/verbs.c
+1 -1
View File
@@ -1531,7 +1531,7 @@ rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, bool temp)
if (!rpcrdma_regbuf_dma_map(r_xprt, rep->rr_rdmabuf)) if (!rpcrdma_regbuf_dma_map(r_xprt, rep->rr_rdmabuf))
goto release_wrs; goto release_wrs;
trace_xprtrdma_post_recv(rep->rr_recv_wr.wr_cqe); trace_xprtrdma_post_recv(rep);
++count; ++count;
} }