mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-03-25 10:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

libbpf: Make few internal helpers available outside of libbpf.c

Browse Source 
Make skip_mods_and_typedefs(), btf_kind_str(), and btf_func_linkage() helpers
available outside of libbpf.c, to be used by static linker code.

Also do few cleanups (error code fixes, comment clean up, etc) that don't
deserve their own commit.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210423181348.1801389-9-andrii@kernel.org
This commit is contained in:
Andrii Nakryiko
2021-04-23 11:13:38 -07:00
committed by Andrii Nakryiko
parent 4dcf439178
commit 24b5d82967
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/linker.c
View File

@@ -123,9 +123,7 @@ struct bpf_linker {
};
#define pr_warn_elf(fmt, ...) \
do { \
libbpf_print(LIBBPF_WARN, "libbpf: " fmt ": %s\n", ##__VA_ARGS__, elf_errmsg(-1)); \
} while (0)
libbpf_print(LIBBPF_WARN, "libbpf: " fmt ": %s\n", ##__VA_ARGS__, elf_errmsg(-1))
static int init_output_elf(struct bpf_linker *linker, const char *file);
@@ -284,7 +282,7 @@ static int init_output_elf(struct bpf_linker *linker, const char *file)
/* ELF header */
linker->elf_hdr = elf64_newehdr(linker->elf);
if (!linker->elf_hdr){
if (!linker->elf_hdr) {
pr_warn_elf("failed to create ELF header");
return -EINVAL;
}
@@ -925,13 +923,13 @@ static int init_sec(struct bpf_linker *linker, struct dst_sec *dst_sec, struct s
scn = elf_newscn(linker->elf);
if (!scn)
return -1;
return -ENOMEM;
data = elf_newdata(scn);
if (!data)
return -1;
return -ENOMEM;
shdr = elf64_getshdr(scn);
if (!shdr)
return -1;
return -ENOMEM;
dst_sec->scn = scn;
dst_sec->shdr = shdr;
@@ -1221,7 +1219,7 @@ static int linker_append_elf_relos(struct bpf_linker *linker, struct src_obj *ob
return err;
}
} else if (!secs_match(dst_sec, src_sec)) {
pr_warn("Secs %s are not compatible\n", src_sec->sec_name);
pr_warn("sections %s are not compatible\n", src_sec->sec_name);
return -1;
}