libbpf: support weak typed ksyms.
Subsystems (6)
PATCH v2 1/1 libbpf: support weak typed ksyms.
Currently weak typeless ksyms have default value zero, when they don't exist in the kernel. However, weak typed ksyms are rejected by libbpf if they can not be resolved. This means that if a bpf object contains the declaration of a nonexistent weak typed ksym, it will be rejected even if there is no program that references the symbol.
Nonexistent weak typed ksyms can also default to zero just like typeless ones. This allows programs that access weak typed ksyms to be accepted by verifier, if the accesses are guarded. For example,
extern const int bpf_link_fops3 __ksym __weak;
/* then in BPF program */
if (&bpf_link_fops3) {
/* use bpf_link_fops3 */
}
If actual use of nonexistent typed ksym is not guarded properly, verifier would see that register is not PTR_TO_BTF_ID and wouldn't allow to use it for direct memory reads or passing it to BPF helpers.
---
Changes since v1:
- Weak typed symbols default to zero, as suggested by Andrii.
- Use ASSERT_XXX() for tets.
tools/lib/bpf/libbpf.c | 17 ++++-- .../selftests/bpf/prog_tests/ksyms_btf.c | 25 ++++++++ .../selftests/bpf/progs/test_ksyms_weak.c | 57 +++++++++++++++++++ 3 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_weak.c
tools/lib/bpf/libbpf.c +12 -5
@@ -5277,11 +5277,11 @@ bpf_object__relocate_data(struct bpf_object *obj, struct bpf_program *prog) } insn[1 ].imm = ext->kcfg.data_off; }else /* EXT_KSYM */ { -if (ext->ksym.type_id) {/* typed ksyms */ +if (ext->ksym.type_id && ext->is_set) {/* typed ksyms */ insn[0 ].src_reg =BPF_PSEUDO_BTF_ID ; insn[0 ].imm = ext->ksym.kernel_btf_id; insn[1 ].imm = ext->ksym.kernel_btf_obj_fd; - }else {/* typeless ksyms */ + }else {/* typeless ksyms or unresolved typed ksyms */ insn[0 ].imm = (__u32 )ext->ksym.addr; insn[1 ].imm = ext->ksym.addr >>32 ; }
@@ -6584,7 +6584,7 @@ static int bpf_object__read_kallsyms_file(struct bpf_object *obj) }static int find_ksym_btf_id (struct bpf_object *obj,const char *ksym_name, -__u16 kind,struct btf **res_btf, +__u16 kind,bool is_weak,struct btf **res_btf,int *res_btf_fd) {int i, id, btf_fd, err;
@@ -6608,6 +6608,9 @@ static int find_ksym_btf_id(struct bpf_object *obj, const char *ksym_name,break ; } } +if (is_weak && id == -ENOENT ) +return 0 ; +if (id <=0 ) {pr_warn ("extern (%s ksym) '%s': failed to find BTF ID in kernel BTF(s).\n" ,__btf_kind_str (kind), ksym_name);
@@ -6627,11 +6630,15 @@ static int bpf_object__resolve_ksym_var_btf_id(struct bpf_object *obj,const char *targ_var_name;int id, btf_fd =0 , err;struct btf *btf =NULL ; +bool is_weak = ext->is_weak; - id =find_ksym_btf_id (obj, ext->name,BTF_KIND_VAR , &btf, &btf_fd); + id =find_ksym_btf_id (obj, ext->name,BTF_KIND_VAR , is_weak, &btf, &btf_fd);if (id <0 )return id; +if (is_weak && id ==0 ) +return 0 ; +/* find local type_id */ local_type_id = ext->ksym.type_id;
@@ -6676,7 +6683,7 @@ static int bpf_object__resolve_ksym_func_btf_id(struct bpf_object *obj, local_func_proto_id = ext->ksym.type_id; - kfunc_id =find_ksym_btf_id (obj, ext->name,BTF_KIND_FUNC , + kfunc_id =find_ksym_btf_id (obj, ext->name,BTF_KIND_FUNC , false, &kern_btf, &kern_btf_fd);if (kfunc_id <0 ) { pr_warn("extern (func ksym) '%s': not found in kernel BTF\n",
tools/testing/selftests/bpf/prog_tests/ksyms_btf.c +25 -0
@@ -6,6 +6,7 @@#include <bpf/btf.h> #include "test_ksyms_btf.skel.h" #include "test_ksyms_btf_null_check.skel.h" +#include "test_ksyms_weak.skel.h" static int duration;
@@ -81,6 +82,27 @@ static void test_null_check(void)test_ksyms_btf_null_check__destroy (skel); } +static void test_weak_syms (void ) +{ +struct test_ksyms_weak *skel; +struct test_ksyms_weak__data *data; + + skel =test_ksyms_weak__open_and_load (); +if (CHECK (!skel,"test_ksyms_weak__open_and_load" ,"failed\n" )) +return ; + +/* trigger tracepoint */ +usleep (1 ); + + data = skel->data; +ASSERT_EQ (data->out__existing_typed,0 ,"existing typed ksym" ); +ASSERT_NEQ (data->out__existing_typeless,-1 ,"existing typeless ksym" ); +ASSERT_EQ (data->out__non_existent_typeless,0 ,"nonexistent typeless ksym" ); +ASSERT_EQ (data->out__non_existent_typed,0 ,"nonexistent typed ksym" ); + +test_ksyms_weak__destroy (skel); +} +void test_ksyms_btf (void ) {int percpu_datasec;
@@ -105,4 +127,7 @@ void test_ksyms_btf(void)if (test__start_subtest ("null_check" ))test_null_check (); + +if (test__start_subtest ("weak_ksyms" )) +test_weak_syms (); }
tools/testing/selftests/bpf/progs/test_ksyms_weak.c new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.32.0.605.g8dce9f2422-goog
Quoted 19 lines · Hao Luo
Currently weak typeless ksyms have default value zero, when they don't exist in the kernel. However, weak typed ksyms are rejected by libbpf if they can not be resolved. This means that if a bpf object contains the declaration of a nonexistent weak typed ksym, it will be rejected even if there is no program that references the symbol.
Nonexistent weak typed ksyms can also default to zero just like typeless ones. This allows programs that access weak typed ksyms to be accepted by verifier, if the accesses are guarded. For example,
extern const int
bpf_link_fops3__ksym__weak;/* then in BPF program */
if (&bpf_link_fops3) { /* use bpf_link_fops3 */ }
Quoted 6 lines
If actual use of nonexistent typed ksym is not guarded properly, verifier would see that register is not
PTR_TO_BTF_IDand wouldn't allow to use it for direct memory reads or passing it to BPF helpers.Signed-off-by Hao Luo <[email protected]>---
Selftests are failing ([0]). Did they work locally?..
test_weak_syms:PASS:test_ksyms_weak__open_and_load 0 nsec test_weak_syms:FAIL:existing typed ksym unexpected existing typed
ksym: actual -1 != expected 0
test_weak_syms:FAIL:existing typeless ksym unexpected existing
typeless ksym: actual -1 == expected -1
test_weak_syms:FAIL:nonexistent typeless ksym unexpected nonexistent
typeless ksym: actual -1 != expected 0
test_weak_syms:FAIL:nonexistent typed ksym unexpected nonexistent
typed ksym: actual -1 != expected 0
#59/3 weak_ksyms:FAIL
#59 ksyms_btf:FAIL
[0] https://github.com/kernel-patches/bpf/pull/1611/checks?check_run_id=3305288074
Quoted 10 lines
Changes since v1:
- Weak typed symbols default to zero, as suggested by Andrii.
- UseASSERT_XXX()for tets.tools/lib/bpf/libbpf.c | 17 ++++-- .../selftests/bpf/prog_tests/ksyms_btf.c | 25 ++++++++ .../selftests/bpf/progs/test_ksyms_weak.c | 57 +++++++++++++++++++ 3 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_weak.c
[...]
Quoted 30 lines · Andrii Nakryiko
Quoted 19 lines · Hao Luo
Currently weak typeless ksyms have default value zero, when they don't exist in the kernel. However, weak typed ksyms are rejected by libbpf if they can not be resolved. This means that if a bpf object contains the declaration of a nonexistent weak typed ksym, it will be rejected even if there is no program that references the symbol.
Nonexistent weak typed ksyms can also default to zero just like typeless ones. This allows programs that access weak typed ksyms to be accepted by verifier, if the accesses are guarded. For example,
extern const int
bpf_link_fops3__ksym__weak;/* then in BPF program */
if (&bpf_link_fops3) { /* use bpf_link_fops3 */ }Quoted 6 lines
If actual use of nonexistent typed ksym is not guarded properly, verifier would see that register is not
PTR_TO_BTF_IDand wouldn't allow to use it for direct memory reads or passing it to BPF helpers.Signed-off-by Hao Luo <[email protected]>---
Selftests are failing ([0]). Did they work locally?..
Quoted 12 lines
test_weak_syms:PASS:test_ksyms_weak__open_and_load 0 nsec test_weak_syms:FAIL:existing typed ksym unexpected existing typed
ksym: actual -1 != expected 0
test_weak_syms:FAIL:existing typeless ksym unexpected existing
typeless ksym: actual -1 == expected -1
test_weak_syms:FAIL:nonexistent typeless ksym unexpected nonexistent
typeless ksym: actual -1 != expected 0
test_weak_syms:FAIL:nonexistent typed ksym unexpected nonexistent
typed ksym: actual -1 != expected 0
#59/3 weak_ksyms:FAIL
#59 ksyms_btf:FAIL
Doh, in the test I accidentally removed the line of attachment in the last minute of sending out... :) Let me resend quickly.
Quoted 15 lines
[0] https://github.com/kernel-patches/bpf/pull/1611/checks?check_run_id=3305288074
Quoted 10 lines
Changes since v1:
- Weak typed symbols default to zero, as suggested by Andrii.
- UseASSERT_XXX()for tets.tools/lib/bpf/libbpf.c | 17 ++++-- .../selftests/bpf/prog_tests/ksyms_btf.c | 25 ++++++++ .../selftests/bpf/progs/test_ksyms_weak.c | 57 +++++++++++++++++++ 3 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_weak.c[...]