libbpf-tools: Update tools to use BTFGen integration

Use save_min_core_btf() to uncompress and save the BTF file for the current system. If the file is available, then use it when opening the object. Signed-off-by: Mauricio Vásquez <[email protected]>
iovisor · Mar 11, 2022 · 6b9834b · 6b9834b
1 parent 49e2042
commit 6b9834b
Show file tree

Hide file tree

Showing 22 changed files with 352 additions and 21 deletions.
diff --git a/libbpf-tools/bashreadline.c b/libbpf-tools/bashreadline.c
@@ -12,6 +12,7 @@
 #include <bpf/bpf.h>
 #include "bashreadline.h"
 #include "bashreadline.skel.h"
+#include "min_core_btf_helpers.h"
 #include "trace_helpers.h"
 #include "uprobe_helpers.h"
 
@@ -143,6 +144,7 @@ static void sig_int(int signo)
 
 int main(int argc, char **argv)
 {
+	LIBBPF_OPTS(bpf_object_open_opts, open_opts);
 	static const struct argp argp = {
 		.options = opts,
 		.parser = parse_arg,
@@ -168,9 +170,21 @@ int main(int argc, char **argv)
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 	libbpf_set_print(libbpf_print_fn);
 
-	obj = bashreadline_bpf__open_and_load();
+	err = ensure_core_btf(&open_opts);
+	if (err) {
+		warn("failed to fetch necessary BTF for CO-RE: %s\n", strerror(-err));
+		goto cleanup;
+	}
+
+	obj = bashreadline_bpf__open_opts(&open_opts);
 	if (!obj) {
-		warn("failed to open and load BPF object\n");
+		warn("failed to open BPF object\n");
+		goto cleanup;
+	}
+
+	err = bashreadline_bpf__load(obj);
+	if (err) {
+		warn("failed to load BPF object: %d\n", err);
 		goto cleanup;
 	}
 
@@ -218,5 +232,10 @@ int main(int argc, char **argv)
 	perf_buffer__free(pb);
 	bashreadline_bpf__destroy(obj);
 
+	if (open_opts.btf_custom_path) {
+		unlink(open_opts.btf_custom_path);
+		free((void *)open_opts.btf_custom_path);
+	}
+
 	return err != 0;
 }
diff --git a/libbpf-tools/bindsnoop.c b/libbpf-tools/bindsnoop.c
@@ -13,12 +13,14 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <bpf/libbpf.h>
 #include <bpf/bpf.h>
 #include "bindsnoop.h"
 #include "bindsnoop.skel.h"
 #include "trace_helpers.h"
+#include "min_core_btf_helpers.h"
 
 #define PERF_BUFFER_PAGES	16
 #define PERF_POLL_TIMEOUT_MS	100
@@ -169,6 +171,7 @@ static void handle_lost_events(void *ctx, int cpu, __u64 lost_cnt)
 
 int main(int argc, char **argv)
 {
+	LIBBPF_OPTS(bpf_object_open_opts, open_opts);
 	static const struct argp argp = {
 		.options = opts,
 		.parser = parse_arg,
@@ -187,7 +190,13 @@ int main(int argc, char **argv)
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 	libbpf_set_print(libbpf_print_fn);
 
-	obj = bindsnoop_bpf__open();
+	err = ensure_core_btf(&open_opts);
+	if (err) {
+		fprintf(stderr, "failed to fetch necessary BTF for CO-RE: %s\n", strerror(-err));
+		return 1;
+	}
+
+	obj = bindsnoop_bpf__open_opts(&open_opts);
 	if (!obj) {
 		warn("failed to open BPF object\n");
 		return 1;
@@ -203,6 +212,11 @@ int main(int argc, char **argv)
 		goto cleanup;
 	}
 
+	if (open_opts.btf_custom_path) {
+		unlink(open_opts.btf_custom_path);
+		free((void *)open_opts.btf_custom_path);
+	}
+
 	if (target_ports) {
 		port_map_fd = bpf_map__fd(obj->maps.ports);
 		port = strtok(target_ports, ",");

diff --git a/libbpf-tools/biopattern.c b/libbpf-tools/biopattern.c
@@ -12,6 +12,7 @@
 #include <bpf/bpf.h>
 #include "biopattern.h"
 #include "biopattern.skel.h"
+#include "min_core_btf_helpers.h"
 #include "trace_helpers.h"
 
 static struct env {
@@ -158,6 +159,7 @@ static int print_map(struct bpf_map *counters, struct partitions *partitions)
 
 int main(int argc, char **argv)
 {
+	LIBBPF_OPTS(bpf_object_open_opts, open_opts);
 	struct partitions *partitions = NULL;
 	const struct partition *partition;
 	static const struct argp argp = {
@@ -175,7 +177,13 @@ int main(int argc, char **argv)
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 	libbpf_set_print(libbpf_print_fn);
 
-	obj = biopattern_bpf__open();
+	err = ensure_core_btf(&open_opts);
+	if (err) {
+		fprintf(stderr, "failed to fetch necessary BTF for CO-RE: %s\n", strerror(-err));
+		return 1;
+	}
+
+	obj = biopattern_bpf__open_opts(&open_opts);
 	if (!obj) {
 		fprintf(stderr, "failed to open BPF object\n");
 		return 1;
@@ -235,5 +243,10 @@ int main(int argc, char **argv)
 	biopattern_bpf__destroy(obj);
 	partitions__free(partitions);
 
+	if (open_opts.btf_custom_path) {
+		unlink(open_opts.btf_custom_path);
+		free((void *)open_opts.btf_custom_path);
+	}
+
 	return err != 0;
 }
diff --git a/libbpf-tools/execsnoop.c b/libbpf-tools/execsnoop.c
@@ -12,6 +12,7 @@
 #include <bpf/bpf.h>
 #include "execsnoop.h"
 #include "execsnoop.skel.h"
+#include "min_core_btf_helpers.h"
 #include "trace_helpers.h"
 
 #define PERF_BUFFER_PAGES   64
@@ -258,6 +259,7 @@ static void handle_lost_events(void *ctx, int cpu, __u64 lost_cnt)
 
 int main(int argc, char **argv)
 {
+	LIBBPF_OPTS(bpf_object_open_opts, open_opts);
 	static const struct argp argp = {
 		.options = opts,
 		.parser = parse_arg,
@@ -274,7 +276,13 @@ int main(int argc, char **argv)
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 	libbpf_set_print(libbpf_print_fn);
 
-	obj = execsnoop_bpf__open();
+	err = ensure_core_btf(&open_opts);
+	if (err) {
+		fprintf(stderr, "failed to fetch necessary BTF for CO-RE: %s\n", strerror(-err));
+		return 1;
+	}
+
+	obj = execsnoop_bpf__open_opts(&open_opts);
 	if (!obj) {
 		fprintf(stderr, "failed to open BPF object\n");
 		return 1;
@@ -340,5 +348,10 @@ int main(int argc, char **argv)
 	perf_buffer__free(pb);
 	execsnoop_bpf__destroy(obj);
 
+	if (open_opts.btf_custom_path) {
+		unlink(open_opts.btf_custom_path);
+		free((void *)open_opts.btf_custom_path);
+	}
+
 	return err != 0;
 }
diff --git a/libbpf-tools/exitsnoop.c b/libbpf-tools/exitsnoop.c
@@ -13,11 +13,13 @@
 #include <signal.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <bpf/libbpf.h>
 #include <bpf/bpf.h>
 #include "exitsnoop.h"
 #include "exitsnoop.skel.h"
+#include "min_core_btf_helpers.h"
 #include "trace_helpers.h"
 
 #define PERF_BUFFER_PAGES	16
@@ -147,6 +149,7 @@ static void handle_lost_events(void *ctx, int cpu, __u64 lost_cnt)
 
 int main(int argc, char **argv)
 {
+	LIBBPF_OPTS(bpf_object_open_opts, open_opts);
 	static const struct argp argp = {
 		.options = opts,
 		.parser = parse_arg,
@@ -163,7 +166,13 @@ int main(int argc, char **argv)
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 	libbpf_set_print(libbpf_print_fn);
 
-	obj = exitsnoop_bpf__open();
+	err = ensure_core_btf(&open_opts);
+	if (err) {
+		fprintf(stderr, "failed to fetch necessary BTF for CO-RE: %s\n", strerror(-err));
+		return 1;
+	}
+
+	obj = exitsnoop_bpf__open_opts(&open_opts);
 	if (!obj) {
 		warn("failed to open BPF object\n");
 		return 1;
@@ -218,5 +227,10 @@ int main(int argc, char **argv)
 	perf_buffer__free(pb);
 	exitsnoop_bpf__destroy(obj);
 
+	if (open_opts.btf_custom_path) {
+		unlink(open_opts.btf_custom_path);
+		free((void *)open_opts.btf_custom_path);
+	}
+
 	return err != 0;
 }
diff --git a/libbpf-tools/filelife.c b/libbpf-tools/filelife.c
@@ -14,6 +14,7 @@
 #include <bpf/bpf.h>
 #include "filelife.h"
 #include "filelife.skel.h"
+#include "min_core_btf_helpers.h"
 #include "trace_helpers.h"
 
 #define PERF_BUFFER_PAGES	16
@@ -105,6 +106,7 @@ void handle_lost_events(void *ctx, int cpu, __u64 lost_cnt)
 
 int main(int argc, char **argv)
 {
+	LIBBPF_OPTS(bpf_object_open_opts, open_opts);
 	static const struct argp argp = {
 		.options = opts,
 		.parser = parse_arg,
@@ -121,7 +123,13 @@ int main(int argc, char **argv)
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 	libbpf_set_print(libbpf_print_fn);
 
-	obj = filelife_bpf__open();
+	err = ensure_core_btf(&open_opts);
+	if (err) {
+		fprintf(stderr, "failed to fetch necessary BTF for CO-RE: %s\n", strerror(-err));
+		return 1;
+	}
+
+	obj = filelife_bpf__open_opts(&open_opts);
 	if (!obj) {
 		fprintf(stderr, "failed to open BPF object\n");
 		return 1;
@@ -173,5 +181,10 @@ int main(int argc, char **argv)
 	perf_buffer__free(pb);
 	filelife_bpf__destroy(obj);
 
+	if (open_opts.btf_custom_path) {
+		unlink(open_opts.btf_custom_path);
+		free((void *)open_opts.btf_custom_path);
+	}
+
 	return err != 0;
 }
diff --git a/libbpf-tools/filetop.c b/libbpf-tools/filetop.c
@@ -20,6 +20,7 @@
 #include <bpf/bpf.h>
 #include "filetop.h"
 #include "filetop.skel.h"
+#include "min_core_btf_helpers.h"
 #include "trace_helpers.h"
 
 #define warn(...) fprintf(stderr, __VA_ARGS__)
@@ -256,6 +257,7 @@ static int print_stat(struct filetop_bpf *obj)
 
 int main(int argc, char **argv)
 {
+	LIBBPF_OPTS(bpf_object_open_opts, open_opts);
 	static const struct argp argp = {
 		.options = opts,
 		.parser = parse_arg,
@@ -271,7 +273,13 @@ int main(int argc, char **argv)
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 	libbpf_set_print(libbpf_print_fn);
 
-	obj = filetop_bpf__open();
+	err = ensure_core_btf(&open_opts);
+	if (err) {
+		fprintf(stderr, "failed to fetch necessary BTF for CO-RE: %s\n", strerror(-err));
+		return 1;
+	}
+
+	obj = filetop_bpf__open_opts(&open_opts);
 	if (!obj) {
 		warn("failed to open BPF object\n");
 		return 1;
@@ -319,5 +327,10 @@ int main(int argc, char **argv)
 cleanup:
 	filetop_bpf__destroy(obj);
 
+	if (open_opts.btf_custom_path) {
+		unlink(open_opts.btf_custom_path);
+		free((void *)open_opts.btf_custom_path);
+	}
+
 	return err != 0;
 }
diff --git a/libbpf-tools/fsdist.c b/libbpf-tools/fsdist.c
@@ -24,6 +24,7 @@
 
 #include "fsdist.h"
 #include "fsdist.skel.h"
+#include "min_core_btf_helpers.h"
 #include "trace_helpers.h"
 
 #define warn(...) fprintf(stderr, __VA_ARGS__)
@@ -343,6 +344,7 @@ static int attach_kprobes(struct fsdist_bpf *obj)
 
 int main(int argc, char **argv)
 {
+	LIBBPF_OPTS(bpf_object_open_opts, open_opts);
 	static const struct argp argp = {
 		.options = opts,
 		.parser = parse_arg,
@@ -367,7 +369,13 @@ int main(int argc, char **argv)
 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
 	libbpf_set_print(libbpf_print_fn);
 
-	skel = fsdist_bpf__open();
+	err = ensure_core_btf(&open_opts);
+	if (err) {
+		fprintf(stderr, "failed to fetch necessary BTF for CO-RE: %s\n", strerror(-err));
+		return 1;
+	}
+
+	skel = fsdist_bpf__open_opts(&open_opts);
 	if (!skel) {
 		warn("failed to open BPF object\n");
 		return 1;
@@ -437,5 +445,10 @@ int main(int argc, char **argv)
 cleanup:
 	fsdist_bpf__destroy(skel);
 
+	if (open_opts.btf_custom_path) {
+		unlink(open_opts.btf_custom_path);
+		free((void *)open_opts.btf_custom_path);
+	}
+
 	return err != 0;
 }