ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-12 12:18:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sel4: keep boot info in core's virt address space

Browse Source 
Issue #2044
This commit is contained in:
Alexander Boettcher
2016-07-12 17:41:41 +02:00
committed by Christian Helmuth
parent 4d10a28411
commit ad7748592a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
repos/base-sel4/src/core/platform.cc
View File

@ -170,14 +170,14 @@ void Platform::_init_allocators()
/* remove core image from core's virtual address allocator */ /* remove core image from core's virtual address allocator */
/* /*
* XXX Why do we need to skip a few KiB after the end of core? * XXX Why do we need to skip a page after the end of core?
* When allocating a PTE immediately after _prog_img_end, the * When allocating a PTE immediately after _prog_img_end, the
* kernel would complain "Mapping already present" on the * kernel would complain "Mapping already present" on the
* attempt to map a page frame. * attempt to map a page frame.
*/ */
addr_t const core_virt_beg = trunc_page((addr_t)&_prog_img_beg), addr_t const core_virt_beg = trunc_page((addr_t)&_prog_img_beg),
core_virt_end = round_page((addr_t)&_boot_modules_binaries_end) core_virt_end = round_page((addr_t)&_boot_modules_binaries_end)
+ 64*1024; + 4096;
size_t const core_size = core_virt_end - core_virt_beg; size_t const core_size = core_virt_end - core_virt_beg;
_core_mem_alloc.virt_alloc()->remove_range(core_virt_beg, core_size); _core_mem_alloc.virt_alloc()->remove_range(core_virt_beg, core_size);
@ -190,6 +190,12 @@ void Platform::_init_allocators()
Hex(core_size)); Hex(core_size));
} }
/* preserve sel4 boot info page in core's virtual address space */
addr_t const sel4_boot_info_page = reinterpret_cast<addr_t>(&bi);
_core_mem_alloc.virt_alloc()->remove_range(sel4_boot_info_page, 0x1000);
if (sel4_boot_info_page != core_virt_end)
warning("unexpected core binary layout");
/* preserve stack area in core's virtual address space */ /* preserve stack area in core's virtual address space */
_core_mem_alloc.virt_alloc()->remove_range(stack_area_virtual_base(), _core_mem_alloc.virt_alloc()->remove_range(stack_area_virtual_base(),
stack_area_virtual_size()); stack_area_virtual_size());