Skip to content

Commit fc73ded

Browse files
ahunter6gregkh
authored andcommitted
perf arm-spe: Fix endless record after being terminated
commit d6bc34c 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 <[email protected]> Signed-off-by: Adrian Hunter <[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] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8ae75e5 commit fc73ded

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

tools/perf/arch/arm64/util/arm-spe.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,12 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx)
165165
struct evsel *evsel;
166166

167167
evlist__for_each_entry(sper->evlist, evsel) {
168-
if (evsel->core.attr.type == sper->arm_spe_pmu->type)
168+
if (evsel->core.attr.type == sper->arm_spe_pmu->type) {
169+
if (evsel->disabled)
170+
return 0;
169171
return perf_evlist__enable_event_idx(sper->evlist,
170172
evsel, idx);
173+
}
171174
}
172175
return -EINVAL;
173176
}

0 commit comments

Comments
 (0)