Skip to content

Commit 2da4dd3

Browse files
stkidacmel
authored andcommitted
perf intel-pt: 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 intel_pt event is disabled, we don't enable it again here. Before the patch: huawei@huawei-2288H-V5:~/linux-5.5-rc4/tools/perf$ ./perf record -e \ intel_pt//u -p 46803 ^C^C^C^C^C^C After the patch: huawei@huawei-2288H-V5:~/linux-5.5-rc4/tools/perf$ ./perf record -e \ intel_pt//u -p 48591 ^C[ perf record: Woken up 0 times to write data ] Warning: AUX data lost 504 times out of 4816! [ perf record: Captured and wrote 2024.405 MB perf.data ] Signed-off-by: Wei Li <[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]>
1 parent 2bbc835 commit 2da4dd3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

tools/perf/arch/x86/util/intel-pt.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,9 +1173,12 @@ static int intel_pt_read_finish(struct auxtrace_record *itr, int idx)
11731173
struct evsel *evsel;
11741174

11751175
evlist__for_each_entry(ptr->evlist, evsel) {
1176-
if (evsel->core.attr.type == ptr->intel_pt_pmu->type)
1176+
if (evsel->core.attr.type == ptr->intel_pt_pmu->type) {
1177+
if (evsel->disabled)
1178+
return 0;
11771179
return perf_evlist__enable_event_idx(ptr->evlist, evsel,
11781180
idx);
1181+
}
11791182
}
11801183
return -EINVAL;
11811184
}

0 commit comments

Comments
 (0)