From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
Andrii Nakryiko <andriin@fb.com>, Yonghong Song <yhs@fb.com>,
Martin KaFai Lau <kafai@fb.com>
Subject: [PATCH] bpftool: Try to read btf as raw data if elf read fails
Date: Fri, 18 Oct 2019 12:34:04 +0200 [thread overview]
Message-ID: <20191018103404.12999-1-jolsa@kernel.org> (raw)
The bpftool interface stays the same, but now it's possible
to run it over BTF raw data, like:
$ bpftool btf dump file /sys/kernel/btf/vmlinux
libbpf: failed to get EHDR from /sys/kernel/btf/vmlinux
[1] INT '(anon)' size=4 bits_offset=0 nr_bits=32 encoding=(none)
[2] INT 'long unsigned int' size=8 bits_offset=0 nr_bits=64 encoding=(none)
[3] CONST '(anon)' type_id=2
I'm also adding err init to 0 because I was getting uninitialized
warnings from gcc.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/bpf/bpftool/btf.c | 47 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 42 insertions(+), 5 deletions(-)
diff --git a/tools/bpf/bpftool/btf.c b/tools/bpf/bpftool/btf.c
index 9a9376d1d3df..100fb7e02329 100644
--- a/tools/bpf/bpftool/btf.c
+++ b/tools/bpf/bpftool/btf.c
@@ -12,6 +12,9 @@
#include <libbpf.h>
#include <linux/btf.h>
#include <linux/hashtable.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#include "btf.h"
#include "json_writer.h"
@@ -388,6 +391,35 @@ static int dump_btf_c(const struct btf *btf,
return err;
}
+static struct btf *btf__parse_raw(const char *file)
+{
+ struct btf *btf = ERR_PTR(-EINVAL);
+ __u8 *buf = NULL;
+ struct stat st;
+ FILE *f;
+
+ if (stat(file, &st))
+ return btf;
+
+ f = fopen(file, "rb");
+ if (!f)
+ return btf;
+
+ buf = malloc(st.st_size);
+ if (!buf)
+ goto err;
+
+ if ((size_t) st.st_size != fread(buf, 1, st.st_size, f))
+ goto err;
+
+ btf = btf__new(buf, st.st_size);
+
+err:
+ free(buf);
+ fclose(f);
+ return btf;
+}
+
static int do_dump(int argc, char **argv)
{
struct btf *btf = NULL;
@@ -397,7 +429,7 @@ static int do_dump(int argc, char **argv)
__u32 btf_id = -1;
const char *src;
int fd = -1;
- int err;
+ int err = 0;
if (!REQ_ARGS(2)) {
usage();
@@ -468,10 +500,15 @@ static int do_dump(int argc, char **argv)
btf = btf__parse_elf(*argv, NULL);
if (IS_ERR(btf)) {
err = PTR_ERR(btf);
- btf = NULL;
- p_err("failed to load BTF from %s: %s",
- *argv, strerror(err));
- goto done;
+ if (err == -LIBBPF_ERRNO__FORMAT)
+ btf = btf__parse_raw(*argv);
+ if (IS_ERR(btf)) {
+ btf = NULL;
+ /* Display the original error value. */
+ p_err("failed to load BTF from %s: %s",
+ *argv, strerror(err));
+ goto done;
+ }
}
NEXT_ARG();
} else {
--
2.21.0
next reply other threads:[~2019-10-18 10:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 10:34 Jiri Olsa [this message]
2019-10-18 16:48 ` [PATCH] bpftool: Try to read btf as raw data if elf read fails Andrii Nakryiko
2019-10-18 20:04 ` Yonghong Song
2019-10-21 13:55 ` Jiri Olsa
2019-10-21 13:54 ` Jiri Olsa
2019-10-18 22:39 ` Jakub Kicinski
2019-10-21 14:02 ` Jiri Olsa
2019-10-21 23:16 ` Jakub Kicinski
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=20191018103404.12999-1-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=yhs@fb.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).