| From c9f2833cb472cf9e0a49b7bcdc210a96017a7bfd Mon Sep 17 00:00:00 2001 |
| From: Wei Li <liwei391@huawei.com> |
| Date: Fri, 14 Feb 2020 15:26:52 +0200 |
| Subject: perf cs-etm: Fix endless record after being terminated |
| |
| From: Wei Li <liwei391@huawei.com> |
| |
| commit c9f2833cb472cf9e0a49b7bcdc210a96017a7bfd upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/perf/arch/arm/util/cs-etm.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/tools/perf/arch/arm/util/cs-etm.c |
| +++ b/tools/perf/arch/arm/util/cs-etm.c |
| @@ -865,9 +865,12 @@ static int cs_etm_read_finish(struct aux |
| struct evsel *evsel; |
| |
| evlist__for_each_entry(ptr->evlist, evsel) { |
| - if (evsel->core.attr.type == ptr->cs_etm_pmu->type) |
| + if (evsel->core.attr.type == ptr->cs_etm_pmu->type) { |
| + if (evsel->disabled) |
| + return 0; |
| return perf_evlist__enable_event_idx(ptr->evlist, |
| evsel, idx); |
| + } |
| } |
| |
| return -EINVAL; |