修复 riscv64 因 AP CPU 栈异常问题导致无法加载 cpio.

Author: xiaoyi1212

src/arch/riscv64/include/nr.h

@@ -11,3 +11,5 @@ typedef uint64_t (*syscall_t)(
     uint64_t arg6,
     struct pt_regs *regs
 );
+
+

src/arch/riscv64/initrd.c

@@ -8,13 +8,18 @@ extern uint64_t fdt_get_initrd(const void *fdt, size_t *out_size);
 extern void *opensbi_dtb_vaddr;
 extern boot_module_t opensbi_modules[MAX_LOAD_MODULE];
 
+static _Atomic(bool) has_initrd = false;
+
+bool is_initrd() {
+    return has_initrd;
+}
+
 void initrd_setup() {
     size_t size;
-    uint64_t buffer = fdt_get_initrd(opensbi_dtb_vaddr, &size);
+    const uint64_t buffer = fdt_get_initrd(opensbi_dtb_vaddr, &size);
     if (buffer == 0) {
         kerror("cannot find initrd file.");
-        arch_close_interrupt();
-        arch_wait_for_interrupt();
+        return;
     }
     opensbi_modules[0].size = size;
     opensbi_modules[0].data = phys_to_virt(buffer);
@@ -24,4 +29,5 @@ void initrd_setup() {
 
     strcpy(opensbi_modules[0].name, "initramfs");
     strcpy(opensbi_modules[0].path, "/initramfs.img");
+    has_initrd = true;
 }

src/arch/riscv64/main.c

@@ -26,6 +26,7 @@
 
 extern void arch_cpu_init();
 extern void initrd_setup();
+extern bool is_initrd();
 
 USED _Noreturn void kmain() {
     size_t boot_argc = boot_parse_cmdline(get_kernel_cmdline());
@@ -58,13 +59,16 @@ USED _Noreturn void kmain() {
     futex_init();
     setup_task();
     smp_init();
-    // cpio_init();
+    if (is_initrd()) {
+        cpio_init();
+    }
     ksuccess("Kernel load done!");
     scheduler_enable();
     arch_open_interrupt();
 
     // launch_init_process();
 
-    while (true)
+    while (true) {
         arch_wait_for_interrupt();
-}
+    }
+}

src/arch/riscv64/task/smp_rv64.c

@@ -108,7 +108,7 @@ void smp_cpu_init(uint64_t *cpu_count0, uint64_t *bsp_cpu_id, cpu_local_t *cpu_l
                 uint64_t cpu_id          = cpu_count++;
                 cpuid_to_hartids[cpu_id] = hartid;
 
-                apu_arg[cpu_id].sp = (uint64_t)aligned_alloc(PAGE_SIZE, 32768);
+                apu_arg[cpu_id].sp = (uint64_t)aligned_alloc(PAGE_SIZE, STACK_SIZE) + STACK_SIZE;
                 apu_arg[cpu_id].satp =
                     MAKE_SATP_PADDR(SATP_MODE_SV48, 0, virt_to_phys(get_kernel_pagedir()->table));
                 uint64_t rv = sbi_ecall(

src/include/task/smp.h

@@ -28,7 +28,7 @@ typedef struct cpu_local_info {
 #if defined(__x86_64__) || defined(__amd64__)
 bool x2apic_mode_supported();
 #endif
-void arch_ap_cpu_entry();
+void arch_ap_cpu_entry(uint64_t hartid);
 cpu_local_t *get_min_task_count_cpu();
 cpu_local_t *get_cpu_local(size_t id);
 uint64_t get_bsp_cpu_id();