justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[boot] Don't use custom UEFI memory types

Browse Source 
The UEFI spec specifically calls out memory types with the high bit set
as being available for OS loaders' custom use. However, it seems many
UEFI firmware implementations don't handle this well. (Virtualbox, and
the firmware on my Intel NUC and Dell XPS laptop to name a few.)

So sadly since we can't rely on this feature of UEFI in all cases, we
can't use it at all. Instead, treat _all_ memory tagged as EfiLoaderData
as possibly containing data that's been passed to the OS by the
bootloader and don't free it yet.

This will need to be followed up with a change that copies anything we
need to save and frees this memory.

See: https://github.com/kiznit/rainbow-os/blob/master/boot/machine/efi/README.md
This commit is contained in:
Justin C. Miller
2021-01-08 22:40:30 -08:00
parent 61845b8761
commit 8dbdebff3f
7 changed files with 12 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/boot/memory.cpp
View File

@@ -39,19 +39,10 @@ static const wchar_t *memory_type_names[] = {
static const wchar_t *
memory_type_name(uefi::memory_type t)
{
if (t < uefi::memory_type::max_memory_type) {
if (t < uefi::memory_type::max_memory_type)
return memory_type_names[static_cast<uint32_t>(t)];
}
switch(t) {
/*
case args_type: return L"jsix kernel args";
case module_type: return L"jsix bootloader module";
case program_type: return L"jsix kernel or program code";
case table_type: return L"jsix page tables";
*/
default: return L"Bad Type Value";
}
return L"Bad Type Value";
}
void
@@ -141,7 +132,7 @@ build_kernel_mem_map(kernel::args::header *args, uefi::boot_services *bs)
try_or_raise(
bs->allocate_pages(
uefi::allocate_type::any_pages,
module_type,
uefi::memory_type::loader_data,
bytes_to_pages(map_size),
reinterpret_cast<void**>(&kernel_map)),
L"Error allocating kernel memory map module space");
@@ -166,13 +157,15 @@ build_kernel_mem_map(kernel::args::header *args, uefi::boot_services *bs)
continue;
case uefi::memory_type::loader_code:
case uefi::memory_type::loader_data:
case uefi::memory_type::boot_services_code:
case uefi::memory_type::boot_services_data:
case uefi::memory_type::conventional_memory:
type = mem_type::free;
break;
case uefi::memory_type::loader_data:
type = mem_type::pending;
case uefi::memory_type::runtime_services_code:
case uefi::memory_type::runtime_services_data:
type = mem_type::uefi_runtime;
@@ -191,24 +184,6 @@ build_kernel_mem_map(kernel::args::header *args, uefi::boot_services *bs)
type = mem_type::persistent;
break;
/*
case args_type:
type = mem_type::args;
break;
case module_type:
type = mem_type::module;
break;
case program_type:
type = mem_type::program;
break;
case table_type:
type = mem_type::table;
break;
*/
default:
error::raise(
uefi::status::invalid_parameter,