解决 riscv64 多任务未重写内核进程获取接口的问题.

Author: xiaoyi1212

src/arch/loongarch64/task/smp_la64.c

@@ -1,8 +1,6 @@
 #include "smp_la64.h"
 #include "task/smp.h"
 
-int nr_cpu = 256;
-
 cpu_local_t *arch_current_cpu() {
     return NULL;
 }
@@ -11,4 +9,4 @@ void arch_bsp_cpu_init() {
 }
 
 void smp_cpu_init(uint64_t *cpu_count0, uint64_t *bsp_cpu_id, cpu_local_t *cpu_local_infos) {
-}
+}

src/arch/riscv64/task/smp_rv64.c

@@ -13,7 +13,6 @@
 #define EARLY_MAP_BASE 0x80000000
 #define EARLY_MAP_END  0x88000000
 
-int nr_cpu = 256;
 uint64_t cpuid_to_hartids[MAX_CPU];
 atomic_t started_cpu_count;
 extern uint64_t bsp_hart_id;
@@ -22,9 +21,6 @@ extern uintptr_t smp_entry;
 extern void arch_cpu_init();
 extern cpu_local_t cpu_local_infos[MAX_CPU];
 
-extern pcb_t kernel_process;
-extern tcb_t bsp_idle_thread;
-
 uint64_t hartid_to_cpuid(uint64_t hartid) {
     for (size_t i = 0; i < MAX_CPU; ++i) {
         if (cpuid_to_hartids[i] == hartid) {
@@ -52,9 +48,9 @@ _Noreturn void arch_ap_cpu_entry(uint64_t hartid) {
     __asm__ volatile("mv tp, %0\n\t" ::"r"(&cpu_local_infos[cpuid]));
 
     tcb_t idle_thread     = malloc(STACK_SIZE);
-    idle_thread->process  = kernel_process;
+    idle_thread->process  = get_kernel_process();
     idle_thread->tid      = alloc_tid();
-    idle_thread->ct_index = cow_list_add(kernel_process->child_threads, idle_thread);
+    idle_thread->ct_index = cow_list_add(get_kernel_process()->child_threads, idle_thread);
     idle_thread->status   = T_RUNNING;
     scheduler_set_cpu_idle(idle_thread, arch_current_cpu());
     arch_context_init(idle_thread, &idle_thread->context);
@@ -126,7 +122,6 @@ void smp_cpu_init(uint64_t *cpu_count0, uint64_t *bsp_cpu_id, cpu_local_t *cpu_l
                     0
                 );
                 (void)rv;
-                continue;
             }
         }
     }

src/include/mem/buddy.h

@@ -190,7 +190,6 @@ extern uint64_t max_pfn;
 extern uint64_t min_pfn;
 extern zone_t *zones[__MAX_NR_ZONES];
 extern int nr_zones;
-extern int nr_cpu;
 
 // 获取页面所属的 zone
 #define page_zone(page) (zones[(page)->zone_id])

src/mem/buddy.c

@@ -68,12 +68,13 @@ bool zone_has_memory(zone_t *zone) {
 
 // GFP 标志到首选 zone 的映射
 static enum zone_type gfp_zone(uint32_t gfp_flags) {
-#if defined(__x86_64__)
+#ifdef __x86_64__
     if (gfp_flags & GFP_DMA)
         return ZONE_DMA;
 #endif
-    if (gfp_flags & GFP_DMA32)
+    if (gfp_flags & GFP_DMA32) {
         return ZONE_DMA32;
+    }
     return ZONE_NORMAL;
 }
 
@@ -585,10 +586,11 @@ void percpu_pagecache_init() {
 void drain_all_pages(void) {
     for (int i = 0; i < __MAX_NR_ZONES; i++) {
         zone_t *zone = zones[i];
-        if (!zone_has_memory(zone))
+        if (!zone_has_memory(zone)) {
             continue;
+        }
 
-        for (int cpu = 0; cpu < nr_cpu; cpu++) {
+        for (int cpu = 0; cpu < MAX_CPU; cpu++) {
             per_cpu_pages_t *pcp = zone_pcp(zone, cpu);
             if (pcp->count > 0) {
                 free_pcppages_bulk(zone, pcp, pcp->count);