Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: qrtr: correct types of trace event parameters

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: dfddb54043f0 ("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>

authored by

Simon Horman and committed by
Jakub Kicinski
054fbf7f 992e7690

+18 -15
+18 -15
include/trace/events/qrtr.h
··· 10 10 11 11 TRACE_EVENT(qrtr_ns_service_announce_new, 12 12 13 - TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port), 13 + TP_PROTO(unsigned int service, unsigned int instance, 14 + unsigned int node, unsigned int port), 14 15 15 16 TP_ARGS(service, instance, node, port), 16 17 17 18 TP_STRUCT__entry( 18 - __field(__le32, service) 19 - __field(__le32, instance) 20 - __field(__le32, node) 21 - __field(__le32, port) 19 + __field(unsigned int, service) 20 + __field(unsigned int, instance) 21 + __field(unsigned int, node) 22 + __field(unsigned int, port) 22 23 ), 23 24 24 25 TP_fast_assign( ··· 37 36 38 37 TRACE_EVENT(qrtr_ns_service_announce_del, 39 38 40 - TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port), 39 + TP_PROTO(unsigned int service, unsigned int instance, 40 + unsigned int node, unsigned int port), 41 41 42 42 TP_ARGS(service, instance, node, port), 43 43 44 44 TP_STRUCT__entry( 45 - __field(__le32, service) 46 - __field(__le32, instance) 47 - __field(__le32, node) 48 - __field(__le32, port) 45 + __field(unsigned int, service) 46 + __field(unsigned int, instance) 47 + __field(unsigned int, node) 48 + __field(unsigned int, port) 49 49 ), 50 50 51 51 TP_fast_assign( ··· 64 62 65 63 TRACE_EVENT(qrtr_ns_server_add, 66 64 67 - TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port), 65 + TP_PROTO(unsigned int service, unsigned int instance, 66 + unsigned int node, unsigned int port), 68 67 69 68 TP_ARGS(service, instance, node, port), 70 69 71 70 TP_STRUCT__entry( 72 - __field(__le32, service) 73 - __field(__le32, instance) 74 - __field(__le32, node) 75 - __field(__le32, port) 71 + __field(unsigned int, service) 72 + __field(unsigned int, instance) 73 + __field(unsigned int, node) 74 + __field(unsigned int, port) 76 75 ), 77 76 78 77 TP_fast_assign(