In per-thread mode there are no context packets so no way to determine which type of context packets exist. But because it's only possible to trace host processes in per-thread mode without context packets then assume host in this case.
This fixes the per-thread test case failures when running on nVHE:
98: Check Arm CoreSight trace data recording and synthesized samples: --- start --- ... Recording trace with '-e cs_etm/timestamp=0/ --per-thread' Looking at perf.data file for dumping branch samples: CoreSight basic testing with '-e cs_etm/timestamp=0/ --per-thread': FAIL Recording trace with '-e cs_etm/timestamp=1/ --per-thread' Looking at perf.data file for dumping branch samples: CoreSight basic testing with '-e cs_etm/timestamp=1/ --per-thread': FAIL ...
Fixes: 8d3031d39fe8 ("perf cs-etm: Track exception level") Signed-off-by: James Clark james.clark@arm.com --- tools/perf/util/cs-etm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 1419b40dfbe8..85821cc5650e 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -900,10 +900,17 @@ static struct machine *cs_etm__get_machine(struct cs_etm_queue *etmq,
/* * For any virtualisation based on nVHE (e.g. pKVM), or host kernels - * running at EL1 assume everything is the host. + * running at EL1, or no context IDs (per-thread mode) assume everything + * is the host. */ - if (pid_fmt == CS_ETM_PIDFMT_CTXTID) + switch (pid_fmt) { + case CS_ETM_PIDFMT_CTXTID: + case CS_ETM_PIDFMT_NONE: return &etmq->etm->session->machines.host; + case CS_ETM_PIDFMT_CTXTID2: + default: + break; + }
/* * Not perfect, but otherwise assume anything in EL1 is the default