mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
caeccd5180
Including devlink.h on ARM and probably other 32-bit architectures results in
a harmless warning:
In file included from ../include/trace/define_trace.h:95:0,
from ../include/trace/events/devlink.h:51,
from ../net/core/devlink.c:30:
include/trace/events/devlink.h: In function 'trace_raw_output_devlink_hwmsg':
include/trace/events/devlink.h:42:12: error: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t {aka unsigned int}' [-Werror=format=]
The correct format string for 'size_t' is %zu, not %lu, this works on all
architectures.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: e5224f0fe2 ("devlink: add hardware messages tracing facility")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
68 lines
1.7 KiB
C
68 lines
1.7 KiB
C
#if IS_ENABLED(CONFIG_NET_DEVLINK)
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM devlink
|
|
|
|
#if !defined(_TRACE_DEVLINK_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_DEVLINK_H
|
|
|
|
#include <linux/device.h>
|
|
#include <net/devlink.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
/*
|
|
* Tracepoint for devlink hardware message:
|
|
*/
|
|
TRACE_EVENT(devlink_hwmsg,
|
|
TP_PROTO(const struct devlink *devlink, bool incoming,
|
|
unsigned long type, const u8 *buf, size_t len),
|
|
|
|
TP_ARGS(devlink, incoming, type, buf, len),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(bus_name, devlink->dev->bus->name)
|
|
__string(dev_name, dev_name(devlink->dev))
|
|
__string(driver_name, devlink->dev->driver->name)
|
|
__field(bool, incoming)
|
|
__field(unsigned long, type)
|
|
__dynamic_array(u8, buf, len)
|
|
__field(size_t, len)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(bus_name, devlink->dev->bus->name);
|
|
__assign_str(dev_name, dev_name(devlink->dev));
|
|
__assign_str(driver_name, devlink->dev->driver->name);
|
|
__entry->incoming = incoming;
|
|
__entry->type = type;
|
|
memcpy(__get_dynamic_array(buf), buf, len);
|
|
__entry->len = len;
|
|
),
|
|
|
|
TP_printk("bus_name=%s dev_name=%s driver_name=%s incoming=%d type=%lu buf=0x[%*phD] len=%zu",
|
|
__get_str(bus_name), __get_str(dev_name),
|
|
__get_str(driver_name), __entry->incoming, __entry->type,
|
|
(int) __entry->len, __get_dynamic_array(buf), __entry->len)
|
|
);
|
|
|
|
#endif /* _TRACE_DEVLINK_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|
|
|
|
#else /* CONFIG_NET_DEVLINK */
|
|
|
|
#if !defined(_TRACE_DEVLINK_H)
|
|
#define _TRACE_DEVLINK_H
|
|
|
|
#include <net/devlink.h>
|
|
|
|
static inline void trace_devlink_hwmsg(const struct devlink *devlink,
|
|
bool incoming, unsigned long type,
|
|
const u8 *buf, size_t len)
|
|
{
|
|
}
|
|
|
|
#endif /* _TRACE_DEVLINK_H */
|
|
|
|
#endif
|