michaelh/zephyr
1
0
Fork 0
Code Releases Activity

llext: Track module memory usage

Browse source 
The memory usage shown in the shell was 0 which is obviously incorrect.
At some point the memory allocation tracking was dropped from llext.c
mistakenly. Add it back.

Signed-off-by: Tom Burdick <thomas.burdick@intel.com>
This commit is contained in:
Tom Burdick 2023-11-01 15:33:24 -05:00 • committed by Carles Cufí
commit 6d651e37a3
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/llext/llext.c
View file

@ -252,6 +252,7 @@ static int llext_copy_section(struct llext_loader *ldr, struct llext *ext,
if (!ext->mem[mem_idx]) { if (!ext->mem[mem_idx]) {
return -ENOMEM; return -ENOMEM;
} }
ext->mem_size += ldr->sects[sect_idx].sh_size;
ret = llext_seek(ldr, ldr->sects[sect_idx].sh_offset); ret = llext_seek(ldr, ldr->sects[sect_idx].sh_offset);
if (ret != 0) { if (ret != 0) {
@ -347,11 +348,13 @@ out:
static inline int llext_allocate_symtab(struct llext_loader *ldr, struct llext *ext) static inline int llext_allocate_symtab(struct llext_loader *ldr, struct llext *ext)
{ {
int ret = 0; int ret = 0;
size_t syms_size = ldr->sym_cnt * sizeof(struct llext_symbol);
ext->sym_tab.syms = k_heap_alloc(&llext_heap, ldr->sym_cnt * sizeof(struct llext_symbol), ext->sym_tab.syms = k_heap_alloc(&llext_heap, syms_size,
K_NO_WAIT); K_NO_WAIT);
ext->sym_tab.sym_cnt = ldr->sym_cnt; ext->sym_tab.sym_cnt = ldr->sym_cnt;
memset(ext->sym_tab.syms, 0, ldr->sym_cnt * sizeof(struct llext_symbol)); memset(ext->sym_tab.syms, 0, ldr->sym_cnt * sizeof(struct llext_symbol));
ext->mem_size += syms_size;
return ret; return ret;
} }
@ -551,6 +554,7 @@ static int do_llext_load(struct llext_loader *ldr, struct llext *ext)
} }
memset(ldr->sect_map, 0, ldr->hdr.e_shnum*sizeof(uint32_t)); memset(ldr->sect_map, 0, ldr->hdr.e_shnum*sizeof(uint32_t));
ldr->sect_cnt = ldr->hdr.e_shnum; ldr->sect_cnt = ldr->hdr.e_shnum;
ext->mem_size += sect_map_sz;
LOG_DBG("Finding ELF tables..."); LOG_DBG("Finding ELF tables...");
ret = llext_find_tables(ldr); ret = llext_find_tables(ldr);