mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 07:04:44 +00:00
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>
118 lines
2.5 KiB
C
118 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM qrtr
|
|
|
|
#if !defined(_TRACE_QRTR_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_QRTR_H
|
|
|
|
#include <linux/qrtr.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
TRACE_EVENT(qrtr_ns_service_announce_new,
|
|
|
|
TP_PROTO(unsigned int service, unsigned int instance,
|
|
unsigned int node, unsigned int port),
|
|
|
|
TP_ARGS(service, instance, node, port),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, service)
|
|
__field(unsigned int, instance)
|
|
__field(unsigned int, node)
|
|
__field(unsigned int, port)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->service = service;
|
|
__entry->instance = instance;
|
|
__entry->node = node;
|
|
__entry->port = port;
|
|
),
|
|
|
|
TP_printk("advertising new server [%d:%x]@[%d:%d]",
|
|
__entry->service, __entry->instance, __entry->node,
|
|
__entry->port
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(qrtr_ns_service_announce_del,
|
|
|
|
TP_PROTO(unsigned int service, unsigned int instance,
|
|
unsigned int node, unsigned int port),
|
|
|
|
TP_ARGS(service, instance, node, port),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, service)
|
|
__field(unsigned int, instance)
|
|
__field(unsigned int, node)
|
|
__field(unsigned int, port)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->service = service;
|
|
__entry->instance = instance;
|
|
__entry->node = node;
|
|
__entry->port = port;
|
|
),
|
|
|
|
TP_printk("advertising removal of server [%d:%x]@[%d:%d]",
|
|
__entry->service, __entry->instance, __entry->node,
|
|
__entry->port
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(qrtr_ns_server_add,
|
|
|
|
TP_PROTO(unsigned int service, unsigned int instance,
|
|
unsigned int node, unsigned int port),
|
|
|
|
TP_ARGS(service, instance, node, port),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, service)
|
|
__field(unsigned int, instance)
|
|
__field(unsigned int, node)
|
|
__field(unsigned int, port)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->service = service;
|
|
__entry->instance = instance;
|
|
__entry->node = node;
|
|
__entry->port = port;
|
|
),
|
|
|
|
TP_printk("add server [%d:%x]@[%d:%d]",
|
|
__entry->service, __entry->instance, __entry->node,
|
|
__entry->port
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(qrtr_ns_message,
|
|
|
|
TP_PROTO(const char * const ctrl_pkt_str, __u32 sq_node, __u32 sq_port),
|
|
|
|
TP_ARGS(ctrl_pkt_str, sq_node, sq_port),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(ctrl_pkt_str, ctrl_pkt_str)
|
|
__field(__u32, sq_node)
|
|
__field(__u32, sq_port)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(ctrl_pkt_str, ctrl_pkt_str);
|
|
__entry->sq_node = sq_node;
|
|
__entry->sq_port = sq_port;
|
|
),
|
|
|
|
TP_printk("%s from %d:%d",
|
|
__get_str(ctrl_pkt_str), __entry->sq_node, __entry->sq_port
|
|
)
|
|
);
|
|
|
|
#endif /* _TRACE_QRTR_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|