Skip to content

Commit d6bc34c

Browse files
ahunter6acmel
authored andcommitted
perf arm-spe: Fix endless record after being terminated
In __cmd_record(), when receiving SIGINT(ctrl + c), a 'done' flag will be set and the event list will be disabled by evlist__disable() once. While in auxtrace_record.read_finish(), the related events will be enabled again, if they are continuous, the recording seems to be endless. If the event is disabled, don't enable it again here. Based-on-patch-by: Wei Li <liwei391@huawei.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Tan Xiaojun <tanxiaojun@huawei.com> Cc: stable@vger.kernel.org # 5.4+ Link: http://lore.kernel.org/lkml/20200214132654.20395-5-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent c9f2833 commit d6bc34c

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

tools/perf/arch/arm64/util/arm-spe.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,12 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx)
165165
struct evsel *evsel;
166166

167167
evlist__for_each_entry(sper->evlist, evsel) {
168-
if (evsel->core.attr.type == sper->arm_spe_pmu->type)
168+
if (evsel->core.attr.type == sper->arm_spe_pmu->type) {
169+
if (evsel->disabled)
170+
return 0;
169171
return perf_evlist__enable_event_idx(sper->evlist,
170172
evsel, idx);
173+
}
171174
}
172175
return -EINVAL;
173176
}

0 commit comments

Comments
 (0)