Commit 6ba77385 authored by Alan Maguire's avatar Alan Maguire Committed by Andrii Nakryiko

resolve_btfids: Handle presence of .BTF.base section

Now that btf_parse_elf() handles .BTF.base section presence,
we need to ensure that resolve_btfids uses .BTF.base when present
rather than the vmlinux base BTF passed in via the -B option.
Detect .BTF.base section presence and unset the base BTF path
to ensure that BTF ELF parsing will do the right thing.
Signed-off-by: default avatarAlan Maguire <alan.maguire@oracle.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Reviewed-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/bpf/20240613095014.357981-7-alan.maguire@oracle.com
parent c86f180f
...@@ -409,6 +409,14 @@ static int elf_collect(struct object *obj) ...@@ -409,6 +409,14 @@ static int elf_collect(struct object *obj)
obj->efile.idlist = data; obj->efile.idlist = data;
obj->efile.idlist_shndx = idx; obj->efile.idlist_shndx = idx;
obj->efile.idlist_addr = sh.sh_addr; obj->efile.idlist_addr = sh.sh_addr;
} else if (!strcmp(name, BTF_BASE_ELF_SEC)) {
/* If a .BTF.base section is found, do not resolve
* BTF ids relative to vmlinux; resolve relative
* to the .BTF.base section instead. btf__parse_split()
* will take care of this once the base BTF it is
* passed is NULL.
*/
obj->base_btf_path = NULL;
} }
if (compressed_section_fix(elf, scn, &sh)) if (compressed_section_fix(elf, scn, &sh))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment