diff options
| author |   Martin KaFai Lau <kafai@fb.com> | 2018-12-05 17:35:47 -0800 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2018-12-05 18:48:40 -0800 |
| commit | 84ecc1f98ca7ce28ede9bc5cc70a557fdfa09caa (patch) | |
| tree | d1b34c120c66dd799428ca4e61bf8ed710f4ae3e /tools/bpf | |
| parent | bpf: tools: Sync uapi bpf.h for the name changes in bpf_func_info (diff) | |
| download | linux-dev-84ecc1f98ca7ce28ede9bc5cc70a557fdfa09caa.tar.xz linux-dev-84ecc1f98ca7ce28ede9bc5cc70a557fdfa09caa.zip | |
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>
Diffstat (limited to 'tools/bpf')
| -rw-r--r-- | tools/bpf/bpftool/prog.c | 7 | ||||
| -rw-r--r-- | tools/bpf/bpftool/xlated_dumper.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 54c8dbf05c9c..a9a51123454c 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -589,6 +589,13 @@ static int do_dump(int argc, char **argv) goto err_free; } + if (func_info && !info.func_info) { + /* kernel.kptr_restrict is set. No func_info available. */ + free(func_info); + func_info = NULL; + finfo_cnt = 0; + } + if ((member_len == &info.jited_prog_len && info.jited_prog_insns == 0) || (member_len == &info.xlated_prog_len && diff --git a/tools/bpf/bpftool/xlated_dumper.c b/tools/bpf/bpftool/xlated_dumper.c index e06ac0286a75..131ecd175533 100644 --- a/tools/bpf/bpftool/xlated_dumper.c +++ b/tools/bpf/bpftool/xlated_dumper.c @@ -261,7 +261,7 @@ void dump_xlated_json(struct dump_data *dd, void *buf, unsigned int len, jsonw_start_object(json_wtr); if (btf && record) { - if (record->insn_offset == i) { + if (record->insn_off == i) { btf_dumper_type_only(btf, record->type_id, func_sig, sizeof(func_sig)); @@ -330,7 +330,7 @@ void dump_xlated_plain(struct dump_data *dd, void *buf, unsigned int len, } if (btf && record) { - if (record->insn_offset == i) { + if (record->insn_off == i) { btf_dumper_type_only(btf, record->type_id, func_sig, sizeof(func_sig)); |