bpf: Show precise rejected function when attaching to __noreturn and __btf_id functions
Subsystems (4)
cover bpf: Show precise rejected function when attaching to __noreturn and __btf_id functions
Show precise rejected function name when attaching to __noreturn and __btf_id functions.
Add selftest for attaching tracing to __btf_id functions.
---
KaFai Wan (3):
bpf: Show precise rejected function when attaching to __noreturn
functions
bpf: Show precise rejected function when attaching to __btf_id
functions
selftests/bpf: Add selftest for attaching tracing to __btf_id
functions
kernel/bpf/verifier.c | 5 ++++- .../selftests/bpf/prog_tests/tracing_btf_ids.c | 16 ++++++++++++++++ .../selftests/bpf/progs/fexit_noreturns.c | 2 +- .../selftests/bpf/progs/tracing_btf_ids.c | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_btf_ids.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_btf_ids.c
Signature · 1 line
2.43.0
PATCH 1/3 bpf: Show precise rejected function when attaching to __noreturn functions
Show the precise rejected function name when attaching fexit/fmod_ret to __noreturn functions.
$ ./fexit libbpf: prog 'fexit': BPF program load failed: -EINVAL libbpf: prog 'fexit': -- BEGIN PROG LOAD LOG -- Attaching fexit/fmod_ret to __noreturn function 'do_exit' is rejected.
--- kernel/bpf/verifier.c | 3 ++- tools/testing/selftests/bpf/progs/fexit_noreturns.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +2 -1
@@ -23942,7 +23942,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) }else if ((prog->expected_attach_type ==BPF_TRACE_FEXIT || prog->expected_attach_type ==BPF_MODIFY_RETURN ) &&btf_id_set_contains (&noreturn_deny, btf_id)) { -verbose (env,"Attaching fexit/fmod_ret to __noreturn functions is rejected.\n" ); +verbose (env,"Attaching fexit/fmod_ret to __noreturn function '%s' is rejected.\n" , + tgt_info.tgt_name);return -EINVAL ; }
tools/testing/selftests/bpf/progs/fexit_noreturns.c +1 -1
@@ -8,7 +8,7 @@ char _license[] SEC("license") = "GPL"; SEC("fexit/do_exit") -__failure __msg("Attaching fexit/fmod_ret to __noreturn functions is rejected.") +__failure __msg("Attaching fexit/fmod_ret to __noreturn function 'do_exit' is rejected.") int BPF_PROG(noreturns) {return 0 ;
Signature · 1 line
2.43.0
PATCH 2/3 bpf: Show precise rejected function when attaching to __btf_id functions
In reply to KaFai WanShow the precise rejected function name when attaching tracing to __btf_id functions.
$ ./fentry libbpf: prog 'migrate_disable': BPF program load failed: -EINVAL libbpf: prog 'migrate_disable': -- BEGIN PROG LOAD LOG -- Attaching tracing to __btf_id function 'migrate_disable' is rejected.
--- kernel/bpf/verifier.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/bpf/verifier.c +2 -0
@@ -23938,6 +23938,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env)return ret; }else if (prog->type ==BPF_PROG_TYPE_TRACING &&btf_id_set_contains (&btf_id_deny, btf_id)) { +verbose (env,"Attaching tracing to __btf_id function '%s' is rejected.\n" , + tgt_info.tgt_name);return -EINVAL ; } else if ((prog->expected_attach_type == BPF_TRACE_FEXIT || prog->expected_attach_type == BPF_MODIFY_RETURN) &&
Signature · 1 line
2.43.0
Re: [PATCH bpf-next 2/3] bpf: Show precise rejected function when attaching to __btf_id functions
Quoted 19 lines · KaFai Wan
Show the precise rejected function name when attaching tracing to
__btf_idfunctions.$ ./fentry libbpf: prog 'migrate_disable': BPF program load failed: -EINVAL libbpf: prog 'migrate_disable': -- BEGIN PROG LOAD LOG -- Attaching tracing to __btf_id function 'migrate_disable' is rejected.Signed-off-by KaFai Wan <[email protected]>--- kernel/bpf/verifier.c | 2 ++ 1 file changed, 2 insertions(+)kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c static int check_attach_btf_id(struct bpf_verifier_env *env) · line 23942
Quoted 5 lines
kernel/bpf/verifier.c +2
-0@@ -23938,6 +23938,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env)return ret; }else if (prog->type ==BPF_PROG_TYPE_TRACING &&btf_id_set_contains (&btf_id_deny, btf_id)) { +verbose (env,"Attaching tracing to __btf_id function '%s' is rejected.\n" , + tgt_info.tgt_name);
"Attaching tracing to __btf_id" ?! What does it mean? Drop "__btf_id" and "tracing" bits.
--
pw-bot: cr
Re: [PATCH bpf-next 2/3] bpf: Show precise rejected function when attaching to __btf_id functions
Quoted 16 lines · Alexei Starovoitov
Quoted 14 lines · KaFai Wan
Show the precise rejected function name when attaching tracing to
__btf_idfunctions.$ ./fentry libbpf: prog 'migrate_disable': BPF program load failed: -EINVAL libbpf: prog 'migrate_disable': -- BEGIN PROG LOAD LOG -- Attaching tracing to __btf_id function 'migrate_disable' is rejected.Signed-off-by KaFai Wan <[email protected]>--- kernel/bpf/verifier.c | 2 ++ 1 file changed, 2 insertions(+)
Quoted 12 lines
kernel/bpf/verifier.c static int check_attach_btf_id(struct bpf_verifier_env *env) · line 23942
Quoted 10 lines
kernel/bpf/verifier.c +2
-0@@ -23938,6 +23938,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env)return ret; }else if (prog->type ==BPF_PROG_TYPE_TRACING &&btf_id_set_contains (&btf_id_deny, btf_id)) { +verbose (env,"Attaching tracing to __btf_id function '%s' is rejected.\n" , + tgt_info.tgt_name);"Attaching tracing to
__btf_id" ?! What does it mean?
The term "tracing" refers to BPF_PROG_TYPE_TRACING. I believe it is useful because it helps identify which functions cannot be attached by a given BPF program type.
Perhaps we should replace "tracing" with "a tracing prog" for clarity?
Quoted 1 line
Drop "
__btf_id" and "tracing" bits.
Signature · 2 lines
Regards Yafang
Re: [PATCH bpf-next 2/3] bpf: Show precise rejected function when attaching to __btf_id functions
Quoted 35 lines · Yafang Shao
Quoted 18 lines · Alexei Starovoitov
Quoted 15 lines · KaFai Wan
Show the precise rejected function name when attaching tracing to
__btf_idfunctions.$ ./fentry libbpf: prog 'migrate_disable': BPF program load failed: -EINVAL libbpf: prog 'migrate_disable': -- BEGIN PROG LOAD LOG -- Attaching tracing to __btf_id function 'migrate_disable' is rejected.Signed-off-by KaFai Wan <[email protected]>---
kernel/bpf/verifier.c | 2 ++1 file changed, 2 insertions(+)Quoted 14 lines
kernel/bpf/verifier.c static int check_attach_btf_id(struct · line 23944
Quoted 12 lines
kernel/bpf/verifier.c +2
-0@@ -23938,6 +23938,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) return ret; } else if (prog->type == BPF_PROG_TYPE_TRACING && btf_id_set_contains(&btf_id_deny, btf_id)) { + verbose(env, "Attaching tracing to __btf_id function '%s' is rejected.\n", + tgt_info.tgt_name);"Attaching tracing to
__btf_id" ?! What does it mean?
Quoted 4 lines
The term "tracing" refers to
BPF_PROG_TYPE_TRACING. I believe it is useful because it helps identify which functions cannot be attached by
a given BPF program type.
Thanks, this is what I want to express.
Quoted 2 lines
Perhaps we should replace "tracing" with "a tracing prog" for clarity?
Looks good, may be 'tracing programs' could be fine.
Quoted 3 lines
Quoted 2 lines
Drop "
__btf_id" and "tracing" bits.
Signature · 2 lines
Thanks, KaFai
Re: [PATCH bpf-next 2/3] bpf: Show precise rejected function when attaching to __btf_id functions
In reply to Alexei StarovoitovQuoted 17 lines · Alexei Starovoitov
Quoted 15 lines · KaFai Wan
Show the precise rejected function name when attaching tracing to
__btf_idfunctions.$ ./fentry libbpf: prog 'migrate_disable': BPF program load failed: -EINVAL libbpf: prog 'migrate_disable': -- BEGIN PROG LOAD LOG -- Attaching tracing to __btf_id function 'migrate_disable' is rejected.Signed-off-by KaFai Wan <[email protected]>---
kernel/bpf/verifier.c | 2 ++1 file changed, 2 insertions(+)
Quoted 16 lines
kernel/bpf/verifier.c static int check_attach_btf_id(struct · line 23944
Quoted 12 lines
kernel/bpf/verifier.c +2
-0@@ -23938,6 +23938,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) return ret; } else if (prog->type == BPF_PROG_TYPE_TRACING && btf_id_set_contains(&btf_id_deny, btf_id)) { + verbose(env, "Attaching tracing to __btf_id function '%s' is rejected.\n", + tgt_info.tgt_name);"Attaching tracing to
__btf_id" ?! What does it mean? Drop "__btf_id" and "tracing" bits.
My fault, I mean "Attaching tracing programs to function" in 'btf_id_deny'.
I will change it in v2.
Quoted 2 lines
--
pw-bot: cr
Signature · 2 lines
Thanks, KaFai
PATCH 3/3 selftests/bpf: Add selftest for attaching tracing to __btf_id functions
In reply to KaFai WanThe reuslt:
$ tools/testing/selftests/bpf/test_progs --name=tracing_btf_ids #467/1 tracing_btf_ids/btf_ids:OK #467 tracing_btf_ids:OK Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED
--- .../selftests/bpf/prog_tests/tracing_btf_ids.c | 16 ++++++++++++++++ .../selftests/bpf/progs/tracing_btf_ids.c | 15 +++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_btf_ids.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_btf_ids.c
tools/testing/selftests/bpf/prog_tests/tracing_btf_ids.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <test_progs.h> +#include "tracing_btf_ids.skel.h" + +void test_tracing_btf_ids (void ) +{ +int btf_id; + +// `migrate_disable` depends on `CONFIG_SMP`, may not exists + btf_id =libbpf_find_vmlinux_btf_id ("migrate_disable" ,BPF_TRACE_FENTRY ); +if (btf_id <=0 ) +return ; + +RUN_TESTS (tracing_btf_ids); +}
tools/testing/selftests/bpf/progs/tracing_btf_ids.c new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> +#include "bpf_misc.h" + +char _license[] SEC("license") = "GPL"; + +SEC("fentry/migrate_disable") +__failure __msg("Attaching tracing to __btf_id function 'migrate_disable' is rejected.") +int BPF_PROG(btf_ids) +{ +return 0 ; +}
Signature · 1 line
2.43.0