libbpf: Treat STV_INTERNAL same as STV_HIDDEN for functions

Do the same global -> static BTF update for global functions with STV_INTERNAL
visibility to turn on static BPF verification mode.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210507054119.270888-7-andrii@kernel.org

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index e2a3cf4378140f2ccabe45df70d40accc63d7bb3..b8cf93fa1b4de4a641305de991d552965be516ed 100644 (file)
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -700,13 +700,14 @@ bpf_object__add_programs(struct bpf_object *obj, Elf_Data *sec_data,
                if (err)
                        return err;
 
-               /* if function is a global/weak symbol, but has hidden
-                * visibility (STV_HIDDEN), mark its BTF FUNC as static to
-                * enable more permissive BPF verification mode with more
-                * outside context available to BPF verifier
+               /* if function is a global/weak symbol, but has restricted
+                * (STV_HIDDEN or STV_INTERNAL) visibility, mark its BTF FUNC
+                * as static to enable more permissive BPF verification mode
+                * with more outside context available to BPF verifier
                 */
                if (GELF_ST_BIND(sym.st_info) != STB_LOCAL
-                   && GELF_ST_VISIBILITY(sym.st_other) == STV_HIDDEN)
+                   && (GELF_ST_VISIBILITY(sym.st_other) == STV_HIDDEN
+                       || GELF_ST_VISIBILITY(sym.st_other) == STV_INTERNAL))
                        prog->mark_btf_static = true;
 
                nr_progs++;