2c92ca849f
With the rework of how the __string() handles dynamic strings where it
saves off the source string in field in the helper structure[1], the
assignment of that value to the trace event field is stored in the helper
value and does not need to be passed in again.
This means that with:
__string(field, mystring)
Which use to be assigned with __assign_str(field, mystring), no longer
needs the second parameter and it is unused. With this, __assign_str()
will now only get a single parameter.
There's over 700 users of __assign_str() and because coccinelle does not
handle the TRACE_EVENT() macro I ended up using the following sed script:
git grep -l __assign_str | while read a ; do
sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file;
mv /tmp/test-file $a;
done
I then searched for __assign_str() that did not end with ';' as those
were multi line assignments that the sed script above would fail to catch.
Note, the same updates will need to be done for:
__assign_str_len()
__assign_rel_str()
__assign_rel_str_len()
I tested this with both an allmodconfig and an allyesconfig (build only for both).
[1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/
Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts.
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for
Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org> # xfs
Tested-by: Guenter Roeck <linux@roeck-us.net>
96 lines
2.6 KiB
C
96 lines
2.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/* Copyright 2022 NXP
|
|
*/
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM mv88e6xxx
|
|
|
|
#if !defined(_MV88E6XXX_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _MV88E6XXX_TRACE_H
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
DECLARE_EVENT_CLASS(mv88e6xxx_atu_violation,
|
|
|
|
TP_PROTO(const struct device *dev, int spid, u16 portvec,
|
|
const unsigned char *addr, u16 fid),
|
|
|
|
TP_ARGS(dev, spid, portvec, addr, fid),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, dev_name(dev))
|
|
__field(int, spid)
|
|
__field(u16, portvec)
|
|
__array(unsigned char, addr, ETH_ALEN)
|
|
__field(u16, fid)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->spid = spid;
|
|
__entry->portvec = portvec;
|
|
memcpy(__entry->addr, addr, ETH_ALEN);
|
|
__entry->fid = fid;
|
|
),
|
|
|
|
TP_printk("dev %s spid %d portvec 0x%x addr %pM fid %u",
|
|
__get_str(name), __entry->spid, __entry->portvec,
|
|
__entry->addr, __entry->fid)
|
|
);
|
|
|
|
DEFINE_EVENT(mv88e6xxx_atu_violation, mv88e6xxx_atu_member_violation,
|
|
TP_PROTO(const struct device *dev, int spid, u16 portvec,
|
|
const unsigned char *addr, u16 fid),
|
|
TP_ARGS(dev, spid, portvec, addr, fid));
|
|
|
|
DEFINE_EVENT(mv88e6xxx_atu_violation, mv88e6xxx_atu_miss_violation,
|
|
TP_PROTO(const struct device *dev, int spid, u16 portvec,
|
|
const unsigned char *addr, u16 fid),
|
|
TP_ARGS(dev, spid, portvec, addr, fid));
|
|
|
|
DEFINE_EVENT(mv88e6xxx_atu_violation, mv88e6xxx_atu_full_violation,
|
|
TP_PROTO(const struct device *dev, int spid, u16 portvec,
|
|
const unsigned char *addr, u16 fid),
|
|
TP_ARGS(dev, spid, portvec, addr, fid));
|
|
|
|
DECLARE_EVENT_CLASS(mv88e6xxx_vtu_violation,
|
|
|
|
TP_PROTO(const struct device *dev, int spid, u16 vid),
|
|
|
|
TP_ARGS(dev, spid, vid),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, dev_name(dev))
|
|
__field(int, spid)
|
|
__field(u16, vid)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->spid = spid;
|
|
__entry->vid = vid;
|
|
),
|
|
|
|
TP_printk("dev %s spid %d vid %u",
|
|
__get_str(name), __entry->spid, __entry->vid)
|
|
);
|
|
|
|
DEFINE_EVENT(mv88e6xxx_vtu_violation, mv88e6xxx_vtu_member_violation,
|
|
TP_PROTO(const struct device *dev, int spid, u16 vid),
|
|
TP_ARGS(dev, spid, vid));
|
|
|
|
DEFINE_EVENT(mv88e6xxx_vtu_violation, mv88e6xxx_vtu_miss_violation,
|
|
TP_PROTO(const struct device *dev, int spid, u16 vid),
|
|
TP_ARGS(dev, spid, vid));
|
|
|
|
#endif /* _MV88E6XXX_TRACE_H */
|
|
|
|
/* We don't want to use include/trace/events */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE trace
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|