| From d6bc34c5ec18c3544c4b0d85963768dfbcd24184 Mon Sep 17 00:00:00 2001 |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| Date: Fri, 14 Feb 2020 15:26:53 +0200 |
| Subject: perf arm-spe: Fix endless record after being terminated |
| |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| |
| commit d6bc34c5ec18c3544c4b0d85963768dfbcd24184 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 event is disabled, don't enable it again here. |
| |
| Based-on-patch-by: Wei Li <liwei391@huawei.com> |
| Signed-off-by: Adrian Hunter <adrian.hunter@intel.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-5-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/arm64/util/arm-spe.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/tools/perf/arch/arm64/util/arm-spe.c |
| +++ b/tools/perf/arch/arm64/util/arm-spe.c |
| @@ -165,9 +165,12 @@ static int arm_spe_read_finish(struct au |
| struct evsel *evsel; |
| |
| evlist__for_each_entry(sper->evlist, evsel) { |
| - if (evsel->core.attr.type == sper->arm_spe_pmu->type) |
| + if (evsel->core.attr.type == sper->arm_spe_pmu->type) { |
| + if (evsel->disabled) |
| + return 0; |
| return perf_evlist__enable_event_idx(sper->evlist, |
| evsel, idx); |
| + } |
| } |
| return -EINVAL; |
| } |
