Skip to content

Commit 4aadde8

Browse files
compudjrostedt
authored andcommitted
tracing/bpf: disable preemption in syscall probe
In preparation for allowing system call enter/exit instrumentation to handle page faults, make sure that bpf can handle this change by explicitly disabling preemption within the bpf system call tracepoint probes to respect the current expectations within bpf tracing code. This change does not yet allow bpf to take page faults per se within its probe, but allows its existing probes to adapt to the upcoming change. Cc: Michael Jeanson <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Yonghong Song <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Andrii Nakryiko <[email protected]> Cc: [email protected] Cc: Joel Fernandes <[email protected]> Link: https://lore.kernel.org/[email protected] Acked-by: Andrii Nakryiko <[email protected]> Tested-by: Andrii Nakryiko <[email protected]> # BPF parts Signed-off-by: Mathieu Desnoyers <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 65e7462 commit 4aadde8

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

include/trace/bpf_probe.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,18 @@ __bpf_trace_##call(void *__data, proto) \
5353
#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
5454
__BPF_DECLARE_TRACE(call, PARAMS(proto), PARAMS(args))
5555

56+
#define __BPF_DECLARE_TRACE_SYSCALL(call, proto, args) \
57+
static notrace void \
58+
__bpf_trace_##call(void *__data, proto) \
59+
{ \
60+
preempt_disable_notrace(); \
61+
CONCATENATE(bpf_trace_run, COUNT_ARGS(args))(__data, CAST_TO_U64(args)); \
62+
preempt_enable_notrace(); \
63+
}
64+
5665
#undef DECLARE_EVENT_SYSCALL_CLASS
57-
#define DECLARE_EVENT_SYSCALL_CLASS DECLARE_EVENT_CLASS
66+
#define DECLARE_EVENT_SYSCALL_CLASS(call, proto, args, tstruct, assign, print) \
67+
__BPF_DECLARE_TRACE_SYSCALL(call, PARAMS(proto), PARAMS(args))
5868

5969
/*
6070
* This part is compiled out, it is only here as a build time check

0 commit comments

Comments
 (0)