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

svcrdma: Clean up trace_svcrdma_send_failed() tracepoint

Browse Source 
- Use the _err naming convention instead
- Remove display of kernel memory address of the controlling xprt

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever
2020-04-30 14:17:40 -04:00
parent ba6cc97738
commit 3f8f25c696
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/trace/events/rpcrdma.h
+2 -5
View File
@@ -1716,7 +1716,7 @@ TRACE_EVENT(svcrdma_send_pullup,
TP_printk("len=%u", __entry->len) TP_printk("len=%u", __entry->len)
); );
TRACE_EVENT(svcrdma_send_failed, TRACE_EVENT(svcrdma_send_err,
TP_PROTO( TP_PROTO(
const struct svc_rqst *rqst, const struct svc_rqst *rqst,
int status int status
@@ -1727,19 +1727,16 @@ TRACE_EVENT(svcrdma_send_failed,
TP_STRUCT__entry( TP_STRUCT__entry(
__field(int, status) __field(int, status)
__field(u32, xid) __field(u32, xid)
__field(const void *, xprt)
__string(addr, rqst->rq_xprt->xpt_remotebuf) __string(addr, rqst->rq_xprt->xpt_remotebuf)
), ),
TP_fast_assign( TP_fast_assign(
__entry->status = status; __entry->status = status;
__entry->xid = __be32_to_cpu(rqst->rq_xid); __entry->xid = __be32_to_cpu(rqst->rq_xid);
__entry->xprt = rqst->rq_xprt;
__assign_str(addr, rqst->rq_xprt->xpt_remotebuf); __assign_str(addr, rqst->rq_xprt->xpt_remotebuf);
), ),
TP_printk("xprt=%p addr=%s xid=0x%08x status=%d", TP_printk("addr=%s xid=0x%08x status=%d", __get_str(addr),
__entry->xprt, __get_str(addr),
__entry->xid, __entry->status __entry->xid, __entry->status
) )
); );
net/sunrpc/xprtrdma/svc_rdma_sendto.c
+1 -1
View File
@@ -971,7 +971,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
err1: err1:
svc_rdma_send_ctxt_put(rdma, sctxt); svc_rdma_send_ctxt_put(rdma, sctxt);
err0: err0:
trace_svcrdma_send_failed(rqstp, ret); trace_svcrdma_send_err(rqstp, ret);
set_bit(XPT_CLOSE, &xprt->xpt_flags); set_bit(XPT_CLOSE, &xprt->xpt_flags);
return -ENOTCONN; return -ENOTCONN;
} }