Commit 051ac384 authored by Pratyush Anand's avatar Pratyush Anand Committed by J. Bruce Fields

net: sunrpc: fix tracepoint Warning: unknown op '->'

`perf stat  -e sunrpc:svc_xprt_do_enqueue true` results in

Warning: unknown op '->'
Warning: [sunrpc:svc_xprt_do_enqueue] unknown op '->'

Similar warning for svc_handle_xprt as well.

Actually TP_printk() should never dereference an address saved in the ring
buffer that points somewhere in the kernel. There's no guarantee that that
object still exists (with the exception of static strings).

Therefore change all the arguments for TP_printk(), so that it references
values existing in the ring buffer only.

While doing that, also fix another possible bug when argument xprt could be
NULL and TP_fast_assign() tries to access it's elements.
Signed-off-by: default avatarPratyush Anand <panand@redhat.com>
Reviewed-by: default avatarJeff Layton <jeff.layton@primarydata.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: stable@vger.kernel.org
Fixes: 83a712e0 "sunrpc: add some tracepoints around ..."
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 51a54568
...@@ -529,18 +529,21 @@ TRACE_EVENT(svc_xprt_do_enqueue, ...@@ -529,18 +529,21 @@ TRACE_EVENT(svc_xprt_do_enqueue,
TP_STRUCT__entry( TP_STRUCT__entry(
__field(struct svc_xprt *, xprt) __field(struct svc_xprt *, xprt)
__field(struct svc_rqst *, rqst) __field_struct(struct sockaddr_storage, ss)
__field(int, pid)
__field(unsigned long, flags)
), ),
TP_fast_assign( TP_fast_assign(
__entry->xprt = xprt; __entry->xprt = xprt;
__entry->rqst = rqst; xprt ? memcpy(&__entry->ss, &xprt->xpt_remote, sizeof(__entry->ss)) : memset(&__entry->ss, 0, sizeof(__entry->ss));
__entry->pid = rqst? rqst->rq_task->pid : 0;
__entry->flags = xprt ? xprt->xpt_flags : 0;
), ),
TP_printk("xprt=0x%p addr=%pIScp pid=%d flags=%s", __entry->xprt, TP_printk("xprt=0x%p addr=%pIScp pid=%d flags=%s", __entry->xprt,
(struct sockaddr *)&__entry->xprt->xpt_remote, (struct sockaddr *)&__entry->ss,
__entry->rqst ? __entry->rqst->rq_task->pid : 0, __entry->pid, show_svc_xprt_flags(__entry->flags))
show_svc_xprt_flags(__entry->xprt->xpt_flags))
); );
TRACE_EVENT(svc_xprt_dequeue, TRACE_EVENT(svc_xprt_dequeue,
...@@ -589,16 +592,20 @@ TRACE_EVENT(svc_handle_xprt, ...@@ -589,16 +592,20 @@ TRACE_EVENT(svc_handle_xprt,
TP_STRUCT__entry( TP_STRUCT__entry(
__field(struct svc_xprt *, xprt) __field(struct svc_xprt *, xprt)
__field(int, len) __field(int, len)
__field_struct(struct sockaddr_storage, ss)
__field(unsigned long, flags)
), ),
TP_fast_assign( TP_fast_assign(
__entry->xprt = xprt; __entry->xprt = xprt;
xprt ? memcpy(&__entry->ss, &xprt->xpt_remote, sizeof(__entry->ss)) : memset(&__entry->ss, 0, sizeof(__entry->ss));
__entry->len = len; __entry->len = len;
__entry->flags = xprt ? xprt->xpt_flags : 0;
), ),
TP_printk("xprt=0x%p addr=%pIScp len=%d flags=%s", __entry->xprt, TP_printk("xprt=0x%p addr=%pIScp len=%d flags=%s", __entry->xprt,
(struct sockaddr *)&__entry->xprt->xpt_remote, __entry->len, (struct sockaddr *)&__entry->ss,
show_svc_xprt_flags(__entry->xprt->xpt_flags)) __entry->len, show_svc_xprt_flags(__entry->flags))
); );
#endif /* _TRACE_SUNRPC_H */ #endif /* _TRACE_SUNRPC_H */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment