[PATCH 6/6] perf tools: arm-spe: fix record hang after being terminated
From: Tan Xiaojun
Date: Wed Dec 18 2019 - 02:09:11 EST
From: Wei Li <liwei391@xxxxxxxxxx>
If the spe event is terminated, we don't enable it again here.
Signed-off-by: Wei Li <liwei391@xxxxxxxxxx>
Tested-by: Qi Liu <liuqi115@xxxxxxxxxxxxx>
---
tools/perf/arch/arm64/util/arm-spe.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c
index eba6541ec0f1..629badda724d 100644
--- a/tools/perf/arch/arm64/util/arm-spe.c
+++ b/tools/perf/arch/arm64/util/arm-spe.c
@@ -165,9 +165,13 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx)
struct evsel *evsel;
evlist__for_each_entry(sper->evlist, evsel) {
- if (evsel->core.attr.type == sper->arm_spe_pmu->type)
- return perf_evlist__enable_event_idx(sper->evlist,
- evsel, idx);
+ if (evsel->core.attr.type == sper->arm_spe_pmu->type) {
+ if (evsel->terminated)
+ return 0;
+ else
+ return perf_evlist__enable_event_idx(
+ sper->evlist, evsel, idx);
+ }
}
return -EINVAL;
}
--
2.17.1