Commit 1442e287 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Daniel Borkmann
Browse files

libbpf: Introduce btf__find_by_name_kind() 



Introduce btf__find_by_name_kind() helper to search BTF by name and kind, since
name alone can be ambiguous.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20191114185720.1641606-6-ast@kernel.org
parent fec56f58

tools/lib/bpf/btf.c

+22 −0
Original line number Diff line number Diff line
@@ -316,6 +316,28 @@ __s32 btf__find_by_name(const struct btf *btf, const char *type_name) 
	return -ENOENT;

}



__s32 btf__find_by_name_kind(const struct btf *btf, const char *type_name,

			     __u32 kind)

{

	__u32 i;



	if (kind == BTF_KIND_UNKN || !strcmp(type_name, "void"))

		return 0;



	for (i = 1; i <= btf->nr_types; i++) {

		const struct btf_type *t = btf->types[i];

		const char *name;



		if (btf_kind(t) != kind)

			continue;

		name = btf__name_by_offset(btf, t->name_off);

		if (name && !strcmp(type_name, name))

			return i;

	}



	return -ENOENT;

}



void btf__free(struct btf *btf)

{

	if (!btf)

tools/lib/bpf/btf.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ LIBBPF_API int btf__finalize_data(struct bpf_object *obj, struct btf *btf); 
LIBBPF_API int btf__load(struct btf *btf);

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_API __u32 btf__get_nr_types(const struct btf *btf);

LIBBPF_API const struct btf_type *btf__type_by_id(const struct btf *btf,

						  __u32 id);

tools/lib/bpf/libbpf.map

+1 −0
Original line number Diff line number Diff line
@@ -204,4 +204,5 @@ LIBBPF_0.0.6 { 
		bpf_program__is_tracing;

		bpf_program__set_tracing;

		bpf_program__size;

		btf__find_by_name_kind;

} LIBBPF_0.0.5;

CRA Git | Maintained and supported by SUSTech CRA and CCSE