libbpf: Allow WEAK and GLOBAL bindings during BTF fixup

During BTF fix up for global variables, global variable can be global
weak and will have STB_WEAK binding in ELF. Support such global
variables in addition to non-weak ones.

This is not the problem when using BPF static linking, as BPF static
linker "fixes up" BTF during generation so that libbpf doesn't have to
do it anymore during bpf_object__open(), which led to this not being
noticed for a while, along with a pretty rare (currently) use of __weak
variables and maps.

Reported-by: Hengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220407230446.3980075-2-andrii@kernel.org

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 016ecdd1c3e1a03bf02ae76a87656e6d8474f19b..9deb1fc67f1908801b0303d3ef1f29a6fb1e1702 100644 (file)
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1401,8 +1401,11 @@ static int find_elf_var_offset(const struct bpf_object *obj, const char *name, _
        for (si = 0; si < symbols->d_size / sizeof(Elf64_Sym); si++) {
                Elf64_Sym *sym = elf_sym_by_idx(obj, si);
 
-               if (ELF64_ST_BIND(sym->st_info) != STB_GLOBAL ||
-                   ELF64_ST_TYPE(sym->st_info) != STT_OBJECT)
+               if (ELF64_ST_TYPE(sym->st_info) != STT_OBJECT)
+                       continue;
+
+               if (ELF64_ST_BIND(sym->st_info) != STB_GLOBAL &&
+                   ELF64_ST_BIND(sym->st_info) != STB_WEAK)
                        continue;
 
                sname = elf_sym_str(obj, sym->st_name);