Skip to contentSkip to conversation

perf tools: intel-bts: fix endless record after being terminated

RFC PATCH New Wei Li 1 participant 1 message Jan 2, 2020 perf events

lore
Share & tools
lore

Wei Li

author
#0 lore raw

RFC PATCH 1/1 perf tools: 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.

---
 tools/perf/arch/x86/util/intel-bts.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
tools/perf/arch/x86/util/intel-bts.c +7 -3
index 27d9e214d068..d524ba802a2e 100644
@@ -420,9 +420,13 @@ static int intel_bts_read_finish(struct auxtrace_record *itr, int idx)
 	struct evsel *evsel;
 
 	evlist__for_each_entry(btsr->evlist, evsel) {
-		if (evsel->core.attr.type == btsr->intel_bts_pmu->type)
-			return perf_evlist__enable_event_idx(btsr->evlist,
-							     evsel, idx);
+		if (evsel->core.attr.type == btsr->intel_bts_pmu->type) {
+			if (evsel->disabled)
+				return 0;
+			else
+				return perf_evlist__enable_event_idx(
+						btsr->evlist, evsel, idx);
+		}
 	}
 	return -EINVAL;
 }
Signature · 1 line
2.17.1