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

Kernel: Change the BSP Processor instance to not have a constructor

Browse source 
This solves a problem where any non-trivial member in the global BSP
Processor instance would get re-initialized (improperly), losing data
that was already initialized earlier.
This commit is contained in:
Tom 2022-03-27 12:48:51 +01:00 • committed by Andreas Kling
parent 22308e52cf
commit c2f6152db8
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Kernel/init.cpp
View file

@ -100,7 +100,13 @@ READONLY_AFTER_INIT VirtualConsole* tty0;
ProcessID g_init_pid { 0 }; ProcessID g_init_pid { 0 };
static Processor s_bsp_processor; // global but let's keep it "private" ALWAYS_INLINE static Processor& bsp_processor()
{
// This solves a problem where the bsp Processor instance
// gets "re"-initialized in init() when we run all global constructors.
alignas(Processor) static u8 bsp_processor_storage[sizeof(Processor)];
return (Processor&)bsp_processor_storage;
}
// SerenityOS Kernel C++ entry point :^) // SerenityOS Kernel C++ entry point :^)
// //
@ -179,7 +185,9 @@ extern "C" [[noreturn]] UNMAP_AFTER_INIT void init(BootInfo const& boot_info)
CommandLine::early_initialize(kernel_cmdline); CommandLine::early_initialize(kernel_cmdline);
memcpy(multiboot_copy_boot_modules_array, multiboot_modules, multiboot_modules_count * sizeof(multiboot_module_entry_t)); memcpy(multiboot_copy_boot_modules_array, multiboot_modules, multiboot_modules_count * sizeof(multiboot_module_entry_t));
multiboot_copy_boot_modules_count = multiboot_modules_count; multiboot_copy_boot_modules_count = multiboot_modules_count;
s_bsp_processor.early_initialize(0);
new (&bsp_processor()) Processor();
bsp_processor().early_initialize(0);
// Invoke the constructors needed for the kernel heap // Invoke the constructors needed for the kernel heap
for (ctor_func_t* ctor = start_heap_ctors; ctor < end_heap_ctors; ctor++) for (ctor_func_t* ctor = start_heap_ctors; ctor < end_heap_ctors; ctor++)
@ -188,7 +196,7 @@ extern "C" [[noreturn]] UNMAP_AFTER_INIT void init(BootInfo const& boot_info)
load_kernel_symbol_table(); load_kernel_symbol_table();
s_bsp_processor.initialize(0); bsp_processor().initialize(0);
CommandLine::initialize(); CommandLine::initialize();
Memory::MemoryManager::initialize(0); Memory::MemoryManager::initialize(0);