Support encoding of BTF kind layout data via btf__new_empty_opts().
Current supported opts are base_btf and add_kind_layout.
Kind layout information is maintained in btf.c in the
kind_layouts[] array; when BTF is created with the
add_kind_layout option it represents the current view
of supported BTF kinds.
Signed-off-by: Alan Maguire <alan.maguire@xxxxxxxxxx>
---
tools/lib/bpf/btf.c | 61 ++++++++++++++++++++++++++++++++++++++--
tools/lib/bpf/btf.h | 20 +++++++++++++
tools/lib/bpf/libbpf.map | 1 +
3 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 7a197dbfc689..f3c4dc0c9007 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -30,6 +30,35 @@
static struct btf_type btf_void;
+/* Describe how kinds are laid out; some have a singular element following the "struct btf_type",
+ * some have BTF_INFO_VLEN(t->info) elements. Specify sizes for both. Flags are currently unused.
+ * Kind layout can be optionally added to the BTF representation in a dedicated section to
+ * facilitate parsing. New kinds must be added here.
+ */
+struct btf_kind_layout kind_layouts[NR_BTF_KINDS] = {
+/* flags singular element size vlen element(s) size */
+{ 0, 0, 0 }, /* _UNKN */
+{ 0, sizeof(__u32), 0 }, /* _INT */
+{ 0, 0, 0 }, /* _PTR */
+{ 0, sizeof(struct btf_array), 0 }, /* _ARRAY */
+{ 0, 0, sizeof(struct btf_member) }, /* _STRUCT */
+{ 0, 0, sizeof(struct btf_member) }, /* _UNION */
+{ 0, 0, sizeof(struct btf_enum) }, /* _ENUM */
+{ 0, 0, 0 }, /* _FWD */
+{ 0, 0, 0 }, /* _TYPEDEF */
+{ 0, 0, 0 }, /* _VOLATILE */
+{ 0, 0, 0 }, /* _CONST */
+{ 0, 0, 0 }, /* _RESTRICT */
+{ 0, 0, 0 }, /* _FUNC */
+{ 0, 0, sizeof(struct btf_param) }, /* _FUNC_PROTO */
+{ 0, sizeof(struct btf_var), 0 }, /* _VAR */
+{ 0, 0, sizeof(struct btf_var_secinfo) }, /* _DATASEC */
+{ 0, 0, 0 }, /* _FLOAT */
+{ 0, sizeof(struct btf_decl_tag), 0 }, /* _DECL_TAG */
+{ 0, 0, 0 }, /* _TYPE_TAG */
+{ 0, 0, sizeof(struct btf_enum64) }, /* _ENUM64 */
+};
+
struct btf {
/* raw BTF data in native endianness */
void *raw_data;
@@ -1078,8 +1107,9 @@ void btf__free(struct btf *btf)
free(btf);
}
-static struct btf *btf_new_empty(struct btf *base_btf)
+static struct btf *btf_new_empty(struct btf_new_opts *opts)
{
+ struct btf *base_btf = OPTS_GET(opts, base_btf, NULL);
struct btf_header *hdr;
struct btf *btf;
@@ -1122,6 +1152,17 @@ static struct btf *btf_new_empty(struct btf *base_btf)
free(btf);
return ERR_PTR(-ENOMEM);
}
+
+ if (opts->add_kind_layout) {
+ hdr->kind_layout_len = sizeof(kind_layouts);
+ btf->kind_layout = malloc(hdr->kind_layout_len);
+ if (!btf->kind_layout) {
+ free(btf->hdr);
+ free(btf);
+ return ERR_PTR(-ENOMEM);
+ }
+ memcpy(btf->kind_layout, kind_layouts, sizeof(kind_layouts));
+ }
memcpy(btf->hdr, hdr, sizeof(*hdr));
return btf;
@@ -1129,12 +1170,26 @@ static struct btf *btf_new_empty(struct btf *base_btf)
struct btf *btf__new_empty(void)
{
- return libbpf_ptr(btf_new_empty(NULL));
+ LIBBPF_OPTS(btf_new_opts, opts);
+
+ return libbpf_ptr(btf_new_empty(&opts));
}
struct btf *btf__new_empty_split(struct btf *base_btf)
{
- return libbpf_ptr(btf_new_empty(base_btf));
+ LIBBPF_OPTS(btf_new_opts, opts);
+
+ opts.base_btf = base_btf;
+
+ return libbpf_ptr(btf_new_empty(&opts));
+}
+
+struct btf *btf__new_empty_opts(struct btf_new_opts *opts)
+{
+ if (!OPTS_VALID(opts, btf_new_opts))
+ return libbpf_err_ptr(-EINVAL);
+
+ return libbpf_ptr(btf_new_empty(opts));
}
static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf, bool is_mmap)
diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h
index 4392451d634b..829c9c47a97f 100644
--- a/tools/lib/bpf/btf.h
+++ b/tools/lib/bpf/btf.h
@@ -108,6 +108,26 @@ LIBBPF_API struct btf *btf__new_empty(void);
*/
LIBBPF_API struct btf *btf__new_empty_split(struct btf *base_btf);
+struct btf_new_opts {
+ size_t sz;
+ struct btf *base_btf; /* optional base BTF */
+ bool add_kind_layout; /* add BTF kind layout information */
+ size_t:0;
+};
+#define btf_new_opts__last_field add_kind_layout
+
+/**
+ * @brief **btf__new_empty_opts()** creates an unpopulated BTF object with
+ * optional *base_btf* and BTF kind layout description if *add_kind_layout*
+ * is set
+ * @return new BTF object instance which has to be eventually freed with
+ * **btf__free()**
+ *
+ * On error, NULL is returned and the thread-local `errno` variable is
+ * set to the error code.
+ */
+LIBBPF_API struct btf *btf__new_empty_opts(struct btf_new_opts *opts);
+
/**
* @brief **btf__distill_base()** creates new versions of the split BTF
* *src_btf* and its base BTF. The new base BTF will only contain the types
diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 1205f9a4fe04..2a854517baeb 100644
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -443,4 +443,5 @@ LIBBPF_1.6.0 {
bpf_program__line_info_cnt;
btf__add_decl_attr;
btf__add_type_attr;
+ btf__new_empty_opts;
} LIBBPF_1.5.0;
--
2.39.3
