bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpftool: Switch to new btf__type_cnt API

Browse source 
Replace the call to btf__get_nr_types with new API btf__type_cnt.
The old API will be deprecated in libbpf v0.7+. No functionality
change.

Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211022130623.1548429-5-hengqi.chen@gmail.com
This commit is contained in:
Hengqi Chen 2021-10-22 21:06:22 +08:00 • committed by Andrii Nakryiko
parent 2d8f09fafc
commit 58fc155b0e
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tools/bpf/bpftool/btf.c
View file

@ -329,7 +329,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
printf("\n\ttype_id=%u offset=%u size=%u", printf("\n\ttype_id=%u offset=%u size=%u",
v->type, v->offset, v->size); v->type, v->offset, v->size);
if (v->type <= btf__get_nr_types(btf)) { if (v->type < btf__type_cnt(btf)) {
vt = btf__type_by_id(btf, v->type); vt = btf__type_by_id(btf, v->type);
printf(" (%s '%s')", printf(" (%s '%s')",
btf_kind_str[btf_kind_safe(btf_kind(vt))], btf_kind_str[btf_kind_safe(btf_kind(vt))],
@ -390,14 +390,14 @@ static int dump_btf_raw(const struct btf *btf,
} }
} else { } else {
const struct btf *base; const struct btf *base;
int cnt = btf__get_nr_types(btf); int cnt = btf__type_cnt(btf);
int start_id = 1; int start_id = 1;
base = btf__base_btf(btf); base = btf__base_btf(btf);
if (base) if (base)
start_id = btf__get_nr_types(base) + 1; start_id = btf__type_cnt(base);
for (i = start_id; i <= cnt; i++) { for (i = start_id; i < cnt; i++) {
t = btf__type_by_id(btf, i); t = btf__type_by_id(btf, i);
dump_btf_type(btf, i, t); dump_btf_type(btf, i, t);
} }
@ -440,9 +440,9 @@ static int dump_btf_c(const struct btf *btf,
goto done; goto done;
} }
} else { } else {
int cnt = btf__get_nr_types(btf); int cnt = btf__type_cnt(btf);
for (i = 1; i <= cnt; i++) { for (i = 1; i < cnt; i++) {
err = btf_dump__dump_type(d, i); err = btf_dump__dump_type(d, i);
if (err) if (err)
goto done; goto done;

4
tools/bpf/bpftool/gen.c
View file

@ -211,7 +211,7 @@ static int codegen_datasec_def(struct bpf_object *obj,
static int codegen_datasecs(struct bpf_object *obj, const char *obj_name) static int codegen_datasecs(struct bpf_object *obj, const char *obj_name)
{ {
struct btf *btf = bpf_object__btf(obj); struct btf *btf = bpf_object__btf(obj);
int n = btf__get_nr_types(btf); int n = btf__type_cnt(btf);
struct btf_dump *d; struct btf_dump *d;
struct bpf_map *map; struct bpf_map *map;
const struct btf_type *sec; const struct btf_type *sec;
@ -233,7 +233,7 @@ static int codegen_datasecs(struct bpf_object *obj, const char *obj_name)
continue; continue;
sec = NULL; sec = NULL;
for (i = 1; i <= n; i++) { for (i = 1; i < n; i++) {
const struct btf_type *t = btf__type_by_id(btf, i); const struct btf_type *t = btf__type_by_id(btf, i);
const char *name; const char *name;