michaelh/zephyr
1
0
Fork 0
Code Releases Activity

llext: xtensa: disable relative relocations for pre-located

Browse source 
When building pre-located LLEXTs of ET_DYN type (shared ELF object)
on Xtensa, all the R_XTENSA_RELATIVE relocations are already correct,
the current code actually breaks them by mobing the value from the
target address-space to a storage range address. Simply removing the
recalculation solves the issue.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2025-02-18 16:36:44 +01:00 • committed by Benjamin Cabé
commit c29e0d3480
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
arch/xtensa/core/elf.c
View file

@ -34,13 +34,18 @@ LOG_MODULE_DECLARE(llext, CONFIG_LLEXT_LOG_LEVEL);
static void xtensa_elf_relocate(struct llext_loader *ldr, struct llext *ext, static void xtensa_elf_relocate(struct llext_loader *ldr, struct llext *ext,
const elf_rela_t *rel, uintptr_t addr, const elf_rela_t *rel, uintptr_t addr,
uint8_t *loc, int type, uint32_t stb) uint8_t *loc, int type, uint32_t stb,
const struct llext_load_param *ldr_parm)
{ {
elf_word *got_entry = (elf_word *)loc; elf_word *got_entry = (elf_word *)loc;
switch (type) { switch (type) {
case R_XTENSA_RELATIVE: case R_XTENSA_RELATIVE:
; if (ldr_parm && ldr_parm->pre_located) {
/* Relative relocations are already correct in the pre-located case */
break;
}
/* Relocate a local symbol: Xtensa specific. Seems to only be used with PIC */ /* Relocate a local symbol: Xtensa specific. Seems to only be used with PIC */
unsigned int sh_ndx; unsigned int sh_ndx;
@ -146,7 +151,8 @@ void arch_elf_relocate_local(struct llext_loader *ldr, struct llext *ext, const
sh_addr = ldr->sects[LLEXT_MEM_TEXT].sh_addr; sh_addr = ldr->sects[LLEXT_MEM_TEXT].sh_addr;
} }
xtensa_elf_relocate(ldr, ext, rel, sh_addr, rel_addr, type, ELF_ST_BIND(sym->st_info)); xtensa_elf_relocate(ldr, ext, rel, sh_addr, rel_addr, type, ELF_ST_BIND(sym->st_info),
ldr_parm);
} }
/** /**
@ -163,5 +169,5 @@ void arch_elf_relocate_global(struct llext_loader *ldr, struct llext *ext, const
} }
xtensa_elf_relocate(ldr, ext, rel, (uintptr_t)link_addr, rel_addr, type, xtensa_elf_relocate(ldr, ext, rel, (uintptr_t)link_addr, rel_addr, type,
ELF_ST_BIND(sym->st_info)); ELF_ST_BIND(sym->st_info), NULL);
} }