diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2025-01-06 18:50:47 +0100 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-01-08 09:39:58 -0800 |
| commit | 2ebadb60cb36f2ee74bf83930fc73a5ceeb935fc (patch) | |
| tree | 0ad805f193bc02f18f137576cfc405721d390b50 /kernel/trace/bpf_trace.c | |
| parent | ca3c4f646a9fc7d23b30c70e6663eaa38ac746af (diff) | |
| download | lwn-2ebadb60cb36f2ee74bf83930fc73a5ceeb935fc.tar.gz lwn-2ebadb60cb36f2ee74bf83930fc73a5ceeb935fc.zip | |
bpf: Return error for missed kprobe multi bpf program execution
When kprobe multi bpf program can't be executed due to recursion check,
we currently return 0 (success) to fprobe layer where it's ignored for
standard kprobe multi probes.
For kprobe session the success return value will make fprobe layer to
install return probe and try to execute it as well.
But the return session probe should not get executed, because the entry
part did not run. FWIW the return probe bpf program most likely won't get
executed, because its recursion check will likely fail as well, but we
don't need to run it in the first place.. also we can make this clear
and obvious.
It also affects missed counts for kprobe session program execution, which
are now doubled (extra count for not executed return probe).
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Link: https://lore.kernel.org/r/20250106175048.1443905-1-jolsa@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/trace/bpf_trace.c')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index a90880f475af..fc657c0eeb3e 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2802,7 +2802,7 @@ kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link, if (unlikely(__this_cpu_inc_return(bpf_prog_active) != 1)) { bpf_prog_inc_misses_counter(link->link.prog); - err = 0; + err = 1; goto out; } |