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>
88 lines
2.0 KiB
C
88 lines
2.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
|
|
*/
|
|
|
|
#if !defined(_TRACE_RPMH_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_RPMH_H
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM rpmh
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include "rpmh-internal.h"
|
|
|
|
TRACE_EVENT(rpmh_tx_done,
|
|
|
|
TP_PROTO(struct rsc_drv *d, int m, const struct tcs_request *r),
|
|
|
|
TP_ARGS(d, m, r),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, d->name)
|
|
__field(int, m)
|
|
__field(u32, addr)
|
|
__field(u32, data)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->m = m;
|
|
__entry->addr = r->cmds[0].addr;
|
|
__entry->data = r->cmds[0].data;
|
|
),
|
|
|
|
TP_printk("%s: ack: tcs-m: %d addr: %#x data: %#x",
|
|
__get_str(name), __entry->m, __entry->addr, __entry->data)
|
|
);
|
|
|
|
TRACE_EVENT(rpmh_send_msg,
|
|
|
|
TP_PROTO(struct rsc_drv *d, int m, enum rpmh_state state, int n, u32 h,
|
|
const struct tcs_cmd *c),
|
|
|
|
TP_ARGS(d, m, state, n, h, c),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(name, d->name)
|
|
__field(int, m)
|
|
__field(u32, state)
|
|
__field(int, n)
|
|
__field(u32, hdr)
|
|
__field(u32, addr)
|
|
__field(u32, data)
|
|
__field(bool, wait)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->m = m;
|
|
__entry->state = state;
|
|
__entry->n = n;
|
|
__entry->hdr = h;
|
|
__entry->addr = c->addr;
|
|
__entry->data = c->data;
|
|
__entry->wait = c->wait;
|
|
),
|
|
|
|
TP_printk("%s: tcs(m): %d [%s] cmd(n): %d msgid: %#x addr: %#x data: %#x complete: %d",
|
|
__get_str(name), __entry->m,
|
|
__print_symbolic(__entry->state,
|
|
{ RPMH_SLEEP_STATE, "sleep" },
|
|
{ RPMH_WAKE_ONLY_STATE, "wake" },
|
|
{ RPMH_ACTIVE_ONLY_STATE, "active" }),
|
|
__entry->n,
|
|
__entry->hdr,
|
|
__entry->addr, __entry->data, __entry->wait)
|
|
);
|
|
|
|
#endif /* _TRACE_RPMH_H */
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE trace-rpmh
|
|
|
|
#include <trace/define_trace.h>
|