bpf: Fixes for CONFIG_X86_KERNEL_IBT
Jiri Olsa
reviewerv4 cover bpf: Fixes for CONFIG_X86_KERNEL_IBT
hi,
Martynas reported bpf_get_func_ip returning +4 address when CONFIG_X86_KERNEL_IBT option is enabled and I found there are some failing bpf tests when this option is enabled.
The CONFIG_X86_KERNEL_IBT option adds endbr instruction at the function entry, so the idea is to 'fix' entry ip for kprobe_multi and trampoline probes, because they are placed on the function entry.
v4 changes:
- used get_kernel_nofault to read previous instruction [Peter]
- used movabs instruction in trampoline comment [Peter]
- renamed fentry_ip argument in kprobe_multi_link_handler [Peter]
v3 changes:
- using 'unused' bpf function to get IBT config option into selftest skeleton
- rebased to current bpf-next/master
- added ack/review from Masami
v2 changes:
- change kprobes get_func_ip to return zero for kprobes attached within the function body [Andrii]
- detect IBT config and properly test kprobe with offset [Andrii]
v1 changes:
- read previous instruction in kprobe_multi link handler and adjust entry_ip for CONFIG_X86_KERNEL_IBT option
- split first patch into 2 separate changes
- update changelogs
thanks,
jirka
---
Jiri Olsa (6):
kprobes: Add new KPROBE_FLAG_ON_FUNC_ENTRY kprobe flag
ftrace: Keep the resolved addr in kallsyms_callback
bpf: Use given function address for trampoline ip arg
bpf: Adjust kprobe_multi entry_ip for CONFIG_X86_KERNEL_IBT
bpf: Return value in kprobe get_func_ip only for entry address selftests/bpf: Fix get_func_ip offset test for CONFIG_X86_KERNEL_IBT
arch/x86/net/bpf_jit_comp.c | 11 +++++------ include/linux/kprobes.h | 1 + kernel/kprobes.c | 6 +++++- kernel/trace/bpf_trace.c | 25 ++++++++++++++++++++++--- kernel/trace/ftrace.c | 3 +-- tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++----------- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 25 +++++++++++++------------ tools/testing/selftests/bpf/progs/kprobe_multi.c | 4 +--- 8 files changed, 96 insertions(+), 38 deletions(-)
Jiri Olsa
reviewerPATCH v4 1/6 kprobes: Add new KPROBE_FLAG_ON_FUNC_ENTRY kprobe flag
Adding KPROBE_FLAG_ON_FUNC_ENTRY kprobe flag to indicate that attach address is on function entry. This is used in following changes in get_func_ip helper to return correct function address.
--- include/linux/kprobes.h | 1 + kernel/kprobes.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)
include/linux/kprobes.h +1 -0
@@ -103,6 +103,7 @@ struct kprobe {* this flag is only for optimized_kprobe. */ #define KPROBE_FLAG_FTRACE 8/* probe is using ftrace */ +#define KPROBE_FLAG_ON_FUNC_ENTRY 16/* probe is on the function entry */ /* Has this kprobe gone ? */ static inline bool kprobe_gone (struct kprobe *p)
kernel/kprobes.c +5 -1
@@ -1606,9 +1606,10 @@ int register_kprobe(struct kprobe *p)struct kprobe *old_p;struct module *probed_mod;kprobe_opcode_t *addr; +bool on_func_entry;/* Adjust probe address from symbol */ - addr =kprobe_addr (p); + addr =_kprobe_addr (p->addr, p->symbol_name, p->offset, &on_func_entry);if (IS_ERR (addr))return PTR_ERR (addr); p->addr = addr;
@@ -1628,6 +1629,9 @@ int register_kprobe(struct kprobe *p)mutex_lock (&kprobe_mutex); +if (on_func_entry) + p->flags |=KPROBE_FLAG_ON_FUNC_ENTRY ; + old_p =get_kprobe (p->addr);if (old_p) {/* Since this may unoptimize 'old_p', locking 'text_mutex'. */
Signature · 1 line
2.37.3
Jiri Olsa
reviewerPATCH v4 2/6 ftrace: Keep the resolved addr in kallsyms_callback
In reply to Jiri OlsaKeeping the resolved 'addr' in kallsyms_callback, instead of taking ftrace_location value, because we depend on symbol address in the cookie related code.
With CONFIG_X86_KERNEL_IBT option the ftrace_location value differs from symbol address, which screwes the symbol address cookies matching.
There are 2 users of this function:
- bpf_kprobe_multi_link_attach
for which this fix is for
- get_ftrace_locations
which is used by register_fprobe_syms
this function needs to get symbols resolved to addresses, but does not need 'ftrace location addresses' at this point there's another ftrace location translation in the path done by ftrace_set_filter_ips call:
register_fprobe_syms
addrs = get_ftrace_locations
register_fprobe_ips(addrs)
...
ftrace_set_filter_ips
...
__ftrace_match_addr
ip = ftrace_location(ip);
...
--- kernel/trace/ftrace.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/ftrace.c +1 -2
@@ -8265,8 +8265,7 @@ static int kallsyms_callback(void *data, const char *name,if (args->addrs[idx])return 0 ; - addr =ftrace_location (addr); -if (!addr) +if (!ftrace_location (addr))return 0 ; args->addrs[idx] = addr;
Signature · 1 line
2.37.3
Jiri Olsa
reviewerPATCH v4 3/6 bpf: Use given function address for trampoline ip arg
In reply to Jiri OlsaUsing function address given at the generation time as the trampoline ip argument. This way we get directly the function address that we need, so we don't need to:
- read the ip from the stack
- subtract X86_PATCH_SIZE
- subtract ENDBR_INSN_SIZE if CONFIG_X86_KERNEL_IBT is enabled which is not even implemented yet ;-)
--- arch/x86/net/bpf_jit_comp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/x86/net/bpf_jit_comp.c +5 -6
@@ -662,7 +662,7 @@ static void emit_mov_imm64(u8 **pprog, u32 dst_reg,*/ emit_mov_imm32 (&prog, false, dst_reg, imm32_lo); }else { -/* movabsq %rax, imm64 */ +/* movabsq rax, imm64 */ EMIT2 (add_1mod (0x48 , dst_reg),add_1reg (0xB8 , dst_reg));EMIT (imm32_lo,4 );EMIT (imm32_hi,4 );
@@ -2039,13 +2039,14 @@ static int invoke_bpf_mod_ret(const struct btf_func_model *m, u8 **pprog,int arch_prepare_bpf_trampoline (struct bpf_tramp_image *im,void *image,void *image_end,const struct btf_func_model *m,u32 flags,struct bpf_tramp_links *tlinks, -void *orig_call) +void *func_addr) {int ret, i, nr_args = m->nr_args, extra_nregs =0 ;int regs_off, ip_off, args_off, stack_size = nr_args *8 , run_ctx_off;struct bpf_tramp_links *fentry = &tlinks[BPF_TRAMP_FENTRY ];struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT ];struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN ]; +void *orig_call = func_addr;u8 **branches =NULL ;u8 *prog;bool save_ret;
@@ -2126,12 +2127,10 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *iif (flags &BPF_TRAMP_F_IP_ARG ) {/* Store IP address of the traced function: -* mov rax, QWORD PTR [rbp + 8] -* sub rax, X86_PATCH_SIZE +* movabsq rax, func_addr * mov QWORD PTR [rbp - ip_off], rax */ -emit_ldx (&prog,BPF_DW ,BPF_REG_0 ,BPF_REG_FP ,8 ); -EMIT4 (0x48 ,0x83 ,0xe8 ,X86_PATCH_SIZE ); +emit_mov_imm64 (&prog,BPF_REG_0 , (long ) func_addr >>32 , (u32 ) (long ) func_addr);emit_stx (&prog,BPF_DW ,BPF_REG_FP ,BPF_REG_0 , -ip_off); }
Signature · 1 line
2.37.3
Jiri Olsa
reviewerPATCH v4 4/6 bpf: Adjust kprobe_multi entry_ip for CONFIG_X86_KERNEL_IBT
In reply to Jiri OlsaMartynas reported bpf_get_func_ip returning +4 address when CONFIG_X86_KERNEL_IBT option is enabled.
When CONFIG_X86_KERNEL_IBT is enabled we'll have endbr instruction at the function entry, which screws return value of bpf_get_func_ip() helper that should return the function address.
There's short term workaround for kprobe_multi bpf program made by Alexei [1], but we need this fixup also for bpf_get_attach_cookie, that returns cookie based on the entry_ip value.
Moving the fixup in the fprobe handler, so both bpf_get_func_ip and bpf_get_attach_cookie get expected function address when CONFIG_X86_KERNEL_IBT option is enabled.
Also renaming kprobe_multi_link_handler entry_ip argument to fentry_ip so it's clearer this is an ftrace __fentry__ ip.
[1] commit 7f0059b58f02 ("selftests/bpf: Fix kprobe_multi test.")
--- kernel/trace/bpf_trace.c | 20 +++++++++++++++++-- .../selftests/bpf/progs/kprobe_multi.c | 4 +--- 2 files changed, 19 insertions(+), 5 deletions(-)
kernel/trace/bpf_trace.c +18 -2
@@ -1028,6 +1028,22 @@ static const struct bpf_func_proto bpf_get_func_ip_proto_tracing = { .arg1_type = ARG_PTR_TO_CTX, }; +#ifdef CONFIG_X86_KERNEL_IBT +static unsigned long get_entry_ip (unsigned long fentry_ip) +{ +u32 instr; + +/* Being extra safe in here in case entry ip is on the page-edge. */ +if (get_kernel_nofault (instr, (u32 *) fentry_ip -1 )) +return fentry_ip; +if (is_endbr (instr)) + fentry_ip -=ENDBR_INSN_SIZE ; +return fentry_ip; +} +#else +#define get_entry_ip (fentry_ip) fentry_ip +#endif + BPF_CALL_1(bpf_get_func_ip_kprobe, struct pt_regs *, regs) {struct kprobe *kp =kprobe_running ();
@@ -2600,13 +2616,13 @@ kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link, }static void -kprobe_multi_link_handler (struct fprobe *fp,unsigned long entry_ip, +kprobe_multi_link_handler (struct fprobe *fp,unsigned long fentry_ip,struct pt_regs *regs) {struct bpf_kprobe_multi_link *link; link = container_of(fp, struct bpf_kprobe_multi_link, fp); -kprobe_multi_link_prog_run (link, entry_ip, regs); +kprobe_multi_link_prog_run (link,get_entry_ip (fentry_ip), regs); }static int symbols_cmp_r (const void *a,const void *b,const void *priv)
tools/testing/selftests/bpf/progs/kprobe_multi.c +1 -3
@@ -36,15 +36,13 @@ __u64 kretprobe_test6_result = 0;__u64 kretprobe_test7_result =0 ;__u64 kretprobe_test8_result =0 ; -extern bool CONFIG_X86_KERNEL_IBT __kconfig __weak; -static void kprobe_multi_check (void *ctx,bool is_return) {if (bpf_get_current_pid_tgid () >>32 != pid)return ;__u64 cookie = test_cookie ?bpf_get_attach_cookie (ctx) :0 ; -__u64 addr =bpf_get_func_ip (ctx) - (CONFIG_X86_KERNEL_IBT ?4 :0 ); +__u64 addr =bpf_get_func_ip (ctx);#define SET (__var, __addr, __cookie) ({ \ if (((const void *) addr == __addr) && \
Signature · 1 line
2.37.3
Re: [PATCHv4 bpf-next 4/6] bpf: Adjust kprobe_multi entry_ip for CONFIG_X86_KERNEL_IBT
Quoted 19 lines · Jiri Olsa
Martynas reported
bpf_get_func_ipreturning +4 address whenCONFIG_X86_KERNEL_IBToption is enabled.When
CONFIG_X86_KERNEL_IBTis enabled we'll have endbr instruction at the function entry, which screws return value ofbpf_get_func_ip()helper that should return the function address.There's short term workaround for
kprobe_multibpf program made by Alexei [1], but we need this fixup also forbpf_get_attach_cookie, that returns cookie based on theentry_ipvalue.Moving the fixup in the fprobe handler, so both
bpf_get_func_ipandbpf_get_attach_cookieget expected function address whenCONFIG_X86_KERNEL_IBToption is enabled.Also renaming
kprobe_multi_link_handlerentry_ipargument tofentry_ipso it's clearer this is an ftrace__fentry__ip.
Quoted 6 lines
[1] commit
7f0059b58f02("selftests/bpf: Fixkprobe_multitest.")Cc Peter Zijlstra <[email protected]>Reported-by Martynas Pumputis <[email protected]>Signed-off-by Jiri Olsa <[email protected]>---
lgtm
Quoted 4 lines
kernel/trace/bpf_trace.c | 20 +++++++++++++++++-- .../selftests/bpf/progs/kprobe_multi.c | 4 +--- 2 files changed, 19 insertions(+), 5 deletions(-)
[...]
Jiri Olsa
reviewerPATCH v4 5/6 bpf: Return value in kprobe get_func_ip only for entry address
In reply to Jiri OlsaChanging return value of kprobe's version of bpf_get_func_ip to return zero if the attach address is not on the function's entry point.
For kprobes attached in the middle of the function we can't easily get to the function address especially now with the CONFIG_X86_KERNEL_IBT support.
If user cares about current IP for kprobes attached within the function body, they can get it with PT_REGS_IP(ctx).
--- kernel/trace/bpf_trace.c | 5 ++++- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-)
kernel/trace/bpf_trace.c +4 -1
@@ -1048,7 +1048,10 @@ BPF_CALL_1(bpf_get_func_ip_kprobe, struct pt_regs *, regs) {struct kprobe *kp =kprobe_running (); -return kp ? (uintptr_t )kp->addr :0 ; +if (!kp || !(kp->flags &KPROBE_FLAG_ON_FUNC_ENTRY )) +return 0 ; + +return get_entry_ip ((uintptr_t )kp->addr); }static const struct bpf_func_proto bpf_get_func_ip_proto_kprobe = {
tools/testing/selftests/bpf/progs/get_func_ip_test.c +2 -2
@@ -69,7 +69,7 @@ int test6(struct pt_regs *ctx) {__u64 addr =bpf_get_func_ip (ctx); - test6_result = (const void *) addr == &bpf_fentry_test6 +5 ; + test6_result = (const void *) addr ==0 ;return 0 ; }
@@ -79,6 +79,6 @@ int test7(struct pt_regs *ctx) {__u64 addr =bpf_get_func_ip (ctx); - test7_result = (const void *) addr == &bpf_fentry_test7 +5 ; + test7_result = (const void *) addr ==0 ;return 0 ; }
Signature · 1 line
2.37.3
Re: [PATCHv4 bpf-next 5/6] bpf: Return value in kprobe get_func_ip only for entry address
Quoted 12 lines · Jiri Olsa
Changing return value of kprobe's version of
bpf_get_func_ipto return zero if the attach address is not on the function's entry point.For kprobes attached in the middle of the function we can't easily get to the function address especially now with the
CONFIG_X86_KERNEL_IBTsupport.If user cares about current IP for kprobes attached within the function body, they can get it with
PT_REGS_IP(ctx).
Quoted 7 lines
Suggested-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- kernel/trace/bpf_trace.c | 5 ++++- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-)
Can you please add a note in bpf_get_func_ip() description in uapi/linux/bpf.h that this function returns zero for kprobes in the middle of the function?
With that:
Quoted 14 lines
kernel/trace/bpf_trace.c +4
-1@@ -1048,7 +1048,10 @@ BPF_CALL_1(bpf_get_func_ip_kprobe, struct pt_regs *, regs) {struct kprobe *kp =kprobe_running (); -return kp ? (uintptr_t )kp->addr :0 ; +if (!kp || !(kp->flags &KPROBE_FLAG_ON_FUNC_ENTRY )) +return 0 ; + +return get_entry_ip ((uintptr_t )kp->addr); }
[...]
Re: [PATCHv4 bpf-next 5/6] bpf: Return value in kprobe get_func_ip only for entry address
Quoted 21 lines · Andrii Nakryiko
Quoted 12 lines · Jiri Olsa
Changing return value of kprobe's version of
bpf_get_func_ipto return zero if the attach address is not on the function's entry point.For kprobes attached in the middle of the function we can't easily get to the function address especially now with the
CONFIG_X86_KERNEL_IBTsupport.If user cares about current IP for kprobes attached within the function body, they can get it with
PT_REGS_IP(ctx).Quoted 7 lines
Suggested-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- kernel/trace/bpf_trace.c | 5 ++++- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-)
Quoted 3 lines
Can you please add a note in
bpf_get_func_ip()description inuapi/linux/bpf.hthat this function returns zero for kprobes in the middle of the function?
yep, will do that
thanks,
jirka
Quoted 22 lines
With that:
Acked-by Andrii Nakryiko <[email protected]>Quoted 14 lines
kernel/trace/bpf_trace.c +4
-1@@ -1048,7 +1048,10 @@ BPF_CALL_1(bpf_get_func_ip_kprobe, struct pt_regs *, regs) {struct kprobe *kp =kprobe_running (); -return kp ? (uintptr_t )kp->addr :0 ; +if (!kp || !(kp->flags &KPROBE_FLAG_ON_FUNC_ENTRY )) +return 0 ; + +return get_entry_ip ((uintptr_t )kp->addr); }[...]
Re: [PATCHv4 bpf-next 5/6] bpf: Return value in kprobe get_func_ip only for entry address
In reply to Jiri OlsaQuoted 8 lines · Jiri Olsa
Changing return value of kprobe's version of
bpf_get_func_ipto return zero if the attach address is not on the function's entry point.For kprobes attached in the middle of the function we can't easily get to the function address especially now with the
CONFIG_X86_KERNEL_IBTsupport.
Quoted 5 lines
If user cares about current IP for kprobes attached within the function body, they can get it with
PT_REGS_IP(ctx).Suggested-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>
Tested the patches with "pwru --filter-func='.*skb.*' --filter-dst-ip=1.1.1.1" from [1] - the symbol name resolution works, thanks!
Without your patches:
SKB CPU PROCESS FUNC
0xffff8989c159b4e8 0 [curl] 0xffffffffbbb06164 0xffff8989c223f000 0 [curl] 0xffffffffbbb07534 0xffff8989c223f000 0 [curl] 0xffffffffbbb04934 0xffff8989c223f000 0 [curl] skb_release_data 0xffff8989c223f000 0 [curl] kfree_skbmem 0xffff8989c159b4e8 0 [curl] 0xffffffffbbb00db4
[..]
With patches:
SKB CPU PROCESS FUNC
0xffffa4564159b4e8 0 [curl] validate_xmit_skb_list 0xffffa4564159b4e8 0 [curl] netif_skb_features 0xffffa4564159b4e8 0 [curl] skb_network_protocol 0xffffa4564159b4e8 0 [curl] skb_csum_hwoffload_help 0xffffa4564159b4e8 0 [curl] skb_checksum_help 0xffffa4564159b4e8 0 [curl] skb_ensure_writable 0xffffa4564159b4e8 0 [curl] skb_to_sgvec
[..]
[1]: https://github.com/cilium/pwru/tree/test-ibt-kernel-fix
Quoted 4 lines
--- kernel/trace/bpf_trace.c | 5 ++++- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-)
[..]
Re: [PATCHv4 bpf-next 5/6] bpf: Return value in kprobe get_func_ip only for entry address
Quoted 40 lines · Martynas Pumputis
Quoted 8 lines · Jiri Olsa
Changing return value of kprobe's version of
bpf_get_func_ipto return zero if the attach address is not on the function's entry point.For kprobes attached in the middle of the function we can't easily get to the function address especially now with the
CONFIG_X86_KERNEL_IBTsupport.Quoted 5 lines
If user cares about current IP for kprobes attached within the function body, they can get it with
PT_REGS_IP(ctx).Suggested-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>Tested the patches with "pwru --filter-func='.*skb.*' --filter-dst-ip=1.1.1.1" from [1] - the symbol name resolution works, thanks!
Without your patches:
SKB CPU PROCESS FUNC
0xffff8989c159b4e8 0 [curl] 0xffffffffbbb06164 0xffff8989c223f000 0 [curl] 0xffffffffbbb07534 0xffff8989c223f000 0 [curl] 0xffffffffbbb04934 0xffff8989c223f000 0 [curl] skb_release_data 0xffff8989c223f000 0 [curl] kfree_skbmem 0xffff8989c159b4e8 0 [curl] 0xffffffffbbb00db4[..]
With patches:
SKB CPU PROCESS FUNC
0xffffa4564159b4e8 0 [curl] validate_xmit_skb_list 0xffffa4564159b4e8 0 [curl] netif_skb_features 0xffffa4564159b4e8 0 [curl] skb_network_protocol 0xffffa4564159b4e8 0 [curl] skb_csum_hwoffload_help 0xffffa4564159b4e8 0 [curl] skb_checksum_help 0xffffa4564159b4e8 0 [curl] skb_ensure_writable 0xffffa4564159b4e8 0 [curl] skb_to_sgvec
Quoted 5 lines
[..]
[1]: https://github.com/cilium/pwru/tree/test-ibt-kernel-fix
awesome, thanks
jirka
Quoted 7 lines
Quoted 5 lines
--- kernel/trace/bpf_trace.c | 5 ++++- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-)[..]
Jiri Olsa
reviewerPATCH v4 6/6 selftests/bpf: Fix get_func_ip offset test for CONFIG_X86_KERNEL_IBT
In reply to Jiri OlsaWith CONFIG_X86_KERNEL_IBT enabled the test for kprobe with offset won't work because of the extra endbr instruction.
As suggested by Andrii adding CONFIG_X86_KERNEL_IBT detection and using appropriate offset value based on that.
Also removing test7 program, because it does the same as test6.
--- .../bpf/prog_tests/get_func_ip_test.c | 59 +++++++++++++++---- .../selftests/bpf/progs/get_func_ip_test.c | 23 ++++---- 2 files changed, 60 insertions(+), 22 deletions(-)
tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c +48 -11
@@ -2,7 +2,7 @@#include <test_progs.h> #include "get_func_ip_test.skel.h" -void test_get_func_ip_test (void ) +static void test_function_entry (void ) {struct get_func_ip_test *skel =NULL ;int err, prog_fd;
@@ -12,14 +12,6 @@ void test_get_func_ip_test(void)if (!ASSERT_OK_PTR (skel,"get_func_ip_test__open" ))return ; -/* test6 is x86_64 specifc because of the instruction -* offset, disabling it for all other archs -*/ -#ifndef __x86_64__ -bpf_program__set_autoload (skel->progs.test6, false); -bpf_program__set_autoload (skel->progs.test7, false); -#endif - err =get_func_ip_test__load (skel);if (!ASSERT_OK (err,"get_func_ip_test__load" )) goto cleanup;
@@ -43,11 +35,56 @@ void test_get_func_ip_test(void)ASSERT_EQ (skel->bss->test3_result,1 ,"test3_result" );ASSERT_EQ (skel->bss->test4_result,1 ,"test4_result" );ASSERT_EQ (skel->bss->test5_result,1 ,"test5_result" ); + +cleanup: +get_func_ip_test__destroy (skel); +} + +/* test6 is x86_64 specific because of the instruction +* offset, disabling it for all other archs +*/ #ifdef __x86_64__ +static void test_function_body (void ) +{ +struct get_func_ip_test *skel =NULL ; +LIBBPF_OPTS (bpf_test_run_opts, topts); +LIBBPF_OPTS (bpf_kprobe_opts, kopts); +struct bpf_link *link6 =NULL ; +int err, prog_fd; + + skel =get_func_ip_test__open (); +if (!ASSERT_OK_PTR (skel,"get_func_ip_test__open" )) +return ; + +bpf_program__set_autoload (skel->progs.test6, true); + + err =get_func_ip_test__load (skel); +if (!ASSERT_OK (err,"get_func_ip_test__load" )) + goto cleanup; + + kopts.offset = skel->kconfig->CONFIG_X86_KERNEL_IBT ?9 :5 ; + + link6 =bpf_program__attach_kprobe_opts (skel->progs.test6,"bpf_fentry_test6" , &kopts); +if (!ASSERT_OK_PTR (link6,"link6" )) + goto cleanup; + + prog_fd =bpf_program__fd (skel->progs.test1); + err =bpf_prog_test_run_opts (prog_fd, &topts); +ASSERT_OK (err,"test_run" ); +ASSERT_EQ (topts.retval,0 ,"test_run" ); +ASSERT_EQ (skel->bss->test6_result,1 ,"test6_result" ); -ASSERT_EQ (skel->bss->test7_result,1 ,"test7_result" ); -#endif cleanup: +bpf_link__destroy (link6);get_func_ip_test__destroy (skel); } +#else +#define test_function_body () +#endif + +void test_get_func_ip_test (void ) +{ +test_function_entry (); +test_function_body (); +}
tools/testing/selftests/bpf/progs/get_func_ip_test.c +12 -11
@@ -2,6 +2,7 @@#include <linux/bpf.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> +#include <stdbool.h> char _license[] SEC("license") = "GPL";
@@ -13,6 +14,16 @@ extern const void bpf_modify_return_test __ksym; extern const void bpf_fentry_test6 __ksym; extern const void bpf_fentry_test7 __ksym; +extern bool CONFIG_X86_KERNEL_IBT __kconfig __weak; + +/* This function is here to have CONFIG_X86_KERNEL_IBT +* used and added to object BTF. +*/ +int unused (void ) +{ +return CONFIG_X86_KERNEL_IBT ?0 :1 ; +} +__u64 test1_result =0 ; SEC("fentry/bpf_fentry_test1")int BPF_PROG (test1 ,int a)
@@ -64,7 +75,7 @@ int BPF_PROG(test5, int a, int *b, int ret) }__u64 test6_result =0 ; -SEC("kprobe/bpf_fentry_test6+0x5") +SEC("?kprobe")int test6 (struct pt_regs *ctx) {__u64 addr =bpf_get_func_ip (ctx);
@@ -72,13 +83,3 @@ int test6(struct pt_regs *ctx) test6_result = (const void *) addr ==0 ;return 0 ; } - -__u64 test7_result =0 ; -SEC("kprobe/bpf_fentry_test7+5") -int test7 (struct pt_regs *ctx) -{ -__u64 addr =bpf_get_func_ip (ctx); - - test7_result = (const void *) addr ==0 ; -return 0 ; -}
Signature · 1 line
2.37.3
Re: [PATCHv4 bpf-next 6/6] selftests/bpf: Fix get_func_ip offset test for CONFIG_X86_KERNEL_IBT
Quoted 7 lines · Jiri Olsa
With
CONFIG_X86_KERNEL_IBTenabled the test for kprobe with offset won't work because of the extra endbr instruction.As suggested by Andrii adding
CONFIG_X86_KERNEL_IBTdetection and using appropriate offset value based on that.
Quoted 9 lines
Also removing test7 program, because it does the same as test6.
Suggested-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- .../bpf/prog_tests/get_func_ip_test.c | 59 +++++++++++++++---- .../selftests/bpf/progs/get_func_ip_test.c | 23 ++++---- 2 files changed, 60 insertions(+), 22 deletions(-)
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c +0
-0@@ -2,7 +2,7 @@#include <test_progs.h> #include "get_func_ip_test.skel.h"
[...]