Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ganapatrao Kulkarni <gankulkarni@os.amperecomputing.com>
To:     linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        mike.leach@linaro.org, suzuki.poulose@arm.com
Cc:     mathieu.poirier@linaro.org, acme@kernel.org,
        darren@os.amperecomputing.com, scott@os.amperecomputing.com,
        scclevenger@os.amperecomputing.com,
        gankulkarni@os.amperecomputing.com
Subject: [PATCH V2] perf cs-etm: Add fix for coresight trace for any range of CPUs
Date:   Thu, 20 Apr 2023 22:52:53 -0700
Message-Id: <20230421055253.83912-1-gankulkarni@os.amperecomputing.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?ev/MhtW3EBWD5g+NRPtDtRztiBvDk8GIF6iYLkED6xd8BHwxKDxc9ySEMpzq?=
 =?us-ascii?Q?9+Q0+uu23z+lACl8lOa9PRyoC/l98VYR+cIUx2pV6soE4eJCOgdRpcf7SZYC?=
 =?us-ascii?Q?tyWJ6pZzAzoIcKSOwOZ+LTkTFtHTY44NGx7qwVpKJSSNYwh5n79vrKMpE9hJ?=
 =?us-ascii?Q?A1K0berageVmlyiQUH+4o+NFf5JzYZ/C9+eJT7qriSi3TTNFPVh7wXE1XK+q?=
 =?us-ascii?Q?EOKqsEoUmDbgBruGc2NBozybYT7qSVvCOaaIwC55aSFFyi49WhT5jWws3huz?=
 =?us-ascii?Q?RB3K8mGkRohJ6z/Qe7IlsUJWiqpBnzUKibZVSM6AoeM07k4rB7o0gTkD2p4e?=
 =?us-ascii?Q?I1u8rfkYssuzLBS2LlZaLR0gRTO4k/SnHiyz2/RIy88My3vEgb9519O7vjko?=
 =?us-ascii?Q?xdAf4cbJomm0pXG88BLwa73L5uwE1nnBcS2EPimHr4LmoUbfKbCaD7HC/RIW?=
 =?us-ascii?Q?vPf4VvnukxC2nnM5f1Au5+y5r94HwZMtlL5d45wHzKQwAsS0n7R43A7rKtnA?=
 =?us-ascii?Q?GWC/Pg22KZMzS9oZWiT1UbBoWxbvM7unNU3BllLz1ABmZhe459QA9bCybl93?=
 =?us-ascii?Q?n+E3NdtYgmiJhagJnNx2B+/ITT7J27JwGh0QX0GH+n6UsyEQrQCXaVVU3qaI?=
 =?us-ascii?Q?Skgt9xwpXLg50rSOOcQRLaiROBsDp19UmtW9+hlGMzKYKLjLPWgel4p32Vfe?=
 =?us-ascii?Q?lwZrEvq54ZNwoWNtO4k72wDJ5liGUNLMCunTWhqkHeoibs3S5FDcC8peWVE3?=
 =?us-ascii?Q?hVmgisQWa3i6lpqKFO8f75rFI4Z2V8Bzw5cAo6R8HK44AH7y9ukbncl3krmI?=
 =?us-ascii?Q?nYZosPNWx2fihvbPm9e7wL1YVfZsRDFmYx/aiPy7EZtV83XPdwUdEUn9BzAv?=
 =?us-ascii?Q?NyQHmUkjpwIGzWlsDUmFM5FUVVSovnpDjRGdoDq/XasL5ayiQwJKkqYC9hh2?=
 =?us-ascii?Q?zmpBm67Rn1NFUiEWyxKeUxXXIkxrou3rP/Xcm4UGPdIqo/1xNsNfyoepCUzU?=
 =?us-ascii?Q?Yk241wj8jAlRYrkf9JAnwIB3ufHNVTwk/p8hUt5FAqj0Jh53HFxp8AJ9vsSv?=
 =?us-ascii?Q?LLnOM/uCkLgpYHspgADaUTblIF3bpZ/Jdst3QWWiy9iJcybPo1spCd8WZg4l?=
 =?us-ascii?Q?uHEydYiQJbUxwPwURZ8ftz2qXE8xPal9ZxgQy1JZp3zwm3oq5Xckvj/c5/Wv?=
 =?us-ascii?Q?ZUbYjKu+xqZDmu21WeGBavBAO09ZnmgJwOdrBog4r9q7tJEvHwaG+ig/PvAT?=
 =?us-ascii?Q?4ORXwLFzXzBfeRLOxDYTfbxxKjuu7oEAEZakMFKu0U5NSEqrLP9dQtzHqj8e?=
 =?us-ascii?Q?h6dnziJIS7WI7RTUzj8GZBpKSSdvCpjbqZE85zaEu9F1yXH5Y8oUlOxF1ymv?=
 =?us-ascii?Q?xdU6YewB8mFf6sQ0rK76yo85rZ3RPAKJE4DgNffpZv9hoPWlG79wrVtF0Jvp?=
 =?us-ascii?Q?6xU3+DF3ftPLSLoedVMKM5qnem2XbJr9aqgp85ctHr2LU9VPKZ0OuG1dN/PF?=
 =?us-ascii?Q?aFx+k23Oi7GSwdVAFiz8G1de/DdJWrhOh82T4vm70/w5YQ+5lAElVgmze2/p?=
 =?us-ascii?Q?nflpNkj7hrcYSiGrtfXDPTDHwlEsv2UPNcMd7iHzbDtqsY2eTyXrE8g8rL7g?=
 =?us-ascii?Q?g213iS6C0Y/QkYHXRvcT72o=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 43c47bd1-9d1e-413c-af27-08db422cadf5
X-MS-Exchange-CrossTenant-AuthSource: DM8PR01MB6824.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2023 05:53:06.9535
 (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: kw6QIaJdzDF3bxDJpXQOVmucxl2yr1arhWXHJrT+ibCgabxJVb3DIQFyfgKPmMiQFqHKLlOEdL5Nx1ttkHB43F+fUOEdZYtSsPbZKm1C44SE90Jn1liXUUgdKEfQlycV
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR01MB5588
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The current implementation supports coresight trace decode for a range
of CPUs, if the first CPU is CPU0.

Perf report segfaults, if tried for sparse CPUs list and also for
any range of CPUs(non zero first CPU).

Adding a fix to perf report for any range of CPUs and for sparse list.

Signed-off-by: Ganapatrao Kulkarni <gankulkarni@os.amperecomputing.com>
---

V2:
	Updated with review comments.
	Fixed for sparse list of CPUs also.

V1:
	[1] https://lore.kernel.org/lkml/20230419172101.78638-1-gankulkarni@os.amperecomputing.com/

 tools/perf/util/cs-etm.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 8dd81ddd9e4e..2003717f5779 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -275,6 +275,25 @@ static int cs_etm__metadata_set_trace_id(u8 trace_chan_id, u64 *cpu_metadata)
 		(typeof(_mask))(((_reg) & (_mask)) >> __bf_shf(_mask)); \
 	})
 
+/*
+ * Get a metadata for a specific cpu from an array.
+ *
+ */
+static u64 *get_cpu_data(struct cs_etm_auxtrace *etm, int cpu)
+{
+	int i;
+	u64 *metadata = NULL;
+
+	for (i = 0; i < etm->num_cpu; i++) {
+		if (etm->metadata[i][CS_ETM_CPU] == (u64)cpu) {
+			metadata = etm->metadata[i];
+			break;
+		}
+	}
+
+	return metadata;
+}
+
 /*
  * Handle the PERF_RECORD_AUX_OUTPUT_HW_ID event.
  *
@@ -344,8 +363,11 @@ static int cs_etm__process_aux_output_hw_id(struct perf_session *session,
 		return 0;
 	}
 
+	cpu_data = get_cpu_data(etm, cpu);
+	if (cpu_data == NULL)
+		return err;
+
 	/* not one we've seen before - lets map it */
-	cpu_data = etm->metadata[cpu];
 	err = cs_etm__map_trace_id(trace_chan_id, cpu_data);
 	if (err)
 		return err;
-- 
2.39.2