feat(kernel, sched): Architectural improvements, and cleaned up

the codebase from previous implementations that didn't work/scale well.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

4 files changed, 55 insertions, 88 deletions

diff --git a/dev/kernel/HALKit/ARM64/ApplicationProcessor.h b/dev/kernel/HALKit/ARM64/ApplicationProcessor.h
index 75f4eb07..06a8e2a8 100644
--- a/dev/kernel/HALKit/ARM64/ApplicationProcessor.h
+++ b/dev/kernel/HALKit/ARM64/ApplicationProcessor.h
@@ -15,5 +15,5 @@
 /************************************************** */
 
 namespace Kernel {
-BOOL mp_initialize_gic(Kernel::Void);
+Void mp_init_cores(Void) noexcept;
 }
\ No newline at end of file
diff --git a/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc b/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
index a89702ea..d37a3e54 100644
--- a/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
+++ b/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
@@ -7,7 +7,9 @@
 #include <HALKit/ARM64/ApplicationProcessor.h>

 #include <HALKit/ARM64/Processor.h>

 #include <KernelKit/DebugOutput.h>

+#include <KernelKit/HardwareThreadScheduler.h>

 #include <KernelKit/ProcessScheduler.h>

+#include <KernelKit/Timer.h>

 

 #define GICD_BASE 0x08000000  // Distributor base address

 #define GICC_BASE 0x08010000  // CPU interface base address

@@ -29,11 +31,12 @@
 // ================================================================= //

 

 namespace Kernel {

-struct PROCESS_CONTROL_BLOCK final {

+struct HAL_HARDWARE_THREAD final {

   HAL::StackFramePtr mFrame;

+  ProcessID          mThreadID{0};

 };

 

-STATIC PROCESS_CONTROL_BLOCK kProcessBlocks[kSchedProcessLimitPerTeam] = {0};

+STATIC HAL_HARDWARE_THREAD kHWThread[kMaxAPInsideSched] = {{nullptr}};

 

 namespace Detail {

   STATIC BOOL kGICEnabled = NO;

@@ -86,7 +89,7 @@ namespace Detail {
 

       const UInt16 kInterruptScheduler = 0x20;

 

-      (Void)(kout << "Handling interrupt for AP: " << interrupt << kendl);

+      (Void)(kout << "SMP: AP: " << hex_number(interrupt) << kendl);

 

       switch (interrupt) {

         case kInterruptScheduler: {

@@ -108,23 +111,32 @@ namespace Detail {
   }

 }  // namespace Detail

 

-EXTERN_C HAL::StackFramePtr mp_get_current_context(ProcessID pid) {

-  return kProcessBlocks[pid % kSchedProcessLimitPerTeam].mFrame;

+EXTERN_C HAL::StackFramePtr mp_get_current_context(ProcessID thrdid) {

+  return kHWThread[thrdid].mFrame;

 }

 

-EXTERN_C Bool mp_register_process(HAL::StackFramePtr stack_frame, ProcessID pid) {

-  MUST_PASS(stack_frame);

+EXTERN_C Bool mp_register_process(HAL::StackFramePtr stack_frame, ProcessID thrdid) {

+  MUST_PASS(Detail::kGICEnabled);

 

-  const auto process_index = pid % kSchedProcessLimitPerTeam;

+  if (!stack_frame) return NO;

+  if (thrdid > kMaxAPInsideSched) return NO;

 

-  kProcessBlocks[process_index].mFrame = stack_frame;

+  const auto process_index = thrdid;

+

+  kHWThread[process_index].mFrame    = stack_frame;

+  kHWThread[process_index].mThreadID = thrdid;

+

+  STATIC HardwareTimer timer{rtl_milliseconds(1000)};

+  timer.Wait();

+

+  HardwareThreadScheduler::The()[thrdid].Leak()->Busy(NO);

 

   return YES;

 }

 

 /// @internal

 /// @brief Initialize the Global Interrupt Controller.

-BOOL mp_initialize_gic(Void) {

+Void mp_init_cores(Void) noexcept {

   if (!Detail::kGICEnabled) {

     Detail::kGICEnabled = YES;

     Detail::mp_setup_gic_el0();

diff --git a/dev/kernel/HALKit/ARM64/HalKernelMain.cc b/dev/kernel/HALKit/ARM64/HalKernelMain.cc
index bf5849ef..c92b12cd 100644
--- a/dev/kernel/HALKit/ARM64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/ARM64/HalKernelMain.cc
@@ -7,9 +7,11 @@
 #include <ArchKit/ArchKit.h>
 #include <CFKit/Property.h>
 #include <FirmwareKit/Handover.h>
+#include <HALKit/ARM64/ApplicationProcessor.h>
 #include <HALKit/ARM64/Processor.h>
 #include <KernelKit/CodeMgr.h>
 #include <KernelKit/FileMgr.h>
+#include <KernelKit/HardwareThreadScheduler.h>
 #include <KernelKit/MemoryMgr.h>
 #include <KernelKit/PEFCodeMgr.h>
 #include <KernelKit/ProcessScheduler.h>
@@ -18,9 +20,10 @@
 #include <modules/ACPI/ACPIFactoryInterface.h>
 #include <modules/CoreGfx/CoreGfx.h>
 
-#include <HALKit/ARM64/ApplicationProcessor.h>
-
+#ifndef __NE_MODULAR_KERNEL_COMPONENTS__
 EXTERN_C void hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) {
+  using namespace Kernel;
+
   /************************************************** */
   /*     INITIALIZE AND VALIDATE HEADER.              */
   /************************************************** */
@@ -32,6 +35,15 @@ EXTERN_C void hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) {
     return;
   }
 
+  FB::fb_clear_video();
+
+#ifdef __NE_ARM64_EFI__
+  fw_init_efi((EfiSystemTable*) handover_hdr->f_FirmwareCustomTables[1]);
+
+  Boot::ExitBootServices(handover_hdr->f_HardwareTables.f_ImageKey,
+                         handover_hdr->f_HardwareTables.f_ImageHandle);
+#endif
+
   /************************************** */
   /*     INITIALIZE BIT MAP.              */
   /************************************** */
@@ -42,31 +54,24 @@ EXTERN_C void hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) {
 
   /// @note do initialize the interrupts after it.
 
-  Kernel::mp_initialize_gic();
-
-  /// after the scheduler runs, we must look over teams, every 5000s in order to schedule every
-  /// process according to their affinity fairly.
-
-  auto constexpr kSchedTeamSwitchMS = 5U;  /// @brief Team switch time in milliseconds.
-
-  Kernel::HardwareTimer timer(rtl_milliseconds(kSchedTeamSwitchMS));
-
-  STATIC Kernel::Array<UserProcessTeam, kSchedTeamCount> kTeams;
-
-  SizeT team_index = 0U;
+  for (SizeT index = 0UL; index < HardwareThreadScheduler::The().Capacity(); ++index) {
+    HardwareThreadScheduler::The()[index].Leak()->Kind() = ThreadKind::kAPStandard;
+    HardwareThreadScheduler::The()[index].Leak()->Busy(NO);
+  }
 
-  /// @brief This just loops over the teams and switches between them.
-  /// @details Not even round-robin, just a simple loop in this boot core we're at.
-  while (YES) {
-    if (team_index > (kSchedTeamCount - 1)) {
-      team_index = 0U;
-    }
+  for (SizeT index = 0UL; index < UserProcessScheduler::The().TheCurrentTeam().AsArray().Count();
+       ++index) {
+    UserProcessScheduler::The().TheCurrentTeam().AsArray()[index].Status =
+        ProcessStatusKind::kInvalid;
+  }
 
-    while (!UserProcessScheduler::The().SwitchTeam(kTeams[team_index]))
-      ;
+  rtl_create_user_process(sched_idle_task, "MgmtSrv");    //! Mgmt command server.
+  rtl_create_user_process(sched_idle_task, "LaunchSrv");  //! launchd
+  rtl_create_user_process(sched_idle_task, "SecSrv");     //! Login Server
 
-    timer.Wait();
+  Kernel::mp_init_cores();
 
-    ++team_index;
-  }
+  while (YES)
+    ;
 }
+#endif
\ No newline at end of file
diff --git a/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc b/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc
index e0b67489..faad6778 100644
--- a/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc
+++ b/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc
@@ -13,65 +13,15 @@
 namespace Kernel::HAL {
 typedef UInt32 PageTableIndex;
 
-/// \brief Page store type.
-struct NE_PAGE_STORE final {
-  struct {
-    PDE*    fPde{nullptr};
-    PTE*    fPte{nullptr};
-    VoidPtr fVAddr{nullptr};
-  } fInternalStore;
-
-  Bool fStoreOp{No};  // Store operation in progress.
-
-  static NE_PAGE_STORE& The() {
-    static NE_PAGE_STORE the;
-    return the;
-  }
-};
-
-/// \brief Retrieve the page status of a PTE.
-STATIC Void mmi_page_status(PTE* pte) {
-  NE_UNUSED(pte);
-}
-
-STATIC Int32 mmi_map_page_table_entry(VoidPtr virtual_address, UInt32 flags, PTE* pt_entry);
-
 /// @brief Maps or allocates a page from virtual_address.
 /// @param virtual_address a valid virtual address.
 /// @param phys_addr point to physical address.
 /// @param flags the flags to put on the page.
 /// @return Status code of page manipulation process.
 EXTERN_C Int32 mm_map_page(VoidPtr virtual_address, VoidPtr physical_address, UInt32 flags) {
-  if (!virtual_address || !flags) return kErrorSuccess;
-
-  NE_PAGE_STORE& page_store = NE_PAGE_STORE::The();
-
-  while (page_store.fStoreOp)
-    ;
-
-  page_store.fStoreOp = Yes;
-
-  if (page_store.fInternalStore.fVAddr == virtual_address) {
-    page_store.fStoreOp = No;
-    return mmi_map_page_table_entry(page_store.fInternalStore.fVAddr, flags,
-                                    page_store.fInternalStore.fPte);
-  }
-
-  return kErrorSuccess;
-}
-
-/// @brief Maps flags for a specific pte.
-/// @internal Internal function.
-STATIC Int32 mmi_map_page_table_entry(VoidPtr virtual_address, UInt32 flags, PTE* pt_entry) {
-  NE_PAGE_STORE& page_store = NE_PAGE_STORE::The();
-
-  // Update internal store, and tlbi the virtual address.
-
-  page_store.fInternalStore.fPde   = nullptr;
-  page_store.fInternalStore.fPte   = pt_entry;
-  page_store.fInternalStore.fVAddr = virtual_address;
+  if (!virtual_address || !flags) return kErrorInvalidData;
 
-  page_store.fStoreOp = No;
+  NE_UNUSED(physical_address);
 
   return kErrorSuccess;
 }