Allow calling kfuncs from raw_tp programs
Subsystems (3)
v2 cover Allow calling kfuncs from raw_tp programs
V1: https://lore.kernel.org/all/[email protected]/
Changes in V1->V2:
- Update selftests to allow success for raw_tp programs calling kfuncs.
This set enables calling kfuncs from raw_tp programs.
Puranjay Mohan (2):
bpf: allow calling kfuncs from raw_tp programs
selftests: bpf: fix tests with raw_tp calling kfuncs
kernel/bpf/btf.c | 1 + tools/testing/selftests/bpf/progs/dynptr_fail.c | 2 +- .../testing/selftests/bpf/progs/verifier_kfunc_prog_types.c | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-)
base-commit: f785a31395d9cafb8b2c42c7358fad72a6463142
Signature · 1 line
2.47.3
PATCH v2 1/2 bpf: allow calling kfuncs from raw_tp programs
Associate raw tracepoint program type with the kfunc tracing hook. This allows calling kfuncs from raw_tp programs.
--- kernel/bpf/btf.c | 1 + 1 file changed, 1 insertion(+)
kernel/bpf/btf.c +1 -0
@@ -8681,6 +8681,7 @@ static int bpf_prog_type_to_kfunc_hook(enum bpf_prog_type prog_type)return BTF_KFUNC_HOOK_STRUCT_OPS ;case BPF_PROG_TYPE_TRACING :case BPF_PROG_TYPE_TRACEPOINT : +case BPF_PROG_TYPE_RAW_TRACEPOINT :case BPF_PROG_TYPE_PERF_EVENT :case BPF_PROG_TYPE_LSM :return BTF_KFUNC_HOOK_TRACING ;
Signature · 1 line
2.47.3
Re: [PATCH bpf-next v2 1/2] bpf: allow calling kfuncs from raw_tp programs
Quoted 4 lines · Puranjay Mohan
Associate raw tracepoint program type with the kfunc tracing hook. This allows calling kfuncs from
raw_tpprograms.Signed-off-by Puranjay Mohan <[email protected]>
PATCH v2 2/2 selftests: bpf: fix tests with raw_tp calling kfuncs
In reply to Puranjay MohanAs the previous commit allowed raw_tp programs to call kfuncs, so of the selftests that were expected to fail will now succeed.
--- tools/testing/selftests/bpf/progs/dynptr_fail.c | 2 +- .../testing/selftests/bpf/progs/verifier_kfunc_prog_types.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/progs/dynptr_fail.c +1 -1
@@ -1465,7 +1465,7 @@ int xdp_invalid_data_slice2(struct xdp_md *xdp) }/* Only supported prog type can create skb-type dynptrs */ -SEC("?raw_tp") +SEC("?xdp") __failure __msg("calling kernel function bpf_dynptr_from_skb is not allowed") int skb_invalid_ctx(void *ctx) {
tools/testing/selftests/bpf/progs/verifier_kfunc_prog_types.c +3 -3
@@ -32,7 +32,7 @@ static void task_kfunc_load_test(void) } SEC("raw_tp") -__failure __msg("calling kernel function") +__successint BPF_PROG (task_kfunc_raw_tp ) {task_kfunc_load_test ();
@@ -86,7 +86,7 @@ static void cgrp_kfunc_load_test(void) } SEC("raw_tp") -__failure __msg("calling kernel function") +__successint BPF_PROG (cgrp_kfunc_raw_tp ) {cgrp_kfunc_load_test ();
@@ -138,7 +138,7 @@ static void cpumask_kfunc_load_test(void) } SEC("raw_tp") -__failure __msg("calling kernel function") +__successint BPF_PROG (cpumask_kfunc_raw_tp ) {cpumask_kfunc_load_test ();
Signature · 1 line
2.47.3
Re: [PATCH bpf-next v2 2/2] selftests: bpf: fix tests with raw_tp calling kfuncs
Quoted 4 lines · Puranjay Mohan
As the previous commit allowed
raw_tpprograms to call kfuncs, so of the selftests that were expected to fail will now succeed.Signed-off-by Puranjay Mohan <[email protected]>