diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-05-15 23:50:06 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-05-15 23:50:59 +0200 |
| commit | b55f22d6a4f85751e0054dbf17eefe438a21b048 (patch) | |
| tree | deca3167de5d4cc146ebbfb97b8007a22575c3cc /dev/kernel/HALKit/AMD64 | |
| parent | 2e7e91648ac419086686910e4b8b124041e14edf (diff) | |
feat(kernel/sched): fixes and improvements on the scheduler's
implementation.
why?
- The previous one wasn't entierly correct on some parts.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel/HALKit/AMD64')
| -rw-r--r-- | dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc | 35 | ||||
| -rw-r--r-- | dev/kernel/HALKit/AMD64/HalInterruptAPI.asm | 10 | ||||
| -rw-r--r-- | dev/kernel/HALKit/AMD64/HalKernelMain.cc | 6 |
3 files changed, 18 insertions, 33 deletions
diff --git a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc index 2c2bf5ff..ff283141 100644 --- a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc +++ b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc @@ -9,16 +9,12 @@ #include <NewKit/KString.h> #include <SignalKit/Signals.h> -STATIC BOOL kIsScheduling = NO; - EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip); /// @brief Handle GPF fault. /// @param rsp EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - - kIsScheduling = NO; + auto& process = Kernel::UserProcessScheduler::The().CurrentProcess(); Kernel::kout << "Kernel: General Protection Fault.\r"; @@ -36,9 +32,7 @@ EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) { /// @brief Handle page fault. /// @param rsp EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - - kIsScheduling = NO; + auto& process = Kernel::UserProcessScheduler::The().CurrentProcess(); Kernel::kout << "Kernel: Page Fault.\r"; Kernel::kout << "Kernel: SIGKILL\r"; @@ -55,20 +49,13 @@ EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) { /// @brief Handle scheduler interrupt. EXTERN_C void idt_handle_scheduler(Kernel::UIntPtr rsp) { NE_UNUSED(rsp); - - Kernel::kout << "Kernel: Scheduler interrupt.\r"; - - kIsScheduling = YES; Kernel::UserProcessHelper::StartScheduling(); - kIsScheduling = NO; } /// @brief Handle math fault. /// @param rsp EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - - kIsScheduling = NO; + auto& process = Kernel::UserProcessScheduler::The().CurrentProcess(); Kernel::kout << "Kernel: Math error (division by zero?).\r"; @@ -86,11 +73,10 @@ EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) { /// @brief Handle any generic fault. /// @param rsp EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - - kIsScheduling = NO; + auto& process = Kernel::UserProcessScheduler::The().CurrentProcess(); - Kernel::kout << "Kernel: Generic Process Fault.\r"; + (Void)(Kernel::kout << "Kernel: Process RSP: " << Kernel::hex_number(rsp) << Kernel::kendl); + Kernel::kout << "Kernel: Access Process Fault.\r"; process.Leak().Signal.SignalArg = rsp; process.Leak().Signal.SignalID = SIGKILL; @@ -104,11 +90,10 @@ EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) { } EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - - kIsScheduling = NO; + auto& process = Kernel::UserProcessScheduler::The().CurrentProcess(); (Void)(Kernel::kout << "Kernel: Process RIP: " << Kernel::hex_number(rip) << Kernel::kendl); + Kernel::kout << "Kernel: SIGTRAP\r"; process.Leak().Signal.SignalArg = rip; @@ -124,9 +109,9 @@ EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) { /// @brief Handle #UD fault. /// @param rsp EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + NE_UNUSED(rsp); - kIsScheduling = NO; + auto& process = Kernel::UserProcessScheduler::The().CurrentProcess(); Kernel::kout << "Kernel: Undefined Opcode.\r"; diff --git a/dev/kernel/HALKit/AMD64/HalInterruptAPI.asm b/dev/kernel/HALKit/AMD64/HalInterruptAPI.asm index 60a20b77..189b2976 100644 --- a/dev/kernel/HALKit/AMD64/HalInterruptAPI.asm +++ b/dev/kernel/HALKit/AMD64/HalInterruptAPI.asm @@ -164,7 +164,6 @@ __NE_INT_8: cld mov al, 0x20 - out 0xA0, al out 0x20, al push rcx @@ -185,7 +184,6 @@ __NE_INT_13: cld mov al, 0x20 - out 0xA0, al out 0x20, al push rcx @@ -200,7 +198,6 @@ __NE_INT_14: cld mov al, 0x20 - out 0xA0, al out 0x20, al push rcx @@ -235,13 +232,16 @@ IntNormal 31 [extern kApicBaseAddress] __NE_INT_32: + mov al, 0x20 + out 0x20, al + + mov dword [kApicBaseAddress+0xB0], 0 + push rax mov rcx, rsp call idt_handle_scheduler pop rax - mov dword [kApicBaseAddress+0xB0], 0 - o64 iret IntNormal 33 diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index 722c9cb5..b7ff3038 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -106,9 +106,9 @@ EXTERN_C Int32 hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) { EXTERN_C void rtl_ne_task(void); EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept { - Kernel::rtl_create_user_process(rtl_ne_task, "NeTask"); - Kernel::rtl_create_user_process(rtl_ne_task, "NeTask#2"); - Kernel::rtl_create_user_process(rtl_ne_task, "NeTask#3"); + Kernel::rtl_create_user_process(rtl_ne_task, "MGMTCTL"); + Kernel::rtl_create_user_process(rtl_ne_task, "LAUNCHCTL"); + Kernel::rtl_create_user_process(rtl_ne_task, "SECURITYCTL"); Kernel::HAL::Register64 idt_reg; idt_reg.Base = reinterpret_cast<Kernel::UIntPtr>(kInterruptVectorTable); |
