GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-24 15:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpf: Remove !func_info and !line_info check from test_btf and bpftool

Browse source 
kernel can provide the func_info and line_info even
it fails the btf_dump_raw_ok() test because they don't contain
kernel address.  This patch removes the corresponding '== 0'
test.

Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Martin KaFai Lau 2018-12-12 10:18:22 -08:00 • committed by Daniel Borkmann
parent 9e794163a6
commit 177e77169b
3 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/bpf/bpftool/prog.c
View file

@ -596,13 +596,6 @@ static int do_dump(int argc, char **argv)
goto err_free; goto err_free;
} }
if (func_info && !info.func_info) {
/* kernel.kptr_restrict is set. No func_info available. */
free(func_info);
func_info = NULL;
nr_finfo = 0;
}
if (linfo && info.nr_line_info != nr_linfo) { if (linfo && info.nr_line_info != nr_linfo) {
p_err("incorrect nr_line_info %u vs. expected %u", p_err("incorrect nr_line_info %u vs. expected %u",
info.nr_line_info, nr_linfo); info.nr_line_info, nr_linfo);

6
tools/lib/bpf/bpf_prog_linfo.c
View file

@ -107,11 +107,7 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info)
nr_linfo = info->nr_line_info; nr_linfo = info->nr_line_info;
/* if (!nr_linfo)
* Test !info->line_info because the kernel may NULL
* the ptr if kernel.kptr_restrict is set.
*/
if (!nr_linfo || !info->line_info)
return NULL; return NULL;
/* /*

7
tools/testing/selftests/bpf/test_btf.c
View file

@ -3948,12 +3948,6 @@ static int test_get_finfo(const struct prog_info_raw_test *test,
goto done; goto done;
} }
if (CHECK(!info.func_info,
"info.func_info == 0. kernel.kptr_restrict is set?")) {
err = -1;
goto done;
}
finfo = func_info; finfo = func_info;
for (i = 0; i < test->func_info_cnt; i++) { for (i = 0; i < test->func_info_cnt; i++) {
if (CHECK(finfo->type_id != test->func_info[i][1], if (CHECK(finfo->type_id != test->func_info[i][1],
@ -4077,7 +4071,6 @@ static int test_get_linfo(const struct prog_info_raw_test *test,
* Other fields are not the concern of this test. * Other fields are not the concern of this test.
*/ */
if (CHECK(err == -1 || if (CHECK(err == -1 ||
!info.line_info ||
info.nr_line_info != cnt || info.nr_line_info != cnt ||
(jited_cnt && !info.jited_line_info) || (jited_cnt && !info.jited_line_info) ||
info.nr_jited_line_info != jited_cnt || info.nr_jited_line_info != jited_cnt ||