Received-SPF: pass (google.com: domain of linux-kernel+bounces-28588-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Ilkka Koskinen <ilkka@os.amperecomputing.com>
To: 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>,
	Namhyung Kim <namhyung@kernel.org>,
	Ian Rogers <irogers@google.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	James Clark <james.clark@arm.com>
Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>,
	linux-perf-users@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2] perf data convert: Fix segfault when converting to json on arm64
Date: Tue, 16 Jan 2024 23:13:31 -0800
Message-ID: <20240117071331.59725-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?732PWs8pgCWCyBIb24KpPlfam6Efu0G9e/aioD/5eWXEu4klHT9mMuVg3iNg?=
 =?us-ascii?Q?khsmPO8JP3AHRG7t/meEjodO9IIkTbfdIFhLWNaaT3EDolFU5aHol8JiZc5i?=
 =?us-ascii?Q?Q3Gn3HFsSGSdWBBPdOxHVwuaVweabc+Nn0uz+0YyS15LWo368I2flfcIGtgc?=
 =?us-ascii?Q?5QLGA4CTM2y/DsRPH5OH75fDHpI+fRvt0BBb3S3rHzbU5joKNIViW6PQkCcr?=
 =?us-ascii?Q?WYrPouXl5WeQhTbNrz3ormb9PY/UUwiBsynCjVJQBohrTwt5S+uMjih8j/4r?=
 =?us-ascii?Q?6OYjBjyRRsKMG0lTh/JxtLlVcGWcN/Uubh1JX/QqijQUeUAOm5hnO6G2KUUt?=
 =?us-ascii?Q?p5dFzw7mwsLEr0PWEH+uxSiPeHINvcKO+YfaurQKeDWmoV1MAtz92sibXtt+?=
 =?us-ascii?Q?5aEOrhikfu3F6EiQTotx1q9ExeGQjncZ2EUwkQnQhNjVw+zGEUyOlqsSRLwv?=
 =?us-ascii?Q?bFt+cnDwvH1ZBr2b7LZHLwr4xzvgx9C1dhCIV1qRIq1SZ/g9nMFqhbiQurVx?=
 =?us-ascii?Q?n4ZhQw0iK3eDhYSmxAMAzpfdG7tCSnJbFhwpHILNrTZ5eIFKKgL/KG/QYKEO?=
 =?us-ascii?Q?KEOUayN0wM7k/UPSAncePBNv93/+IUb7CnijccDUYyTl3pcUUin/efq5Brk1?=
 =?us-ascii?Q?E8Fxoy7VFthJe6iuYzP0UIS8fNBQVuRjmR1kfzzwaHbm8zTB34ktI8ulzFwq?=
 =?us-ascii?Q?1r6h93MRkhTl6ElRVmpKR5iJ3jbosyGhIOMvYfvnTIrZOuNueMoaPWpvwv8u?=
 =?us-ascii?Q?81Gx78sEe6aOHfuXLZbF2Zo5Bbr5+64qycQXywynyAU/y4hR4XKW6EsOVe34?=
 =?us-ascii?Q?tRHNsMVNAvZ6FjzqOU65bQWxE/ZJl0t3Yir5vUcSBiPhg8yH/zHaEheUlSJY?=
 =?us-ascii?Q?AoWQSbdao3aRth4PVHrfLMyA1dxJxRh8ZJQyMqGRj2BGbfRgxSO6q2uG4apX?=
 =?us-ascii?Q?jEJuiCetHc4aY2JUD0pTGzfdDzt/uzNA9BB9e4QlU2H2mwhgQXkLyI+0DRVd?=
 =?us-ascii?Q?sQamEtT24Yy66vFXZPYwGej2Xht7EMO7jYWUskLpUkCAJLhMjtvcXf6F9HQb?=
 =?us-ascii?Q?pNatiiQlPDWMmqY+MqUbP351Arug9m2dnZFQuZjx3Mp1GucxJNwo5911Mu+G?=
 =?us-ascii?Q?8b7jOezBHNO2X/8ObRuJ+dYVSSZ707xdoHleKkIBSeAaiaQvC7GeZsIh2tRt?=
 =?us-ascii?Q?HA9Ym67N6Hre73BqXBpaVbYn8Vinndy28gXlxO/SIZtZMrHeuExrdEgpJKlV?=
 =?us-ascii?Q?QLuHr+wbR49fqVGNrgNQIqYiAj2/6RBWaMdeVBAMoRcvIKoPcjACHMBDnOeK?=
 =?us-ascii?Q?ei6wCTrOKMX+N92zxTKGkeBMzgltKD93+gnYFmU9GKGMSUJIAa9shqagoyl+?=
 =?us-ascii?Q?VATBii+4iaEgwZ5dX9UxYry/cG1YQpkun8AAQuNTbEpQOgQb4SIoLtk3zXZq?=
 =?us-ascii?Q?CeD6COwCBmxoPMH5oYEZbO0tI7gs6DB9u7vrNxHYkSLdc74WZ6H+lnOzIPgt?=
 =?us-ascii?Q?Q48i/VD8O1RTHhV86mCiWOjADnCrTsu2TG2x+H+MTO+iLgR3P1YHNgUiA32k?=
 =?us-ascii?Q?An4SeNIz1+cXjkJpvqLrvYS7SQmRkrMXiZ6BGbTzVyFiVHmxBFeyOccqOhuI?=
 =?us-ascii?Q?S79/2rzTDwsHbT3JFpon9N4=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6932ff28-8426-41f3-26a0-08dc172bdc25
X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB8166.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2024 07:13:52.5297
 (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: +ktdQwX1QlEmNUowB2Lgfy65VdBRTcnKVSczHm2P5TqFEE6yG/SlTYFsr/vnfitPTtdL/mMWL34ZIcKrG4j+xr0amr5OPnl1JUgFlCAdUrYeNu8ydu8be7p1A/1eaz9R
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR01MB7580

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.
---
tools/perf/util/data-convert-json.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
index 5bb3c2ba95ca..e8b006c3581f 100644
--- a/tools/perf/util/data-convert-json.c
+++ b/tools/perf/util/data-convert-json.c
@@ -284,7 +284,13 @@ 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);
 
+#if !defined(__aarch64__)
+	/*
+	 * arm64 doesn't have Model section in /proc/cpuinfo and, thus, cpu-desc
+	 * is not set.
+	 */
 	output_json_key_string(out, true, 2, "cpu-desc", header->env.cpu_desc);
+#endif
 	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