| Message ID | 20200102074034.38650-1-liwei391@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | perf tools: arm-spe: fix endless record after being terminated | expand |
diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c index eba6541ec0f1..d1ff278a8ab2 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -165,9 +165,13 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx) struct evsel *evsel; evlist__for_each_entry(sper->evlist, evsel) { - if (evsel->core.attr.type == sper->arm_spe_pmu->type) - return perf_evlist__enable_event_idx(sper->evlist, - evsel, idx); + if (evsel->core.attr.type == sper->arm_spe_pmu->type) { + if (evsel->disabled) + return 0; + else + return perf_evlist__enable_event_idx( + sper->evlist, evsel, idx); + } } return -EINVAL; }
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 arm_spe event is disabled, we don't enable it again here. Before the patch: [root@localhost ~]# ./perf record -e arm_spe_0/ts_enable=1,pct_enable=1,\ pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/ -p 5387 ^C^C^C^C^C^C After the patch: [root@localhost ~]# ./perf record -e arm_spe_0/ts_enable=1,pct_enable=1,\ pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/ -p 5387 ^C[ perf record: Woken up 0 times to write data ] Warning: AUX data lost 255 times out of 789! [ perf record: Captured and wrote 1020.719 MB perf.data ] Signed-off-by: Wei Li <liwei391@huawei.com> --- tools/perf/arch/arm64/util/arm-spe.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)