selftests/bpf: Fix "missing ENDBR" BUG for destructor kfunc
Subsystems (3)
PATCH v2 1/1 selftests/bpf: Fix "missing ENDBR" BUG for destructor kfunc
With CONFIG_X86_KERNEL_IBT enabled, the test_verifier triggers the following BUG:
traps: Missing ENDBR: bpf_kfunc_call_test_release+0x0/0x30
------------[ cut here ]------------
kernel BUG at arch/x86/kernel/traps.c:254!
invalid opcode: 0000 [#1] PREEMPT SMP
<TASK>
asm_exc_control_protection+0x26/0x50
RIP: 0010:bpf_kfunc_call_test_release+0x0/0x30
Code: 00 48 c7 c7 18 f2 e1 b4 e8 0d ca 8c ff 48 c7 c0 00 f2 e1 b4 c3
0f 1f 44 00 00 66 0f 1f 00 0f 1f 44 00 00 0f 0b 31 c0 c3 66 90
<66> 0f 1f 00 0f 1f 44 00 00 48 85 ff 74 13 4c 8d 47 18 b8 ff ff ff
bpf_map_free_kptrs+0x2e/0x70
array_map_free+0x57/0x140
process_one_work+0x194/0x3a0
worker_thread+0x54/0x3a0
? rescuer_thread+0x390/0x390
kthread+0xe9/0x110
? kthread_complete_and_exit+0x20/0x20This is because there are no compile-time references to the destructor kfuncs, bpf_kfunc_call_test_release() for example. So objtool marked them sealable and ENDBR in the functions were sealed (converted to NOP) by apply_ibt_endbr().
This fix creates dummy compile-time references to destructor kfuncs so ENDBR stay there.
---
v2:
- Use generic macro name and place the macro after function body as
- suggested by Jiri Olsa
v1: https://lore.kernel.org/all/[email protected]/
include/linux/btf_ids.h | 7 +++++++ net/bpf/test_run.c | 4 ++++ 2 files changed, 11 insertions(+)
include/linux/btf_ids.h +7 -0
@@ -266,4 +266,11 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[]; +#if defined(CONFIG_X86_KERNEL_IBT ) && !defined(__DISABLE_EXPORTS) +#define FUNC_IBT_NOSEAL (name) \ + asm(IBT_NOSEAL(#name)); +#else +#define FUNC_IBT_NOSEAL (name) +#endif /* CONFIG_X86_KERNEL_IBT */ +#endif
net/bpf/test_run.c +4 -0
@@ -597,10 +597,14 @@ noinline void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p)refcount_dec (&p->cnt); } +FUNC_IBT_NOSEAL (bpf_kfunc_call_test_release) + noinline void bpf_kfunc_call_memb_release(struct prog_test_member *p) { } +FUNC_IBT_NOSEAL (bpf_kfunc_call_memb_release) + noinline void bpf_kfunc_call_memb1_release(struct prog_test_member1 *p) {WARN_ON_ONCE (1 );
Signature · 1 line
2.34.1
Quoted 48 lines · Chen Hu
With
CONFIG_X86_KERNEL_IBTenabled, thetest_verifiertriggers the following BUG:traps: Missing ENDBR:
bpf_kfunc_call_test_release+0x0/0x30------------[ cut here ]------------ kernel BUG at arch/x86/kernel/traps.c:254! invalid opcode: 0000 [#1] PREEMPT SMP <TASK> asm_exc_control_protection+0x26/0x50 RIP: 0010:bpf_kfunc_call_test_release+0x0/0x30 Code: 00 48 c7 c7 18 f2 e1 b4 e8 0d ca 8c ff 48 c7 c0 00 f2 e1 b4 c3 0f 1f 44 00 00 66 0f 1f 00 0f 1f 44 00 00 0f 0b 31 c0 c3 66 90 <66> 0f 1f 00 0f 1f 44 00 00 48 85 ff 74 13 4c 8d 47 18 b8 ff ff ff bpf_map_free_kptrs+0x2e/0x70 array_map_free+0x57/0x140 process_one_work+0x194/0x3a0 worker_thread+0x54/0x3a0 ? rescuer_thread+0x390/0x390 kthread+0xe9/0x110 ? kthread_complete_and_exit+0x20/0x20This is because there are no compile-time references to the destructor kfuncs,
bpf_kfunc_call_test_release()for example. So objtool marked them sealable and ENDBR in the functions were sealed (converted to NOP) byapply_ibt_endbr().This fix creates dummy compile-time references to destructor kfuncs so ENDBR stay there.
Fixes 05a945deefaa ("selftests/bpf: Add verifier tests for kptr")Signed-off-by Chen Hu <[email protected]>Tested-by Pengfei Xu <[email protected]>---
v2:
- Use generic macro name and place the macro after function body as
- suggested by Jiri Olsav1: https://lore.kernel.org/all/[email protected]/
include/linux/btf_ids.h | 7 +++++++ net/bpf/test_run.c | 4 ++++ 2 files changed, 11 insertions(+)include/linux/btf_ids.h +0
-0
include/linux/btf_ids.h MAX_BTF_TRACING_TYPE, · line 274
Quoted 9 lines
include/linux/btf_ids.h +6
-0@@ -266,4 +266,11 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[]; +#if defined(CONFIG_X86_KERNEL_IBT ) && !defined(__DISABLE_EXPORTS) +#define FUNC_IBT_NOSEAL (name) \ + asm(IBT_NOSEAL(#name)); +#else +#define FUNC_IBT_NOSEAL (name) +#endif /* CONFIG_X86_KERNEL_IBT */
hum, IBT_NOSEAL is x86 specific, so this will probably fail build on other archs.. I think we could ifdef it with CONFIG_X86, but it should go to some IBT related header? surely not to btf_ids.h
cc-ing Peter and Josh
thanks,
jirka
Quoted 24 lines
include/linux/btf_ids.h +1
-0+#endif net/bpf/test_run.c +4
-0@@ -597,10 +597,14 @@ noinline void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p)refcount_dec (&p->cnt); } +FUNC_IBT_NOSEAL (bpf_kfunc_call_test_release) + noinline void bpf_kfunc_call_memb_release(struct prog_test_member *p) { } +FUNC_IBT_NOSEAL (bpf_kfunc_call_memb_release) + noinline void bpf_kfunc_call_memb1_release(struct prog_test_member1 *p) {WARN_ON_ONCE (1 );Signature · 1 line
2.34.1
Quoted 22 lines · Jiri Olsa
Quoted 21 lines · Chen Hu
With
CONFIG_X86_KERNEL_IBTenabled, thetest_verifiertriggers the following BUG:traps: Missing ENDBR:
bpf_kfunc_call_test_release+0x0/0x30------------[ cut here ]------------ kernel BUG at arch/x86/kernel/traps.c:254! invalid opcode: 0000 [#1] PREEMPT SMP <TASK> asm_exc_control_protection+0x26/0x50 RIP: 0010:bpf_kfunc_call_test_release+0x0/0x30 Code: 00 48 c7 c7 18 f2 e1 b4 e8 0d ca 8c ff 48 c7 c0 00 f2 e1 b4 c3 0f 1f 44 00 00 66 0f 1f 00 0f 1f 44 00 00 0f 0b 31 c0 c3 66 90 <66> 0f 1f 00 0f 1f 44 00 00 48 85 ff 74 13 4c 8d 47 18 b8 ff ff ff bpf_map_free_kptrs+0x2e/0x70 array_map_free+0x57/0x140 process_one_work+0x194/0x3a0 worker_thread+0x54/0x3a0 ? rescuer_thread+0x390/0x390 kthread+0xe9/0x110 ? kthread_complete_and_exit+0x20/0x20
Quoted 4 lines
Quoted 4 lines
This is because there are no compile-time references to the destructor kfuncs,
bpf_kfunc_call_test_release()for example. So objtool marked them sealable and ENDBR in the functions were sealed (converted to NOP) byapply_ibt_endbr().
If there is no compile time reference to it, what stops an LTO linker from throwing it out in the first place?
Quoted 23 lines · Peter Zijlstra
Quoted 22 lines · Jiri Olsa
Quoted 21 lines · Chen Hu
With
CONFIG_X86_KERNEL_IBTenabled, thetest_verifiertriggers the following BUG:traps: Missing ENDBR:
bpf_kfunc_call_test_release+0x0/0x30------------[ cut here ]------------ kernel BUG at arch/x86/kernel/traps.c:254! invalid opcode: 0000 [#1] PREEMPT SMP <TASK> asm_exc_control_protection+0x26/0x50 RIP: 0010:bpf_kfunc_call_test_release+0x0/0x30 Code: 00 48 c7 c7 18 f2 e1 b4 e8 0d ca 8c ff 48 c7 c0 00 f2 e1 b4 c3 0f 1f 44 00 00 66 0f 1f 00 0f 1f 44 00 00 0f 0b 31 c0 c3 66 90 <66> 0f 1f 00 0f 1f 44 00 00 48 85 ff 74 13 4c 8d 47 18 b8 ff ff ff bpf_map_free_kptrs+0x2e/0x70 array_map_free+0x57/0x140 process_one_work+0x194/0x3a0 worker_thread+0x54/0x3a0 ? rescuer_thread+0x390/0x390 kthread+0xe9/0x110 ? kthread_complete_and_exit+0x20/0x20
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
This is because there are no compile-time references to the destructor kfuncs,
bpf_kfunc_call_test_release()for example. So objtool marked them sealable and ENDBR in the functions were sealed (converted to NOP) byapply_ibt_endbr().If there is no compile time reference to it, what stops an LTO linker from throwing it out in the first place?
Ah, my stupid.
The only references to this function from kernel space are:
$ grep -r bpf_kfunc_call_test_release
net/bpf/test_run.c:noinline void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p)
net/bpf/test_run.c:BTF_ID_FLAGS(func, bpf_kfunc_call_test_release, KF_RELEASE)
net/bpf/test_run.c:BTF_ID(func, bpf_kfunc_call_test_release)Macro BTF_ID_... puts the function names to .BTF_ids section. It looks like:__BTF_ID__func__bpf_kfunc_call_test_release__692
When running, it uses kallsyms_lookup_name() to find the function address via names in .BTF_ids section.
Hi jirka,
Please kindly correct me if my understanding of BTF_ids is wrong.
Quoted 36 lines · On Fri, Nov 25, 2022 at 09:44:29PM +0800, Chen, Hu1 wrote:
Quoted 23 lines · Peter Zijlstra
Quoted 22 lines · Jiri Olsa
Quoted 21 lines · Chen Hu
With
CONFIG_X86_KERNEL_IBTenabled, thetest_verifiertriggers the following BUG:traps: Missing ENDBR:
bpf_kfunc_call_test_release+0x0/0x30------------[ cut here ]------------ kernel BUG at arch/x86/kernel/traps.c:254! invalid opcode: 0000 [#1] PREEMPT SMP <TASK> asm_exc_control_protection+0x26/0x50 RIP: 0010:bpf_kfunc_call_test_release+0x0/0x30 Code: 00 48 c7 c7 18 f2 e1 b4 e8 0d ca 8c ff 48 c7 c0 00 f2 e1 b4 c3 0f 1f 44 00 00 66 0f 1f 00 0f 1f 44 00 00 0f 0b 31 c0 c3 66 90 <66> 0f 1f 00 0f 1f 44 00 00 48 85 ff 74 13 4c 8d 47 18 b8 ff ff ff bpf_map_free_kptrs+0x2e/0x70 array_map_free+0x57/0x140 process_one_work+0x194/0x3a0 worker_thread+0x54/0x3a0 ? rescuer_thread+0x390/0x390 kthread+0xe9/0x110 ? kthread_complete_and_exit+0x20/0x20Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
This is because there are no compile-time references to the destructor kfuncs,
bpf_kfunc_call_test_release()for example. So objtool marked them sealable and ENDBR in the functions were sealed (converted to NOP) byapply_ibt_endbr().If there is no compile time reference to it, what stops an LTO linker from throwing it out in the first place?
Ah, my stupid.
The only references to this function from kernel space are:
Quoted 8 lines
$ grep -r bpf_kfunc_call_test_release net/bpf/test_run.c:noinline void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p) net/bpf/test_run.c:BTF_ID_FLAGS(func, bpf_kfunc_call_test_release, KF_RELEASE) net/bpf/test_run.c:BTF_ID(func, bpf_kfunc_call_test_release)Macro
BTF_ID_... puts the function names to .BTF_ids section. It looks like:__BTF_ID__func__bpf_kfunc_call_test_release__692
bpf_kfunc_call_test_release test function called bpf program as kfunc (check tools/testing/selftests/bpf/progs/*.c)
it's placed in BTF ID lists so verifier can validate its ID when called from bpf program.. it has no other caller from kernel side
jirka
Quoted 7 lines
When running, it uses
kallsyms_lookup_name()to find the function address via names in .BTF_ids section.Hi jirka,
Please kindly correct me if my understanding ofBTF_idsis wrong.
Quoted 47 lines · Jiri Olsa
Quoted 36 lines · On Fri, Nov 25, 2022 at 09:44:29PM +0800, Chen, Hu1 wrote:
Quoted 23 lines · Peter Zijlstra
Quoted 22 lines · Jiri Olsa
Quoted 21 lines · Chen Hu
With
CONFIG_X86_KERNEL_IBTenabled, thetest_verifiertriggers the following BUG:traps: Missing ENDBR:
bpf_kfunc_call_test_release+0x0/0x30------------[ cut here ]------------ kernel BUG at arch/x86/kernel/traps.c:254! invalid opcode: 0000 [#1] PREEMPT SMP <TASK> asm_exc_control_protection+0x26/0x50 RIP: 0010:bpf_kfunc_call_test_release+0x0/0x30 Code: 00 48 c7 c7 18 f2 e1 b4 e8 0d ca 8c ff 48 c7 c0 00 f2 e1 b4 c3 0f 1f 44 00 00 66 0f 1f 00 0f 1f 44 00 00 0f 0b 31 c0 c3 66 90 <66> 0f 1f 00 0f 1f 44 00 00 48 85 ff 74 13 4c 8d 47 18 b8 ff ff ff bpf_map_free_kptrs+0x2e/0x70 array_map_free+0x57/0x140 process_one_work+0x194/0x3a0 worker_thread+0x54/0x3a0 ? rescuer_thread+0x390/0x390 kthread+0xe9/0x110 ? kthread_complete_and_exit+0x20/0x20Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
This is because there are no compile-time references to the destructor kfuncs,
bpf_kfunc_call_test_release()for example. So objtool marked them sealable and ENDBR in the functions were sealed (converted to NOP) byapply_ibt_endbr().If there is no compile time reference to it, what stops an LTO linker from throwing it out in the first place?
Ah, my stupid.
The only references to this function from kernel space are:
Quoted 8 lines
$ grep -r bpf_kfunc_call_test_release net/bpf/test_run.c:noinline void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p) net/bpf/test_run.c:BTF_ID_FLAGS(func, bpf_kfunc_call_test_release, KF_RELEASE) net/bpf/test_run.c:BTF_ID(func, bpf_kfunc_call_test_release)Macro
BTF_ID_... puts the function names to .BTF_ids section. It looks like:__BTF_ID__func__bpf_kfunc_call_test_release__692
Quoted 5 lines
bpf_kfunc_call_test_releasetest function called bpf program as kfunc (checktools/testing/selftests/bpf/progs/*.c)it's placed in BTF ID lists so verifier can validate its ID when called from bpf program.. it has no other caller from kernel side
They were added when we had no ability to call kfuncs from modules. Now we should probably move all of them to bpf_testmod.
Quoted 63 lines · Jiri Olsa
Quoted 48 lines · Chen Hu
With
CONFIG_X86_KERNEL_IBTenabled, thetest_verifiertriggers the following BUG:traps: Missing ENDBR:
bpf_kfunc_call_test_release+0x0/0x30------------[ cut here ]------------ kernel BUG at arch/x86/kernel/traps.c:254! invalid opcode: 0000 [#1] PREEMPT SMP <TASK> asm_exc_control_protection+0x26/0x50 RIP: 0010:bpf_kfunc_call_test_release+0x0/0x30 Code: 00 48 c7 c7 18 f2 e1 b4 e8 0d ca 8c ff 48 c7 c0 00 f2 e1 b4 c3 0f 1f 44 00 00 66 0f 1f 00 0f 1f 44 00 00 0f 0b 31 c0 c3 66 90 <66> 0f 1f 00 0f 1f 44 00 00 48 85 ff 74 13 4c 8d 47 18 b8 ff ff ff bpf_map_free_kptrs+0x2e/0x70 array_map_free+0x57/0x140 process_one_work+0x194/0x3a0 worker_thread+0x54/0x3a0 ? rescuer_thread+0x390/0x390 kthread+0xe9/0x110 ? kthread_complete_and_exit+0x20/0x20This is because there are no compile-time references to the destructor kfuncs,
bpf_kfunc_call_test_release()for example. So objtool marked them sealable and ENDBR in the functions were sealed (converted to NOP) byapply_ibt_endbr().This fix creates dummy compile-time references to destructor kfuncs so ENDBR stay there.
Fixes 05a945deefaa ("selftests/bpf: Add verifier tests for kptr")Signed-off-by Chen Hu <[email protected]>Tested-by Pengfei Xu <[email protected]>---
v2:
- Use generic macro name and place the macro after function body as
- suggested by Jiri Olsav1: https://lore.kernel.org/all/[email protected]/
include/linux/btf_ids.h | 7 +++++++ net/bpf/test_run.c | 4 ++++ 2 files changed, 11 insertions(+)include/linux/btf_ids.h +0
-0include/linux/btf_ids.h MAX_BTF_TRACING_TYPE, · line 274
Quoted 9 lines
include/linux/btf_ids.h +6
-0@@ -266,4 +266,11 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[]; +#if defined(CONFIG_X86_KERNEL_IBT ) && !defined(__DISABLE_EXPORTS) +#define FUNC_IBT_NOSEAL (name) \ + asm(IBT_NOSEAL(#name)); +#else +#define FUNC_IBT_NOSEAL (name) +#endif /* CONFIG_X86_KERNEL_IBT */ hum,
IBT_NOSEALis x86 specific, so this will probably fail build on other archs.. I think we could ifdef it withCONFIG_X86, but it should go to some IBT related header? surely not tobtf_ids.h
Quoted 5 lines
cc-ing Peter and Josh
thanks,
jirka
The lkp reports build success because X86_KERNEL_IBT alredy depends on X86_64.
Currently, arch/x86/include/asm/ibt.h which defines macro IBT_NOSEAL is x86 specific. How about we just put asm at test_run.c directly (ugly?):
#if defined(CONFIG_X86_KERNEL_IBT) && !defined(__DISABLE_EXPORTS) asm(IBT_NOSEAL("bpf_kfunc_call_test_release")); asm(IBT_NOSEAL("bpf_kfunc_call_memb_release"));
#endif
thanks
Chen Hu
Quoted 25 lines
Quoted 25 lines
include/linux/btf_ids.h +1
-0+#endif net/bpf/test_run.c +4
-0@@ -597,10 +597,14 @@ noinline void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p)refcount_dec (&p->cnt); } +FUNC_IBT_NOSEAL (bpf_kfunc_call_test_release) + noinline void bpf_kfunc_call_memb_release(struct prog_test_member *p) { } +FUNC_IBT_NOSEAL (bpf_kfunc_call_memb_release) + noinline void bpf_kfunc_call_memb1_release(struct prog_test_member1 *p) {WARN_ON_ONCE (1 );Signature · 1 line
2.34.1
Quoted 64 lines · On Fri, Nov 25, 2022 at 09:28:28PM +0800, Chen, Hu1 wrote:
Quoted 63 lines · Jiri Olsa
Quoted 48 lines · Chen Hu
With
CONFIG_X86_KERNEL_IBTenabled, thetest_verifiertriggers the following BUG:traps: Missing ENDBR:
bpf_kfunc_call_test_release+0x0/0x30------------[ cut here ]------------ kernel BUG at arch/x86/kernel/traps.c:254! invalid opcode: 0000 [#1] PREEMPT SMP <TASK> asm_exc_control_protection+0x26/0x50 RIP: 0010:bpf_kfunc_call_test_release+0x0/0x30 Code: 00 48 c7 c7 18 f2 e1 b4 e8 0d ca 8c ff 48 c7 c0 00 f2 e1 b4 c3 0f 1f 44 00 00 66 0f 1f 00 0f 1f 44 00 00 0f 0b 31 c0 c3 66 90 <66> 0f 1f 00 0f 1f 44 00 00 48 85 ff 74 13 4c 8d 47 18 b8 ff ff ff bpf_map_free_kptrs+0x2e/0x70 array_map_free+0x57/0x140 process_one_work+0x194/0x3a0 worker_thread+0x54/0x3a0 ? rescuer_thread+0x390/0x390 kthread+0xe9/0x110 ? kthread_complete_and_exit+0x20/0x20This is because there are no compile-time references to the destructor kfuncs,
bpf_kfunc_call_test_release()for example. So objtool marked them sealable and ENDBR in the functions were sealed (converted to NOP) byapply_ibt_endbr().This fix creates dummy compile-time references to destructor kfuncs so ENDBR stay there.
Fixes 05a945deefaa ("selftests/bpf: Add verifier tests for kptr")Signed-off-by Chen Hu <[email protected]>Tested-by Pengfei Xu <[email protected]>---
v2:
- Use generic macro name and place the macro after function body as
- suggested by Jiri Olsav1: https://lore.kernel.org/all/[email protected]/
include/linux/btf_ids.h | 7 +++++++ net/bpf/test_run.c | 4 ++++ 2 files changed, 11 insertions(+)include/linux/btf_ids.h +0
-0include/linux/btf_ids.h MAX_BTF_TRACING_TYPE, · line 274
Quoted 9 lines
include/linux/btf_ids.h +6
-0@@ -266,4 +266,11 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[]; +#if defined(CONFIG_X86_KERNEL_IBT ) && !defined(__DISABLE_EXPORTS) +#define FUNC_IBT_NOSEAL (name) \ + asm(IBT_NOSEAL(#name)); +#else +#define FUNC_IBT_NOSEAL (name) +#endif /* CONFIG_X86_KERNEL_IBT */ hum,
IBT_NOSEALis x86 specific, so this will probably fail build on other archs.. I think we could ifdef it withCONFIG_X86, but it should go to some IBT related header? surely not tobtf_ids.h
Quoted 8 lines
Quoted 5 lines
cc-ing Peter and Josh
thanks,
jirkaThe lkp reports build success because
X86_KERNEL_IBTalredy depends onX86_64.
ah right, so please just move it to some other header
jirka
Quoted 37 lines
Currently,
arch/x86/include/asm/ibt.hwhich defines macroIBT_NOSEALis x86 specific. How about we just put asm attest_run.cdirectly (ugly?):#if
defined(CONFIG_X86_KERNEL_IBT)&& !defined(__DISABLE_EXPORTS) asm(IBT_NOSEAL("bpf_kfunc_call_test_release")); asm(IBT_NOSEAL("bpf_kfunc_call_memb_release"));
#endifthanks
Chen HuQuoted 25 lines
Quoted 25 lines
include/linux/btf_ids.h +1
-0+#endif net/bpf/test_run.c +4
-0@@ -597,10 +597,14 @@ noinline void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p)refcount_dec (&p->cnt); } +FUNC_IBT_NOSEAL (bpf_kfunc_call_test_release) + noinline void bpf_kfunc_call_memb_release(struct prog_test_member *p) { } +FUNC_IBT_NOSEAL (bpf_kfunc_call_memb_release) + noinline void bpf_kfunc_call_memb1_release(struct prog_test_member1 *p) {WARN_ON_ONCE (1 );Signature · 1 line
2.34.1