mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 04:26:45 +00:00
Code Issues Releases Wiki Activity

xprtrdma: Don't display r_xprt memory addresses in tracepoints

Browse source 
The remote peer's IP address is sufficient, and does not expose
details of the kernel's memory layout.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Chuck Lever 2021-04-19 14:03:44 -04:00 committed by Trond Myklebust
parent 6b147ea7f4
commit 83189d1511
1 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
include/trace/events/rpcrdma.h
View file

@ -190,19 +190,17 @@ DECLARE_EVENT_CLASS(xprtrdma_rxprt,
TP_ARGS(r_xprt), TP_ARGS(r_xprt),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, r_xprt)
__string(addr, rpcrdma_addrstr(r_xprt)) __string(addr, rpcrdma_addrstr(r_xprt))
__string(port, rpcrdma_portstr(r_xprt)) __string(port, rpcrdma_portstr(r_xprt))
), ),
TP_fast_assign( TP_fast_assign(
__entry->r_xprt = r_xprt;
__assign_str(addr, rpcrdma_addrstr(r_xprt)); __assign_str(addr, rpcrdma_addrstr(r_xprt));
__assign_str(port, rpcrdma_portstr(r_xprt)); __assign_str(port, rpcrdma_portstr(r_xprt));
), ),
TP_printk("peer=[%s]:%s r_xprt=%p", TP_printk("peer=[%s]:%s",
__get_str(addr), __get_str(port), __entry->r_xprt __get_str(addr), __get_str(port)
) )
); );
@ -222,7 +220,6 @@ DECLARE_EVENT_CLASS(xprtrdma_connect_class,
TP_ARGS(r_xprt, rc), TP_ARGS(r_xprt, rc),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, r_xprt)
__field(int, rc) __field(int, rc)
__field(int, connect_status) __field(int, connect_status)
__string(addr, rpcrdma_addrstr(r_xprt)) __string(addr, rpcrdma_addrstr(r_xprt))
@ -230,15 +227,14 @@ DECLARE_EVENT_CLASS(xprtrdma_connect_class,
), ),
TP_fast_assign( TP_fast_assign(
__entry->r_xprt = r_xprt;
__entry->rc = rc; __entry->rc = rc;
__entry->connect_status = r_xprt->rx_ep->re_connect_status; __entry->connect_status = r_xprt->rx_ep->re_connect_status;
__assign_str(addr, rpcrdma_addrstr(r_xprt)); __assign_str(addr, rpcrdma_addrstr(r_xprt));
__assign_str(port, rpcrdma_portstr(r_xprt)); __assign_str(port, rpcrdma_portstr(r_xprt));
), ),
TP_printk("peer=[%s]:%s r_xprt=%p: rc=%d connection status=%d", TP_printk("peer=[%s]:%s rc=%d connection status=%d",
__get_str(addr), __get_str(port), __entry->r_xprt, __get_str(addr), __get_str(port),
__entry->rc, __entry->connect_status __entry->rc, __entry->connect_status
) )
); );
@ -535,22 +531,19 @@ TRACE_EVENT(xprtrdma_op_connect,
TP_ARGS(r_xprt, delay), TP_ARGS(r_xprt, delay),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, r_xprt)
__field(unsigned long, delay) __field(unsigned long, delay)
__string(addr, rpcrdma_addrstr(r_xprt)) __string(addr, rpcrdma_addrstr(r_xprt))
__string(port, rpcrdma_portstr(r_xprt)) __string(port, rpcrdma_portstr(r_xprt))
), ),
TP_fast_assign( TP_fast_assign(
__entry->r_xprt = r_xprt;
__entry->delay = delay; __entry->delay = delay;
__assign_str(addr, rpcrdma_addrstr(r_xprt)); __assign_str(addr, rpcrdma_addrstr(r_xprt));
__assign_str(port, rpcrdma_portstr(r_xprt)); __assign_str(port, rpcrdma_portstr(r_xprt));
), ),
TP_printk("peer=[%s]:%s r_xprt=%p delay=%lu", TP_printk("peer=[%s]:%s delay=%lu",
__get_str(addr), __get_str(port), __entry->r_xprt, __get_str(addr), __get_str(port), __entry->delay
__entry->delay
) )
); );
@ -565,7 +558,6 @@ TRACE_EVENT(xprtrdma_op_set_cto,
TP_ARGS(r_xprt, connect, reconnect), TP_ARGS(r_xprt, connect, reconnect),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, r_xprt)
__field(unsigned long, connect) __field(unsigned long, connect)
__field(unsigned long, reconnect) __field(unsigned long, reconnect)
__string(addr, rpcrdma_addrstr(r_xprt)) __string(addr, rpcrdma_addrstr(r_xprt))
@ -573,15 +565,14 @@ TRACE_EVENT(xprtrdma_op_set_cto,
), ),
TP_fast_assign( TP_fast_assign(
__entry->r_xprt = r_xprt;
__entry->connect = connect; __entry->connect = connect;
__entry->reconnect = reconnect; __entry->reconnect = reconnect;
__assign_str(addr, rpcrdma_addrstr(r_xprt)); __assign_str(addr, rpcrdma_addrstr(r_xprt));
__assign_str(port, rpcrdma_portstr(r_xprt)); __assign_str(port, rpcrdma_portstr(r_xprt));
), ),
TP_printk("peer=[%s]:%s r_xprt=%p: connect=%lu reconnect=%lu", TP_printk("peer=[%s]:%s connect=%lu reconnect=%lu",
__get_str(addr), __get_str(port), __entry->r_xprt, __get_str(addr), __get_str(port),
__entry->connect / HZ, __entry->reconnect / HZ __entry->connect / HZ, __entry->reconnect / HZ
) )
); );
@ -631,22 +622,19 @@ TRACE_EVENT(xprtrdma_createmrs,
TP_ARGS(r_xprt, count), TP_ARGS(r_xprt, count),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, r_xprt)
__string(addr, rpcrdma_addrstr(r_xprt)) __string(addr, rpcrdma_addrstr(r_xprt))
__string(port, rpcrdma_portstr(r_xprt)) __string(port, rpcrdma_portstr(r_xprt))
__field(unsigned int, count) __field(unsigned int, count)
), ),
TP_fast_assign( TP_fast_assign(
__entry->r_xprt = r_xprt;
__entry->count = count; __entry->count = count;
__assign_str(addr, rpcrdma_addrstr(r_xprt)); __assign_str(addr, rpcrdma_addrstr(r_xprt));
__assign_str(port, rpcrdma_portstr(r_xprt)); __assign_str(port, rpcrdma_portstr(r_xprt));
), ),
TP_printk("peer=[%s]:%s r_xprt=%p: created %u MRs", TP_printk("peer=[%s]:%s created %u MRs",
__get_str(addr), __get_str(port), __entry->r_xprt, __get_str(addr), __get_str(port), __entry->count
__entry->count
) )
); );
@ -869,7 +857,7 @@ TRACE_EVENT(xprtrdma_post_recvs,
TP_ARGS(r_xprt, count, status), TP_ARGS(r_xprt, count, status),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, r_xprt) __field(u32, cq_id)
__field(unsigned int, count) __field(unsigned int, count)
__field(int, status) __field(int, status)
__field(int, posted) __field(int, posted)
@ -878,16 +866,18 @@ TRACE_EVENT(xprtrdma_post_recvs,
), ),
TP_fast_assign( TP_fast_assign(
__entry->r_xprt = r_xprt; const struct rpcrdma_ep *ep = r_xprt->rx_ep;
__entry->cq_id = ep->re_attr.recv_cq->res.id;
__entry->count = count; __entry->count = count;
__entry->status = status; __entry->status = status;
__entry->posted = r_xprt->rx_ep->re_receive_count; __entry->posted = ep->re_receive_count;
__assign_str(addr, rpcrdma_addrstr(r_xprt)); __assign_str(addr, rpcrdma_addrstr(r_xprt));
__assign_str(port, rpcrdma_portstr(r_xprt)); __assign_str(port, rpcrdma_portstr(r_xprt));
), ),
TP_printk("peer=[%s]:%s r_xprt=%p: %u new recvs, %d active (rc %d)", TP_printk("peer=[%s]:%s cq.id=%d %u new recvs, %d active (rc %d)",
__get_str(addr), __get_str(port), __entry->r_xprt, __get_str(addr), __get_str(port), __entry->cq_id,
__entry->count, __entry->posted, __entry->status __entry->count, __entry->posted, __entry->status
) )
); );
@ -1289,22 +1279,19 @@ TRACE_EVENT(xprtrdma_cb_setup,
TP_ARGS(r_xprt, reqs), TP_ARGS(r_xprt, reqs),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(const void *, r_xprt)
__field(unsigned int, reqs) __field(unsigned int, reqs)
__string(addr, rpcrdma_addrstr(r_xprt)) __string(addr, rpcrdma_addrstr(r_xprt))
__string(port, rpcrdma_portstr(r_xprt)) __string(port, rpcrdma_portstr(r_xprt))
), ),
TP_fast_assign( TP_fast_assign(
__entry->r_xprt = r_xprt;
__entry->reqs = reqs; __entry->reqs = reqs;
__assign_str(addr, rpcrdma_addrstr(r_xprt)); __assign_str(addr, rpcrdma_addrstr(r_xprt));
__assign_str(port, rpcrdma_portstr(r_xprt)); __assign_str(port, rpcrdma_portstr(r_xprt));
), ),
TP_printk("peer=[%s]:%s r_xprt=%p: %u reqs", TP_printk("peer=[%s]:%s %u reqs",
__get_str(addr), __get_str(port), __get_str(addr), __get_str(port), __entry->reqs
__entry->r_xprt, __entry->reqs
) )
); );