RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:58:12 +00:00
Code Issues Activity Actions

Kernel: Make map_bios() and map_ebda() fallible using ErrorOr

Browse source
This commit is contained in:
Idan Horowitz 2022-01-13 17:38:09 +02:00 • committed by Andreas Kling
parent ae5f5a4d50
commit e2e5d4da16
4 changed files with 48 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Kernel/Firmware/ACPI/Parser.cpp
View file

@ -384,21 +384,34 @@ static bool validate_table(const Structures::SDTHeader& v_header, size_t length)
// https://uefi.org/specs/ACPI/6.4/05_ACPI_Software_Programming_Model/ACPI_Software_Programming_Model.html#finding-the-rsdp-on-ia-pc-systems // https://uefi.org/specs/ACPI/6.4/05_ACPI_Software_Programming_Model/ACPI_Software_Programming_Model.html#finding-the-rsdp-on-ia-pc-systems
UNMAP_AFTER_INIT Optional<PhysicalAddress> StaticParsing::find_rsdp() UNMAP_AFTER_INIT Optional<PhysicalAddress> StaticParsing::find_rsdp()
{ {
StringView signature("RSD PTR "); static constexpr auto signature = "RSD PTR "sv;
auto rsdp = map_ebda().find_chunk_starting_with(signature, 16); auto ebda_or_error = map_ebda();
if (rsdp.has_value()) if (!ebda_or_error.is_error()) {
return rsdp; auto rsdp = ebda_or_error.value().find_chunk_starting_with(signature, 16);
rsdp = map_bios().find_chunk_starting_with(signature, 16); if (rsdp.has_value())
if (rsdp.has_value()) return rsdp;
return rsdp; }
auto bios_or_error = map_bios();
if (!bios_or_error.is_error()) {
auto rsdp = bios_or_error.value().find_chunk_starting_with(signature, 16);
if (rsdp.has_value())
return rsdp;
}
// On some systems the RSDP may be located in ACPI NVS or reclaimable memory regions // On some systems the RSDP may be located in ACPI NVS or reclaimable memory regions
Optional<PhysicalAddress> rsdp;
MM.for_each_physical_memory_range([&](auto& memory_range) { MM.for_each_physical_memory_range([&](auto& memory_range) {
if (!(memory_range.type == Memory::PhysicalMemoryRangeType::ACPI_NVS || memory_range.type == Memory::PhysicalMemoryRangeType::ACPI_Reclaimable)) if (!(memory_range.type == Memory::PhysicalMemoryRangeType::ACPI_NVS || memory_range.type == Memory::PhysicalMemoryRangeType::ACPI_Reclaimable))
return IterationDecision::Continue; return IterationDecision::Continue;
Memory::MappedROM mapping; Memory::MappedROM mapping;
mapping.region = MM.allocate_kernel_region(memory_range.start, Memory::page_round_up(memory_range.length).release_value_but_fixme_should_propagate_errors(), {}, Memory::Region::Access::Read).release_value(); auto region_size_or_error = Memory::page_round_up(memory_range.length);
if (region_size_or_error.is_error())
return IterationDecision::Continue;
auto region_or_error = MM.allocate_kernel_region(memory_range.start, region_size_or_error.value(), {}, Memory::Region::Access::Read);
if (region_or_error.is_error())
return IterationDecision::Continue;
mapping.region = region_or_error.release_value();
mapping.offset = memory_range.start.offset_in_page(); mapping.offset = memory_range.start.offset_in_page();
mapping.size = memory_range.length; mapping.size = memory_range.length;
mapping.paddr = memory_range.start; mapping.paddr = memory_range.start;

20
Kernel/Firmware/BIOS.cpp
View file

@ -143,24 +143,31 @@ UNMAP_AFTER_INIT BIOSSysFSDirectory::BIOSSysFSDirectory(FirmwareSysFSDirectory&
UNMAP_AFTER_INIT Optional<PhysicalAddress> BIOSSysFSDirectory::find_dmi_entry64bit_point() UNMAP_AFTER_INIT Optional<PhysicalAddress> BIOSSysFSDirectory::find_dmi_entry64bit_point()
{ {
return map_bios().find_chunk_starting_with("_SM3_", 16); auto bios_or_error = map_bios();
if (bios_or_error.is_error())
return {};
return bios_or_error.value().find_chunk_starting_with("_SM3_", 16);
} }
UNMAP_AFTER_INIT Optional<PhysicalAddress> BIOSSysFSDirectory::find_dmi_entry32bit_point() UNMAP_AFTER_INIT Optional<PhysicalAddress> BIOSSysFSDirectory::find_dmi_entry32bit_point()
{ {
return map_bios().find_chunk_starting_with("_SM_", 16); auto bios_or_error = map_bios();
if (bios_or_error.is_error())
return {};
return bios_or_error.value().find_chunk_starting_with("_SM_", 16);
} }
Memory::MappedROM map_bios() ErrorOr<Memory::MappedROM> map_bios()
{ {
Memory::MappedROM mapping; Memory::MappedROM mapping;
mapping.size = 128 * KiB; mapping.size = 128 * KiB;
mapping.paddr = PhysicalAddress(0xe0000); mapping.paddr = PhysicalAddress(0xe0000);
mapping.region = MM.allocate_kernel_region(mapping.paddr, Memory::page_round_up(mapping.size).release_value_but_fixme_should_propagate_errors(), {}, Memory::Region::Access::Read).release_value(); auto region_size = TRY(Memory::page_round_up(mapping.size));
mapping.region = TRY(MM.allocate_kernel_region(mapping.paddr, region_size, {}, Memory::Region::Access::Read));
return mapping; return mapping;
} }
Memory::MappedROM map_ebda() ErrorOr<Memory::MappedROM> map_ebda()
{ {
auto ebda_segment_ptr = Memory::map_typed<u16>(PhysicalAddress(0x40e)); auto ebda_segment_ptr = Memory::map_typed<u16>(PhysicalAddress(0x40e));
PhysicalAddress ebda_paddr(PhysicalAddress(*ebda_segment_ptr).get() << 4); PhysicalAddress ebda_paddr(PhysicalAddress(*ebda_segment_ptr).get() << 4);
@ -169,7 +176,8 @@ Memory::MappedROM map_ebda()
ebda_size *= 1024; ebda_size *= 1024;
Memory::MappedROM mapping; Memory::MappedROM mapping;
mapping.region = MM.allocate_kernel_region(ebda_paddr.page_base(), Memory::page_round_up(ebda_size).release_value_but_fixme_should_propagate_errors(), {}, Memory::Region::Access::Read).release_value(); auto region_size = TRY(Memory::page_round_up(ebda_size));
mapping.region = TRY(MM.allocate_kernel_region(ebda_paddr.page_base(), region_size, {}, Memory::Region::Access::Read));
mapping.offset = ebda_paddr.offset_in_page(); mapping.offset = ebda_paddr.offset_in_page();
mapping.size = ebda_size; mapping.size = ebda_size;
mapping.paddr = ebda_paddr; mapping.paddr = ebda_paddr;

4
Kernel/Firmware/BIOS.h
View file

@ -57,8 +57,8 @@ struct [[gnu::packed]] EntryPoint64bit {
namespace Kernel { namespace Kernel {
Memory::MappedROM map_bios(); ErrorOr<Memory::MappedROM> map_bios();
Memory::MappedROM map_ebda(); ErrorOr<Memory::MappedROM> map_ebda();
class BIOSSysFSComponent : public SysFSComponent { class BIOSSysFSComponent : public SysFSComponent {
public: public:

16
Kernel/Firmware/MultiProcessor/Parser.cpp
View file

@ -86,11 +86,17 @@ UNMAP_AFTER_INIT void MultiProcessorParser::parse_configuration_table()
UNMAP_AFTER_INIT Optional<PhysicalAddress> MultiProcessorParser::find_floating_pointer() UNMAP_AFTER_INIT Optional<PhysicalAddress> MultiProcessorParser::find_floating_pointer()
{ {
StringView signature("_MP_"); static constexpr auto signature = "_MP_"sv;
auto mp_floating_pointer = map_ebda().find_chunk_starting_with(signature, 16); auto ebda_or_error = map_ebda();
if (mp_floating_pointer.has_value()) if (!ebda_or_error.is_error()) {
return mp_floating_pointer; auto mp_floating_pointer = ebda_or_error.value().find_chunk_starting_with(signature, 16);
return map_bios().find_chunk_starting_with(signature, 16); if (mp_floating_pointer.has_value())
return mp_floating_pointer;
}
auto bios_or_error = map_bios();
if (bios_or_error.is_error())
return {};
return bios_or_error.value().find_chunk_starting_with(signature, 16);
} }
UNMAP_AFTER_INIT Vector<u8> MultiProcessorParser::get_pci_bus_ids() const UNMAP_AFTER_INIT Vector<u8> MultiProcessorParser::get_pci_bus_ids() const