mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +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>
145 lines
2.8 KiB
C
145 lines
2.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM lock
|
|
|
|
#if !defined(_TRACE_LOCK_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_LOCK_H
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
/* flags for lock:contention_begin */
|
|
#define LCB_F_SPIN (1U << 0)
|
|
#define LCB_F_READ (1U << 1)
|
|
#define LCB_F_WRITE (1U << 2)
|
|
#define LCB_F_RT (1U << 3)
|
|
#define LCB_F_PERCPU (1U << 4)
|
|
#define LCB_F_MUTEX (1U << 5)
|
|
|
|
|
|
#ifdef CONFIG_LOCKDEP
|
|
|
|
#include <linux/lockdep.h>
|
|
|
|
TRACE_EVENT(lock_acquire,
|
|
|
|
TP_PROTO(struct lockdep_map *lock, unsigned int subclass,
|
|
int trylock, int read, int check,
|
|
struct lockdep_map *next_lock, unsigned long ip),
|
|
|
|
TP_ARGS(lock, subclass, trylock, read, check, next_lock, ip),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, flags)
|
|
__string(name, lock->name)
|
|
__field(void *, lockdep_addr)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->flags = (trylock ? 1 : 0) | (read ? 2 : 0);
|
|
__assign_str(name);
|
|
__entry->lockdep_addr = lock;
|
|
),
|
|
|
|
TP_printk("%p %s%s%s", __entry->lockdep_addr,
|
|
(__entry->flags & 1) ? "try " : "",
|
|
(__entry->flags & 2) ? "read " : "",
|
|
__get_str(name))
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(lock,
|
|
|
|
TP_PROTO(struct lockdep_map *lock, unsigned long ip),
|
|
|
|
TP_ARGS(lock, ip),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, lock->name )
|
|
__field( void *, lockdep_addr )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->lockdep_addr = lock;
|
|
),
|
|
|
|
TP_printk("%p %s", __entry->lockdep_addr, __get_str(name))
|
|
);
|
|
|
|
DEFINE_EVENT(lock, lock_release,
|
|
|
|
TP_PROTO(struct lockdep_map *lock, unsigned long ip),
|
|
|
|
TP_ARGS(lock, ip)
|
|
);
|
|
|
|
#ifdef CONFIG_LOCK_STAT
|
|
|
|
DEFINE_EVENT(lock, lock_contended,
|
|
|
|
TP_PROTO(struct lockdep_map *lock, unsigned long ip),
|
|
|
|
TP_ARGS(lock, ip)
|
|
);
|
|
|
|
DEFINE_EVENT(lock, lock_acquired,
|
|
|
|
TP_PROTO(struct lockdep_map *lock, unsigned long ip),
|
|
|
|
TP_ARGS(lock, ip)
|
|
);
|
|
|
|
#endif /* CONFIG_LOCK_STAT */
|
|
#endif /* CONFIG_LOCKDEP */
|
|
|
|
TRACE_EVENT(contention_begin,
|
|
|
|
TP_PROTO(void *lock, unsigned int flags),
|
|
|
|
TP_ARGS(lock, flags),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(void *, lock_addr)
|
|
__field(unsigned int, flags)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->lock_addr = lock;
|
|
__entry->flags = flags;
|
|
),
|
|
|
|
TP_printk("%p (flags=%s)", __entry->lock_addr,
|
|
__print_flags(__entry->flags, "|",
|
|
{ LCB_F_SPIN, "SPIN" },
|
|
{ LCB_F_READ, "READ" },
|
|
{ LCB_F_WRITE, "WRITE" },
|
|
{ LCB_F_RT, "RT" },
|
|
{ LCB_F_PERCPU, "PERCPU" },
|
|
{ LCB_F_MUTEX, "MUTEX" }
|
|
))
|
|
);
|
|
|
|
TRACE_EVENT(contention_end,
|
|
|
|
TP_PROTO(void *lock, int ret),
|
|
|
|
TP_ARGS(lock, ret),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(void *, lock_addr)
|
|
__field(int, ret)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->lock_addr = lock;
|
|
__entry->ret = ret;
|
|
),
|
|
|
|
TP_printk("%p (ret=%d)", __entry->lock_addr, __entry->ret)
|
|
);
|
|
|
|
#endif /* _TRACE_LOCK_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|