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>,
        LKML <linux-kernel@vger.kernel.org>
Cc:     william.kucharski@oracle.com
Subject: [PATCH V2] cgroup: Trace event cgroup id fields should be u64
Date:   Wed,  1 Dec 2021 09:07:46 -0700
Message-Id: <20211201160746.726158-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?D94mq2UPUXUyNoGbZXRzwL9W75mjeTLIJhDuwsuLOVMvfja0+zOBBSppDh2J?=
 =?us-ascii?Q?4yASvJ8AhU+aQl9HWe1gQXfQlbfU7YF7tfTy7pY7vB/qkDrcNp6fayn+tKOV?=
 =?us-ascii?Q?oE+fx6kvjBnC1NzFf/6BTs4ifJCGy5V73zszzlagQjQ3E06zGBejEn3pofMO?=
 =?us-ascii?Q?yOc8pz0C6JasamMvC3e99zsBkiXjLGh9VTrnoMGEIqjmq62TbxmVxiFmHBHI?=
 =?us-ascii?Q?Be+ZVuqns+7Z0tMdYJB6IjgFtQuSeqEwfs/+zLBf+lLrfaCAvJ+pn+/7gtmL?=
 =?us-ascii?Q?bTCnQmnHQpk4HD2gS9UIwT014LyRlkeklCNQsPSsTd8YjFgq63CIJA8ROfhN?=
 =?us-ascii?Q?M0SYRM1VEHm/I3EfU9IXXmFClHmTgIgyhZeFmTnvULvx486FSjmgTPxFnSQY?=
 =?us-ascii?Q?SFLz1turED/SZTSDoUNnFFBFhWOiiYkjqyElNKh0+rOqmH/eLe/PM5dCOIfX?=
 =?us-ascii?Q?pv3mbsd7RdnpJ3B+Q/c+69E2tiqd5ALP9Aq20XtUPX4GqiWEAT+PM08QSfPR?=
 =?us-ascii?Q?McdMOsqcR4tn3qC/6ekloH+otZt/H/bHWQl1MrRo6eQJMWma5QUZvk6v6jGA?=
 =?us-ascii?Q?sXxa9A4Khy4zsThRouvAIATll0SV/T5t55MPuEiawVyZELNPzfVwCeBjxBF0?=
 =?us-ascii?Q?9Cxptqktn5Bd3CTLgEqjlke+8xSqiN4hZfXNHRVe74a21ZhI7lKuEf6OFSoD?=
 =?us-ascii?Q?tT4OQPuOEGW8foZ5yMomU00Cv3t7aNDCzQ47ydCfURr1+1J8UZUscONMJ9qS?=
 =?us-ascii?Q?haxntrQWIpgoyrlZdBa6LvWiTqniH8EDc/9DFjP0s8M9C6Xmu/3fTUSqmxBh?=
 =?us-ascii?Q?NIi17cTa+JPG5IeffXox9vHjvJijD89BqS+g44hV+7sAnnkQL2ljzJYMmrNf?=
 =?us-ascii?Q?q2YGgI0wad0BSdxNyCd/MNi1YDjv9BfLtQ0CQCi+ceeV0kz2I5ySGyckyGkY?=
 =?us-ascii?Q?QSpnvHv/ryEf/I6b+lRwY8DcYjm+Ujr/cpY7ZLBmY8pzpF5ruiJN3shbIFt4?=
 =?us-ascii?Q?4Umu00nsxrkN8KR9hmUJQSJqJD0gv1gomw7CqSDF4n2dl/EzpubLyxZ6LzaI?=
 =?us-ascii?Q?SdvUJPfblSz2LImYiE0XG3U0SiwDEL8snQXwKJRSG1vBp3qWi3CC7U0t3ayf?=
 =?us-ascii?Q?2fPT58XtwnlfxKCXtZwnCtNrviyzIVx1SaXf4YL0aluf15Yv3stHlcfYDAhN?=
 =?us-ascii?Q?rWzp4c7Lv1csG9P9pTpcFAuilYUagX//amcfIigiQX/x/G/jwz3MxE2QqxBy?=
 =?us-ascii?Q?I2DwjCXljIZFQua3XzuMxUZqhPhgAFNxQWl1UVqHKcpYgQ7Hh8IPbdEtWeYH?=
 =?us-ascii?Q?gEWWxx6CHqoZX2MXYjlela1yHemomCNufu4RzJM+5cCnRUOAuvxvZ6xwPm0p?=
 =?us-ascii?Q?9bWD6NDTwXXf8F924Y5QxuMWE2o75CfsNEeQEyyz66w7IGm/5sQjnpE/VfgB?=
 =?us-ascii?Q?/1Lm40de+RfE7V2Iy5FZtmC47eO5mGenSMB9iXN6TZ7u0gAfL87E5K0/1v9t?=
 =?us-ascii?Q?r75a5JIA24Cxv2ASJRaGVwa6BmR9r9ptFLQca/IbRvTifZSz4Fp/ylndFTR4?=
 =?us-ascii?Q?XrzRYT73WMGSRj37jgWxX7Y6v7vbcBiL6IVhSLd6HfD6ogiuLe9U16nG6UDa?=
 =?us-ascii?Q?kJp4fKKbKQX/zipiT1QTHkSwi5Os5m7QNT55Cfo9vnhZ2KXqGIa/OU7T3btG?=
 =?us-ascii?Q?T+aQNLo1M5f2SzCR5/f5PKTq0znX0N0N3DekP2X8JhYfrwhDuBiwTWLrNCCN?=
 =?us-ascii?Q?QXVmYnOZ0Q=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 799a28e3-b7c8-4a1f-86a6-08d9b4e4babf
X-MS-Exchange-CrossTenant-AuthSource: SN4PR10MB5559.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 16:07:53.0244
 (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: JIUT1clsjaKktB0yG81lyWmJ0CGFTsbyXs8GNTDOgfUp4KdPto/cIi/E4dGJ0wpPU2Cjd4lIS9mYmI8U1RiazvjWIuBZ+JUs51uxGhHIZ+s=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5823
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10185 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 adultscore=0
 bulkscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2112010089
X-Proofpoint-ORIG-GUID: P-11AQ-awP2HoyuYY7CIl_82B2sLBiJU
X-Proofpoint-GUID: P-11AQ-awP2HoyuYY7CIl_82B2sLBiJU
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 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>
---
V2: Do not remove spaces from macro arguments

 include/trace/events/cgroup.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/trace/events/cgroup.h b/include/trace/events/cgroup.h
index 7f42a3de59e6..1b68c842ac46 100644
--- a/include/trace/events/cgroup.h
+++ b/include/trace/events/cgroup.h
@@ -59,7 +59,7 @@ DECLARE_EVENT_CLASS(cgroup,
 
 	TP_STRUCT__entry(
 		__field(	int,		root			)
-		__field(	int,		id			)
+		__field(	u64,		id			)
 		__field(	int,		level			)
 		__string(	path,		path			)
 	),
@@ -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))
 );
 
@@ -126,7 +126,7 @@ DECLARE_EVENT_CLASS(cgroup_migrate,
 
 	TP_STRUCT__entry(
 		__field(	int,		dst_root		)
-		__field(	int,		dst_id			)
+		__field(	u64,		dst_id			)
 		__field(	int,		dst_level		)
 		__field(	int,		pid			)
 		__string(	dst_path,	path			)
@@ -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))
 );
@@ -171,7 +171,7 @@ DECLARE_EVENT_CLASS(cgroup_event,
 
 	TP_STRUCT__entry(
 		__field(	int,		root			)
-		__field(	int,		id			)
+		__field(	u64,		id			)
 		__field(	int,		level			)
 		__string(	path,		path			)
 		__field(	int,		val			)
@@ -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