diff options
author | Wei Li <[email protected]> | 2020-02-14 15:26:52 +0200 |
---|---|---|
committer | Arnaldo Carvalho de Melo <[email protected]> | 2020-02-18 10:13:29 -0300 |
commit | c9f2833cb472cf9e0a49b7bcdc210a96017a7bfd (patch) | |
tree | 13137d04737ee41be8bcf6a676c6dcd491abe294 | |
parent | 783fed2f35e2a6771c8dc6ee29b8c4b9930783ce (diff) |
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 <[email protected]>
Reviewed-by: Leo Yan <[email protected]>
Reviewed-by: Mathieu Poirier <[email protected]>
Tested-by: Leo Yan <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Tan Xiaojun <[email protected]>
Cc: [email protected] # 5.4+
Link: http://lore.kernel.org/lkml/[email protected]
[ahunter: removed redundant 'else' after 'return']
Signed-off-by: Adrian Hunter <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
-rw-r--r-- | tools/perf/arch/arm/util/cs-etm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c index 2898cfdf8fe1..60141c3007a9 100644 --- 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 auxtrace_record *itr, int idx) 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; |