Collect static vs global information about BPF functions from ELF file and
improve BTF with this additional info if compiler is too old and doesn't emit
this information its own. There is no attempt to improve extern BTF.
Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
Acked-by: Song Liu <songliubraving@xxxxxx>
---
tools/lib/bpf/btf.h | 5 ++
tools/lib/bpf/libbpf.c | 115 +++++++++++++++++++++++++++++++++++++++--
2 files changed, 116 insertions(+), 4 deletions(-)
diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h
index 8d73f7f5551f..3cbb95b2616e 100644
--- a/tools/lib/bpf/btf.h
+++ b/tools/lib/bpf/btf.h
@@ -161,6 +161,11 @@ static inline __u16 btf_vlen(const struct btf_type *t)
return BTF_INFO_VLEN(t->info);
}
+static inline __u16 btf_func_linkage(const struct btf_type *t)
+{
+ return BTF_INFO_VLEN(t->info);
+}
+
static inline bool btf_kflag(const struct btf_type *t)
{
return BTF_INFO_KFLAG(t->info);
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 1039362a06a9..92996de52172 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -294,6 +294,12 @@ struct extern_desc {
static LIST_HEAD(bpf_objects_list);
+struct func_desc {
+ int insn_idx;
+ int sec_idx;
+ enum btf_func_linkage linkage;
+};
+
struct bpf_object {
char name[BPF_OBJ_NAME_LEN];
char license[64];
@@ -304,6 +310,8 @@ struct bpf_object {
struct bpf_map *maps;
size_t nr_maps;
size_t maps_cap;
+ struct func_desc *funcs;
+ int nr_funcs;
char *kconfig;
struct extern_desc *externs;
@@ -313,6 +321,7 @@ struct bpf_object {
bool loaded;
bool has_pseudo_calls;
bool relaxed_core_relocs;
+ bool compiler_emits_func_linkage;
/*
* Information when doing elf related work. Only valid if fd
@@ -526,10 +535,10 @@ bpf_object__init_prog_names(struct bpf_object *obj)
continue;
if (GELF_ST_BIND(sym.st_info) != STB_GLOBAL)
continue;
-
name = elf_strptr(obj->efile.elf,
obj->efile.strtabidx,
sym.st_name);
+
if (!name) {
pr_warn("failed to get sym name string for prog %s\n",
prog->section_name);
@@ -2232,6 +2241,34 @@ static int cmp_externs(const void *_a, const void *_b)
return strcmp(a->name, b->name);
}
+static int bpf_object__record_func_info(struct bpf_object *obj, GElf_Sym *sym)
+{
+ int bind = GELF_ST_BIND(sym->st_info);
+ bool static_func = bind == STB_LOCAL;
+ struct func_desc *f;
+
+ /*
+ * Cannot check obj->caps.btf_func_global during elf open phase.
+ * Otherwise could have skipped collection of this info.
+ */
+
+ f = obj->funcs;
+ f = reallocarray(f, obj->nr_funcs + 1, sizeof(*f));
+ if (!f)
+ return -ENOMEM;
+ obj->funcs = f;
+ f = &f[obj->nr_funcs];
+ memset(f, 0, sizeof(*f));
+ obj->nr_funcs++;
+
+ f->insn_idx = sym->st_value / 8;
+ f->linkage = static_func ? BTF_FUNC_STATIC : BTF_FUNC_GLOBAL;
+ f->sec_idx = sym->st_shndx;
+ pr_debug("Func at insn %d sec %d linkage %d\n",
+ f->insn_idx, f->sec_idx, f->linkage);
+ return 0;
+}
+
static int bpf_object__collect_externs(struct bpf_object *obj)
{
const struct btf_type *t;
@@ -2258,6 +2295,12 @@ static int bpf_object__collect_externs(struct bpf_object *obj)
if (!gelf_getsym(obj->efile.symbols, i, &sym))
return -LIBBPF_ERRNO__FORMAT;
+ if (GELF_ST_TYPE(sym.st_info) == STT_FUNC) {
+ int err = bpf_object__record_func_info(obj, &sym);
+
+ if (err)
+ return err;
+ }
if (!sym_is_extern(&sym))
continue;
ext_name = elf_strptr(obj->efile.elf, obj->efile.strtabidx,
@@ -3145,9 +3188,62 @@ check_btf_ext_reloc_err(struct bpf_program *prog, int err,
return 0;
}
+static int btf_ext_improve_func_info(struct bpf_object *obj,
+ struct bpf_program *prog,
+ __u32 sec_idx)
+{
+ struct bpf_func_info_min *info;
+ struct btf_type *t;
+ struct func_desc *f;
+ const char *name;
+ int i, j;
+
+ if (!obj->caps.btf_func_global || obj->compiler_emits_func_linkage)
+ /*
+ * If kernel doesn't understand func linkage or compiler emits
+ * it already into BTF then don't try to improve BTF based on
+ * ELF info.
+ */
+ return 0;
+
+ info = prog->func_info;
+ for (i = 0; i < prog->func_info_cnt; i++) {
+ for (j = 0; j < obj->nr_funcs; j++) {
+ f = &obj->funcs[j];
+ if (f->insn_idx != info->insn_off ||
+ f->sec_idx != sec_idx)
+ continue;
+ t = (void *)btf__type_by_id(obj->btf, info->type_id);
+ if (!t)
+ return -EINVAL;
+ name = btf__name_by_offset(obj->btf, t->name_off);
+ if (!name)
+ return -EINVAL;
+ pr_debug("Func '%s' at insn %d btf_id %d linkage in BTF %d in ELF %d\n",
+ name, info->insn_off, info->type_id,
+ btf_func_linkage(t), f->linkage);
+ if (btf_func_linkage(t) == f->linkage) {
+ if (btf_func_linkage(t)) {
+ /* compiler emits func linkage. Don't touch BTF */
+ obj->compiler_emits_func_linkage = true;
+ return 0;
+ }
+ } else {
+ /* improve BTF with static vs global */
+ t->info = BTF_INFO_ENC(BTF_KIND_FUNC, 0,
+ f->linkage);
+ }
+ break;
+ }
+ info = ((void *)info) + prog->func_info_rec_size;
+ }
+ return 0;
+}
+
static int
bpf_program_reloc_btf_ext(struct bpf_program *prog, struct bpf_object *obj,
- const char *section_name, __u32 insn_offset)
+ const char *section_name, __u32 insn_offset,
+ __u32 sec_idx)
{
int err;
@@ -3168,6 +3264,15 @@ bpf_program_reloc_btf_ext(struct bpf_program *prog, struct bpf_object *obj,
"bpf_func_info");
prog->func_info_rec_size = btf_ext__func_info_rec_size(obj->btf_ext);
+ if (!insn_offset) {
+ /*
+ * improve BTF_KIND_FUNC when func_info is allocated
+ * first time. Don't touch it during relocation.
+ */
+ err = btf_ext_improve_func_info(obj, prog, sec_idx);
+ if (err)
+ return err;
+ }
}
if (!insn_offset || prog->line_info) {
@@ -4308,7 +4413,8 @@ bpf_program__reloc_text(struct bpf_program *prog, struct bpf_object *obj,
if (obj->btf_ext) {
err = bpf_program_reloc_btf_ext(prog, obj,
text->section_name,
- prog->insns_cnt);
+ prog->insns_cnt,
+ text->idx);
if (err)
return err;
}
@@ -4336,7 +4442,8 @@ bpf_program__relocate(struct bpf_program *prog, struct bpf_object *obj)
if (obj->btf_ext) {
err = bpf_program_reloc_btf_ext(prog, obj,
- prog->section_name, 0);
+ prog->section_name, 0,
+ prog->idx);
if (err)
return err;
}
--
2.23.0
