libbpf: Add btf__type_cnt() and btf__raw_data() APIs
Subsystems (6)
v2 cover libbpf: Add btf__type_cnt() and btf__raw_data() APIs
Add btf__type_cnt() and btf__raw_data() APIs and deprecate btf__get_nr_type() and btf__get_raw_data() since the old APIs don't follow libbpf naming convention. Also update tools/selftests to use these new APIs. This is part of effort towards libbpf v1.0
v1->v2:
- Update commit message, deprecate the old APIs in libbpf v0.7 (Andrii)
- Separate changes in tools/ to individual patches (Andrii)
Hengqi Chen (5):
libbpf: Add btf__type_cnt() and btf__raw_data() APIs perf bpf: Switch to new btf__raw_data API tools/resolve_btfids: Switch to new btf__type_cnt API
bpftool: Switch to new btf__type_cnt API selftests/bpf: Switch to new btf__type_cnt/btf__raw_data APIs
tools/bpf/bpftool/btf.c | 12 +++---- tools/bpf/bpftool/gen.c | 4 +-- tools/bpf/resolve_btfids/main.c | 4 +-- tools/lib/bpf/btf.c | 36 +++++++++++-------- tools/lib/bpf/btf.h | 4 +++ tools/lib/bpf/btf_dump.c | 8 ++--- tools/lib/bpf/libbpf.c | 36 +++++++++---------- tools/lib/bpf/libbpf.map | 2 ++ tools/lib/bpf/linker.c | 28 +++++++-------- tools/perf/util/bpf-event.c | 2 +- tools/testing/selftests/bpf/btf_helpers.c | 4 +-- tools/testing/selftests/bpf/prog_tests/btf.c | 10 +++--- .../selftests/bpf/prog_tests/btf_dump.c | 8 ++--- .../selftests/bpf/prog_tests/btf_endian.c | 12 +++---- .../selftests/bpf/prog_tests/btf_split.c | 2 +- .../selftests/bpf/prog_tests/core_autosize.c | 2 +- .../selftests/bpf/prog_tests/core_reloc.c | 2 +- .../selftests/bpf/prog_tests/resolve_btfids.c | 4 +-- 18 files changed, 97 insertions(+), 83 deletions(-)
--
2.30.2
PATCH v2 1/5 libbpf: Add btf__type_cnt() and btf__raw_data() APIs
Add btf__type_cnt() and btf__raw_data() APIs and deprecate btf__get_nr_type() and btf__get_raw_data() since the old APIs don't follow the libbpf naming convention for getters which omit 'get' in the name (see [0]). btf__raw_data() is just an alias to the existing btf__get_raw_data(). btf__type_cnt() now returns the number of all types of the BTF object including 'void'.
[0] Closes: https://github.com/libbpf/libbpf/issues/279
--- tools/lib/bpf/btf.c | 36 ++++++++++++++++++++++-------------- tools/lib/bpf/btf.h | 4 ++++ tools/lib/bpf/btf_dump.c | 8 ++++---- tools/lib/bpf/libbpf.c | 36 ++++++++++++++++++------------------ tools/lib/bpf/libbpf.map | 2 ++ tools/lib/bpf/linker.c | 28 ++++++++++++++-------------- 6 files changed, 64 insertions(+), 50 deletions(-)
tools/lib/bpf/btf.c +22 -14
@@ -57,7 +57,7 @@ struct btf {* representation is broken up into three independently allocated * memory regions to be able to modify them independently. * raw_data is nulled out at that point, but can be later allocated -* and cached again if user calls btf__get_raw_data(), at which point +* and cached again if user calls btf__raw_data(), at which point * raw_data will contain a contiguous copy of header, types, and * strings: *
@@ -435,6 +435,11 @@ __u32 btf__get_nr_types(const struct btf *btf)return btf->start_id + btf->nr_types -1 ; } +__u32 btf__type_cnt (const struct btf *btf) +{ +return btf->start_id + btf->nr_types; +} +const struct btf *btf__base_btf (const struct btf *btf) {return btf->base_btf;
@@ -466,8 +471,8 @@ static int determine_ptr_size(const struct btf *btf)if (btf->base_btf && btf->base_btf->ptr_sz >0 )return btf->base_btf->ptr_sz; - n =btf__get_nr_types (btf); -for (i =1 ; i <= n; i++) { + n =btf__type_cnt (btf); +for (i =1 ; i < n; i++) { t =btf__type_by_id (btf, i);if (!btf_is_int (t))continue ;
@@ -684,12 +689,12 @@ int btf__resolve_type(const struct btf *btf, __u32 type_id)__s32 btf__find_by_name (const struct btf *btf,const char *type_name) { -__u32 i, nr_types =btf__get_nr_types (btf); +__u32 i, nr_types =btf__type_cnt (btf);if (!strcmp (type_name,"void" ))return 0 ; -for (i =1 ; i <= nr_types; i++) { +for (i =1 ; i < nr_types; i++) {const struct btf_type *t =btf__type_by_id (btf, i);const char *name =btf__name_by_offset (btf, t->name_off);
@@ -703,12 +708,12 @@ __s32 btf__find_by_name(const struct btf *btf, const char *type_name)static __s32 btf_find_by_name_kind (const struct btf *btf,int start_id,const char *type_name,__u32 kind) { -__u32 i, nr_types =btf__get_nr_types (btf); +__u32 i, nr_types =btf__type_cnt (btf);if (kind ==BTF_KIND_UNKN || !strcmp (type_name,"void" ))return 0 ; -for (i = start_id; i <= nr_types; i++) { +for (i = start_id; i < nr_types; i++) {const struct btf_type *t =btf__type_by_id (btf, i);const char *name;
@@ -781,7 +786,7 @@ static struct btf *btf_new_empty(struct btf *base_btf)if (base_btf) { btf->base_btf = base_btf; - btf->start_id =btf__get_nr_types (base_btf) +1 ; + btf->start_id =btf__type_cnt (base_btf); btf->start_str_off = base_btf->hdr->str_len; }
@@ -831,7 +836,7 @@ static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf)if (base_btf) { btf->base_btf = base_btf; - btf->start_id =btf__get_nr_types (base_btf) +1 ; + btf->start_id =btf__type_cnt (base_btf); btf->start_str_off = base_btf->hdr->str_len; }
@@ -1224,7 +1229,7 @@ static void *btf_get_raw_data(const struct btf *btf, __u32 *size, bool swap_endireturn NULL ; } -const void *btf__get_raw_data (const struct btf *btf_ro,__u32 *size) +const void *btf__raw_data (const struct btf *btf_ro,__u32 *size) {struct btf *btf = (struct btf *)btf_ro;__u32 data_sz;
@@ -1232,7 +1237,7 @@ const void *btf__get_raw_data(const struct btf *btf_ro, __u32 *size) data =btf_get_raw_data (btf, &data_sz, btf->swapped_endian);if (!data) -return errno = -ENOMEM ,NULL ; +return errno =ENOMEM ,NULL ; btf->raw_size = data_sz;if (btf->swapped_endian)
@@ -1243,6 +1248,9 @@ const void *btf__get_raw_data(const struct btf *btf_ro, __u32 *size)return data; } +__attribute__((alias ("btf__raw_data" ))) +const void *btf__get_raw_data (const struct btf *btf,__u32 *size); +const char *btf__str_by_offset (const struct btf *btf,__u32 offset) {if (offset < btf->start_str_off)
@@ -1651,7 +1659,7 @@ int btf__add_btf(struct btf *btf, const struct btf *src_btf) old_strs_len = btf->hdr->str_len; data_sz = src_btf->hdr->type_len; - cnt =btf__get_nr_types (src_btf); + cnt =btf__type_cnt (src_btf) -1 ;/* pre-allocate enough memory for new types */ t =btf_add_type_mem (btf, data_sz);
@@ -1968,7 +1976,7 @@ int btf__add_union(struct btf *btf, const char *name, __u32 byte_sz)static struct btf_type *btf_last_type (struct btf *btf) { -return btf_type_by_id (btf,btf__get_nr_types (btf)); +return btf_type_by_id (btf,btf__type_cnt (btf) -1 ); }/*
@@ -3172,7 +3180,7 @@ static struct btf_dedup *btf_dedup_new(struct btf *btf, struct btf_ext *btf_ext, goto done; } - type_cnt =btf__get_nr_types (btf) +1 ; + type_cnt =btf__type_cnt (btf); d->map =malloc (sizeof (__u32) * type_cnt);if (!d->map) { err = -ENOMEM ;
tools/lib/bpf/btf.h +4 -0
@@ -132,7 +132,9 @@ LIBBPF_API __s32 btf__find_by_name(const struct btf *btf, const char *type_name); LIBBPF_API __s32 btf__find_by_name_kind(const struct btf *btf,const char *type_name,__u32 kind); +LIBBPF_DEPRECATED_SINCE(0, 7, "use btf__type_cnt() instead; note that btf__get_nr_types() == btf__type_cnt() - 1") LIBBPF_API __u32 btf__get_nr_types(const struct btf *btf); +LIBBPF_API __u32 btf__type_cnt(const struct btf *btf); LIBBPF_API const struct btf *btf__base_btf(const struct btf *btf); LIBBPF_API const struct btf_type *btf__type_by_id(const struct btf *btf,__u32 id);
@@ -145,7 +147,9 @@ LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id); LIBBPF_API int btf__align_of(const struct btf *btf, __u32 id); LIBBPF_API int btf__fd(const struct btf *btf); LIBBPF_API void btf__set_fd(struct btf *btf, int fd); +LIBBPF_DEPRECATED_SINCE(0, 7, "use btf__raw_data() instead") LIBBPF_API const void *btf__get_raw_data(const struct btf *btf, __u32 *size); +LIBBPF_API const void *btf__raw_data(const struct btf *btf, __u32 *size); LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset); LIBBPF_API const char *btf__str_by_offset(const struct btf *btf, __u32 offset); LIBBPF_API int btf__get_map_kv_tids(const struct btf *btf, const char *map_name,
tools/lib/bpf/btf_dump.c +4 -4
@@ -188,7 +188,7 @@ struct btf_dump *btf_dump__new(const struct btf *btf,static int btf_dump_resize (struct btf_dump *d) { -int err, last_id =btf__get_nr_types (d->btf); +int err, last_id =btf__type_cnt (d->btf) -1 ;if (last_id <= d->last_id)return 0 ;
@@ -262,7 +262,7 @@ int btf_dump__dump_type(struct btf_dump *d, __u32 id) {int err, i; -if (id >btf__get_nr_types (d->btf)) +if (id >=btf__type_cnt (d->btf))return libbpf_err (-EINVAL ); err =btf_dump_resize (d);
@@ -294,11 +294,11 @@ int btf_dump__dump_type(struct btf_dump *d, __u32 id)*/ static int btf_dump_mark_referenced (struct btf_dump *d) { -int i, j, n =btf__get_nr_types (d->btf); +int i, j, n =btf__type_cnt (d->btf);const struct btf_type *t;__u16 vlen; -for (i = d->last_id +1 ; i <= n; i++) { +for (i = d->last_id +1 ; i < n; i++) { t =btf__type_by_id (d->btf, i); vlen =btf_vlen (t);
tools/lib/bpf/libbpf.c +18 -18
@@ -2497,8 +2497,8 @@ static int bpf_object__init_user_btf_maps(struct bpf_object *obj, bool strict,return -EINVAL ; } - nr_types =btf__get_nr_types (obj->btf); -for (i =1 ; i <= nr_types; i++) { + nr_types =btf__type_cnt (obj->btf); +for (i =1 ; i < nr_types; i++) { t =btf__type_by_id (obj->btf, i);if (!btf_is_datasec (t))continue ;
@@ -2579,7 +2579,7 @@ static void bpf_object__sanitize_btf(struct bpf_object *obj, struct btf *btf)struct btf_type *t;int i, j, vlen; -for (i =1 ; i <=btf__get_nr_types (btf); i++) { +for (i =1 ; i <btf__type_cnt (btf); i++) { t = (struct btf_type *)btf__type_by_id (btf, i);if ((!has_datasec &&btf_is_var (t)) || (!has_decl_tag &&btf_is_decl_tag (t))) {
@@ -2763,9 +2763,9 @@ static int btf_fixup_datasec(struct bpf_object *obj, struct btf *btf,static int btf_finalize_data (struct bpf_object *obj,struct btf *btf) {int err =0 ; -__u32 i, n =btf__get_nr_types (btf); +__u32 i, n =btf__type_cnt (btf); -for (i =1 ; i <= n; i++) { +for (i =1 ; i < n; i++) {struct btf_type *t =btf_type_by_id (btf, i);/* Loader needs to fix up some of the things compiler
@@ -2905,8 +2905,8 @@ static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj)if (!prog->mark_btf_static || !prog_is_subprog (obj, prog))continue ; - n =btf__get_nr_types (obj->btf); -for (j =1 ; j <= n; j++) { + n =btf__type_cnt (obj->btf); +for (j =1 ; j < n; j++) { t =btf_type_by_id (obj->btf, j);if (!btf_is_func (t) ||btf_func_linkage (t) !=BTF_FUNC_GLOBAL )continue ;
@@ -2926,7 +2926,7 @@ static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj)__u32 sz;/* clone BTF to sanitize a copy and leave the original intact */ - raw_data =btf__get_raw_data (obj->btf, &sz); + raw_data =btf__raw_data (obj->btf, &sz); kern_btf =btf__new (raw_data, sz); err =libbpf_get_error (kern_btf);if (err)
@@ -2939,7 +2939,7 @@ static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj)if (obj->gen_loader) {__u32 raw_size =0 ; -const void *raw_data =btf__get_raw_data (kern_btf, &raw_size); +const void *raw_data =btf__raw_data (kern_btf, &raw_size);if (!raw_data)return -ENOMEM ;
@@ -3350,8 +3350,8 @@ static int find_extern_btf_id(const struct btf *btf, const char *ext_name)if (!btf)return -ESRCH ; - n =btf__get_nr_types (btf); -for (i =1 ; i <= n; i++) { + n =btf__type_cnt (btf); +for (i =1 ; i < n; i++) { t =btf__type_by_id (btf, i);if (!btf_is_var (t) && !btf_is_func (t))
@@ -3382,8 +3382,8 @@ static int find_extern_sec_btf_id(struct btf *btf, int ext_btf_id) {if (!btf)return -ESRCH ; - n =btf__get_nr_types (btf); -for (i =1 ; i <= n; i++) { + n =btf__type_cnt (btf); +for (i =1 ; i < n; i++) { t =btf__type_by_id (btf, i);if (!btf_is_datasec (t))
@@ -3467,8 +3467,8 @@ static int find_int_btf_id(const struct btf *btf)const struct btf_type *t;int i, n; - n =btf__get_nr_types (btf); -for (i =1 ; i <= n; i++) { + n =btf__type_cnt (btf); +for (i =1 ; i < n; i++) { t =btf__type_by_id (btf, i);if (btf_is_int (t) &&btf_int_bits (t) ==32 )
@@ -5076,8 +5076,8 @@ static int bpf_core_add_cands(struct bpf_core_cand *local_cand,size_t targ_essent_len;int n, i; - n =btf__get_nr_types (targ_btf); -for (i = targ_start_id; i <= n; i++) { + n =btf__type_cnt (targ_btf); +for (i = targ_start_id; i < n; i++) { t =btf__type_by_id (targ_btf, i);if (btf_kind (t) !=btf_kind (local_cand->t))continue ;
@@ -5252,7 +5252,7 @@ bpf_core_find_cands(struct bpf_object *obj, const struct btf *local_btf, __u32 l err =bpf_core_add_cands (&local_cand, local_essent_len, obj->btf_modules[i].btf, obj->btf_modules[i].name, -btf__get_nr_types (obj->btf_vmlinux) +1 , +btf__type_cnt (obj->btf_vmlinux), cands);if (err) goto err_out;
tools/lib/bpf/libbpf.map +2 -0
@@ -395,4 +395,6 @@ LIBBPF_0.6.0 { bpf_object__prev_program; btf__add_btf; btf__add_decl_tag; + btf__raw_data; + btf__type_cnt; } LIBBPF_0.5.0;
tools/lib/bpf/linker.c +14 -14
@@ -920,7 +920,7 @@ static int check_btf_type_id(__u32 *type_id, void *ctx) {struct btf *btf = ctx; -if (*type_id >btf__get_nr_types (btf)) +if (*type_id >=btf__type_cnt (btf))return -EINVAL ;return 0 ;
@@ -947,8 +947,8 @@ static int linker_sanity_check_btf(struct src_obj *obj)if (!obj->btf)return 0 ; - n =btf__get_nr_types (obj->btf); -for (i =1 ; i <= n; i++) { + n =btf__type_cnt (obj->btf); +for (i =1 ; i < n; i++) { t =btf_type_by_id (obj->btf, i); err = err ?:btf_type_visit_type_ids (t, check_btf_type_id, obj->btf);
@@ -1658,8 +1658,8 @@ static int find_glob_sym_btf(struct src_obj *obj, Elf64_Sym *sym, const char *syreturn -EINVAL ; } - n =btf__get_nr_types (obj->btf); -for (i =1 ; i <= n; i++) { + n =btf__type_cnt (obj->btf); +for (i =1 ; i < n; i++) { t =btf__type_by_id (obj->btf, i);/* some global and extern FUNCs and VARs might not be associated with any
@@ -2130,8 +2130,8 @@ static int linker_fixup_btf(struct src_obj *obj)if (!obj->btf)return 0 ; - n =btf__get_nr_types (obj->btf); -for (i =1 ; i <= n; i++) { + n =btf__type_cnt (obj->btf); +for (i =1 ; i < n; i++) {struct btf_var_secinfo *vi;struct btf_type *t;
@@ -2234,14 +2234,14 @@ static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj)if (!obj->btf)return 0 ; - start_id =btf__get_nr_types (linker->btf) +1 ; - n =btf__get_nr_types (obj->btf); + start_id =btf__type_cnt (linker->btf); + n =btf__type_cnt (obj->btf); obj->btf_type_map =calloc (n +1 ,sizeof (int ));if (!obj->btf_type_map)return -ENOMEM ; -for (i =1 ; i <= n; i++) { +for (i =1 ; i < n; i++) {struct glob_sym *glob_sym =NULL ; t =btf__type_by_id (obj->btf, i);
@@ -2296,8 +2296,8 @@ static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj) }/* remap all the types except DATASECs */ - n =btf__get_nr_types (linker->btf); -for (i = start_id; i <= n; i++) { + n =btf__type_cnt (linker->btf); +for (i = start_id; i < n; i++) {struct btf_type *dst_t =btf_type_by_id (linker->btf, i);if (btf_type_visit_type_ids (dst_t, remap_type_id, obj->btf_type_map))
@@ -2656,7 +2656,7 @@ static int finalize_btf(struct bpf_linker *linker)__u32 raw_sz;/* bail out if no BTF data was produced */ -if (btf__get_nr_types (linker->btf) ==0 ) +if (btf__type_cnt (linker->btf) ==1 )return 0 ;for (i =1 ; i < linker->sec_cnt; i++) {
@@ -2693,7 +2693,7 @@ static int finalize_btf(struct bpf_linker *linker) }/* Emit .BTF section */ - raw_data =btf__get_raw_data (linker->btf, &raw_sz); + raw_data =btf__raw_data (linker->btf, &raw_sz);if (!raw_data)return -ENOMEM ;
--
2.30.2
PATCH v2 2/5 perf bpf: Switch to new btf__raw_data API
In reply to Hengqi ChenReplace the call to btf__get_raw_data with new API btf__raw_data. The old APIs will be deprecated in libbpf v0.7+. No functionality change.
--- tools/perf/util/bpf-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/bpf-event.c +1 -1
@@ -110,7 +110,7 @@ static int perf_env__fetch_btf(struct perf_env *env,u32 data_size;const void *data; - data =btf__get_raw_data (btf, &data_size); + data =btf__raw_data (btf, &data_size); node =malloc (data_size +sizeof (struct btf_node ));if (!node)
--
2.30.2
PATCH v2 3/5 tools/resolve_btfids: Switch to new btf__type_cnt API
In reply to Hengqi ChenReplace 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.
--- tools/bpf/resolve_btfids/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/bpf/resolve_btfids/main.c +2 -2
@@ -502,12 +502,12 @@ static int symbols_resolve(struct object *obj) } err =-1 ; - nr_types =btf__get_nr_types (btf); + nr_types =btf__type_cnt (btf);/* * Iterate all the BTF types and search for collected symbol IDs. */ -for (type_id =1 ; type_id <= nr_types; type_id++) { +for (type_id =1 ; type_id < nr_types; type_id++) {const struct btf_type *type;struct rb_root *root;struct btf_id *id;
--
2.30.2
PATCH v2 4/5 bpftool: Switch to new btf__type_cnt API
In reply to Hengqi ChenReplace 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.
--- tools/bpf/bpftool/btf.c | 12 ++++++------ tools/bpf/bpftool/gen.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)
tools/bpf/bpftool/btf.c +6 -6
@@ -329,7 +329,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,printf ("\n\ttype_id=%u offset=%u size=%u" , 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); printf(" (%s '%s')", btf_kind_str[btf_kind_safe(btf_kind(vt))],
@@ -390,14 +390,14 @@ static int dump_btf_raw(const struct btf *btf, } }else {const struct btf *base; -int cnt =btf__get_nr_types (btf); +int cnt =btf__type_cnt (btf);int start_id =1 ; base =btf__base_btf (btf);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);dump_btf_type (btf, i, t); }
@@ -440,9 +440,9 @@ static int dump_btf_c(const struct btf *btf, goto done; } }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);if (err) goto done;
tools/bpf/bpftool/gen.c +2 -2
@@ -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) {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 bpf_map *map;const struct btf_type *sec;
@@ -233,7 +233,7 @@ static int codegen_datasecs(struct bpf_object *obj, const char *obj_name)continue ; 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 char *name;
--
2.30.2
PATCH v2 5/5 selftests/bpf: Switch to new btf__type_cnt/btf__raw_data APIs
In reply to Hengqi ChenReplace the calls to btf__get_nr_types/btf__get_raw_data in selftests with new APIs btf__type_cnt/btf__raw_data. The old APIs will be deprecated in libbpf v0.7+.
--- tools/testing/selftests/bpf/btf_helpers.c | 4 ++-- tools/testing/selftests/bpf/prog_tests/btf.c | 10 +++++----- tools/testing/selftests/bpf/prog_tests/btf_dump.c | 8 ++++---- tools/testing/selftests/bpf/prog_tests/btf_endian.c | 12 ++++++------ tools/testing/selftests/bpf/prog_tests/btf_split.c | 2 +- .../testing/selftests/bpf/prog_tests/core_autosize.c | 2 +- tools/testing/selftests/bpf/prog_tests/core_reloc.c | 2 +- .../selftests/bpf/prog_tests/resolve_btfids.c | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-)
tools/testing/selftests/bpf/btf_helpers.c +2 -2
@@ -215,7 +215,7 @@ int btf_validate_raw(struct btf *btf, int nr_types, const char *exp_types[])int i;bool ok = true; -ASSERT_EQ (btf__get_nr_types (btf), nr_types,"btf_nr_types" ); +ASSERT_EQ (btf__type_cnt (btf) -1 , nr_types,"btf_nr_types" );for (i =1 ; i <= nr_types; i++) {if (!ASSERT_STREQ (btf_type_raw_dump (btf, i), exp_types[i -1 ],"raw_dump" ))
@@ -254,7 +254,7 @@ const char *btf_type_c_dump(const struct btf *btf)return NULL ; } -for (i =1 ; i <=btf__get_nr_types (btf); i++) { +for (i =1 ; i <btf__type_cnt (btf); i++) { err =btf_dump__dump_type (d, i);if (err) {fprintf (stderr,"Failed to dump type [%d]: %d\n" , i, err);
tools/testing/selftests/bpf/prog_tests/btf.c +5 -5
@@ -7274,8 +7274,8 @@ static void do_test_dedup(unsigned int test_num) goto done; } - test_btf_data =btf__get_raw_data (test_btf, &test_btf_size); - expect_btf_data =btf__get_raw_data (expect_btf, &expect_btf_size); + test_btf_data =btf__raw_data (test_btf, &test_btf_size); + expect_btf_data =btf__raw_data (expect_btf, &expect_btf_size);if (CHECK (test_btf_size != expect_btf_size,"test_btf_size:%u != expect_btf_size:%u" , test_btf_size, expect_btf_size)) {
@@ -7329,8 +7329,8 @@ static void do_test_dedup(unsigned int test_num) expect_str_cur += expect_len +1 ; } - test_nr_types =btf__get_nr_types (test_btf); - expect_nr_types =btf__get_nr_types (expect_btf); + test_nr_types =btf__type_cnt (test_btf); + expect_nr_types =btf__type_cnt (expect_btf);if (CHECK (test_nr_types != expect_nr_types,"test_nr_types:%u != expect_nr_types:%u" , test_nr_types, expect_nr_types)) {
@@ -7338,7 +7338,7 @@ static void do_test_dedup(unsigned int test_num) goto done; } -for (i =1 ; i <= test_nr_types; i++) { +for (i =1 ; i < test_nr_types; i++) {const struct btf_type *test_type, *expect_type;int test_size, expect_size;
tools/testing/selftests/bpf/prog_tests/btf_dump.c +4 -4
@@ -27,7 +27,7 @@ static struct btf_dump_test_case {static int btf_dump_all_types (const struct btf *btf,const struct btf_dump_opts *opts) { -size_t type_cnt =btf__get_nr_types (btf); +size_t type_cnt =btf__type_cnt (btf);struct btf_dump *d;int err =0 , id;
@@ -36,7 +36,7 @@ static int btf_dump_all_types(const struct btf *btf,if (err)return err; -for (id =1 ; id <= type_cnt; id++) { +for (id =1 ; id < type_cnt; id++) { err =btf_dump__dump_type (d, id);if (err) goto done;
@@ -171,7 +171,7 @@ void test_btf_dump_incremental(void) err =btf__add_field (btf,"x" ,2 ,0 ,0 );ASSERT_OK (err,"field_ok" ); -for (i =1 ; i <=btf__get_nr_types (btf); i++) { +for (i =1 ; i <btf__type_cnt (btf); i++) { err =btf_dump__dump_type (d, i);ASSERT_OK (err,"dump_type_ok" ); }
@@ -210,7 +210,7 @@ void test_btf_dump_incremental(void) err =btf__add_field (btf,"s" ,3 ,32 ,0 );ASSERT_OK (err,"field_ok" ); -for (i =1 ; i <=btf__get_nr_types (btf); i++) { +for (i =1 ; i <btf__type_cnt (btf); i++) { err =btf_dump__dump_type (d, i);ASSERT_OK (err,"dump_type_ok" ); }
tools/testing/selftests/bpf/prog_tests/btf_endian.c +6 -6
@@ -32,7 +32,7 @@ void test_btf_endian() {ASSERT_EQ (btf__endianness (btf), swap_endian,"endian" );/* Get raw BTF data in non-native endianness... */ - raw_data =btf__get_raw_data (btf, &raw_sz); + raw_data =btf__raw_data (btf, &raw_sz);if (!ASSERT_OK_PTR (raw_data,"raw_data_inverted" )) goto err_out;
@@ -42,9 +42,9 @@ void test_btf_endian() { goto err_out;ASSERT_EQ (btf__endianness (swap_btf), swap_endian,"endian" ); -ASSERT_EQ (btf__get_nr_types (swap_btf),btf__get_nr_types (btf),"nr_types" ); +ASSERT_EQ (btf__type_cnt (swap_btf),btf__type_cnt (btf),"nr_types" ); - swap_raw_data =btf__get_raw_data (swap_btf, &swap_raw_sz); + swap_raw_data =btf__raw_data (swap_btf, &swap_raw_sz);if (!ASSERT_OK_PTR (swap_raw_data,"swap_raw_data" )) goto err_out;
@@ -58,7 +58,7 @@ void test_btf_endian() {/* swap it back to native endianness */ btf__set_endianness (swap_btf, endian); - swap_raw_data =btf__get_raw_data (swap_btf, &swap_raw_sz); + swap_raw_data =btf__raw_data (swap_btf, &swap_raw_sz);if (!ASSERT_OK_PTR (swap_raw_data,"swap_raw_data" )) goto err_out;
@@ -75,7 +75,7 @@ void test_btf_endian() { swap_btf =NULL ;btf__set_endianness (btf, swap_endian); - raw_data =btf__get_raw_data (btf, &raw_sz); + raw_data =btf__raw_data (btf, &raw_sz);if (!ASSERT_OK_PTR (raw_data,"raw_data_inverted" )) goto err_out;
@@ -85,7 +85,7 @@ void test_btf_endian() { goto err_out;ASSERT_EQ (btf__endianness (swap_btf), swap_endian,"endian" ); -ASSERT_EQ (btf__get_nr_types (swap_btf),btf__get_nr_types (btf),"nr_types" ); +ASSERT_EQ (btf__type_cnt (swap_btf),btf__type_cnt (btf),"nr_types" );/* the type should appear as if it was stored in native endianness */ t =btf__type_by_id (swap_btf, var_id);
tools/testing/selftests/bpf/prog_tests/btf_split.c +1 -1
@@ -72,7 +72,7 @@ void test_btf_split() { d =btf_dump__new (btf2,NULL , &opts, btf_dump_printf);if (!ASSERT_OK_PTR (d,"btf_dump__new" )) goto cleanup; -for (i =1 ; i <=btf__get_nr_types (btf2); i++) { +for (i =1 ; i <btf__type_cnt (btf2); i++) { err =btf_dump__dump_type (d, i);ASSERT_OK (err,"dump_type_ok" ); }
tools/testing/selftests/bpf/prog_tests/core_autosize.c +1 -1
@@ -112,7 +112,7 @@ void test_core_autosize(void)if (!ASSERT_OK_PTR (f,"btf_fdopen" )) goto cleanup; - raw_data =btf__get_raw_data (btf, &raw_sz); + raw_data =btf__raw_data (btf, &raw_sz);if (!ASSERT_OK_PTR (raw_data,"raw_data" )) goto cleanup; written =fwrite (raw_data,1 , raw_sz, f);
tools/testing/selftests/bpf/prog_tests/core_reloc.c +1 -1
@@ -381,7 +381,7 @@ static int setup_type_id_case_local(struct core_reloc_test_case *test) exp->local_anon_void_ptr =-1 ; exp->local_anon_arr =-1 ; -for (i =1 ; i <=btf__get_nr_types (local_btf); i++) +for (i =1 ; i <btf__type_cnt (local_btf); i++) { t =btf__type_by_id (local_btf, i);/* we are interested only in anonymous types */
tools/testing/selftests/bpf/prog_tests/resolve_btfids.c +2 -2
@@ -106,9 +106,9 @@ static int resolve_symbols(void) "Failed to load BTF from btf_data.o\n"))return -1 ; - nr =btf__get_nr_types (btf); + nr =btf__type_cnt (btf); -for (type_id =1 ; type_id <= nr; type_id++) { +for (type_id =1 ; type_id < nr; type_id++) {if (__resolve_symbol (btf, type_id))break ; }
--
2.30.2
Andrii Nakryiko
AppliedQuoted 10 lines · Hengqi Chen
Add
btf__type_cnt()andbtf__raw_data()APIs and deprecatebtf__get_nr_type()andbtf__get_raw_data()since the old APIs don't follow libbpf naming convention. Also updatetools/selfteststo use these new APIs. This is part of effort towards libbpf v1.0
v1->v2:
- Update commit message, deprecate the old APIs in libbpf v0.7 (Andrii)
- Separate changes intools/to individual patches (Andrii)
Applied to bpf-next, thanks.
Quoted 29 lines
Hengqi Chen (5):
libbpf: Addbtf__type_cnt()andbtf__raw_data()APIs perf bpf: Switch to newbtf__raw_dataAPItools/resolve_btfids: Switch to newbtf__type_cntAPI
bpftool: Switch to newbtf__type_cntAPI selftests/bpf: Switch to new btf__type_cnt/btf__raw_data APIstools/bpf/bpftool/btf.c | 12 +++---- tools/bpf/bpftool/gen.c | 4 +-- tools/bpf/resolve_btfids/main.c | 4 +-- tools/lib/bpf/btf.c | 36 +++++++++++-------- tools/lib/bpf/btf.h | 4 +++ tools/lib/bpf/btf_dump.c | 8 ++--- tools/lib/bpf/libbpf.c | 36 +++++++++---------- tools/lib/bpf/libbpf.map | 2 ++ tools/lib/bpf/linker.c | 28 +++++++-------- tools/perf/util/bpf-event.c | 2 +- tools/testing/selftests/bpf/btf_helpers.c | 4 +-- tools/testing/selftests/bpf/prog_tests/btf.c | 10 +++--- .../selftests/bpf/prog_tests/btf_dump.c | 8 ++--- .../selftests/bpf/prog_tests/btf_endian.c | 12 +++---- .../selftests/bpf/prog_tests/btf_split.c | 2 +- .../selftests/bpf/prog_tests/core_autosize.c | 2 +- .../selftests/bpf/prog_tests/core_reloc.c | 2 +- .../selftests/bpf/prog_tests/resolve_btfids.c | 4 +-- 18 files changed, 97 insertions(+), 83 deletions(-)--
2.30.2