bpf: btf: allow typedef func_proto
Subsystems (5)
cover bpf: btf: allow typedef func_proto
The current btf implementation disallows the typedef of a func_proto type. This actually is allowed per C standard. This patch fixed btf verification to permit such types. Patch #1 fixed the kernel side and Patch #2 fixed the tools test_btf test.
Yonghong Song (2):
bpf: btf: allow typedef func_proto tools/bpf: fix test_btf for typedef func_proto case
kernel/bpf/btf.c | 3 ++- tools/testing/selftests/bpf/test_btf.c | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 bpf: btf: allow typedef func_proto
Current implementation does not allow typedef func_proto.
But it is actually allowed.
-bash-4.4$ cat t.c
typedef int (f) (int);
f *g;
-bash-4.4$ clang -O2 -g -c -target bpf t.c -Xclang -target-feature -Xclang +dwarfris -bash-4.4$ pahole -JV t.o
File t.o:
[1] PTR (anon) type_id=2
[2] TYPEDEF f type_id=3
[3] FUNC_PROTO (anon) return=4 args=(4 (anon))
[4] INT int size=4 bit_offset=0 nr_bits=32 encoding=SIGNED
-bash-4.4$
This patch related btf verifier to allow such (typedef func_proto) patterns.
--- kernel/bpf/btf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/btf.c +2 -1
@@ -1459,7 +1459,8 @@ static int btf_modifier_resolve(struct btf_verifier_env *env,/* "typedef void new_void", "const void"...etc */ if (!btf_type_is_void (next_type) && - !btf_type_is_fwd (next_type)) { + !btf_type_is_fwd (next_type) && + !btf_type_is_func_proto (next_type)) {btf_verifier_log_type (env, v->t,"Invalid type_id" );return -EINVAL ; }
Signature · 1 line
2.17.1
PATCH 2/2 tools/bpf: fix test_btf for typedef func_proto case
In reply to Yonghong SongFixed one test_btf raw test such that typedef func_proto is permitted now.
--- tools/testing/selftests/bpf/test_btf.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/test_btf.c +3 -6
@@ -1881,13 +1881,12 @@ static struct btf_raw_test raw_tests[] = { }, { - .descr = "func proto (CONST=>TYPEDEF=>FUNC_PROTO)", + .descr = "func proto (TYPEDEF=>FUNC_PROTO)", .raw_types = {BTF_TYPE_INT_ENC (0 ,BTF_INT_SIGNED ,0 ,32 ,4 ),/* [1] */ BTF_TYPE_INT_ENC (0 ,0 ,0 ,32 ,4 ),/* [2] */ -BTF_CONST_ENC (4 ),/* [3] */ -BTF_TYPEDEF_ENC (NAME_TBD ,5 ),/* [4] */ -BTF_FUNC_PROTO_ENC (0 ,2 ),/* [5] */ +BTF_TYPEDEF_ENC (NAME_TBD ,4 ),/* [3] */ +BTF_FUNC_PROTO_ENC (0 ,2 ),/* [4] */ BTF_FUNC_PROTO_ARG_ENC (0 ,1 ),BTF_FUNC_PROTO_ARG_ENC (0 ,2 ), BTF_END_RAW,
@@ -1901,8 +1900,6 @@ static struct btf_raw_test raw_tests[] = { .key_type_id = 1, .value_type_id = 1, .max_entries = 4, - .btf_load_err = true, - .err_str = "Invalid type_id", }, {
Signature · 1 line
2.17.1
Alexei Starovoitov
AppliedQuoted 5 lines · Yonghong Song
The current btf implementation disallows the typedef of a
func_prototype. This actually is allowed per C standard. This patch fixed btf verification to permit such types. Patch #1 fixed the kernel side and Patch #2 fixed the toolstest_btftest.
Applied, Thanks