From:   William Kucharski <william.kucharski@oracle.com>
To:     Steven Rostedt <rostedt@goodmis.org>,
        Ingo Molnar <mingo@redhat.com>, Tejun Heo <tj@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org
Cc:     william.kucharski@oracle.com
Subject: [PATCH] cgroup: Trace event cgroup id fields should be u64
Date:   Wed,  1 Dec 2021 07:40:43 -0700
Message-Id: <20211201144043.557470-1-william.kucharski@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N+MpZ8vYIyGxXtrjuS7MxtaUImugMR5W2StwbShciQv+bDd044vvQ2cFEsgR?=
 =?us-ascii?Q?oftnUjFNNt2LBQtJmeIdvPQFTfJU34rfSkdf2uAb1wkf9yQn4Gwufv8kB1Bc?=
 =?us-ascii?Q?UHEBYt/MmviqFUXipppaPmE/mmre1VOVOHiMmEzFn578rB3qq8yb8HuFwl6C?=
 =?us-ascii?Q?0TGboUe5JZ6VydycnE8RlkNKND9Tnth3Egae4xL3PA8pZ00uXjSc0s7NIh56?=
 =?us-ascii?Q?N8baDiwGG2SJ1ydpfV9tRHh8yO0xKv1rpdk+LhM+3J9l8iGru8EJ5JkY0Et9?=
 =?us-ascii?Q?t0VQbEQoRAFr+sVB5kkLVzVnKrXw7zFp4O+dJuTQrYFBFIyHB/yNsOi+dtLy?=
 =?us-ascii?Q?DkoKCA1TWNyDQoUU1BiVgvFRmQFjg/0XzzbAqJoV/r6Zb6pz/kcD6stRoJ+f?=
 =?us-ascii?Q?3Z16WfVKmRA5L9W6Io0kpJRr679/2Qx5/t2CF4GaGREXcl03gtMnDKiuoRi0?=
 =?us-ascii?Q?DiexEX2cIucriy+zOSMfZWCcg/XdJt08+P7gMRAInEMICSlE6Hl3ln9fk0qw?=
 =?us-ascii?Q?QYvsLxvmn2oJDMXko+BR/yvkwE/dt2Gg+b9TOby74U3mZTwgKC0zluiUBY3K?=
 =?us-ascii?Q?K8JCiTrwBZco8nnKIPDD1PgQz5Wc19kciu/iePSjeZFPhky+CMekp5zlMaVR?=
 =?us-ascii?Q?loAns37/dvDZY9cAm14fhVzlJKbdVo+3rqcskmFUoR9AqwS/0hgoLZ0xHMBh?=
 =?us-ascii?Q?KGt+GiejDC6H77iVgxExrLSSAuAoAmznLJjpUbtVWKRePFy+L7kVTEUKbM/b?=
 =?us-ascii?Q?LKE51GULryEw5achIunpVlUb/IIM/o8sqn/ZvWDFO2zwgiultrmBLCOGlQ2T?=
 =?us-ascii?Q?CucQ9JoBb5QOavltEluiOQ4yiTav1NgemeSsSG+9VDmYYYgL1ms/YdwLPLqh?=
 =?us-ascii?Q?BB3pLmWaO68AHP0r5owpwkftORNKn9Vj+03XnLquhOaUCF5hb1qwMtbWvz+a?=
 =?us-ascii?Q?Ea3TnqE8E+vMoA8aWGWLp1gIMfKtGryf5mng1yAyLa6VoMkVSO96RoTL7OaS?=
 =?us-ascii?Q?NWm/ZSpz9M2WidURiTFMQHPUDNvZVIympx4ORgKlMSPvpUL7g919YCs0oWkk?=
 =?us-ascii?Q?FEcOw+/1dXEiEQJc3fFIwJqgYHpWa1zQ3y+k0VsyytPsh9SKfg3O7b4RyR+j?=
 =?us-ascii?Q?BAnlnAhPYbi2cqR7dvWT02zOD+3yF6DQDvWHoaxhpz5GDG1jwEssxL21ld9L?=
 =?us-ascii?Q?evzdtKgeFgK/6Tk7myZv3KIUYpDazWTjNTbXcfa12G6DkDMUNQUjANyyPcwg?=
 =?us-ascii?Q?mtJ1kmt3JoZr+rPFNwxBp/uKHstMClkdgwPuRXXkkEc3CouTlCJBNaRHxtYX?=
 =?us-ascii?Q?rQs9ePbVBLgRp2qwvmRx8+JOfrzk8WCAb4qgxuqHJG7Niza5TKblQv3ItKTJ?=
 =?us-ascii?Q?r2wk/Q6kIBwjGp7EazfGCMZLrhGlNKkWAEbuDgxXQ1hMOpKW3F8HoY8lovY4?=
 =?us-ascii?Q?Z9SI79JQzenp51OWEA2jBd7sg9B5y0Fbx0Kge0W1iGvyDSN0SOlikeoj2ipS?=
 =?us-ascii?Q?TtcPPtUlHJJ2+L/OEV3TEr0zpRPqSf8A0qoULcXd4RgT8bZ7RgL/RUcVMmd/?=
 =?us-ascii?Q?K1GiyWjqlwEDB/9lidJpwpL7vJaVOn9RC2mj7NNWsAPQNzUgzpAYmHDzkYJ/?=
 =?us-ascii?Q?muhaQQLAA3n3t5AxZpSzLrLedG/Ad6hT0KQv/LrB6KDkOedJqAC/roo0mwNz?=
 =?us-ascii?Q?l6wLJ98QO/61xo83FDc7Xip9Py2B9CxyQoOJlRT52/ImUR0BECn7qLaEzefQ?=
 =?us-ascii?Q?z4GwVCg/1Q=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8111b99c-4faf-4937-6198-08d9b4d892dd
X-MS-Exchange-CrossTenant-AuthSource: SN4PR10MB5559.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 14:40:52.1285
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 25Zr+lwWyjks0Sk4+Y0lSCIJCtaiGWKgoQd4eFii7on53BbXiz2gGvUlldu8GuaMXcqJ5DriHSupUgEnfE6eE9gdFm9w957E+EsS5lKBEI8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2445
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10184 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 phishscore=0 suspectscore=0 spamscore=0 adultscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2112010083
X-Proofpoint-ORIG-GUID: ZtIvLcPysXC5XCqsCQpy6UUk6FvO_uD4
X-Proofpoint-GUID: ZtIvLcPysXC5XCqsCQpy6UUk6FvO_uD4
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Various trace event fields that store cgroup IDs were declared
as ints, but cgroup_id(() returns a u64 and the conversion was
not intended.

Also remove extraneous spaces in fields that are no longer proper C style.

Fixes: 743210386c03 ("cgroup: use cgrp->kn->id as the cgroup ID")
Signed-off-by: William Kucharski <william.kucharski@oracle.com>
---
 include/trace/events/cgroup.h | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/trace/events/cgroup.h b/include/trace/events/cgroup.h
index 7f42a3de59e6..a85b01aa1fff 100644
--- a/include/trace/events/cgroup.h
+++ b/include/trace/events/cgroup.h
@@ -15,9 +15,9 @@ DECLARE_EVENT_CLASS(cgroup_root,
 	TP_ARGS(root),
 
 	TP_STRUCT__entry(
-		__field(	int,		root			)
-		__field(	u16,		ss_mask			)
-		__string(	name,		root->name		)
+		__field(int, root)
+		__field(u16, ss_mask)
+		__string(name, root->name)
 	),
 
 	TP_fast_assign(
@@ -58,10 +58,10 @@ DECLARE_EVENT_CLASS(cgroup,
 	TP_ARGS(cgrp, path),
 
 	TP_STRUCT__entry(
-		__field(	int,		root			)
-		__field(	int,		id			)
-		__field(	int,		level			)
-		__string(	path,		path			)
+		__field(int, root)
+		__field(u64, id)
+		__field(int, level)
+		__string(path, path)
 	),
 
 	TP_fast_assign(
@@ -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))
 );
 
@@ -125,12 +125,12 @@ DECLARE_EVENT_CLASS(cgroup_migrate,
 	TP_ARGS(dst_cgrp, path, task, threadgroup),
 
 	TP_STRUCT__entry(
-		__field(	int,		dst_root		)
-		__field(	int,		dst_id			)
-		__field(	int,		dst_level		)
-		__field(	int,		pid			)
-		__string(	dst_path,	path			)
-		__string(	comm,		task->comm		)
+		__field(int, dst_root)
+		__field(u64, dst_id)
+		__field(int, dst_level)
+		__field(int, pid)
+		__string(dst_path, path)
+		__string(comm, task->comm)
 	),
 
 	TP_fast_assign(
@@ -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))
 );
@@ -170,11 +170,11 @@ DECLARE_EVENT_CLASS(cgroup_event,
 	TP_ARGS(cgrp, path, val),
 
 	TP_STRUCT__entry(
-		__field(	int,		root			)
-		__field(	int,		id			)
-		__field(	int,		level			)
-		__string(	path,		path			)
-		__field(	int,		val			)
+		__field(int, root)
+		__field(u64, id)
+		__field(int, level)
+		__string(path, path)
+		__field(int, val)
 	),
 
 	TP_fast_assign(
@@ -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)
 );
-- 
2.33.1