Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 743210386c03 ("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>

authored by

William Kucharski and committed by
Tejun Heo
e14da771 af3bf054

+6 -6
+6 -6
include/trace/events/cgroup.h
··· 59 59 60 60 TP_STRUCT__entry( 61 61 __field( int, root ) 62 - __field( int, id ) 63 62 __field( int, level ) 63 + __field( u64, id ) 64 64 __string( path, path ) 65 65 ), 66 66 ··· 71 71 __assign_str(path, path); 72 72 ), 73 73 74 - TP_printk("root=%d id=%d level=%d path=%s", 74 + TP_printk("root=%d id=%llu level=%d path=%s", 75 75 __entry->root, __entry->id, __entry->level, __get_str(path)) 76 76 ); 77 77 ··· 126 126 127 127 TP_STRUCT__entry( 128 128 __field( int, dst_root ) 129 - __field( int, dst_id ) 130 129 __field( int, dst_level ) 130 + __field( u64, dst_id ) 131 131 __field( int, pid ) 132 132 __string( dst_path, path ) 133 133 __string( comm, task->comm ) ··· 142 142 __assign_str(comm, task->comm); 143 143 ), 144 144 145 - TP_printk("dst_root=%d dst_id=%d dst_level=%d dst_path=%s pid=%d comm=%s", 145 + TP_printk("dst_root=%d dst_id=%llu dst_level=%d dst_path=%s pid=%d comm=%s", 146 146 __entry->dst_root, __entry->dst_id, __entry->dst_level, 147 147 __get_str(dst_path), __entry->pid, __get_str(comm)) 148 148 ); ··· 171 171 172 172 TP_STRUCT__entry( 173 173 __field( int, root ) 174 - __field( int, id ) 175 174 __field( int, level ) 175 + __field( u64, id ) 176 176 __string( path, path ) 177 177 __field( int, val ) 178 178 ), ··· 185 185 __entry->val = val; 186 186 ), 187 187 188 - TP_printk("root=%d id=%d level=%d path=%s val=%d", 188 + TP_printk("root=%d id=%llu level=%d path=%s val=%d", 189 189 __entry->root, __entry->id, __entry->level, __get_str(path), 190 190 __entry->val) 191 191 );