mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08: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>
143 lines
2.9 KiB
C
143 lines
2.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM osnoise
|
|
|
|
#if !defined(_OSNOISE_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _OSNOISE_TRACE_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
TRACE_EVENT(thread_noise,
|
|
|
|
TP_PROTO(struct task_struct *t, u64 start, u64 duration),
|
|
|
|
TP_ARGS(t, start, duration),
|
|
|
|
TP_STRUCT__entry(
|
|
__array( char, comm, TASK_COMM_LEN)
|
|
__field( u64, start )
|
|
__field( u64, duration)
|
|
__field( pid_t, pid )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
memcpy(__entry->comm, t->comm, TASK_COMM_LEN);
|
|
__entry->pid = t->pid;
|
|
__entry->start = start;
|
|
__entry->duration = duration;
|
|
),
|
|
|
|
TP_printk("%8s:%d start %llu.%09u duration %llu ns",
|
|
__entry->comm,
|
|
__entry->pid,
|
|
__print_ns_to_secs(__entry->start),
|
|
__print_ns_without_secs(__entry->start),
|
|
__entry->duration)
|
|
);
|
|
|
|
TRACE_EVENT(softirq_noise,
|
|
|
|
TP_PROTO(int vector, u64 start, u64 duration),
|
|
|
|
TP_ARGS(vector, start, duration),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( u64, start )
|
|
__field( u64, duration)
|
|
__field( int, vector )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->vector = vector;
|
|
__entry->start = start;
|
|
__entry->duration = duration;
|
|
),
|
|
|
|
TP_printk("%8s:%d start %llu.%09u duration %llu ns",
|
|
show_softirq_name(__entry->vector),
|
|
__entry->vector,
|
|
__print_ns_to_secs(__entry->start),
|
|
__print_ns_without_secs(__entry->start),
|
|
__entry->duration)
|
|
);
|
|
|
|
TRACE_EVENT(irq_noise,
|
|
|
|
TP_PROTO(int vector, const char *desc, u64 start, u64 duration),
|
|
|
|
TP_ARGS(vector, desc, start, duration),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( u64, start )
|
|
__field( u64, duration)
|
|
__string( desc, desc )
|
|
__field( int, vector )
|
|
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(desc);
|
|
__entry->vector = vector;
|
|
__entry->start = start;
|
|
__entry->duration = duration;
|
|
),
|
|
|
|
TP_printk("%s:%d start %llu.%09u duration %llu ns",
|
|
__get_str(desc),
|
|
__entry->vector,
|
|
__print_ns_to_secs(__entry->start),
|
|
__print_ns_without_secs(__entry->start),
|
|
__entry->duration)
|
|
);
|
|
|
|
TRACE_EVENT(nmi_noise,
|
|
|
|
TP_PROTO(u64 start, u64 duration),
|
|
|
|
TP_ARGS(start, duration),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( u64, start )
|
|
__field( u64, duration)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->start = start;
|
|
__entry->duration = duration;
|
|
),
|
|
|
|
TP_printk("start %llu.%09u duration %llu ns",
|
|
__print_ns_to_secs(__entry->start),
|
|
__print_ns_without_secs(__entry->start),
|
|
__entry->duration)
|
|
);
|
|
|
|
TRACE_EVENT(sample_threshold,
|
|
|
|
TP_PROTO(u64 start, u64 duration, u64 interference),
|
|
|
|
TP_ARGS(start, duration, interference),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( u64, start )
|
|
__field( u64, duration)
|
|
__field( u64, interference)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->start = start;
|
|
__entry->duration = duration;
|
|
__entry->interference = interference;
|
|
),
|
|
|
|
TP_printk("start %llu.%09u duration %llu ns interference %llu",
|
|
__print_ns_to_secs(__entry->start),
|
|
__print_ns_without_secs(__entry->start),
|
|
__entry->duration,
|
|
__entry->interference)
|
|
);
|
|
|
|
#endif /* _TRACE_OSNOISE_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|