Skip to content

Commit

Permalink
cgroup: Trace event cgroup id fields should be u64
Browse files Browse the repository at this point in the history
Various trace event fields that store cgroup IDs were declared as
ints, but cgroup_id(() returns a u64 and the structures and associated
TP_printk() calls were not updated to reflect this.

Fixes: 7432103 ("cgroup: use cgrp->kn->id as the cgroup ID")
Signed-off-by: William Kucharski <william.kucharski@oracle.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
William Kucharski authored and Tejun Heo committed Dec 1, 2021
1 parent af3bf05 commit e14da77
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions include/trace/events/cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ DECLARE_EVENT_CLASS(cgroup,

TP_STRUCT__entry(
__field( int, root )
__field( int, id )
__field( int, level )
__field( u64, id )
__string( path, path )
),

Expand All @@ -71,7 +71,7 @@ DECLARE_EVENT_CLASS(cgroup,
__assign_str(path, path);
),

TP_printk("root=%d id=%d level=%d path=%s",
TP_printk("root=%d id=%llu level=%d path=%s",
__entry->root, __entry->id, __entry->level, __get_str(path))
);

Expand Down Expand Up @@ -126,8 +126,8 @@ DECLARE_EVENT_CLASS(cgroup_migrate,

TP_STRUCT__entry(
__field( int, dst_root )
__field( int, dst_id )
__field( int, dst_level )
__field( u64, dst_id )
__field( int, pid )
__string( dst_path, path )
__string( comm, task->comm )
Expand All @@ -142,7 +142,7 @@ DECLARE_EVENT_CLASS(cgroup_migrate,
__assign_str(comm, task->comm);
),

TP_printk("dst_root=%d dst_id=%d dst_level=%d dst_path=%s pid=%d comm=%s",
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))
);
Expand Down Expand Up @@ -171,8 +171,8 @@ DECLARE_EVENT_CLASS(cgroup_event,

TP_STRUCT__entry(
__field( int, root )
__field( int, id )
__field( int, level )
__field( u64, id )
__string( path, path )
__field( int, val )
),
Expand All @@ -185,7 +185,7 @@ DECLARE_EVENT_CLASS(cgroup_event,
__entry->val = val;
),

TP_printk("root=%d id=%d level=%d path=%s val=%d",
TP_printk("root=%d id=%llu level=%d path=%s val=%d",
__entry->root, __entry->id, __entry->level, __get_str(path),
__entry->val)
);
Expand Down

0 comments on commit e14da77

Please sign in to comment.