libbpf: fix return value for PERF_EVENT __arg_ctx type fix up check
Andrii Nakryiko
maintainerPATCH 1/1 libbpf: fix return value for PERF_EVENT __arg_ctx type fix up check
If PERF_EVENT program has __arg_ctx argument with matching architecture-specific pt_regs/user_pt_regs/user_regs_struct pointer type, libbpf should still perform type rewrite for old kernels, but not emit the warning. Fix copy/paste from kernel code where 0 is meant to signify "no error" condition. For libbpf we need to return "true" to proceed with type rewrite (which for PERF_EVENT program will be a canonical struct bpf_perf_event_data * type).
--- tools/lib/bpf/libbpf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/lib/bpf/libbpf.c +3 -3
@@ -6404,13 +6404,13 @@ static bool need_func_arg_type_fixup(const struct btf *btf, const struct bpf_procase BPF_PROG_TYPE_PERF_EVENT : if (__builtin_types_compatible_p(bpf_user_pt_regs_t, struct pt_regs) &&btf_is_struct (t) &&strcmp (tname,"pt_regs" ) ==0 ) -return 0 ; +return true; if (__builtin_types_compatible_p(bpf_user_pt_regs_t, struct user_pt_regs) &&btf_is_struct (t) &&strcmp (tname,"user_pt_regs" ) ==0 ) -return 0 ; +return true; if (__builtin_types_compatible_p(bpf_user_pt_regs_t, struct user_regs_struct) &&btf_is_struct (t) &&strcmp (tname,"user_regs_struct" ) ==0 ) -return 0 ; +return true;break ;case BPF_PROG_TYPE_RAW_TRACEPOINT :case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE :
Signature · 1 line
2.34.1
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Mon, 5 Feb 2024 16:22:43 -0800 you wrote:
If
PERF_EVENTprogram has__arg_ctxargument with matching architecture-specific pt_regs/user_pt_regs/user_regs_struct pointer type, libbpf should still perform type rewrite for old kernels, but not emit the warning. Fix copy/paste from kernel code where 0 is meant to signify "no error" condition. For libbpf we need to return "true" to proceed with type rewrite (which forPERF_EVENTprogram will be a canonicalstruct bpf_perf_event_data *type).[...]
Here is the summary with links:
- [bpf-next] libbpf: fix return value for PERF_EVENT __arg_ctx type fix up check
https://git.kernel.org/bpf/bpf-next/c/d7bc416aa5cc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html