Received-SPF: pass (google.com: domain of linux-kernel+bounces-79235-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Ilkka Koskinen <ilkka@os.amperecomputing.com>
To: Namhyung Kim <namhyung@kernel.org>,
	James Clark <james.clark@arm.com>,
	Ian Rogers <irogers@google.com>
Cc: Evgeny Pistun <kotborealis@awooo.ru>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>,
	Adrian Hunter <adrian.hunter@intel.com>,
	linux-perf-users@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Ilkka Koskinen <ilkka@os.amperecomputing.com>
Subject: [PATCH v4] perf data convert: Fix segfault when converting to json when cpu_desc isn't set
Date: Fri, 23 Feb 2024 14:04:58 -0800
Message-ID: <20240223220458.15282-1-ilkka@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?3izKFjqYMgqvJerVJpEat7Z54zdxQj9C3+ISk/8KRMWMse7uh1Gx9T4vbef9?=
 =?us-ascii?Q?whXUoc5bVRgh7fpX+K/E6365mKLz/waSZp2n30s/Uw0Es5rUvT6US7sFBQfI?=
 =?us-ascii?Q?YAX4ce3EbzgbMN1kFl23Z5RUEjoKv6dAC9VexDldgNNsEuH/9Q0l7mNafHxg?=
 =?us-ascii?Q?+slfUeYBUAJgW5ROXwlltwGfpO9c2MVVEtsnJdSJ1fc3UWnMn/70k0latE8d?=
 =?us-ascii?Q?3B6mJsfooiJ4rX3KaevtJiJWCxCGliZv+b2SFfBoKUuWAuXMw4X1IcDWsLxX?=
 =?us-ascii?Q?ZX4boL0o/ESyP0ldq7mFfEevRNZGP7bEG8F8CIYPqsXRDXbuorR3VJ3gpLA4?=
 =?us-ascii?Q?CJ8QEWrZI/0LwtU1mOuKA+WdSpE6v88U/xWx1gjhOHMf1oxEYo1/lqaBbjBy?=
 =?us-ascii?Q?wTxW+gjRE9KerH5X02QyY77R+LrKCBH7JnfnZ9lx/LL4rfRagbgMfgpSWh09?=
 =?us-ascii?Q?C30OCHuYX7T2C61WYXPZJC1yPjWayt7u8kMZSkLXnJKylfCS0WMVwK2THm5m?=
 =?us-ascii?Q?1297Be+pa91eZ2+NfdyM29rU8bME43RGd0b74mOadPZ/SoydAp+V7kjpHKX9?=
 =?us-ascii?Q?/vkEIodC7ZFWsrzPzC66yDruI2/DHbgRwrtMkWro/rHS+s7FJVYpK75cxHE5?=
 =?us-ascii?Q?utTjTlp/6NWO0MYpRWV52eIHiZyqrmk7mrQYHKGy+Wsdg2JKfKO8BRtcrl9s?=
 =?us-ascii?Q?TzR+fq6hyOpAx86Po5ruqXCpIhjJew9H6Djtj8/ThbcRh2En2Gco5VdxyBsf?=
 =?us-ascii?Q?wVZF++zdhziTG4p9so0TxKT+mhrX35wFUh88rn28oOZyIXaqHcDp1uk/3O/g?=
 =?us-ascii?Q?+7MYJjsQ7HxAxx2iufJJVGM/+EygQ1bylFvaHlQakd43c5OxjAFuRj4k32Pz?=
 =?us-ascii?Q?ejuY/atA6gdVwS3pP5Sc7t04amxB97IHIja/pcsztx3DBXhKQg8viXqtMIZr?=
 =?us-ascii?Q?RTX76FcxslEzuRya9GQH7PprMSpEnlJFttt3JNmhPSNmUvtq1kDF4wbeexYf?=
 =?us-ascii?Q?WolsJCCzkqc6ChzyQjaE/618z2Ok+9PSdGGHyC4TdCEciExHf+VWZLzgwvrH?=
 =?us-ascii?Q?Dw0luf0zqWa96GLD4vqpOKgQcfWSOI8lAELYIZQUG7V+ip/yBcX8t59WbWv0?=
 =?us-ascii?Q?Mn2Mz0xCBiDIz4fBVkENbBt1kOcQE82stRqVP23CswkQ5YlZVRcUB3x3g83o?=
 =?us-ascii?Q?JI3MlCsIen43RGOdwy+xyOTg7DYTKaXXY8MO303vtjuLpvJzGSQEemWHtnHz?=
 =?us-ascii?Q?Tfl9YipK5ma2IKiAW5o8Ohi3f58oWy8j8aSwaLoOc4rHlouukzqnYxtG83eC?=
 =?us-ascii?Q?te0itRIKFNOyUJncFFaTG5p5cxnNYRNf0LNyXccMW6PS36kPn9jW+ur5TUKg?=
 =?us-ascii?Q?S4QM5Jm6D9qEk+6aBZ4Uhm88bSFUiFvBKonEqKH950y9kO1lUSFzufI1vqjN?=
 =?us-ascii?Q?4rXZLx2MLh9s1X4zBSvahFN5zn0YDewHuRwUImyGN+HJPbtlseEQ2l4rHfL8?=
 =?us-ascii?Q?h8zgFFMesVeezBrfXxjXlKgnMETwOsD5xXHG8N2DFQvzIVWmjam7qegEY/w+?=
 =?us-ascii?Q?fe8a9FQmzPzQTRRUCsNm10iU1SbCPiTuC2IME+dNshlXDj4D0f2OdjXkFuEs?=
 =?us-ascii?Q?odX2kZyz6CV02mQj048oCnA=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f63acb81-749e-421f-b520-08dc34bb881d
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR01MB8257.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2024 22:05:22.8397
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: F3Ldda1HBnuJmruHKmDAN3un4DFItmnJd3aNgHJcN8Phy7HI87tPvRovqxXMrR4dAVnLXtGpQqENEXhZHwxrvDhCgwyvzbglTU812cPiTbz0/vWp07vhTju+T6PcnZ72
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR01MB8022

Arm64 doesn't have Model in /proc/cpuinfo and, thus, cpu_desc doesn't get
assigned.

Running
	$ perf data convert --to-json perf.data.json

ends up calling output_json_string() with NULL pointer, which causes a
segmentation fault.

Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
---

v1:
    - https://lore.kernel.org/all/20240111232923.8138-1-ilkka@os.amperecomputing.com/
v2:
    - Changed the patch based on James's comments.
v3:
    - The architecture is checked from the actual data file to allow one to do
      conversion on another system. (thanks to James for the feedback)
    - https://lore.kernel.org/all/20240117215101.77713-1-ilkka@os.amperecomputing.com/
v4:
    - Made the fix more generic in case there are other architectures where cpu_desc
      isn't assigned as asked by Namhyung
    - Rephrased the subject line
---

tools/perf/util/data-convert-json.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
index 5bb3c2ba95ca..09d57efd2d9d 100644
--- a/tools/perf/util/data-convert-json.c
+++ b/tools/perf/util/data-convert-json.c
@@ -284,7 +284,9 @@ static void output_headers(struct perf_session *session, struct convert_json *c)
 	output_json_key_string(out, true, 2, "os-release", header->env.os_release);
 	output_json_key_string(out, true, 2, "arch", header->env.arch);
 
-	output_json_key_string(out, true, 2, "cpu-desc", header->env.cpu_desc);
+	if (header->env.cpu_desc)
+		output_json_key_string(out, true, 2, "cpu-desc", header->env.cpu_desc);
+
 	output_json_key_string(out, true, 2, "cpuid", header->env.cpuid);
 	output_json_key_format(out, true, 2, "nrcpus-online", "%u", header->env.nr_cpus_online);
 	output_json_key_format(out, true, 2, "nrcpus-avail", "%u", header->env.nr_cpus_avail);
-- 
2.43.0