mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +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>
69 lines
1.9 KiB
C
69 lines
1.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM devfreq
|
|
|
|
#if !defined(_TRACE_DEVFREQ_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_DEVFREQ_H
|
|
|
|
#include <linux/devfreq.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
TRACE_EVENT(devfreq_frequency,
|
|
TP_PROTO(struct devfreq *devfreq, unsigned long freq,
|
|
unsigned long prev_freq),
|
|
|
|
TP_ARGS(devfreq, freq, prev_freq),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(dev_name, dev_name(&devfreq->dev))
|
|
__field(unsigned long, freq)
|
|
__field(unsigned long, prev_freq)
|
|
__field(unsigned long, busy_time)
|
|
__field(unsigned long, total_time)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(dev_name);
|
|
__entry->freq = freq;
|
|
__entry->prev_freq = prev_freq;
|
|
__entry->busy_time = devfreq->last_status.busy_time;
|
|
__entry->total_time = devfreq->last_status.total_time;
|
|
),
|
|
|
|
TP_printk("dev_name=%-30s freq=%-12lu prev_freq=%-12lu load=%-2lu",
|
|
__get_str(dev_name), __entry->freq, __entry->prev_freq,
|
|
__entry->total_time == 0 ? 0 :
|
|
(100 * __entry->busy_time) / __entry->total_time)
|
|
);
|
|
|
|
TRACE_EVENT(devfreq_monitor,
|
|
TP_PROTO(struct devfreq *devfreq),
|
|
|
|
TP_ARGS(devfreq),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned long, freq)
|
|
__field(unsigned long, busy_time)
|
|
__field(unsigned long, total_time)
|
|
__field(unsigned int, polling_ms)
|
|
__string(dev_name, dev_name(&devfreq->dev))
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->freq = devfreq->previous_freq;
|
|
__entry->busy_time = devfreq->last_status.busy_time;
|
|
__entry->total_time = devfreq->last_status.total_time;
|
|
__entry->polling_ms = devfreq->profile->polling_ms;
|
|
__assign_str(dev_name);
|
|
),
|
|
|
|
TP_printk("dev_name=%-30s freq=%-12lu polling_ms=%-3u load=%-2lu",
|
|
__get_str(dev_name), __entry->freq, __entry->polling_ms,
|
|
__entry->total_time == 0 ? 0 :
|
|
(100 * __entry->busy_time) / __entry->total_time)
|
|
);
|
|
#endif /* _TRACE_DEVFREQ_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|