Skip to content

Commit c9f2833

Browse files
stkidacmel
authored andcommitted
perf cs-etm: 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 cs_etm 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 coresight feature, but the code seems buggy same as arm-spe and intel-pt. Tester notes: Thanks for looping, Adrian. Applied this patch and tested with CoreSight on juno board, it works well. Signed-off-by: Wei Li <liwei391@huawei.com> Reviewed-by: Leo Yan <leo.yan@linaro.org> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> Tested-by: Leo Yan <leo.yan@linaro.org> 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-4-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 783fed2 commit c9f2833

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

tools/perf/arch/arm/util/cs-etm.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,9 +865,12 @@ static int cs_etm_read_finish(struct auxtrace_record *itr, int idx)
865865
struct evsel *evsel;
866866

867867
evlist__for_each_entry(ptr->evlist, evsel) {
868-
if (evsel->core.attr.type == ptr->cs_etm_pmu->type)
868+
if (evsel->core.attr.type == ptr->cs_etm_pmu->type) {
869+
if (evsel->disabled)
870+
return 0;
869871
return perf_evlist__enable_event_idx(ptr->evlist,
870872
evsel, idx);
873+
}
871874
}
872875

873876
return -EINVAL;

0 commit comments

Comments
 (0)