michaelh/zephyr
1
0
Fork 0
Code Releases Activity

llext: rework debug code in llext_link

Browse source 
This removes 'return' statements affecting code flow from debug code in
llext_link(). Also, all valid relocations are tried before returning an
error, so that the user can see all the errors (most likely missing
symbols) at once.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
This commit is contained in:
Luca Burelli 2025-06-16 09:45:13 +02:00 • committed by Benjamin Cabé
commit 741c5b5a98
1 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

75
subsys/llext/llext_link.c
View file

@ -409,6 +409,7 @@ int llext_link(struct llext_loader *ldr, struct llext *ext, const struct llext_l
elf_rela_t rel = {0}; elf_rela_t rel = {0};
elf_word rel_cnt = 0; elf_word rel_cnt = 0;
const char *name; const char *name;
int link_err = 0;
int i, ret; int i, ret;
for (i = 0; i < ext->sect_cnt; ++i) { for (i = 0; i < ext->sect_cnt; ++i) {
@ -510,52 +511,52 @@ int llext_link(struct llext_loader *ldr, struct llext *ext, const struct llext_l
return ret; return ret;
} }
#ifdef CONFIG_LLEXT_LOG_LEVEL #if CONFIG_LLEXT_LOG_LEVEL > LOG_LEVEL_INF /* also gets skipped without CONFIG_LOG */
if (CONFIG_LLEXT_LOG_LEVEL >= LOG_LEVEL_INF) { uintptr_t link_addr;
uintptr_t link_addr; uintptr_t op_loc = llext_get_reloc_instruction_location(ldr, ext,
uintptr_t op_loc = shdr->sh_info,
llext_get_reloc_instruction_location(ldr, ext, &rel);
shdr->sh_info, elf_sym_t sym;
&rel); const char *inv_str = "";
elf_sym_t sym;
ret = llext_read_symbol(ldr, ext, &rel, &sym);
if (ret != 0) {
return ret;
}
ret = llext_read_symbol(ldr, ext, &rel, &sym);
if (ret == 0) {
name = llext_symbol_name(ldr, ext, &sym); name = llext_symbol_name(ldr, ext, &sym);
ret = llext_lookup_symbol(ldr, ext, &link_addr, &rel, &sym,
ret = llext_lookup_symbol(ldr, ext, &link_addr, &rel, &sym, name, name, shdr);
shdr); } else {
name = "<unknown>";
if (ret != 0) {
LOG_ERR("Could not find symbol %s!", name);
return ret;
}
LOG_DBG("relocation %d:%d info %#zx (type %zd, sym %zd) offset %zd"
" sym_name %s sym_type %d sym_bind %d sym_ndx %d",
i, j, (size_t)rel.r_info, (size_t)ELF_R_TYPE(rel.r_info),
(size_t)ELF_R_SYM(rel.r_info), (size_t)rel.r_offset,
name, ELF_ST_TYPE(sym.st_info),
ELF_ST_BIND(sym.st_info), sym.st_shndx);
LOG_DBG("writing relocation type %d at %#lx with symbol %s (%#lx)",
(int)ELF_R_TYPE(rel.r_info), op_loc, name, link_addr);
} }
#endif /* CONFIG_LLEXT_LOG_LEVEL */
/* relocation */
ret = arch_elf_relocate(ldr, ext, &rel, shdr);
if (ret != 0) { if (ret != 0) {
return ret; inv_str = "(invalid) ";
memset(&sym, 0, sizeof(sym));
link_addr = 0;
}
LOG_DBG("%srelocation %d:%d info %#zx (type %zd, sym %zd) offset %zd"
" sym_name %s sym_type %d sym_bind %d sym_ndx %d",
inv_str, i, j, (size_t)rel.r_info, (size_t)ELF_R_TYPE(rel.r_info),
(size_t)ELF_R_SYM(rel.r_info), (size_t)rel.r_offset,
name, ELF_ST_TYPE(sym.st_info),
ELF_ST_BIND(sym.st_info), sym.st_shndx);
LOG_DBG("%swriting relocation type %d at %#lx with symbol %s (%#lx)",
inv_str, (int)ELF_R_TYPE(rel.r_info), op_loc, name, link_addr);
#endif /* CONFIG_LLEXT_LOG_LEVEL > LOG_LEVEL_INF */
/* relocation, collect first error */
ret = arch_elf_relocate(ldr, ext, &rel, shdr);
if (link_err == 0) {
link_err = ret;
} }
} }
} }
if (link_err != 0) {
return link_err;
}
#ifdef CONFIG_CACHE_MANAGEMENT #ifdef CONFIG_CACHE_MANAGEMENT
/* Make sure changes to memory regions are flushed to RAM */ /* Make sure changes to memory regions are flushed to RAM */
for (i = 0; i < LLEXT_MEM_COUNT; ++i) { for (i = 0; i < LLEXT_MEM_COUNT; ++i) {