Commit bd3c628f authored by Wei Li's avatar Wei Li Committed by Arnaldo Carvalho de Melo

perf tools: Fix record failure when mixed with ARM SPE event

When recording with cache-misses and arm_spe_x event, I found that it
will just fail without showing any error info if i put cache-misses
after 'arm_spe_x' event.

  [root@localhost 0620]# perf record -e cache-misses \
				-e arm_spe_0/ts_enable=1,pct_enable=1,pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/ sleep 1
  [ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 0.067 MB perf.data ]
  [root@localhost 0620]#
  [root@localhost 0620]# perf record -e arm_spe_0/ts_enable=1,pct_enable=1,pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/ \
				     -e  cache-misses sleep 1
  [root@localhost 0620]#

The current code can only work if the only event to be traced is an
'arm_spe_x', or if it is the last event to be specified. Otherwise the
last event type will be checked against all the arm_spe_pmus[i]->types,
none will match and an out of bound 'i' index will be used in
arm_spe_recording_init().

We don't support concurrent multiple arm_spe_x events currently, that
is checked in arm_spe_recording_options(), and it will show the relevant
info. So add the check and record of the first found 'arm_spe_pmu' to
fix this issue here.

Fixes: ffd3d18c ("perf tools: Add ARM Statistical Profiling Extensions (SPE) support")
Signed-off-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Tested-by-by: default avatarLeo Yan <leo.yan@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Hanjun Guo <guohanjun@huawei.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lore.kernel.org/lkml/20200724071111.35593-2-liwei391@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 463538a3
...@@ -56,7 +56,7 @@ struct auxtrace_record ...@@ -56,7 +56,7 @@ struct auxtrace_record
struct perf_pmu *cs_etm_pmu; struct perf_pmu *cs_etm_pmu;
struct evsel *evsel; struct evsel *evsel;
bool found_etm = false; bool found_etm = false;
bool found_spe = false; struct perf_pmu *found_spe = NULL;
static struct perf_pmu **arm_spe_pmus = NULL; static struct perf_pmu **arm_spe_pmus = NULL;
static int nr_spes = 0; static int nr_spes = 0;
int i = 0; int i = 0;
...@@ -74,12 +74,12 @@ struct auxtrace_record ...@@ -74,12 +74,12 @@ struct auxtrace_record
evsel->core.attr.type == cs_etm_pmu->type) evsel->core.attr.type == cs_etm_pmu->type)
found_etm = true; found_etm = true;
if (!nr_spes) if (!nr_spes || found_spe)
continue; continue;
for (i = 0; i < nr_spes; i++) { for (i = 0; i < nr_spes; i++) {
if (evsel->core.attr.type == arm_spe_pmus[i]->type) { if (evsel->core.attr.type == arm_spe_pmus[i]->type) {
found_spe = true; found_spe = arm_spe_pmus[i];
break; break;
} }
} }
...@@ -96,7 +96,7 @@ struct auxtrace_record ...@@ -96,7 +96,7 @@ struct auxtrace_record
#if defined(__aarch64__) #if defined(__aarch64__)
if (found_spe) if (found_spe)
return arm_spe_recording_init(err, arm_spe_pmus[i]); return arm_spe_recording_init(err, found_spe);
#endif #endif
/* /*
......
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