From: Alexei Starovoitov <ast@kernel.org>
To: <davem@davemloft.net>
Cc: <daniel@iogearbox.net>, <x86@kernel.org>,
<netdev@vger.kernel.org>, <bpf@vger.kernel.org>,
<kernel-team@fb.com>
Subject: [PATCH v3 bpf-next 04/18] libbpf: Introduce btf__find_by_name_kind()
Date: Thu, 7 Nov 2019 22:40:25 -0800 [thread overview]
Message-ID: <20191108064039.2041889-5-ast@kernel.org> (raw)
In-Reply-To: <20191108064039.2041889-1-ast@kernel.org>
Introduce btf__find_by_name_kind() helper to search BTF by name and kind, since
name alone can be ambiguous.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---
tools/lib/bpf/btf.c | 22 ++++++++++++++++++++++
tools/lib/bpf/btf.h | 2 ++
tools/lib/bpf/libbpf.map | 1 +
3 files changed, 25 insertions(+)
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 86a1847e4a9f..88efa2bb7137 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -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)
diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h
index b18994116a44..d9ac73a02cde 100644
--- a/tools/lib/bpf/btf.h
+++ b/tools/lib/bpf/btf.h
@@ -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);
diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 86173cbb159d..cddb0e9d0695 100644
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -202,4 +202,5 @@ LIBBPF_0.0.6 {
bpf_program__get_type;
bpf_program__is_tracing;
bpf_program__set_tracing;
+ btf__find_by_name_kind;
} LIBBPF_0.0.5;
--
2.23.0
next prev parent reply other threads:[~2019-11-08 6:40 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 6:40 [PATCH v3 bpf-next 00/18] Introduce BPF trampoline Alexei Starovoitov
2019-11-08 6:40 ` [PATCH v3 bpf-next 01/18] bpf: refactor x86 JIT into helpers Alexei Starovoitov
2019-11-08 19:27 ` Andrii Nakryiko
2019-11-08 6:40 ` [PATCH v3 bpf-next 02/18] bpf: Add bpf_arch_text_poke() helper Alexei Starovoitov
2019-11-08 6:56 ` Song Liu
2019-11-08 8:23 ` Björn Töpel
2019-11-08 14:09 ` Alexei Starovoitov
2019-11-08 9:11 ` Peter Zijlstra
2019-11-08 9:36 ` Peter Zijlstra
2019-11-08 13:41 ` Alexei Starovoitov
2019-11-08 19:32 ` Alexei Starovoitov
2019-11-08 21:36 ` Peter Zijlstra
2019-11-08 21:39 ` David Miller
2019-11-11 8:14 ` Peter Zijlstra
2019-11-11 10:21 ` Daniel Borkmann
2019-11-11 16:10 ` Jonathan Corbet
2019-11-08 23:05 ` Alexei Starovoitov
2019-11-10 10:54 ` Thomas Gleixner
2019-11-08 6:40 ` [PATCH v3 bpf-next 03/18] bpf: Introduce BPF trampoline Alexei Starovoitov
2019-11-08 7:04 ` Song Liu
2019-11-08 6:40 ` Alexei Starovoitov [this message]
2019-11-08 7:05 ` [PATCH v3 bpf-next 04/18] libbpf: Introduce btf__find_by_name_kind() Song Liu
2019-11-08 19:21 ` Andrii Nakryiko
2019-11-08 6:40 ` [PATCH v3 bpf-next 05/18] libbpf: Add support to attach to fentry/fexit tracing progs Alexei Starovoitov
2019-11-08 7:12 ` Song Liu
2019-11-08 19:44 ` Andrii Nakryiko
2019-11-08 6:40 ` [PATCH v3 bpf-next 06/18] selftest/bpf: Simple test for fentry/fexit Alexei Starovoitov
2019-11-08 6:40 ` [PATCH v3 bpf-next 07/18] bpf: Add kernel test functions for fentry testing Alexei Starovoitov
2019-11-08 6:40 ` [PATCH v3 bpf-next 08/18] selftests/bpf: Add test for BPF trampoline Alexei Starovoitov
2019-11-08 6:40 ` [PATCH v3 bpf-next 09/18] selftests/bpf: Add fexit tests " Alexei Starovoitov
2019-11-08 6:40 ` [PATCH v3 bpf-next 10/18] selftests/bpf: Add combined fentry/fexit test Alexei Starovoitov
2019-11-08 7:14 ` Song Liu
2019-11-08 6:40 ` [PATCH v3 bpf-next 11/18] selftests/bpf: Add stress test for maximum number of progs Alexei Starovoitov
2019-11-08 7:24 ` Song Liu
2019-11-08 6:40 ` [PATCH v3 bpf-next 12/18] bpf: Reserve space for BPF trampoline in BPF programs Alexei Starovoitov
2019-11-08 7:25 ` Song Liu
2019-11-08 6:40 ` [PATCH v3 bpf-next 13/18] bpf: Fix race in btf_resolve_helper_id() Alexei Starovoitov
2019-11-08 7:32 ` Song Liu
2019-11-08 19:58 ` Andrii Nakryiko
2019-11-08 6:40 ` [PATCH v3 bpf-next 14/18] bpf: Compare BTF types of functions arguments with actual types Alexei Starovoitov
2019-11-08 17:28 ` Song Liu
2019-11-08 17:32 ` Song Liu
2019-11-08 17:57 ` Alexei Starovoitov
2019-11-08 17:59 ` Song Liu
2019-11-08 23:46 ` Andrii Nakryiko
2019-11-08 6:40 ` [PATCH v3 bpf-next 15/18] bpf: Support attaching tracing BPF program to other BPF programs Alexei Starovoitov
2019-11-08 18:49 ` Song Liu
2019-11-08 18:59 ` Alexei Starovoitov
2019-11-08 20:17 ` Toke Høiland-Jørgensen
2019-11-08 21:14 ` Alexei Starovoitov
2019-11-08 21:32 ` Toke Høiland-Jørgensen
2019-11-10 7:17 ` Andrii Nakryiko
2019-11-11 23:04 ` Alexei Starovoitov
2019-11-12 4:38 ` Andrii Nakryiko
2019-11-12 4:47 ` Alexei Starovoitov
2019-11-08 6:40 ` [PATCH v3 bpf-next 16/18] libbpf: Add support for attaching BPF programs " Alexei Starovoitov
2019-11-08 18:57 ` Song Liu
2019-11-08 19:13 ` Alexei Starovoitov
2019-11-08 19:14 ` Song Liu
2019-11-10 16:56 ` Andrii Nakryiko
2019-11-08 6:40 ` [PATCH v3 bpf-next 17/18] selftests/bpf: Extend test_pkt_access test Alexei Starovoitov
2019-11-08 19:03 ` Song Liu
2019-11-10 16:58 ` Andrii Nakryiko
2019-11-08 6:40 ` [PATCH v3 bpf-next 18/18] selftests/bpf: Add a test for attaching BPF prog to another BPF prog and subprog Alexei Starovoitov
2019-11-08 19:13 ` Song Liu
2019-11-10 17:04 ` Andrii Nakryiko
2019-11-11 23:07 ` Alexei Starovoitov
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=20191108064039.2041889-5-ast@kernel.org \
--to=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
--cc=x86@kernel.org \
/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).