mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net: qrtr: correct types of trace event parameters 

[ Upstream commit 054fbf7ff8 ]

The arguments passed to the trace events are of type unsigned int,
however the signature of the events used __le32 parameters.

I may be missing the point here, but sparse flagged this and it
does seem incorrect to me.

  net/qrtr/ns.c: note: in included file (through include/trace/trace_events.h, include/trace/define_trace.h, include/trace/events/qrtr.h):
  ./include/trace/events/qrtr.h:11:1: warning: cast to restricted __le32
  ./include/trace/events/qrtr.h:11:1: warning: restricted __le32 degrades to integer
  ./include/trace/events/qrtr.h:11:1: warning: restricted __le32 degrades to integer
  ... (a lot more similar warnings)
  net/qrtr/ns.c:115:47:    expected restricted __le32 [usertype] service
  net/qrtr/ns.c:115:47:    got unsigned int service
  net/qrtr/ns.c:115:61: warning: incorrect type in argument 2 (different base types)
  ... (a lot more similar warnings)

Fixes: dfddb54043 ("net: qrtr: Add tracepoint support")
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20230402-qrtr-trace-types-v1-1-92ad55008dd3@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Simon Horman 2023-04-03 17:43:16 +02:00 committed by Greg Kroah-Hartman
parent b8236fd6d9
commit ddbc994d95
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/trace/events/qrtr.h
View File

@ -10,15 +10,16 @@
TRACE_EVENT(qrtr_ns_service_announce_new,
TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port),
TP_PROTO(unsigned int service, unsigned int instance,
unsigned int node, unsigned int port),
TP_ARGS(service, instance, node, port),
TP_STRUCT__entry(
__field(__le32, service)
__field(__le32, instance)
__field(__le32, node)
__field(__le32, port)
__field(unsigned int, service)
__field(unsigned int, instance)
__field(unsigned int, node)
__field(unsigned int, port)
),
TP_fast_assign(
@ -36,15 +37,16 @@ TRACE_EVENT(qrtr_ns_service_announce_new,
TRACE_EVENT(qrtr_ns_service_announce_del,
TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port),
TP_PROTO(unsigned int service, unsigned int instance,
unsigned int node, unsigned int port),
TP_ARGS(service, instance, node, port),
TP_STRUCT__entry(
__field(__le32, service)
__field(__le32, instance)
__field(__le32, node)
__field(__le32, port)
__field(unsigned int, service)
__field(unsigned int, instance)
__field(unsigned int, node)
__field(unsigned int, port)
),
TP_fast_assign(
@ -62,15 +64,16 @@ TRACE_EVENT(qrtr_ns_service_announce_del,
TRACE_EVENT(qrtr_ns_server_add,
TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port),
TP_PROTO(unsigned int service, unsigned int instance,
unsigned int node, unsigned int port),
TP_ARGS(service, instance, node, port),
TP_STRUCT__entry(
__field(__le32, service)
__field(__le32, instance)
__field(__le32, node)
__field(__le32, port)
__field(unsigned int, service)
__field(unsigned int, instance)
__field(unsigned int, node)
__field(unsigned int, port)
),
TP_fast_assign(