mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
bpf: Expect !info.func_info and insn_off name changes in test_btf/libbpf/bpftool
Similar to info.jited_*, info.func_info could be 0 if bpf_dump_raw_ok() == false. This patch makes changes to test_btf and bpftool to expect info.func_info could be 0. This patch also makes the needed changes for s/insn_offset/insn_off/. Signed-off-by: Martin KaFai Lau <kafai@fb.com> Acked-by: Yonghong Song <yhs@fb.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
parent
555249df71
commit
84ecc1f98c
4 changed files with 22 additions and 9 deletions
|
|
@ -3156,7 +3156,7 @@ static struct btf_func_type_test {
|
|||
},
|
||||
|
||||
{
|
||||
.descr = "func_type (Incorrect bpf_func_info.insn_offset)",
|
||||
.descr = "func_type (Incorrect bpf_func_info.insn_off)",
|
||||
.raw_types = {
|
||||
BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4), /* [1] */
|
||||
BTF_TYPE_INT_ENC(NAME_TBD, 0, 0, 32, 4), /* [2] */
|
||||
|
|
@ -3303,6 +3303,12 @@ static int do_test_func_type(int test_num)
|
|||
goto done;
|
||||
}
|
||||
|
||||
if (CHECK(!info.func_info,
|
||||
"info.func_info == 0. kernel.kptr_restrict is set?")) {
|
||||
err = -1;
|
||||
goto done;
|
||||
}
|
||||
|
||||
finfo = func_info;
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (CHECK(finfo->type_id != test->func_info[i][1],
|
||||
|
|
|
|||
Loading…
Reference in a new issue