bpf: BTF fixes
Subsystems (3)
Alexei Starovoitov
maintainercover bpf: BTF fixes
Two trivial BTF fixes.
Alexei Starovoitov (2):
bpf: fix BTF verification of enums
bpf: fix BTF limits
include/uapi/linux/btf.h | 4 ++-- kernel/bpf/btf.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
Signature · 1 line
2.20.0
Alexei Starovoitov
maintainerPATCH 1/2 bpf: fix BTF verification of enums
vmlinux BTF has enums that are 8 byte and 1 byte in size. 2 byte enum is a valid construct as well.
Fix BTF enum verification to accept those sizes.
--- kernel/bpf/btf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/bpf/btf.c +2 -3
@@ -2377,9 +2377,8 @@ static s32 btf_enum_check_meta(struct btf_verifier_env *env,return -EINVAL ; } -if (t->size !=sizeof (int )) { -btf_verifier_log_type (env, t,"Expected size:%zu" , -sizeof (int )); +if (t->size >8 || !is_power_of_2 (t->size)) { +btf_verifier_log_type (env, t,"Unexpected size" );return -EINVAL ; }
Signature · 1 line
2.20.0
Alexei Starovoitov
maintainerPATCH 2/2 bpf: fix BTF limits
In reply to Alexei Starovoitovvmlinux BTF has more than 64k types.
Its string section is also at the offset larger than 64k.
Adjust both limits to make in-kernel BTF verifier successfully parse in-kernel BTF.
--- include/uapi/linux/btf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/btf.h +2 -2
@@ -22,9 +22,9 @@ struct btf_header { };/* Max # of type identifier */ -#define BTF_MAX_TYPE 0x0000ffff +#define BTF_MAX_TYPE 0x000fffff/* Max offset into the string section */ -#define BTF_MAX_NAME_OFFSET 0x0000ffff +#define BTF_MAX_NAME_OFFSET 0x00ffffff/* Max # of struct/union/enum members or func args */ #define BTF_MAX_VLEN 0xffff
Signature · 1 line
2.20.0
Quoted 7 lines · Alexei Starovoitov
Two trivial BTF fixes.
Alexei Starovoitov (2):
bpf: fix BTF verification of enums
bpf: fix BTF limits
Quoted 7 lines
include/uapi/linux/btf.h | 4 ++-- kernel/bpf/btf.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)--
2.20.0
For the series:
Quoted 9 lines · Alexei Starovoitov
Two trivial BTF fixes.
Alexei Starovoitov (2):
bpf: fix BTF verification of enums
bpf: fix BTF limitsinclude/uapi/linux/btf.h | 4 ++-- kernel/bpf/btf.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
Applied, thanks!