Skip to contentSkip to conversation

perf trace: Check if the raw_syscalls:sys_{enter,exit} are setup before setting tp filter

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jan 3, 2019 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  f76214f93783f9f902954cf6e57fd818c4bffe29
Gitweb:     https://git.kernel.org/tip/f76214f93783f9f902954cf6e57fd818c4bffe29
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 19 Dec 2018 10:01:20 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 21 Dec 2018 09:42:46 -0300

perf trace: Check if the raw_syscalls:sys_{enter,exit} are setup before setting tp filter

While updating 'perf trace' on an machine with an old precompiled augmented_raw_syscalls.o that didn't setup the syscall map the new 'perf trace' codebase notices the augmented_raw_syscalls.o eBPF event, decides to use it instead of the old raw_syscalls:sys_{enter,exit} method, but then because we don't have the syscall map tries to set the tracepoint filter on the sys_{enter,exit} evsels, that are NULL, segfaulting.

Make the code more robust by checking it those tracepoints have their respective evsels in place before trying to set the tp filter.

With this we still get everything to work, just not setting up the syscall filters, which is better than a segfault. Now to update the precompiled augmented_raw_syscalls.o and continue development :-)

---
 tools/perf/builtin-trace.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-trace.c +3 -1
index ebde59e61133..6689c1a114fe 100644
@@ -2686,7 +2686,9 @@ static int trace__set_ev_qualifier_filter(struct trace *trace)
 {
 	if (trace->syscalls.map)
 		return trace__set_ev_qualifier_bpf_filter(trace);
-	return trace__set_ev_qualifier_tp_filter(trace);
+	if (trace->syscalls.events.sys_enter)
+		return trace__set_ev_qualifier_tp_filter(trace);
+	return 0;
 }
 
 static int bpf_map__set_filter_pids(struct bpf_map *map __maybe_unused,