Commit 6bf86cad authored by Ganapatrao Kulkarni's avatar Ganapatrao Kulkarni Committed by Arnaldo Carvalho de Melo

perf cs-etm: Add fix for coresight trace for any range of CPUs

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: default avatarGanapatrao Kulkarni <gankulkarni@os.amperecomputing.com>
Link: https://lore.kernel.org/r/20230421055253.83912-1-gankulkarni@os.amperecomputing.com
Cc: suzuki.poulose@arm.com
Cc: acme@kernel.org
Cc: mathieu.poirier@linaro.org
Cc: mike.leach@linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: darren@os.amperecomputing.com
Cc: scclevenger@os.amperecomputing.com
Cc: scott@os.amperecomputing.com
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d1992261
...@@ -290,6 +290,25 @@ static int cs_etm__metadata_set_trace_id(u8 trace_chan_id, u64 *cpu_metadata) ...@@ -290,6 +290,25 @@ static int cs_etm__metadata_set_trace_id(u8 trace_chan_id, u64 *cpu_metadata)
(typeof(_mask))(((_reg) & (_mask)) >> __bf_shf(_mask)); \ (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. * Handle the PERF_RECORD_AUX_OUTPUT_HW_ID event.
* *
...@@ -359,8 +378,11 @@ static int cs_etm__process_aux_output_hw_id(struct perf_session *session, ...@@ -359,8 +378,11 @@ static int cs_etm__process_aux_output_hw_id(struct perf_session *session,
return 0; return 0;
} }
cpu_data = get_cpu_data(etm, cpu);
if (cpu_data == NULL)
return err;
/* not one we've seen before - lets map it */ /* 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); err = cs_etm__map_trace_id(trace_chan_id, cpu_data);
if (err) if (err)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment