fix: spinlock

Signed-off-by: Zone.N <[email protected]>
MRNIU · Jan 7, 2025 · 27a5314 · 27a5314
1 parent 42c1eaa
commit 27a5314
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -25,27 +25,27 @@ repos:
       # - id: clang-tidy
       #   args:
       #     - --checks=.clang-tidy
-      #     - -p=/root/SimpleKernel/build_aarch64/compiler_commands.json
+      #     - -p=/root/SimpleKernel/build_riscv64/compiler_commands.json
       #     - -extra-arg=--std=c++2b
       #     - --fix
-      #     - --header-filter=^(/root/SimpleKernel/build_aarch64/src/).*
-          # - --exclude-header-filter=^(?/root/SimpleKernel/build_aarch64/src/arch/x86_64|/root/SimpleKernel/build_aarch64/src/arch/aarch64).*
+      #     - --header-filter=^(/root/SimpleKernel/build_riscv64/src/).*
+          # - --exclude-header-filter=^(?/root/SimpleKernel/build_riscv64/src/arch/x86_64|/root/SimpleKernel/build_riscv64/src/arch/aarch64).*
       # - id: clang-tidy
       #   args:
       #     - --checks=.clang-tidy
-      #     - -p=/root/SimpleKernel/build_aarch64/build_x86_64/compiler_commands.json
+      #     - -p=/root/SimpleKernel/build_riscv64/build_x86_64/compiler_commands.json
       #     - -extra-arg=--std=c++2b
       #     - --fix
-      #     - --header-filter=^(?/root/SimpleKernel/build_aarch64/src/).*
-      #     - --exclude-header-filter=^(?/root/SimpleKernel/build_aarch64/src/arch/riscv_64|/root/SimpleKernel/build_aarch64/src/arch/aarch64).*
+      #     - --header-filter=^(?/root/SimpleKernel/build_riscv64/src/).*
+      #     - --exclude-header-filter=^(?/root/SimpleKernel/build_riscv64/src/arch/riscv_64|/root/SimpleKernel/build_riscv64/src/arch/aarch64).*
       # - id: clang-tidy
       #   args:
       #     - --checks=.clang-tidy
-      #     - -p=/root/SimpleKernel/build_aarch64/build_aarch64/compiler_commands.json
+      #     - -p=/root/SimpleKernel/build_riscv64/build_aarch64/compiler_commands.json
       #     - -extra-arg=--std=c++2b
       #     - --fix
-      #     - --header-filter=^(?/root/SimpleKernel/build_aarch64/src/).*
-      #     - --exclude-header-filter=^(?/root/SimpleKernel/build_aarch64/src/arch/riscv64|/root/SimpleKernel/build_aarch64/src/arch/x86_64).*
+      #     - --header-filter=^(?/root/SimpleKernel/build_riscv64/src/).*
+      #     - --exclude-header-filter=^(?/root/SimpleKernel/build_riscv64/src/arch/riscv64|/root/SimpleKernel/build_riscv64/src/arch/x86_64).*
 
   - repo: https://github.com/koalaman/shellcheck-precommit
     rev: v0.10.0

diff --git a/src/kernel/arch/riscv64/arch_main.cpp b/src/kernel/arch/riscv64/arch_main.cpp
@@ -51,13 +51,9 @@ auto ArchInit(uint32_t argc, const uint8_t *argv) -> uint32_t {
   printf("boot hart id: %d\n", argc);
   printf("dtb info addr: %p\n", argv);
 
-  for (auto i = 0; i < 8; i++) {
-    g_per_cpu[i].core_id_ = SIZE_MAX;
-  }
-
   // 将 core id 保存到 tp 寄存器
   cpu_io::Tp::Write(argc);
-  g_per_cpu[argc].core_id_ = argc;
+  GetCurrentCore().core_id_ = argc;
 
   Singleton<KernelFdt>::GetInstance() =
       KernelFdt(reinterpret_cast<uint64_t>(argv));
@@ -99,8 +95,7 @@ auto ArchInit(uint32_t argc, const uint8_t *argv) -> uint32_t {
 
 auto ArchInitSMP(uint32_t argc, const uint8_t *) -> uint32_t {
   cpu_io::Tp::Write(argc);
-  g_per_cpu[argc].core_id_ = argc;
+  GetCurrentCore().core_id_ = argc;
   Singleton<BasicInfo>::GetInstance().core_count++;
-
   return 0;
 }
diff --git a/src/kernel/arch/x86_64/arch_main.cpp b/src/kernel/arch/x86_64/arch_main.cpp
@@ -56,7 +56,7 @@ auto ArchInit(uint32_t argc, const uint8_t *argv) -> uint32_t {
     throw;
   }
 
-  g_per_cpu[cpu_io::GetCurrentCoreId()].core_id_ = cpu_io::GetCurrentCoreId();
+  GetCurrentCore().core_id_ = cpu_io::GetCurrentCoreId();
 
   Singleton<BasicInfo>::GetInstance() = BasicInfo(argc, argv);
   Singleton<BasicInfo>::GetInstance().core_count++;

diff --git a/src/kernel/include/per_cpu.hpp b/src/kernel/include/per_cpu.hpp
@@ -17,6 +17,7 @@
 #ifndef SIMPLEKERNEL_SRC_KERNEL_INCLUDE_PER_CPU_HPP_
 #define SIMPLEKERNEL_SRC_KERNEL_INCLUDE_PER_CPU_HPP_
 
+#include <cpu_io.h>
 #include <unistd.h>
 
 #include <array>
@@ -25,6 +26,8 @@
 #include <cstdint>
 #include <cstdlib>
 
+#include "singleton.hpp"
+
 class PerCpu {
  public:
   /// 最大 CPU 数
@@ -55,6 +58,11 @@ class PerCpu {
 };
 
 /// per cpu 数据
-static std::array<PerCpu, PerCpu::kMaxCoreCount> g_per_cpu{};
+// static std::array<PerCpu, PerCpu::kMaxCoreCount> g_per_cpu{};
+
+static __always_inline auto GetCurrentCore() -> PerCpu & {
+  return Singleton<std::array<PerCpu, PerCpu::kMaxCoreCount>>::GetInstance()
+      [cpu_io::GetCurrentCoreId()];
+}
 
 #endif /* SIMPLEKERNEL_SRC_KERNEL_INCLUDE_PER_CPU_HPP_ */
diff --git a/src/kernel/include/spinlock.hpp b/src/kernel/include/spinlock.hpp
@@ -116,10 +116,10 @@ class SpinLock {
 
     DisableInterrupt();
 
-    if (g_per_cpu[GetCurrentCoreId()].noff_ == 0) {
-      g_per_cpu[GetCurrentCoreId()].intr_enable_ = old;
+    if (GetCurrentCore().noff_ == 0) {
+      GetCurrentCore().intr_enable_ = old;
     }
-    g_per_cpu[GetCurrentCoreId()].noff_ += 1;
+    GetCurrentCore().noff_ += 1;
   }
 
   /**
@@ -130,13 +130,12 @@ class SpinLock {
       printf("RestoreInterruptsNested - interruptible\n");
     }
 
-    if (g_per_cpu[GetCurrentCoreId()].noff_ < 1) {
+    if (GetCurrentCore().noff_ < 1) {
       printf("RestoreInterruptsNested\n");
     }
-    g_per_cpu[GetCurrentCoreId()].noff_ -= 1;
+    GetCurrentCore().noff_ -= 1;
 
-    if ((g_per_cpu[GetCurrentCoreId()].noff_ == 0) &&
-        (g_per_cpu[GetCurrentCoreId()].intr_enable_)) {
+    if ((GetCurrentCore().noff_ == 0) && (GetCurrentCore().intr_enable_)) {
       EnableInterrupt();
     }
   }

diff --git a/test/unit_test/spinlock_test.cpp b/test/unit_test/spinlock_test.cpp
@@ -24,8 +24,6 @@
 #include <thread>
 #include <vector>
 
-// static std::array<PerCpu, PerCpu::kMaxCoreCount> g_per_cpu{};
-
 class TestableSpinLock : public SpinLock {
  public:
   using SpinLock::SpinLock;