From 5e004e21c8804573ea86f470a9a47d5353806848 Mon Sep 17 00:00:00 2001 From: Miguel Silva Date: Wed, 27 Nov 2024 11:44:24 +0000 Subject: [PATCH] fix(extra_mem): Correct the bitmap_base for MMU systems In mmu-based systems, the vm_image_size is already encompassed in the image_size. Signed-off-by: Miguel Silva --- src/core/mem.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/mem.c b/src/core/mem.c index 5903eaad4..f0f554fd0 100644 --- a/src/core/mem.c +++ b/src/core/mem.c @@ -147,7 +147,12 @@ static bool root_pool_set_up_bitmap(paddr_t load_addr, struct page_pool* root_po if (root_pool->size <= bitmap_num_pages) { return false; } + +#ifdef MEM_PROT_MMU size_t bitmap_base = load_addr + image_size + vm_image_size + cpu_size; +#else + size_t bitmap_base = load_addr + image_size + cpu_size; +#endif struct ppages bitmap_pp = mem_ppages_get(bitmap_base, bitmap_num_pages); bitmap_t* root_bitmap = (bitmap_t*)mem_alloc_map(&cpu()->as, SEC_HYP_GLOBAL, &bitmap_pp,