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>
303 lines
6.3 KiB
C
303 lines
6.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM cgroup
|
|
|
|
#if !defined(_TRACE_CGROUP_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_CGROUP_H
|
|
|
|
#include <linux/cgroup.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
DECLARE_EVENT_CLASS(cgroup_root,
|
|
|
|
TP_PROTO(struct cgroup_root *root),
|
|
|
|
TP_ARGS(root),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( int, root )
|
|
__field( u16, ss_mask )
|
|
__string( name, root->name )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->root = root->hierarchy_id;
|
|
__entry->ss_mask = root->subsys_mask;
|
|
__assign_str(name);
|
|
),
|
|
|
|
TP_printk("root=%d ss_mask=%#x name=%s",
|
|
__entry->root, __entry->ss_mask, __get_str(name))
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_root, cgroup_setup_root,
|
|
|
|
TP_PROTO(struct cgroup_root *root),
|
|
|
|
TP_ARGS(root)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_root, cgroup_destroy_root,
|
|
|
|
TP_PROTO(struct cgroup_root *root),
|
|
|
|
TP_ARGS(root)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_root, cgroup_remount,
|
|
|
|
TP_PROTO(struct cgroup_root *root),
|
|
|
|
TP_ARGS(root)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(cgroup,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path),
|
|
|
|
TP_ARGS(cgrp, path),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( int, root )
|
|
__field( int, level )
|
|
__field( u64, id )
|
|
__string( path, path )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->root = cgrp->root->hierarchy_id;
|
|
__entry->id = cgroup_id(cgrp);
|
|
__entry->level = cgrp->level;
|
|
__assign_str(path);
|
|
),
|
|
|
|
TP_printk("root=%d id=%llu level=%d path=%s",
|
|
__entry->root, __entry->id, __entry->level, __get_str(path))
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup, cgroup_mkdir,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path),
|
|
|
|
TP_ARGS(cgrp, path)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup, cgroup_rmdir,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path),
|
|
|
|
TP_ARGS(cgrp, path)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup, cgroup_release,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path),
|
|
|
|
TP_ARGS(cgrp, path)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup, cgroup_rename,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path),
|
|
|
|
TP_ARGS(cgrp, path)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup, cgroup_freeze,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path),
|
|
|
|
TP_ARGS(cgrp, path)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup, cgroup_unfreeze,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path),
|
|
|
|
TP_ARGS(cgrp, path)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(cgroup_migrate,
|
|
|
|
TP_PROTO(struct cgroup *dst_cgrp, const char *path,
|
|
struct task_struct *task, bool threadgroup),
|
|
|
|
TP_ARGS(dst_cgrp, path, task, threadgroup),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( int, dst_root )
|
|
__field( int, dst_level )
|
|
__field( u64, dst_id )
|
|
__field( int, pid )
|
|
__string( dst_path, path )
|
|
__string( comm, task->comm )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->dst_root = dst_cgrp->root->hierarchy_id;
|
|
__entry->dst_id = cgroup_id(dst_cgrp);
|
|
__entry->dst_level = dst_cgrp->level;
|
|
__assign_str(dst_path);
|
|
__entry->pid = task->pid;
|
|
__assign_str(comm);
|
|
),
|
|
|
|
TP_printk("dst_root=%d dst_id=%llu dst_level=%d dst_path=%s pid=%d comm=%s",
|
|
__entry->dst_root, __entry->dst_id, __entry->dst_level,
|
|
__get_str(dst_path), __entry->pid, __get_str(comm))
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_migrate, cgroup_attach_task,
|
|
|
|
TP_PROTO(struct cgroup *dst_cgrp, const char *path,
|
|
struct task_struct *task, bool threadgroup),
|
|
|
|
TP_ARGS(dst_cgrp, path, task, threadgroup)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_migrate, cgroup_transfer_tasks,
|
|
|
|
TP_PROTO(struct cgroup *dst_cgrp, const char *path,
|
|
struct task_struct *task, bool threadgroup),
|
|
|
|
TP_ARGS(dst_cgrp, path, task, threadgroup)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(cgroup_event,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path, int val),
|
|
|
|
TP_ARGS(cgrp, path, val),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( int, root )
|
|
__field( int, level )
|
|
__field( u64, id )
|
|
__string( path, path )
|
|
__field( int, val )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->root = cgrp->root->hierarchy_id;
|
|
__entry->id = cgroup_id(cgrp);
|
|
__entry->level = cgrp->level;
|
|
__assign_str(path);
|
|
__entry->val = val;
|
|
),
|
|
|
|
TP_printk("root=%d id=%llu level=%d path=%s val=%d",
|
|
__entry->root, __entry->id, __entry->level, __get_str(path),
|
|
__entry->val)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_event, cgroup_notify_populated,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path, int val),
|
|
|
|
TP_ARGS(cgrp, path, val)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_event, cgroup_notify_frozen,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, const char *path, int val),
|
|
|
|
TP_ARGS(cgrp, path, val)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(cgroup_rstat,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( int, root )
|
|
__field( int, level )
|
|
__field( u64, id )
|
|
__field( int, cpu )
|
|
__field( bool, contended )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->root = cgrp->root->hierarchy_id;
|
|
__entry->id = cgroup_id(cgrp);
|
|
__entry->level = cgrp->level;
|
|
__entry->cpu = cpu;
|
|
__entry->contended = contended;
|
|
),
|
|
|
|
TP_printk("root=%d id=%llu level=%d cpu=%d lock contended:%d",
|
|
__entry->root, __entry->id, __entry->level,
|
|
__entry->cpu, __entry->contended)
|
|
);
|
|
|
|
/* Related to global: cgroup_rstat_lock */
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_lock_contended,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_locked,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_unlock,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
/* Related to per CPU: cgroup_rstat_cpu_lock */
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_cpu_lock_contended,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_cpu_lock_contended_fastpath,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_cpu_locked,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_cpu_locked_fastpath,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_cpu_unlock,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
DEFINE_EVENT(cgroup_rstat, cgroup_rstat_cpu_unlock_fastpath,
|
|
|
|
TP_PROTO(struct cgroup *cgrp, int cpu, bool contended),
|
|
|
|
TP_ARGS(cgrp, cpu, contended)
|
|
);
|
|
|
|
#endif /* _TRACE_CGROUP_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|