commit d5a36e2070bf00d5cd0aec95fcf76731300fea43
author Andrii Nakryiko <andriin@fb.com> Tue Jul 07 18:53:14 2020 -0700
committer Andrii Nakryiko <andrii.nakryiko@gmail.com> Wed Jul 08 17:12:53 2020 -0700
tree 5f0b850067b62932d7b410d0714a4e62bbdd1f77
parent 133543c202ef5c1529ca93cc631d3dc5f68cf6ff

libbpf: Add btf__set_fd() for more control over loaded BTF FD

Add setter for BTF FD to allow application more fine-grained control in more
advanced scenarios. Storing BTF FD inside `struct btf` provides little benefit
and probably would be better done differently (e.g., btf__load() could just
return FD on success), but we are stuck with this due to backwards
compatibility. The main problem is that it's impossible to load BTF and than
free user-space memory, but keep FD intact, because `struct btf` assumes
ownership of that FD upon successful load and will attempt to close it during
btf__free(). To allow callers (e.g., libbpf itself for BTF sanitization) to
have more control over this, add btf__set_fd() to allow to reset FD
arbitrarily, if necessary.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200708015318.3827358-3-andriin@fb.com

src/btf.c

diff --git a/src/btf.c b/src/btf.c
index bfef3d6..c8861c9 100644
--- a/src/btf.c
+++ b/src/btf.c
@@ -389,7 +389,7 @@
 	if (!btf)
 		return;
 
-	if (btf->fd != -1)
+	if (btf->fd >= 0)
 		close(btf->fd);
 
 	free(btf->data);
@@ -700,6 +700,11 @@
 	return btf->fd;
 }
 
+void btf__set_fd(struct btf *btf, int fd)
+{
+	btf->fd = fd;
+}
+
 const void *btf__get_raw_data(const struct btf *btf, __u32 *size)
 {
 	*size = btf->data_size;

src/btf.h

diff --git a/src/btf.h b/src/btf.h
index 06cd173..173eff2 100644
--- a/src/btf.h
+++ b/src/btf.h
@@ -79,6 +79,7 @@
 LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id);
 LIBBPF_API int btf__align_of(const struct btf *btf, __u32 id);
 LIBBPF_API int btf__fd(const struct btf *btf);
+LIBBPF_API void btf__set_fd(struct btf *btf, int fd);
 LIBBPF_API const void *btf__get_raw_data(const struct btf *btf, __u32 *size);
 LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
 LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf);

src/libbpf.map

diff --git a/src/libbpf.map b/src/libbpf.map
index 6544d2c..c5d5c76 100644
--- a/src/libbpf.map
+++ b/src/libbpf.map
@@ -288,4 +288,5 @@
 		bpf_map__value_size;
 		bpf_program__autoload;
 		bpf_program__set_autoload;
+		btf__set_fd;
 } LIBBPF_0.0.9;