Commit e14da771 authored by William Kucharski's avatar William Kucharski Committed by Tejun Heo

cgroup: Trace event cgroup id fields should be u64

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: 74321038 ("cgroup: use cgrp->kn->id as the cgroup ID")
Signed-off-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
Reviewed-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent af3bf054
...@@ -59,8 +59,8 @@ DECLARE_EVENT_CLASS(cgroup, ...@@ -59,8 +59,8 @@ DECLARE_EVENT_CLASS(cgroup,
TP_STRUCT__entry( TP_STRUCT__entry(
__field( int, root ) __field( int, root )
__field( int, id )
__field( int, level ) __field( int, level )
__field( u64, id )
__string( path, path ) __string( path, path )
), ),
...@@ -71,7 +71,7 @@ DECLARE_EVENT_CLASS(cgroup, ...@@ -71,7 +71,7 @@ DECLARE_EVENT_CLASS(cgroup,
__assign_str(path, path); __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)) __entry->root, __entry->id, __entry->level, __get_str(path))
); );
...@@ -126,8 +126,8 @@ DECLARE_EVENT_CLASS(cgroup_migrate, ...@@ -126,8 +126,8 @@ DECLARE_EVENT_CLASS(cgroup_migrate,
TP_STRUCT__entry( TP_STRUCT__entry(
__field( int, dst_root ) __field( int, dst_root )
__field( int, dst_id )
__field( int, dst_level ) __field( int, dst_level )
__field( u64, dst_id )
__field( int, pid ) __field( int, pid )
__string( dst_path, path ) __string( dst_path, path )
__string( comm, task->comm ) __string( comm, task->comm )
...@@ -142,7 +142,7 @@ DECLARE_EVENT_CLASS(cgroup_migrate, ...@@ -142,7 +142,7 @@ DECLARE_EVENT_CLASS(cgroup_migrate,
__assign_str(comm, task->comm); __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, __entry->dst_root, __entry->dst_id, __entry->dst_level,
__get_str(dst_path), __entry->pid, __get_str(comm)) __get_str(dst_path), __entry->pid, __get_str(comm))
); );
...@@ -171,8 +171,8 @@ DECLARE_EVENT_CLASS(cgroup_event, ...@@ -171,8 +171,8 @@ DECLARE_EVENT_CLASS(cgroup_event,
TP_STRUCT__entry( TP_STRUCT__entry(
__field( int, root ) __field( int, root )
__field( int, id )
__field( int, level ) __field( int, level )
__field( u64, id )
__string( path, path ) __string( path, path )
__field( int, val ) __field( int, val )
), ),
...@@ -185,7 +185,7 @@ DECLARE_EVENT_CLASS(cgroup_event, ...@@ -185,7 +185,7 @@ DECLARE_EVENT_CLASS(cgroup_event,
__entry->val = val; __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->root, __entry->id, __entry->level, __get_str(path),
__entry->val) __entry->val)
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment