libbpf: Return btf_fd for load_sk_storage_btf

Before this change, function load_sk_storage_btf expected that
libbpf__probe_raw_btf was returning a BTF descriptor, but in fact it was
returning an information about whether the probe was successful (0 or
1). load_sk_storage_btf was using that value as an argument of the close
function, which was resulting in closing stdout and thus terminating the
process which called that function.

That bug was visible in bpftool. `bpftool feature` subcommand was always
exiting too early (because of closed stdout) and it didn't display all
requested probes. `bpftool -j feature` or `bpftool -p feature` were not
returning a valid json object.

This change renames the libbpf__probe_raw_btf function to
libbpf__load_raw_btf, which now returns a BTF descriptor, as expected in
load_sk_storage_btf.

v2:
- Fix typo in the commit message.

v3:
- Simplify BTF descriptor handling in bpf_object__probe_btf_* functions.
- Rename libbpf__probe_raw_btf function to libbpf__load_raw_btf and
return a BTF descriptor.

v4:
- Fix typo in the commit message.

Fixes: d7c4b3980c18 ("libbpf: detect supported kernel BTF features and sanitize BTF")
Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

1 files changed, 16 insertions, 12 deletions

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 197b574406b3..5d046cc7b207 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1645,14 +1645,16 @@ static int bpf_object__probe_btf_func(struct bpf_object *obj)
                 /* FUNC x */                                    /* [3] */
                 BTF_TYPE_ENC(5, BTF_INFO_ENC(BTF_KIND_FUNC, 0, 0), 2),
         };
-        int res;
+        int btf_fd;
 
-        res = libbpf__probe_raw_btf((char *)types, sizeof(types),
-                                    strs, sizeof(strs));
-        if (res < 0)
-                return res;
-        if (res > 0)
+        btf_fd = libbpf__load_raw_btf((char *)types, sizeof(types),
+                                      strs, sizeof(strs));
+        if (btf_fd >= 0) {
                 obj->caps.btf_func = 1;
+                close(btf_fd);
+                return 1;
+        }
+
         return 0;
 }
 
@@ -1670,14 +1672,16 @@ static int bpf_object__probe_btf_datasec(struct bpf_object *obj)
                 BTF_TYPE_ENC(3, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 1), 4),
                 BTF_VAR_SECINFO_ENC(2, 0, 4),
         };
-        int res;
+        int btf_fd;
 
-        res = libbpf__probe_raw_btf((char *)types, sizeof(types),
-                                    strs, sizeof(strs));
-        if (res < 0)
-                return res;
-        if (res > 0)
+        btf_fd = libbpf__load_raw_btf((char *)types, sizeof(types),
+                                      strs, sizeof(strs));
+        if (btf_fd >= 0) {
                 obj->caps.btf_datasec = 1;
+                close(btf_fd);
+                return 1;
+        }
+
         return 0;
 }