From: "Mauricio Vásquez" <mauricio@kinvolk.io>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Quentin Monnet <quentin@isovalent.com>,
Rafael David Tinoco <rafaeldtinoco@gmail.com>,
Lorenzo Fontana <lorenzo.fontana@elastic.co>,
Leonardo Di Donato <leonardo.didonato@elastic.co>
Subject: [PATCH bpf-next v5 4/9] bpftool: Add struct definitions and helpers for BTFGen
Date: Fri, 28 Jan 2022 17:33:07 -0500 [thread overview]
Message-ID: <20220128223312.1253169-5-mauricio@kinvolk.io> (raw)
In-Reply-To: <20220128223312.1253169-1-mauricio@kinvolk.io>
Add some structs and helpers that will be used by BTFGen in the next
commits.
Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io>
Signed-off-by: Rafael David Tinoco <rafael.tinoco@aquasec.com>
Signed-off-by: Lorenzo Fontana <lorenzo.fontana@elastic.co>
Signed-off-by: Leonardo Di Donato <leonardo.didonato@elastic.co>
---
tools/bpf/bpftool/gen.c | 75 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 75 insertions(+)
diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c
index 64371f466fa6..68bb88e86b27 100644
--- a/tools/bpf/bpftool/gen.c
+++ b/tools/bpf/bpftool/gen.c
@@ -1118,6 +1118,81 @@ static int btf_save_raw(const struct btf *btf, const char *path)
return err;
}
+struct btfgen_type {
+ struct btf_type *type;
+ unsigned int id;
+};
+
+struct btfgen_info {
+ struct hashmap *types;
+ struct btf *src_btf;
+};
+
+static size_t btfgen_hash_fn(const void *key, void *ctx)
+{
+ return (size_t)key;
+}
+
+static bool btfgen_equal_fn(const void *k1, const void *k2, void *ctx)
+{
+ return k1 == k2;
+}
+
+static void *uint_as_hash_key(int x)
+{
+ return (void *)(uintptr_t)x;
+}
+
+static void btfgen_free_type(struct btfgen_type *type)
+{
+ free(type);
+}
+
+static void btfgen_free_info(struct btfgen_info *info)
+{
+ struct hashmap_entry *entry;
+ size_t bkt;
+
+ if (!info)
+ return;
+
+ if (!IS_ERR_OR_NULL(info->types)) {
+ hashmap__for_each_entry(info->types, entry, bkt) {
+ btfgen_free_type(entry->value);
+ }
+ hashmap__free(info->types);
+ }
+
+ btf__free(info->src_btf);
+
+ free(info);
+}
+
+static struct btfgen_info *
+btfgen_new_info(const char *targ_btf_path)
+{
+ struct btfgen_info *info;
+
+ info = calloc(1, sizeof(*info));
+ if (!info)
+ return NULL;
+
+ info->src_btf = btf__parse(targ_btf_path, NULL);
+ if (libbpf_get_error(info->src_btf)) {
+ btfgen_free_info(info);
+ return NULL;
+ }
+
+ info->types = hashmap__new(btfgen_hash_fn, btfgen_equal_fn, NULL);
+ if (IS_ERR(info->types)) {
+ errno = -PTR_ERR(info->types);
+ btfgen_free_info(info);
+ return NULL;
+ }
+
+ return info;
+}
+
/* Create BTF file for a set of BPF objects */
static int btfgen(const char *src_btf, const char *dst_btf, const char *objspaths[])
{
--
2.25.1
next prev parent reply other threads:[~2022-01-28 22:33 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 22:33 [PATCH bpf-next v5 0/9] libbpf: Implement BTFGen Mauricio Vásquez
2022-01-28 22:33 ` [PATCH bpf-next v5 1/9] libbpf: Implement changes needed for BTFGen in bpftool Mauricio Vásquez
2022-02-01 20:57 ` Quentin Monnet
2022-02-03 16:08 ` Mauricio Vásquez Bernal
2022-02-02 18:54 ` Andrii Nakryiko
2022-02-02 19:02 ` Andrii Nakryiko
2022-02-03 16:09 ` Mauricio Vásquez Bernal
2022-01-28 22:33 ` [PATCH bpf-next v5 2/9] bpftool: Add gen min_core_btf command Mauricio Vásquez
2022-02-02 17:58 ` Andrii Nakryiko
2022-02-03 16:07 ` Mauricio Vásquez Bernal
2022-02-03 17:21 ` Andrii Nakryiko
2022-01-28 22:33 ` [PATCH bpf-next v5 3/9] bpftool: Implement btf_save_raw() Mauricio Vásquez
2022-02-02 18:48 ` Andrii Nakryiko
2022-02-03 16:07 ` Mauricio Vásquez Bernal
2022-02-03 17:23 ` Andrii Nakryiko
2022-01-28 22:33 ` Mauricio Vásquez [this message]
2022-02-02 18:54 ` [PATCH bpf-next v5 4/9] bpftool: Add struct definitions and helpers for BTFGen Andrii Nakryiko
2022-02-03 16:08 ` Mauricio Vásquez Bernal
2022-02-03 17:24 ` Andrii Nakryiko
2022-01-28 22:33 ` [PATCH bpf-next v5 5/9] bpftool: Implement btfgen() Mauricio Vásquez
2022-02-01 20:57 ` Quentin Monnet
2022-02-03 19:10 ` Mauricio Vásquez Bernal
2022-02-02 19:14 ` Andrii Nakryiko
2022-02-03 16:09 ` Mauricio Vásquez Bernal
2022-01-28 22:33 ` [PATCH bpf-next v5 6/9] bpftool: Implement relocations recording for BTFGen Mauricio Vásquez
2022-02-02 19:31 ` Andrii Nakryiko
2022-02-03 16:40 ` Mauricio Vásquez Bernal
2022-02-03 17:30 ` Andrii Nakryiko
2022-02-04 6:20 ` Rafael David Tinoco
2022-02-04 18:41 ` Andrii Nakryiko
2022-02-02 22:55 ` Andrii Nakryiko
2022-02-04 19:44 ` Mauricio Vásquez Bernal
2022-01-28 22:33 ` [PATCH bpf-next v5 7/9] bpftool: Implement btfgen_get_btf() Mauricio Vásquez
2022-02-02 19:36 ` Andrii Nakryiko
2022-02-03 16:10 ` Mauricio Vásquez Bernal
2022-02-03 17:31 ` Andrii Nakryiko
2022-01-28 22:33 ` [PATCH bpf-next v5 8/9] bpftool: gen min_core_btf explanation and examples Mauricio Vásquez
2022-02-01 20:57 ` Quentin Monnet
2022-01-28 22:33 ` [PATCH bpf-next v5 9/9] selftest/bpf: Implement tests for bpftool gen min_core_btf Mauricio Vásquez
2022-01-28 23:23 ` Mauricio Vásquez Bernal
2022-02-01 20:58 ` Quentin Monnet
2022-02-02 19:50 ` Andrii Nakryiko
2022-02-03 21:17 ` Mauricio Vásquez Bernal
2022-02-04 20:05 ` Andrii Nakryiko
2022-02-01 20:57 ` Quentin Monnet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220128223312.1253169-5-mauricio@kinvolk.io \
--to=mauricio@kinvolk.io \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=leonardo.didonato@elastic.co \
--cc=lorenzo.fontana@elastic.co \
--cc=netdev@vger.kernel.org \
--cc=quentin@isovalent.com \
--cc=rafaeldtinoco@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).