bpf: Fix bpf_session_cookie BTF_ID in special_kfunc_set list
Subsystems (5)
Jiri Olsa
reviewerPATCH 1/1 bpf: Fix bpf_session_cookie BTF_ID in special_kfunc_set list
The bpf_session_cookie is unavailable for !CONFIG_FPROBE as reported by Sebastian [1].
To fix that we remove CONFIG_FPROBE ifdef for session kfuncs, which is fine, because there's filter for session programs.
Then based on bpf_trace.o dependency:
obj-$(CONFIG_BPF_EVENTS) += bpf_trace.o
we add bpf_session_cookie BTF_ID in special_kfunc_set list dependency on CONFIG_BPF_EVENTS.
[1] https://lore.kernel.org/bpf/[email protected]/T/#m71c6d5ec71db2967288cb79acedc15cc5dbfeec5
--- kernel/bpf/verifier.c | 4 ++++ kernel/trace/bpf_trace.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +4 -0
@@ -11128,7 +11128,11 @@ BTF_ID(func, bpf_iter_css_task_new)#else BTF_ID_UNUSED#endif +#ifdef CONFIG_BPF_EVENTS BTF_ID(func, bpf_session_cookie) +#else +BTF_ID_UNUSED +#endif static bool is_kfunc_ret_null (struct bpf_kfunc_call_arg_meta *meta) {
kernel/trace/bpf_trace.c +0 -2
@@ -3517,7 +3517,6 @@ static u64 bpf_uprobe_multi_entry_ip(struct bpf_run_ctx *ctx) }#endif /* CONFIG_UPROBES */ -#ifdef CONFIG_FPROBE __bpf_kfunc_start_defs (); __bpf_kfunc bool bpf_session_is_return(void)
@@ -3566,4 +3565,3 @@ static int __init bpf_kprobe_multi_kfuncs_init(void) }late_initcall (bpf_kprobe_multi_kfuncs_init); -#endif
Signature · 1 line
2.45.1
This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:
Quoted 10 lines · On Fri, 31 May 2024 21:45:00 +0200 you wrote:
The
bpf_session_cookieis unavailable for !CONFIG_FPROBE as reported by Sebastian [1].To fix that we remove
CONFIG_FPROBEifdef for session kfuncs, which is fine, because there's filter for session programs.Then based on bpf_trace.o dependency:
obj-$(CONFIG_BPF_EVENTS) += bpf_trace.o[...]
Here is the summary with links:
- [bpf] bpf: Fix bpf_session_cookie BTF_ID in special_kfunc_set list
https://git.kernel.org/bpf/bpf/c/aeb8fe0283d4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html