Skip to content

Commit 783fed2

Browse files
stkidacmel
authored andcommitted
perf intel-bts: 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 intel_bts event is disabled, we don't enable it again here. Note: This patch is NOT tested since i don't have such a machine with intel_bts feature, but the code seems buggy same as arm-spe and intel-pt. Signed-off-by: Wei Li <liwei391@huawei.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-3-adrian.hunter@intel.com [ahunter: removed redundant 'else' after 'return'] Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 2da4dd3 commit 783fed2

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

tools/perf/arch/x86/util/intel-bts.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,12 @@ static int intel_bts_read_finish(struct auxtrace_record *itr, int idx)
420420
struct evsel *evsel;
421421

422422
evlist__for_each_entry(btsr->evlist, evsel) {
423-
if (evsel->core.attr.type == btsr->intel_bts_pmu->type)
423+
if (evsel->core.attr.type == btsr->intel_bts_pmu->type) {
424+
if (evsel->disabled)
425+
return 0;
424426
return perf_evlist__enable_event_idx(btsr->evlist,
425427
evsel, idx);
428+
}
426429
}
427430
return -EINVAL;
428431
}

0 commit comments

Comments
 (0)