iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: Add bpf_get_func_ip kprobe helper for multi kprobe link

Browse Source 
Adding support to call bpf_get_func_ip helper from kprobe
programs attached by multi kprobe link.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220316122419.933957-5-jolsa@kernel.org
This commit is contained in:
Jiri Olsa 2022-03-16 13:24:10 +01:00 committed by Alexei Starovoitov
parent 0dcac27254
commit 42a5712094
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/trace/bpf_trace.c
View File

@ -1037,6 +1037,18 @@ static const struct bpf_func_proto bpf_get_func_ip_proto_kprobe = {
.arg1_type = ARG_PTR_TO_CTX, .arg1_type = ARG_PTR_TO_CTX,
}; };
BPF_CALL_1(bpf_get_func_ip_kprobe_multi, struct pt_regs *, regs)
{
return instruction_pointer(regs);
}
static const struct bpf_func_proto bpf_get_func_ip_proto_kprobe_multi = {
.func = bpf_get_func_ip_kprobe_multi,
.gpl_only = false,
.ret_type = RET_INTEGER,
.arg1_type = ARG_PTR_TO_CTX,
};
BPF_CALL_1(bpf_get_attach_cookie_trace, void *, ctx) BPF_CALL_1(bpf_get_attach_cookie_trace, void *, ctx)
{ {
struct bpf_trace_run_ctx *run_ctx; struct bpf_trace_run_ctx *run_ctx;
@ -1280,7 +1292,9 @@ kprobe_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
return &bpf_override_return_proto; return &bpf_override_return_proto;
#endif #endif
case BPF_FUNC_get_func_ip: case BPF_FUNC_get_func_ip:
return &bpf_get_func_ip_proto_kprobe; return prog->expected_attach_type == BPF_TRACE_KPROBE_MULTI ?
&bpf_get_func_ip_proto_kprobe_multi :
&bpf_get_func_ip_proto_kprobe;
case BPF_FUNC_get_attach_cookie: case BPF_FUNC_get_attach_cookie:
return &bpf_get_attach_cookie_proto_trace; return &bpf_get_attach_cookie_proto_trace;
default: default: