mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
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>
95 lines
2.6 KiB
C
95 lines
2.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM tegra_vde
|
|
|
|
#if !defined(TEGRA_VDE_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define TEGRA_VDE_TRACE_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
#include "vde.h"
|
|
|
|
DECLARE_EVENT_CLASS(register_access,
|
|
TP_PROTO(struct tegra_vde *vde, void __iomem *base,
|
|
u32 offset, u32 value),
|
|
TP_ARGS(vde, base, offset, value),
|
|
TP_STRUCT__entry(
|
|
__string(hw_name, tegra_vde_reg_base_name(vde, base))
|
|
__field(u32, offset)
|
|
__field(u32, value)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(hw_name);
|
|
__entry->offset = offset;
|
|
__entry->value = value;
|
|
),
|
|
TP_printk("%s:0x%03x 0x%08x", __get_str(hw_name), __entry->offset,
|
|
__entry->value)
|
|
);
|
|
|
|
DEFINE_EVENT(register_access, vde_writel,
|
|
TP_PROTO(struct tegra_vde *vde, void __iomem *base,
|
|
u32 offset, u32 value),
|
|
TP_ARGS(vde, base, offset, value));
|
|
DEFINE_EVENT(register_access, vde_readl,
|
|
TP_PROTO(struct tegra_vde *vde, void __iomem *base,
|
|
u32 offset, u32 value),
|
|
TP_ARGS(vde, base, offset, value));
|
|
|
|
TRACE_EVENT(vde_setup_iram_entry,
|
|
TP_PROTO(unsigned int table, unsigned int row, u32 value, u32 aux_addr),
|
|
TP_ARGS(table, row, value, aux_addr),
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, table)
|
|
__field(unsigned int, row)
|
|
__field(u32, value)
|
|
__field(u32, aux_addr)
|
|
),
|
|
TP_fast_assign(
|
|
__entry->table = table;
|
|
__entry->row = row;
|
|
__entry->value = value;
|
|
__entry->aux_addr = aux_addr;
|
|
),
|
|
TP_printk("[%u][%u] = { 0x%08x (flags = \"%s\", frame_num = %u); 0x%08x }",
|
|
__entry->table, __entry->row, __entry->value,
|
|
__print_flags(__entry->value, " ", { (1 << 25), "B" }),
|
|
__entry->value & 0x7FFFFF, __entry->aux_addr)
|
|
);
|
|
|
|
TRACE_EVENT(vde_ref_l0,
|
|
TP_PROTO(unsigned int frame_num),
|
|
TP_ARGS(frame_num),
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, frame_num)
|
|
),
|
|
TP_fast_assign(
|
|
__entry->frame_num = frame_num;
|
|
),
|
|
TP_printk("REF L0: DPB: Frame 0: frame_num = %u", __entry->frame_num)
|
|
);
|
|
|
|
TRACE_EVENT(vde_ref_l1,
|
|
TP_PROTO(unsigned int with_later_poc_nb,
|
|
unsigned int with_earlier_poc_nb),
|
|
TP_ARGS(with_later_poc_nb, with_earlier_poc_nb),
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, with_later_poc_nb)
|
|
__field(unsigned int, with_earlier_poc_nb)
|
|
),
|
|
TP_fast_assign(
|
|
__entry->with_later_poc_nb = with_later_poc_nb;
|
|
__entry->with_earlier_poc_nb = with_earlier_poc_nb;
|
|
),
|
|
TP_printk("REF L1: with_later_poc_nb %u, with_earlier_poc_nb %u",
|
|
__entry->with_later_poc_nb, __entry->with_earlier_poc_nb)
|
|
);
|
|
|
|
#endif /* TEGRA_VDE_TRACE_H */
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH ../../drivers/media/platform/nvidia/tegra-vde
|
|
#define TRACE_INCLUDE_FILE trace
|
|
#include <trace/define_trace.h>
|