From: Andrii Nakryiko <andrii@kernel.org>
To: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>, <ast@fb.com>,
<daniel@iogearbox.net>
Cc: <andrii@kernel.org>, <kernel-team@fb.com>,
Luka Perkov <luka.perkov@sartura.hr>,
Tony Ambardar <tony.ambardar@gmail.com>,
Andrii Nakryiko <andriin@fb.com>
Subject: [PATCH v2 bpf-next 3/4] libbpf: allow specifying both ELF and raw BTF for CO-RE BTF override
Date: Wed, 7 Oct 2020 13:29:45 -0700 [thread overview]
Message-ID: <20201007202946.3684483-4-andrii@kernel.org> (raw)
In-Reply-To: <20201007202946.3684483-1-andrii@kernel.org>
From: Andrii Nakryiko <andriin@fb.com>
Use generalized BTF parsing logic, making it possible to parse BTF both from
ELF file, as well as a raw BTF dump. This makes it easier to write custom
tests with manually generated BTFs.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
tools/lib/bpf/libbpf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 032cf0049ddb..105cb8ad1d75 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -5842,7 +5842,7 @@ bpf_object__relocate_core(struct bpf_object *obj, const char *targ_btf_path)
return 0;
if (targ_btf_path)
- targ_btf = btf__parse_elf(targ_btf_path, NULL);
+ targ_btf = btf__parse(targ_btf_path, NULL);
else
targ_btf = obj->btf_vmlinux;
if (IS_ERR_OR_NULL(targ_btf)) {
--
2.24.1
next prev parent reply other threads:[~2020-10-07 20:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 20:29 [PATCH v2 bpf-next 0/4] libbpf: auto-resize relocatable LOAD/STORE instructions Andrii Nakryiko
2020-10-07 20:29 ` [PATCH v2 bpf-next 1/4] libbpf: skip CO-RE relocations for not loaded BPF programs Andrii Nakryiko
2020-10-07 20:29 ` [PATCH v2 bpf-next 2/4] libbpf: support safe subset of load/store instruction resizing with CO-RE Andrii Nakryiko
2020-10-07 20:29 ` Andrii Nakryiko [this message]
2020-10-07 20:29 ` [PATCH v2 bpf-next 4/4] selftests/bpf: validate libbpf's auto-sizing of LD/ST/STX instructions Andrii Nakryiko
2020-10-07 23:29 ` Alexei Starovoitov
2020-10-07 23:33 ` Andrii Nakryiko
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=20201007202946.3684483-4-andrii@kernel.org \
--to=andrii@kernel.org \
--cc=andriin@fb.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=luka.perkov@sartura.hr \
--cc=netdev@vger.kernel.org \
--cc=tony.ambardar@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).