RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 21:37:35 +00:00
Code Issues Activity Actions

Kernel: Separate panic behavior from bootmode

Browse source 
Bootmode used to control panic behavior and SystemServer.
This patch factors panic behavior control into a separate flag.
This commit is contained in:
Ben Wiederhake 2021-10-23 17:31:00 +02:00 • committed by Andreas Kling
parent 542a88a7be
commit 09432a8241
8 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Kernel/CommandLine.cpp
View file

@ -38,8 +38,9 @@ UNMAP_AFTER_INIT void CommandLine::initialize()
VERIFY(!s_the);
s_the = new CommandLine(s_cmd_line);
dmesgln("Kernel Commandline: {}", kernel_command_line().string());
// Validate the boot mode the user passed in.
// Validate the modes the user passed in.
(void)s_the->boot_mode(Validate::Yes);
(void)s_the->panic_mode(Validate::Yes);
}
UNMAP_AFTER_INIT void CommandLine::build_commandline(const String& cmdline_from_bootloader)
@ -214,6 +215,21 @@ BootMode CommandLine::boot_mode(Validate should_validate) const
return BootMode::Unknown;
}
PanicMode CommandLine::panic_mode(Validate should_validate) const
{
const auto panic_mode = lookup("panic"sv).value_or("halt"sv);
if (panic_mode == "halt"sv) {
return PanicMode::Halt;
} else if (panic_mode == "shutdown"sv) {
return PanicMode::Shutdown;
}
if (should_validate == Validate::Yes)
PANIC("Unknown PanicMode: {}", panic_mode);
return PanicMode::Halt;
}
UNMAP_AFTER_INIT bool CommandLine::are_framebuffer_devices_enabled() const
{
return lookup("fbdev"sv).value_or("on"sv) == "on"sv;

6
Kernel/CommandLine.h
View file

@ -22,6 +22,11 @@ enum class BootMode {
Unknown,
};
enum class PanicMode {
Halt,
Shutdown,
};
enum class HPETMode {
Periodic,
NonPeriodic
@ -70,6 +75,7 @@ public:
[[nodiscard]] bool is_force_pio() const;
[[nodiscard]] AcpiFeatureLevel acpi_feature_level() const;
[[nodiscard]] BootMode boot_mode(Validate should_validate = Validate::No) const;
[[nodiscard]] PanicMode panic_mode(Validate should_validate = Validate::No) const;
[[nodiscard]] HPETMode hpet_mode() const;
[[nodiscard]] bool disable_physical_storage() const;
[[nodiscard]] bool disable_ps2_controller() const;

8
Kernel/Panic.cpp
View file

@ -33,9 +33,13 @@ void __panic(const char* file, unsigned int line, const char* function)
critical_dmesgln("at {}:{} in {}", file, line, function);
dump_backtrace(PrintToScreen::Yes);
if (kernel_command_line().boot_mode() == BootMode::SelfTest)
switch (kernel_command_line().panic_mode()) {
case PanicMode::Shutdown:
__shutdown();
else
case PanicMode::Halt:
[[fallthrough]];
default:
Processor::halt();
}
}
}