bpf, x86: Add bpf_get_func_ip helper
Subsystems (12)
v2 cover bpf, x86: Add bpf_get_func_ip helper
hi,
adding bpf_get_func_ip helper that returns IP address of the caller function for trampoline and krobe programs.
There're 2 specific implementation of the bpf_get_func_ip helper, one for trampoline progs and one for kprobe/kretprobe progs.
The trampoline helper call is replaced/inlined by verifier with simple move instruction. The kprobe/kretprobe is actual helper call that returns prepared caller address.
Also available at:
https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
bpf/get_func_ip
v2 changes:
- use kprobe_running to get kprobe instead of cpu var [Masami]
- added support to add kprobe on function+offset
and test for that [Alan]
thanks,
jirka
---
Alan Maguire (1):
libbpf: allow specification of "kprobe/function+offset"
Jiri Olsa (6):
bpf, x86: Store caller's ip in trampoline stack
bpf: Enable BPF_TRAMP_F_IP_ARG for trampolines with call_get_func_ip
bpf: Add bpf_get_func_ip helper for tracing programs
bpf: Add bpf_get_func_ip helper for kprobe programs selftests/bpf: Add test for bpf_get_func_ip helper selftests/bpf: Add test for bpf_get_func_ip in kprobe+offset probe
arch/x86/net/bpf_jit_comp.c | 19 +++++++++++++++++++ include/linux/bpf.h | 5 +++++ include/linux/filter.h | 3 ++- include/uapi/linux/bpf.h | 7 +++++++ kernel/bpf/trampoline.c | 12 +++++++++--- kernel/bpf/verifier.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 32 ++++++++++++++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 7 +++++++ tools/lib/bpf/libbpf.c | 20 +++++++++++++++++--- tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c | 42 ++++++++++++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/progs/get_func_ip_test.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 270 insertions(+), 7 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_test.c
PATCH v2 1/7 bpf, x86: Store caller's ip in trampoline stack
Storing caller's ip in trampoline's stack. Trampoline programs can reach the IP in (ctx - 8) address, so there's no change in program's arguments interface.
The IP address is takes from [fp + 8], which is return address from the initial 'call fentry' call to trampoline.
This IP address will be returned via bpf_get_func_ip helper helper, which is added in following patches.
--- arch/x86/net/bpf_jit_comp.c | 19 +++++++++++++++++++ include/linux/bpf.h | 5 +++++ 2 files changed, 24 insertions(+)
arch/x86/net/bpf_jit_comp.c +19 -0
@@ -1951,6 +1951,9 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *iif (flags &BPF_TRAMP_F_CALL_ORIG ) stack_size +=8 ;/* room for return value of orig_call */ +if (flags &BPF_TRAMP_F_IP_ARG ) + stack_size +=8 ;/* room for IP address argument */ +if (flags &BPF_TRAMP_F_SKIP_FRAME )/* skip patched call instruction and point orig_call to actual * body of the kernel function.
@@ -1964,6 +1967,22 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *iEMIT4 (0x48 ,0x83 ,0xEC , stack_size);/* sub rsp, stack_size */ EMIT1 (0x53 );/* push rbx */ +if (flags &BPF_TRAMP_F_IP_ARG ) { +/* Store IP address of the traced function: +* mov rax, QWORD PTR [rbp + 8] +* sub rax, X86_PATCH_SIZE +* mov QWORD PTR [rbp - stack_size], rax +*/ +emit_ldx (&prog,BPF_DW ,BPF_REG_0 ,BPF_REG_FP ,8 ); +EMIT4 (0x48 ,0x83 ,0xe8 ,X86_PATCH_SIZE ); +emit_stx (&prog,BPF_DW ,BPF_REG_FP ,BPF_REG_0 , -stack_size); + +/* Continue with stack_size for regs storage, stack will +* be correctly restored with 'leave' instruction. +*/ + stack_size -=8 ; + } +save_regs (m, &prog, nr_args, stack_size);if (flags &BPF_TRAMP_F_CALL_ORIG ) {
include/linux/bpf.h +5 -0
@@ -554,6 +554,11 @@ struct btf_func_model {*/ #define BPF_TRAMP_F_SKIP_FRAME BIT(2) +/* Store IP address of the caller on the trampoline stack, +* so it's available for trampoline's programs. +*/ +#define BPF_TRAMP_F_IP_ARG BIT(3) +/* Each call __bpf_prog_enter + call bpf_func + call __bpf_prog_exit is ~50 * bytes on x86. Pick a number to fit into BPF_IMAGE_SIZE / 2 */
Signature · 1 line
2.31.1
PATCH v2 2/7 bpf: Enable BPF_TRAMP_F_IP_ARG for trampolines with call_get_func_ip
In reply to Jiri OlsaEnabling BPF_TRAMP_F_IP_ARG for trampolines that actually need it.
The BPF_TRAMP_F_IP_ARG adds extra 3 instructions to trampoline code and is used only by programs with bpf_get_func_ip helper, which is added in following patch and sets call_get_func_ip bit.
This patch ensures that BPF_TRAMP_F_IP_ARG flag is used only for trampolines that have programs with call_get_func_ip set.
--- include/linux/filter.h | 3 ++- kernel/bpf/trampoline.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-)
include/linux/filter.h +2 -1
@@ -559,7 +559,8 @@ struct bpf_prog { kprobe_override:1, /* Do we override a kprobe? */ has_callchain_buf:1, /* callchain buffer allocated? */ enforce_expected_attach_type:1, /* Enforce expected_attach_type checking at attach time */ - call_get_stack:1; /* Do we call bpf_get_stack() or bpf_get_stackid() */ + call_get_stack:1, /* Do we call bpf_get_stack() or bpf_get_stackid() */ + call_get_func_ip:1; /* Do we call get_func_ip() */enum bpf_prog_type type;/* Type of BPF program */ enum bpf_attach_type expected_attach_type;/* For some prog types */ u32 len;/* Number of filter blocks */
kernel/bpf/trampoline.c +9 -3
@@ -172,7 +172,7 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) }static struct bpf_tramp_progs * -bpf_trampoline_get_progs (const struct bpf_trampoline *tr,int *total) +bpf_trampoline_get_progs (const struct bpf_trampoline *tr,int *total,bool *ip_arg) {const struct bpf_prog_aux *aux;struct bpf_tramp_progs *tprogs;
@@ -189,8 +189,10 @@ bpf_trampoline_get_progs(const struct bpf_trampoline *tr, int *total) *total += tr->progs_cnt[kind]; progs = tprogs[kind].progs; -hlist_for_each_entry (aux, &tr->progs_hlist[kind], tramp_hlist) +hlist_for_each_entry (aux, &tr->progs_hlist[kind], tramp_hlist) { + *ip_arg |= aux->prog->call_get_func_ip; *progs++ = aux->prog; + } }return tprogs; }
@@ -333,9 +335,10 @@ static int bpf_trampoline_update(struct bpf_trampoline *tr)struct bpf_tramp_image *im;struct bpf_tramp_progs *tprogs;u32 flags =BPF_TRAMP_F_RESTORE_REGS ; +bool ip_arg = false;int err, total; - tprogs =bpf_trampoline_get_progs (tr, &total); + tprogs =bpf_trampoline_get_progs (tr, &total, &ip_arg);if (IS_ERR (tprogs))return PTR_ERR (tprogs);
@@ -357,6 +360,9 @@ static int bpf_trampoline_update(struct bpf_trampoline *tr) tprogs[BPF_TRAMP_MODIFY_RETURN].nr_progs) flags =BPF_TRAMP_F_CALL_ORIG |BPF_TRAMP_F_SKIP_FRAME ; +if (ip_arg) + flags |=BPF_TRAMP_F_IP_ARG ; + err =arch_prepare_bpf_trampoline (im, im->image, im->image +PAGE_SIZE , &tr->func.model, flags, tprogs, tr->func.addr);
Signature · 1 line
2.31.1
PATCH v2 3/7 bpf: Add bpf_get_func_ip helper for tracing programs
In reply to Jiri OlsaAdding bpf_get_func_ip helper for BPF_PROG_TYPE_TRACING programs, specifically for all trampoline attach types.
The trampoline's caller IP address is stored in (ctx - 8) address. so there's no reason to actually call the helper, but rather fixup the call instruction and return [ctx - 8] value directly (suggested by Alexei).
--- include/uapi/linux/bpf.h | 7 +++++ kernel/bpf/verifier.c | 53 ++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 15 ++++++++++ tools/include/uapi/linux/bpf.h | 7 +++++ 4 files changed, 82 insertions(+)
include/uapi/linux/bpf.h +7 -0
@@ -4780,6 +4780,12 @@ union bpf_attr {* Execute close syscall for given FD. * Return * A syscall result. +* +* u64 bpf_get_func_ip(void *ctx) +* Description +* Get address of the traced function (for tracing programs). +* Return +* Address of the traced function. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -4951,6 +4957,7 @@ union bpf_attr {FN (sys_bpf), \FN (btf_find_by_name_kind), \FN (sys_close), \ +FN (get_func_ip), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
kernel/bpf/verifier.c +53 -0
83 lines not on this page · raw message
kernel/trace/bpf_trace.c +15 -0
@@ -948,6 +948,19 @@ const struct bpf_func_proto bpf_snprintf_btf_proto = { .arg5_type = ARG_ANYTHING, }; +BPF_CALL_1(bpf_get_func_ip_tracing, void *, ctx) +{ +/* Stub, the helper call is inlined in the program. */ +return 0 ; +} + +static const struct bpf_func_proto bpf_get_func_ip_proto_tracing = { + .func = bpf_get_func_ip_tracing, + .gpl_only = true, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_CTX , +}; +const struct bpf_func_proto *bpf_tracing_func_proto (enum bpf_func_id func_id,const struct bpf_prog *prog) {
@@ -1058,6 +1071,8 @@ bpf_tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)return &bpf_for_each_map_elem_proto;case BPF_FUNC_snprintf:return &bpf_snprintf_proto; +case BPF_FUNC_get_func_ip: +return &bpf_get_func_ip_proto_tracing;default :return NULL ; }
tools/include/uapi/linux/bpf.h +7 -0
@@ -4780,6 +4780,12 @@ union bpf_attr {* Execute close syscall for given FD. * Return * A syscall result. +* +* u64 bpf_get_func_ip(void *ctx) +* Description +* Get address of the traced function (for tracing programs). +* Return +* Address of the traced function. */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -4951,6 +4957,7 @@ union bpf_attr {FN (sys_bpf), \FN (btf_find_by_name_kind), \FN (sys_close), \ +FN (get_func_ip), \/* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper
Signature · 1 line
2.31.1
PATCH v2 4/7 bpf: Add bpf_get_func_ip helper for kprobe programs
In reply to Jiri OlsaAdding bpf_get_func_ip helper for BPF_PROG_TYPE_KPROBE programs, so it's now possible to call bpf_get_func_ip from both kprobe and kretprobe programs.
Taking the caller's address from 'struct kprobe::addr', which is defined for both kprobe and kretprobe.
--- include/uapi/linux/bpf.h | 2 +- kernel/bpf/verifier.c | 2 ++ kernel/trace/bpf_trace.c | 17 +++++++++++++++++ tools/include/uapi/linux/bpf.h | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +1 -1
@@ -4783,7 +4783,7 @@ union bpf_attr {* * u64 bpf_get_func_ip(void *ctx) * Description -* Get address of the traced function (for tracing programs). +* Get address of the traced function (for tracing and kprobe programs). * Return * Address of the traced function. */
kernel/bpf/verifier.c +2 -0
@@ -5979,6 +5979,8 @@ static int has_get_func_ip(struct bpf_verifier_env *env)return -ENOTSUPP ; }return 0 ; + }else if (type ==BPF_PROG_TYPE_KPROBE ) { +return 0 ; } verbose(env, "func %s#%d not supported for program type %d\n",
kernel/trace/bpf_trace.c +17 -0
@@ -17,6 +17,7 @@#include <linux/error-injection.h> #include <linux/btf_ids.h> #include <linux/bpf_lsm.h> +#include <linux/kprobes.h> #include <net/bpf_sk_storage.h>
@@ -961,6 +962,20 @@ static const struct bpf_func_proto bpf_get_func_ip_proto_tracing = { .arg1_type = ARG_PTR_TO_CTX, }; +BPF_CALL_1(bpf_get_func_ip_kprobe, struct pt_regs *, regs) +{ +struct kprobe *kp =kprobe_running (); + +return kp ? (u64 ) kp->addr :0 ; +} + +static const struct bpf_func_proto bpf_get_func_ip_proto_kprobe = { + .func = bpf_get_func_ip_kprobe, + .gpl_only = true, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_CTX , +}; +const struct bpf_func_proto *bpf_tracing_func_proto (enum bpf_func_id func_id,const struct bpf_prog *prog) {
@@ -1092,6 +1107,8 @@ kprobe_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)case BPF_FUNC_override_return:return &bpf_override_return_proto;#endif +case BPF_FUNC_get_func_ip: +return &bpf_get_func_ip_proto_kprobe;default :return bpf_tracing_func_proto (func_id, prog); }
tools/include/uapi/linux/bpf.h +1 -1
@@ -4783,7 +4783,7 @@ union bpf_attr {* * u64 bpf_get_func_ip(void *ctx) * Description -* Get address of the traced function (for tracing programs). +* Get address of the traced function (for tracing and kprobe programs). * Return * Address of the traced function. */
Signature · 1 line
2.31.1
PATCH v2 5/7 selftests/bpf: Add test for bpf_get_func_ip helper
In reply to Jiri OlsaAdding test for bpf_get_func_ip helper for fentry, fexit, kprobe, kretprobe and fmod_ret programs.
--- .../bpf/prog_tests/get_func_ip_test.c | 42 +++++++++++++ .../selftests/bpf/progs/get_func_ip_test.c | 62 +++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_test.c
tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c new file +42 -0
@@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <test_progs.h> +#include "get_func_ip_test.skel.h" + +void test_get_func_ip_test (void ) +{ +struct get_func_ip_test *skel =NULL ; +__u32 duration =0 , retval; +int err, prog_fd, i; +__u64 *result; + + skel =get_func_ip_test__open_and_load (); +if (!ASSERT_OK_PTR (skel,"get_func_ip_test__open_and_load" )) + goto cleanup; + + err =get_func_ip_test__attach (skel); +if (!ASSERT_OK (err,"get_func_ip_test__attach" )) + goto cleanup; + + prog_fd =bpf_program__fd (skel->progs.test1); + err =bpf_prog_test_run (prog_fd,1 ,NULL ,0 , +NULL ,NULL , &retval, &duration); +ASSERT_OK (err,"test_run" ); +ASSERT_EQ (retval,0 ,"test_run" ); + + prog_fd =bpf_program__fd (skel->progs.fmod_ret_test); + err =bpf_prog_test_run (prog_fd,1 ,NULL ,0 , +NULL ,NULL , &retval, &duration); + +ASSERT_OK (err,"test_run" ); + + result = (__u64 *)skel->bss; +for (i =0 ; i <sizeof (*skel->bss) /sizeof (__u64); i++) { +if (!ASSERT_EQ (result[i],1 ,"fentry_result" )) +break ; + } + +get_func_ip_test__detach (skel); + +cleanup: +get_func_ip_test__destroy (skel); +}
tools/testing/selftests/bpf/progs/get_func_ip_test.c new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v2 6/7 libbpf: allow specification of "kprobe/function+offset"
In reply to Jiri OlsaFrom: Alan Maguire <[email protected]>
kprobes can be placed on most instructions in a function, not just entry, and ftrace and bpftrace support the function+offset notification for probe placement. Adding parsing of func_name into func+offset to bpf_program__attach_kprobe() allows the user to specify
SEC("kprobe/bpf_fentry_test5+0x6")
...for example, and the offset can be passed to perf_event_open_probe() to support kprobe attachment.
--- tools/lib/bpf/libbpf.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
tools/lib/bpf/libbpf.c +17 -3
@@ -10309,11 +10309,25 @@ struct bpf_link *bpf_program__attach_kprobe(struct bpf_program *prog, const char *func_name) {char errmsg[STRERR_BUFSIZE ]; +char func[BPF_OBJ_NAME_LEN ]; +unsigned long offset =0 ;struct bpf_link *link; -int pfd, err; +int pfd, err, n; + + n =sscanf (func_name,"%[a-zA-Z0-9_.]+%lx" , func, &offset); +if (n <1 ) { + err = -EINVAL ; +pr_warn ("kprobe name is invalid: %s\n" , func_name); +return libbpf_err_ptr (err); + } +if (retprobe && offset !=0 ) { + err = -EINVAL ; +pr_warn ("kretprobes do not support offset specification\n" ); +return libbpf_err_ptr (err); + } - pfd =perf_event_open_probe (false/* uprobe */ , retprobe, func_name, -0 /* offset */ ,-1 /* pid */ ); + pfd =perf_event_open_probe (false/* uprobe */ , retprobe, func, + offset,-1 /* pid */ );if (pfd <0 ) { pr_warn("prog '%s': failed to create %s '%s' perf event: %s\n", prog->name, retprobe ? "kretprobe" : "kprobe", func_name,
Signature · 1 line
2.31.1
PATCH v2 7/7 selftests/bpf: Add test for bpf_get_func_ip in kprobe+offset probe
In reply to Jiri OlsaAdding test for bpf_get_func_ip in kprobe+ofset probe. Because of the offset value it's arch specific, adding it only for x86_64 architecture.
--- .../testing/selftests/bpf/progs/get_func_ip_test.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/testing/selftests/bpf/progs/get_func_ip_test.c +13 -0
@@ -10,6 +10,7 @@ extern const void bpf_fentry_test2 __ksym; extern const void bpf_fentry_test3 __ksym; extern const void bpf_fentry_test4 __ksym; extern const void bpf_modify_return_test __ksym; +extern const void bpf_fentry_test6 __ksym;__u64 test1_result =0 ;SEC ("fentry/bpf_fentry_test1" )
@@ -60,3 +61,15 @@ int BPF_PROG(fmod_ret_test, int a, int *b, int ret) test5_result = (const void *) addr == &bpf_modify_return_test;return ret; } + +#ifdef __x86_64__ +__u64 test6_result =0 ; +SEC("kprobe/bpf_fentry_test6+0x5") +int test6 (struct pt_regs *ctx) +{ +__u64 addr =bpf_get_func_ip (ctx); + + test6_result = (const void *) addr == &bpf_fentry_test6 +5 ; +return 0 ; +} +#endif
Signature · 1 line
2.31.1
ugh forgot to cc Masami.. sorry, I can resend if needed
jirka
Quoted 51 lines · Jiri Olsa
hi,
addingbpf_get_func_iphelper that returns IP address of the caller function for trampoline and krobe programs.There're 2 specific implementation of the
bpf_get_func_iphelper, one for trampoline progs and one for kprobe/kretprobe progs.The trampoline helper call is replaced/inlined by verifier with simple move instruction. The kprobe/kretprobe is actual helper call that returns prepared caller address.
Also available at:
https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
bpf/get_func_ipv2 changes:
- usekprobe_runningto get kprobe instead of cpu var [Masami]
- added support to add kprobe on function+offset
and test for that [Alan]thanks,
jirka---
Alan Maguire (1):
libbpf: allow specification of "kprobe/function+offset"Jiri Olsa (6):
bpf, x86: Store caller's ip in trampoline stack
bpf: EnableBPF_TRAMP_F_IP_ARGfor trampolines withcall_get_func_ip
bpf: Addbpf_get_func_iphelper for tracing programs
bpf: Addbpf_get_func_iphelper for kprobe programs selftests/bpf: Add test forbpf_get_func_iphelper selftests/bpf: Add test forbpf_get_func_ipin kprobe+offset probearch/x86/net/bpf_jit_comp.c | 19 +++++++++++++++++++ include/linux/bpf.h | 5 +++++ include/linux/filter.h | 3 ++- include/uapi/linux/bpf.h | 7 +++++++ kernel/bpf/trampoline.c | 12 +++++++++--- kernel/bpf/verifier.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 32 ++++++++++++++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 7 +++++++ tools/lib/bpf/libbpf.c | 20 +++++++++++++++++--- tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c | 42 ++++++++++++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/progs/get_func_ip_test.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 270 insertions(+), 7 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_test.c
Quoted 2 lines · Jiri Olsa
ugh forgot to cc Masami.. sorry, I can resend if needed
Can you please also add v2, v3, etc tags to *each patch*, not just cover letter? It makes tracking different versions much easier. Thanks!
Quoted 56 lines
jirka
Quoted 51 lines · Jiri Olsa
hi,
addingbpf_get_func_iphelper that returns IP address of the caller function for trampoline and krobe programs.There're 2 specific implementation of the
bpf_get_func_iphelper, one for trampoline progs and one for kprobe/kretprobe progs.The trampoline helper call is replaced/inlined by verifier with simple move instruction. The kprobe/kretprobe is actual helper call that returns prepared caller address.
Also available at:
https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
bpf/get_func_ipv2 changes:
- usekprobe_runningto get kprobe instead of cpu var [Masami]
- added support to add kprobe on function+offset
and test for that [Alan]thanks,
jirka---
Alan Maguire (1):
libbpf: allow specification of "kprobe/function+offset"Jiri Olsa (6):
bpf, x86: Store caller's ip in trampoline stack
bpf: EnableBPF_TRAMP_F_IP_ARGfor trampolines withcall_get_func_ip
bpf: Addbpf_get_func_iphelper for tracing programs
bpf: Addbpf_get_func_iphelper for kprobe programs selftests/bpf: Add test forbpf_get_func_iphelper selftests/bpf: Add test forbpf_get_func_ipin kprobe+offset probearch/x86/net/bpf_jit_comp.c | 19 +++++++++++++++++++ include/linux/bpf.h | 5 +++++ include/linux/filter.h | 3 ++- include/uapi/linux/bpf.h | 7 +++++++ kernel/bpf/trampoline.c | 12 +++++++++--- kernel/bpf/verifier.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 32 ++++++++++++++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 7 +++++++ tools/lib/bpf/libbpf.c | 20 +++++++++++++++++--- tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c | 42 ++++++++++++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/progs/get_func_ip_test.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 270 insertions(+), 7 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_test.c