tools/bpf: expose several libbpf API functions
Subsystems (4)
cover tools/bpf: expose several libbpf API functions
This patch set exposed a few functions in libbpf. All these newly added API functions are helpful for JIT based bpf compilation where .BTF and .BTF.ext are available as in-memory data blobs.
Patch #1 exposed several btf_ext__* API functions which are used to handle .BTF.ext ELF sections.
Patch #2 refactored the function bpf_map_find_btf_info() and exposed API function btf__get_map_kv_tids() to retrieve the map key/value type id's generated by bpf program through BPF_ANNOTATE_KV_PAIR macro.
Yonghong Song (2):
tools/bpf: expose functions btf_ext__* as API functions tools/bpf: implement libbpf btf__get_map_kv_tids() API function
tools/lib/bpf/btf.c | 73 ++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/btf.h | 28 ++++++++------- tools/lib/bpf/libbpf.c | 72 +++++---------------------------------- tools/lib/bpf/libbpf.map | 7 ++++ 4 files changed, 105 insertions(+), 75 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 tools/bpf: expose functions btf_ext__* as API functions
The following set of functions, which manipulates .BTF.ext section, are exposed as API functions:
. btf_ext__new
. btf_ext__free
. btf_ext__reloc_func_info
. btf_ext__reloc_line_info
. btf_ext__func_info_rec_size
. btf_ext__line_info_rec_size
These functions are useful for JIT based bpf codegen, e.g., bcc, to manipulate in-memory .BTF.ext sections.
The signature of function btf_ext__reloc_func_info() is also changed to be the same as its definition in btf.c.
--- tools/lib/bpf/btf.h | 24 ++++++++++++------------ tools/lib/bpf/libbpf.map | 6 ++++++ 2 files changed, 18 insertions(+), 12 deletions(-)
tools/lib/bpf/btf.h +12 -12
@@ -67,18 +67,18 @@ LIBBPF_API int btf__fd(const struct btf *btf); LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset); LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf); -struct btf_ext *btf_ext__new (__u8 *data,__u32 size); -void btf_ext__free (struct btf_ext *btf_ext); -int btf_ext__reloc_func_info (const struct btf *btf, -const struct btf_ext *btf_ext, -const char *sec_name,__u32 insns_cnt, -void **func_info,__u32 *func_info_len); -int btf_ext__reloc_line_info (const struct btf *btf, -const struct btf_ext *btf_ext, -const char *sec_name,__u32 insns_cnt, -void **line_info,__u32 *cnt); -__u32 btf_ext__func_info_rec_size (const struct btf_ext *btf_ext); -__u32 btf_ext__line_info_rec_size (const struct btf_ext *btf_ext); +LIBBPF_API struct btf_ext *btf_ext__new(__u8 *data, __u32 size); +LIBBPF_API void btf_ext__free(struct btf_ext *btf_ext); +LIBBPF_API int btf_ext__reloc_func_info(const struct btf *btf, +const struct btf_ext *btf_ext, +const char *sec_name,__u32 insns_cnt, +void **func_info,__u32 *cnt); +LIBBPF_API int btf_ext__reloc_line_info(const struct btf *btf, +const struct btf_ext *btf_ext, +const char *sec_name,__u32 insns_cnt, +void **line_info,__u32 *cnt); +LIBBPF_API __u32 btf_ext__func_info_rec_size(const struct btf_ext *btf_ext); +LIBBPF_API __u32 btf_ext__line_info_rec_size(const struct btf_ext *btf_ext); #ifdef __cplusplus }/* extern "C" */
tools/lib/bpf/libbpf.map +6 -0
@@ -133,4 +133,10 @@ LIBBPF_0.0.2 { bpf_map_lookup_elem_flags; bpf_object__find_map_fd_by_name; bpf_get_link_xdp_id; + btf_ext__free; + btf_ext__func_info_rec_size; + btf_ext__line_info_rec_size; + btf_ext__new; + btf_ext__reloc_func_info; + btf_ext__reloc_line_info; } LIBBPF_0.0.1;
Signature · 1 line
2.17.1
PATCH 2/2 tools/bpf: implement libbpf btf__get_map_kv_tids() API function
In reply to Yonghong SongCurrently, to get map key/value type id's, the macro
BPF_ANNOTATE_KV_PAIR(<map_name>, <key_type>, <value_type>)
needs to be defined in the bpf program for the corresponding map.
During program/map loading time,
the local static function bpf_map_find_btf_info() in libbpf.c is implemented to retrieve the key/value type ids given the map name.
The patch refactored function bpf_map_find_btf_info() to create an API btf__get_map_kv_tids() which includes the bulk of implementation for the original function. The API btf__get_map_kv_tids() can be used by bcc, a JIT based bpf compilation system, which uses the same BPF_ANNOTATE_KV_PAIR to record map key/value types.
--- tools/lib/bpf/btf.c | 73 ++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/btf.h | 4 +++ tools/lib/bpf/libbpf.c | 72 +++++---------------------------------- tools/lib/bpf/libbpf.map | 1 + 4 files changed, 87 insertions(+), 63 deletions(-)
tools/lib/bpf/btf.c +73 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) /* Copyright (c) 2018 Facebook */ +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h>
@@ -504,6 +505,78 @@ int btf__get_from_id(__u32 id, struct btf **btf)return err; } +int btf__get_map_kv_tids (const struct btf *btf,char *map_name, +__u32 expected_key_size,__u32 expected_value_size, +__u32 *key_type_id,__u32 *value_type_id) +{ +const struct btf_type *container_type; +const struct btf_member *key, *value; +const size_t max_name =256 ; +char container_name[max_name]; +__s64 key_size, value_size; +__s32 container_id; + +if (snprintf (container_name, max_name,"____btf_map_%s" , map_name) == + max_name) { +pr_warning ("map:%s length of '____btf_map_%s' is too long\n" , + map_name, map_name); +return -EINVAL ; + } + + container_id =btf__find_by_name (btf, container_name); +if (container_id <0 ) { +pr_warning ("map:%s container_name:%s cannot be found in BTF. Missing BPF_ANNOTATE_KV_PAIR?\n" , + map_name, container_name); +return container_id; + } + + container_type =btf__type_by_id (btf, container_id); +if (!container_type) { +pr_warning ("map:%s cannot find BTF type for container_id:%u\n" , + map_name, container_id); +return -EINVAL ; + } + +if (BTF_INFO_KIND (container_type->info) !=BTF_KIND_STRUCT || +BTF_INFO_VLEN (container_type->info) <2 ) { +pr_warning ("map:%s container_name:%s is an invalid container struct\n" , + map_name, container_name); +return -EINVAL ; + } + + key = (struct btf_member *)(container_type +1 ); + value = key +1 ; + + key_size =btf__resolve_size (btf, key->type); +if (key_size <0 ) { +pr_warning ("map:%s invalid BTF key_type_size\n" , map_name); +return key_size; + } + +if (expected_key_size != key_size) { +pr_warning ("map:%s btf_key_type_size:%u != map_def_key_size:%u\n" , + map_name, (__u32 )key_size, expected_key_size); +return -EINVAL ; + } + + value_size =btf__resolve_size (btf, value->type); +if (value_size <0 ) { +pr_warning ("map:%s invalid BTF value_type_size\n" , map_name); +return value_size; + } + +if (expected_value_size != value_size) { +pr_warning ("map:%s btf_value_type_size:%u != map_def_value_size:%u\n" , + map_name, (__u32 )value_size, expected_value_size); +return -EINVAL ; + } + + *key_type_id = key->type; + *value_type_id = value->type; + +return 0 ; +} +struct btf_ext_sec_copy_param {__u32 off;__u32 len;
tools/lib/bpf/btf.h +4 -0
@@ -66,6 +66,10 @@ LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id); LIBBPF_API int btf__fd(const struct btf *btf); LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset); LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf); +LIBBPF_API int btf__get_map_kv_tids(const struct btf *btf, char *map_name, +__u32 expected_key_size, +__u32 expected_value_size, +__u32 *key_type_id,__u32 *value_type_id); LIBBPF_API struct btf_ext *btf_ext__new(__u8 *data, __u32 size); LIBBPF_API void btf_ext__free(struct btf_ext *btf_ext);
tools/lib/bpf/libbpf.c +9 -63
81 lines not on this page · raw message
tools/lib/bpf/libbpf.map +1 -0
@@ -133,6 +133,7 @@ LIBBPF_0.0.2 { bpf_map_lookup_elem_flags; bpf_object__find_map_fd_by_name; bpf_get_link_xdp_id; + btf__get_map_kv_tids; btf_ext__free; btf_ext__func_info_rec_size; btf_ext__line_info_rec_size;
Signature · 1 line
2.17.1
Alexei Starovoitov
AppliedQuoted 6 lines · Yonghong Song
This patch set exposed a few functions in libbpf. All these newly added API functions are helpful for JIT based bpf compilation where .BTF and .BTF.ext are available as in-memory data blobs.
Quoted 6 lines
Patch #1 exposed several btf_ext__* API functions which are used to handle .BTF.ext ELF sections.
Patch #2 refactored the functionbpf_map_find_btf_info()and exposed API functionbtf__get_map_kv_tids()to retrieve the map key/value type id's generated by bpf program throughBPF_ANNOTATE_KV_PAIRmacro.
Applied to bpf-next. Thanks!