Follow ups for bpf-list set
Subsystems (4)
Kumar Kartikeya Dwivedi
maintainercover Follow ups for bpf-list set
Make a few changes
- Remove bpf_global_ma_set check at runtime, disallow calling bpf_obj_new during verification
- Disable spin lock failure test when JIT does not support kfunc (s390x)
Kumar Kartikeya Dwivedi (2):
bpf: Disallow calling bpf_obj_new_impl on bpf_mem_alloc_init failure selftests/bpf: Skip spin lock failure test on s390x
kernel/bpf/helpers.c | 2 -- kernel/bpf/verifier.c | 13 ++++++++++++- tools/testing/selftests/bpf/prog_tests/spin_lock.c | 6 ++++++ 3 files changed, 18 insertions(+), 3 deletions(-)
base-commit: db6bf999544c8c8dcae093e91eba4570647874b1
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH 1/2 bpf: Disallow calling bpf_obj_new_impl on bpf_mem_alloc_init failure
Instead of checking bpf_global_ma_set at runtime on each allocation inside bpf_obj_new_impl, simply disallow calling the kfunc in case bpf_global_ma initialization failed during program verification.
The error generated when bpf_global_ma initialization fails:
...
21: (18) r1 = 0x7 ; R1_w=7
23: (b7) r2 = 0 ; R2_w=0
24: (85) call bpf_obj_new_impl#36585bpf_global_ma initialization failed, can't call bpf_obj_new_impl calling kernel function bpf_obj_new_impl is not allowed
--- kernel/bpf/helpers.c | 2 -- kernel/bpf/verifier.c | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-)
kernel/bpf/helpers.c +0 -2
@@ -1760,8 +1760,6 @@ void *bpf_obj_new_impl(u64 local_type_id__k, void *meta__ign)u64 size = local_type_id__k;void *p; -if (unlikely (!bpf_global_ma_set)) -return NULL ; p =bpf_mem_alloc (&bpf_global_ma, size);if (!p)return NULL ;
kernel/bpf/verifier.c +12 -1
@@ -8746,6 +8746,17 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_return 0 ; } +static bool is_kfunc_disabled (struct bpf_verifier_env *env,const struct btf *btf,u32 func_id) +{ +if (btf != btf_vmlinux) +return false; +if (!bpf_global_ma_set && func_id == special_kfunc_list[KF_bpf_obj_new_impl]) { +verbose (env,"bpf_global_ma initialization failed, can't call bpf_obj_new_impl\n" ); +return true; + } +return false; +} +static int check_kfunc_call (struct bpf_verifier_env *env,struct bpf_insn *insn,int *insn_idx_p) {
@@ -8773,7 +8784,7 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, func_proto =btf_type_by_id (desc_btf, func->type); kfunc_flags =btf_kfunc_id_set_contains (desc_btf,resolve_prog_type (env->prog), func_id); -if (!kfunc_flags) { +if (!kfunc_flags ||is_kfunc_disabled (env, desc_btf, func_id)) {verbose (env,"calling kernel function %s is not allowed\n" , func_name);return -EACCES ;
Signature · 1 line
2.38.1
Re: [PATCH bpf-next v1 1/2] bpf: Disallow calling bpf_obj_new_impl on bpf_mem_alloc_init failure
Quoted 42 lines · Kumar Kartikeya Dwivedi
Instead of checking
bpf_global_ma_setat runtime on each allocation insidebpf_obj_new_impl, simply disallow calling the kfunc in casebpf_global_mainitialization failed during program verification.The error generated when
bpf_global_mainitialization fails:
...
21: (18) r1 =0x7; R1_w=7
23: (b7) r2 = 0 ; R2_w=0
24: (85) call bpf_obj_new_impl#36585bpf_global_mainitialization failed, can't callbpf_obj_new_implcalling kernel functionbpf_obj_new_implis not allowedSuggested-by Alexei Starovoitov <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>--- kernel/bpf/helpers.c | 2 -- kernel/bpf/verifier.c | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-)kernel/bpf/helpers.c +0
-2@@ -1760,8 +1760,6 @@ void *bpf_obj_new_impl(u64 local_type_id__k, void *meta__ign)u64 size = local_type_id__k;void *p; -if (unlikely (!bpf_global_ma_set)) -return NULL ; p =bpf_mem_alloc (&bpf_global_ma, size);if (!p)return NULL ;kernel/bpf/verifier.c +1
-0@@ -8746,6 +8746,17 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_return 0 ; } +static bool is_kfunc_disabled (struct bpf_verifier_env *env,const struct btf *btf,u32 func_id)
kernel/bpf/verifier.c static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_ · line 8759
Quoted 10 lines
kernel/bpf/verifier.c +10
-0+{ +if (btf != btf_vmlinux) +return false; +if (!bpf_global_ma_set && func_id == special_kfunc_list[KF_bpf_obj_new_impl]) { +verbose (env,"bpf_global_ma initialization failed, can't call bpf_obj_new_impl\n" ); +return true; + } +return false; +} +
This is all just unnecessary code bloat for the case that cannot happen.
When you do:
meta.func_id == special_kfunc_list[KF_bpf_obj_new_impl] just add
if (!bpf_global_ma_set)
return -ENOMEM;
No need for verbose(). The users will never hit it.
Also please get rid of special_kfunc_set and
and btf_id_set_contains(&special_kfunc_set, meta.func_id) That additional check is unnecessary as well. special_kfunc_list is enough.
I'm going to apply patch 2 to make CI green.
Kumar Kartikeya Dwivedi
maintainerRe: [PATCH bpf-next v1 1/2] bpf: Disallow calling bpf_obj_new_impl on bpf_mem_alloc_init failure
Quoted 58 lines · Alexei Starovoitov
Quoted 42 lines · Kumar Kartikeya Dwivedi
Instead of checking
bpf_global_ma_setat runtime on each allocation insidebpf_obj_new_impl, simply disallow calling the kfunc in casebpf_global_mainitialization failed during program verification.The error generated when
bpf_global_mainitialization fails:
...
21: (18) r1 =0x7; R1_w=7
23: (b7) r2 = 0 ; R2_w=0
24: (85) call bpf_obj_new_impl#36585bpf_global_mainitialization failed, can't callbpf_obj_new_implcalling kernel functionbpf_obj_new_implis not allowedSuggested-by Alexei Starovoitov <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>--- kernel/bpf/helpers.c | 2 -- kernel/bpf/verifier.c | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-)kernel/bpf/helpers.c +0
-2@@ -1760,8 +1760,6 @@ void *bpf_obj_new_impl(u64 local_type_id__k, void *meta__ign)u64 size = local_type_id__k;void *p; -if (unlikely (!bpf_global_ma_set)) -return NULL ; p =bpf_mem_alloc (&bpf_global_ma, size);if (!p)return NULL ;kernel/bpf/verifier.c +1
-0@@ -8746,6 +8746,17 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_return 0 ; } +static bool is_kfunc_disabled (struct bpf_verifier_env *env,const struct btf *btf,u32 func_id)kernel/bpf/verifier.c static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_ · line 8759
Quoted 10 lines
kernel/bpf/verifier.c +10
-0+{ +if (btf != btf_vmlinux) +return false; +if (!bpf_global_ma_set && func_id == special_kfunc_list[KF_bpf_obj_new_impl]) { +verbose (env,"bpf_global_ma initialization failed, can't call bpf_obj_new_impl\n" ); +return true; + } +return false; +} +This is all just unnecessary code bloat for the case that cannot happen.
Quoted 8 lines
When you do:
meta.func_id == special_kfunc_list[KF_bpf_obj_new_impl] just add
if (!bpf_global_ma_set)
return-ENOMEM;No need for
verbose(). The users will never hit it.
Ok, makes sense, will fix and resend.
Quoted 4 lines
Also please get rid of
special_kfunc_setand
andbtf_id_set_contains(&special_kfunc_set, meta.func_id)That additional check is unnecessary as well.special_kfunc_listis enough.
It provides an easy way to do 'btf == vmlinux && is_special_kfunc'. Otherwise if I drop it, every check matching func_id == special_kfunc_list will also have to do btf == vmlinux check (because eventually we want to drop to the other branches that should work for non-vmlinux BTF as well).
What I mean is:
if (btf == vmlinux && btf_id_set_contains(special_kfunc_set)) {
if (func_id == special_kfunc_list) {
} else if (func_id == special_kfunc_list) {
} else {
}
} else if (!__btf_type_is_struct) {
} else /* struct */ {
}will become:
if (btf == vmlinux && func_id == special_kfunc_list) {
} else if (btf == vmlinux && func_id == special_kfunc_list) {
} else if (!__btf_type_is_struct) {
} else /* struct */ {
}I think it's better to keep it. It also fails the kfunc call if the return type is not properly handled (either custom implementation or just falling through to default cases, w/e applies).
But up to you.
Re: [PATCH bpf-next v1 1/2] bpf: Disallow calling bpf_obj_new_impl on bpf_mem_alloc_init failure
Quoted 21 lines · Kumar Kartikeya Dwivedi
Quoted 5 lines
Also please get rid of
special_kfunc_setand
andbtf_id_set_contains(&special_kfunc_set, meta.func_id)That additional check is unnecessary as well.special_kfunc_listis enough.It provides an easy way to do 'btf == vmlinux &&
is_special_kfunc'. Otherwise if I drop it, every check matchingfunc_id==special_kfunc_listwill also have to do btf == vmlinux check (because eventually we want to drop to the other branches that should work for non-vmlinux BTF as well).What I mean is:
if (btf == vmlinux && btf_id_set_contains(special_kfunc_set)) { if (func_id == special_kfunc_list) { } else if (func_id == special_kfunc_list) { } else { } } else if (!__btf_type_is_struct) { } else /* struct */ { }
Quoted 6 lines
will become:
if (btf == vmlinux && func_id == special_kfunc_list) { } else if (btf == vmlinux && func_id == special_kfunc_list) { } else if (!__btf_type_is_struct) { } else /* struct */ { }
One less indent looks better.
Repeated btf == vmlinux doesn't bother me.
There is no use for this special_kfunc_set. It just wastes memory. So I still think it's better to remove it.
While at it please swap branches !__btf_type_is_struct to __btf_type_is_struct:
else if (__btf_type_is_struct) {
regs[BPF_REG_0].type = PTR_TO_BTF_ID } else { // handle 'void *' return aka r0_size
would read better.
Kumar Kartikeya Dwivedi
maintainerPATCH 2/2 selftests/bpf: Skip spin lock failure test on s390x
In reply to Kumar Kartikeya DwivediInstead of adding the whole test to DENYLIST.s390x, which also has success test cases that should be run, just skip over failure test cases in case the JIT does not support kfuncs.
--- tools/testing/selftests/bpf/prog_tests/spin_lock.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/testing/selftests/bpf/prog_tests/spin_lock.c +6 -0
@@ -68,6 +68,12 @@ static void test_spin_lock_fail_prog(const char *prog_name, const char *err_msg)if (!ASSERT_ERR (ret,"test_spin_lock_fail__load must fail" )) goto end; +/* Skip check if JIT does not support kfuncs */ +if (strstr (log_buf,"JIT does not support calling kernel function" )) { +test__skip (); + goto end; + } +if (!ASSERT_OK_PTR (strstr (log_buf, err_msg),"expected error message" )) {fprintf (stderr,"Expected: %s\n" , err_msg);fprintf (stderr,"Verifier: %s\n" , log_buf);
Signature · 1 line
2.38.1
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Sat, 19 Nov 2022 00:29:36 +0530 you wrote:
Make a few changes
- Removebpf_global_ma_setcheck at runtime, disallow callingbpf_obj_newduring verification
- Disable spin lock failure test when JIT does not support kfunc (s390x)Kumar Kartikeya Dwivedi (2):
bpf: Disallow callingbpf_obj_new_implonbpf_mem_alloc_initfailure selftests/bpf: Skip spin lock failure test on s390x[...]
Here is the summary with links:
- [bpf-next,v1,1/2] bpf: Disallow calling bpf_obj_new_impl on bpf_mem_alloc_init failure (no matching commit)
- [bpf-next,v1,2/2] selftests/bpf: Skip spin lock failure test on s390x
https://git.kernel.org/bpf/bpf-next/c/97c11d6e3154
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html