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 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM mmap_lock
|
|
|
|
#if !defined(_TRACE_MMAP_LOCK_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_MMAP_LOCK_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/types.h>
|
|
|
|
struct mm_struct;
|
|
|
|
extern int trace_mmap_lock_reg(void);
|
|
extern void trace_mmap_lock_unreg(void);
|
|
|
|
DECLARE_EVENT_CLASS(mmap_lock,
|
|
|
|
TP_PROTO(struct mm_struct *mm, const char *memcg_path, bool write),
|
|
|
|
TP_ARGS(mm, memcg_path, write),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(struct mm_struct *, mm)
|
|
__string(memcg_path, memcg_path)
|
|
__field(bool, write)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->mm = mm;
|
|
__assign_str(memcg_path);
|
|
__entry->write = write;
|
|
),
|
|
|
|
TP_printk(
|
|
"mm=%p memcg_path=%s write=%s",
|
|
__entry->mm,
|
|
__get_str(memcg_path),
|
|
__entry->write ? "true" : "false"
|
|
)
|
|
);
|
|
|
|
#define DEFINE_MMAP_LOCK_EVENT(name) \
|
|
DEFINE_EVENT_FN(mmap_lock, name, \
|
|
TP_PROTO(struct mm_struct *mm, const char *memcg_path, \
|
|
bool write), \
|
|
TP_ARGS(mm, memcg_path, write), \
|
|
trace_mmap_lock_reg, trace_mmap_lock_unreg)
|
|
|
|
DEFINE_MMAP_LOCK_EVENT(mmap_lock_start_locking);
|
|
DEFINE_MMAP_LOCK_EVENT(mmap_lock_released);
|
|
|
|
TRACE_EVENT_FN(mmap_lock_acquire_returned,
|
|
|
|
TP_PROTO(struct mm_struct *mm, const char *memcg_path, bool write,
|
|
bool success),
|
|
|
|
TP_ARGS(mm, memcg_path, write, success),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(struct mm_struct *, mm)
|
|
__string(memcg_path, memcg_path)
|
|
__field(bool, write)
|
|
__field(bool, success)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->mm = mm;
|
|
__assign_str(memcg_path);
|
|
__entry->write = write;
|
|
__entry->success = success;
|
|
),
|
|
|
|
TP_printk(
|
|
"mm=%p memcg_path=%s write=%s success=%s",
|
|
__entry->mm,
|
|
__get_str(memcg_path),
|
|
__entry->write ? "true" : "false",
|
|
__entry->success ? "true" : "false"
|
|
),
|
|
|
|
trace_mmap_lock_reg, trace_mmap_lock_unreg
|
|
);
|
|
|
|
#endif /* _TRACE_MMAP_LOCK_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|