smp增加核心加载等待阻塞

Author: xiaoyi1212

src/core/cpu/smp.c

@@ -22,6 +22,8 @@ smp_cpu_t cpus[MAX_CPU];
 uint32_t bsp_processor_id;
 uint64_t cpu_count = 0;
 
+static int16_t cpu_done_count = 0;
+
 static void apu_hlt(){
     cpu_hlt;
 }
@@ -91,7 +93,7 @@ static void apu_gdt_setup(){
 void apu_entry(){
     __asm__ volatile("lidt %0" : : "m"(idt_pointer));
 
-    ticket_trylock(&apu_lock);
+    ticket_lock(&apu_lock);
     apu_gdt_setup();
 
     page_table_t *physical_table = virt_to_phys((uint64_t)get_kernel_pagedir()->table);
@@ -126,6 +128,7 @@ void apu_entry(){
     smp_cpu_t *cpu = get_cpu_smp(get_current_cpuid());
     if(cpu == NULL){
         logkf("Error: smp cpu info null %d\n",get_current_cpuid());
+        cpu->flags = 0;
         cpu_hlt;
     }
     cpu->idle_pcb = apu_idle;
@@ -135,7 +138,8 @@ void apu_entry(){
         logkf("Error: scheduler null %d\n",get_current_cpuid());
         cpu_hlt;
     }
-    logkf("APU %d started.\n",get_current_cpuid());
+    logkf("APU %d: %p %p started.\n",get_current_cpuid(),cpu->current_pcb,cpu->idle_pcb);
+    cpu_done_count++;
     ticket_unlock(&apu_lock);
     open_interrupt;
     apu_hlt();
@@ -149,6 +153,7 @@ smp_cpu_t *get_cpu_smp(uint32_t processor_id){
 }
 
 void apu_startup(struct limine_smp_request smp_request){
+    ticket_init(&apu_lock);
     struct limine_smp_response *response = smp_request.response;
     cpu_count = response->cpu_count;
     for (uint64_t i = 0; i < cpu_count && i < MAX_CPU - 1; i++){
@@ -165,13 +170,21 @@ void apu_startup(struct limine_smp_request smp_request){
             info->goto_address = (void*)apu_entry;
         }
     }
+
+    while (cpu_done_count < cpu_count && cpu_done_count < (MAX_CPU - 1)) __asm__ volatile("pause" ::: "memory");
+    logkf("APU %d processors have been enabled.\n",cpu_count);
+
     smp_cpu_t *cpu = get_cpu_smp(get_current_cpuid());
     if(cpu == NULL){
         return;
     }
+    cpu->idle_pcb = kernel_head_task;
     kernel_head_task->queue_index = queue_enqueue(cpu->scheduler_queue,kernel_head_task);
     if(kernel_head_task->queue_index == -1){
         logkf("Error: scheduler null %d\n",get_current_cpuid());
     }
+
+
+
     kinfo("%d processors have been enabled.",cpu_count);
 }

src/core/task/pcb.c

@@ -14,6 +14,7 @@
 
 extern pcb_t kernel_head_task;
 ticketlock pcb_lock;
+extern ticketlock scheduler_lock;
 
 int now_pid = 0;
 
@@ -100,6 +101,8 @@ int create_kernel_thread(int (*_start)(void *arg), void *args, char *name){
 }
 
 void init_pcb(){
+    ticket_init(&pcb_lock);
+    ticket_init(&scheduler_lock);
     kernel_head_task = (pcb_t)malloc(STACK_SIZE);
     kernel_head_task->task_level = 0;
     kernel_head_task->pid = now_pid++;

src/core/task/scheduler.c

@@ -45,6 +45,8 @@ int add_task(pcb_t new_task) {
         }
     }
 
+    logkf("Add task CPU %d idle: %p\n",new_task->pid,cpuid,cpu0->idle_pcb);
+
     if(cpu0 == NULL){
         ticket_unlock(&scheduler_lock);
         return -1;

src/include/krlibc.h

@@ -4,7 +4,7 @@
  * 定义CP_Kernel的各种属性
  */
 #define KERNEL_NAME "CP_Kernel-x86_64-0.0.8" //内核编号
-#define MAX_CPU 256                          //最大支持CPU核心数
+#define MAX_CPU (256*2)                      //最大支持CPU核心数 256
 #define STACK_SIZE 32768                     //栈大小(byte)
 #define MAX_WAIT_INDEX 100000                //阻塞最大循环数
 

xmake.lua

@@ -3,7 +3,7 @@ set_project("CoolPotOS")
 add_rules("mode.debug", "mode.release")
 add_requires("zig")
 
-set_optimize("fastest")
+--set_optimize("fastest")
 set_languages("c23")
 --set_warnings("all", "extra", "pedantic", "error")
 
@@ -14,7 +14,7 @@ add_cflags("-target x86_64-freestanding")
 add_ldflags("-target x86_64-freestanding")
 
 add_cflags("-mno-80387", "-mno-mmx", "-mno-sse", "-mno-sse2", "-msoft-float","-nostdinc")
-add_cflags("-mcmodel=kernel")
+add_cflags("-mcmodel=kernel","-mno-red-zone")
 add_ldflags("-static","-nostdlib")
 
 target("kernel")