补充适用于多核CPU的页表切换

Author: xiaoyi1212

src/x86_64/core/main.c

@@ -126,6 +126,7 @@ void kmain(void) {
     // beep();
     enable_scheduler();
     open_interrupt;
+
     //    //
     //    vfs_node_t node = vfs_open("/dev/sata0");
     //    if (node != NULL) {

src/x86_64/core/mem/page.c

@@ -74,11 +74,11 @@ page_directory_t *get_kernel_pagedir() {
 }
 
 page_directory_t *get_current_directory() {
-    return current_directory;
+    smp_cpu_t *cpu = get_cpu_smp(get_current_cpuid());
+    return cpu != NULL ? cpu->directory : current_directory;
 }
 
-static void copy_page_table_recursive(page_table_t *source_table, page_table_t *new_table,
-                                      int level) {
+static void copy_page_table_recursive(page_table_t *source_table, page_table_t *new_table, int level) {
     if (level == 0) {
         for (int i = 0; i < 512; i++) {
             new_table->entries[i].value = source_table->entries[i].value;
@@ -127,7 +127,10 @@ void page_map_to(page_directory_t *directory, uint64_t addr, uint64_t frame, uin
 }
 
 void switch_page_directory(page_directory_t *dir) {
-    current_directory            = dir;
+    smp_cpu_t *cpu = get_cpu_smp(get_current_cpuid());
+    if(cpu != NULL){
+        cpu->directory = dir;
+    } else current_directory = dir;
     page_table_t *physical_table = virt_to_phys((uint64_t)dir->table);
     __asm__ volatile("mov %0, %%cr3" : : "r"(physical_table));
 }

src/x86_64/driver/pci/rtl8169.c

@@ -9,17 +9,6 @@ RTL8169_Regs *rtl8169;
 RTL8169_Desc  tx_desc[TX_DESC_COUNT] __attribute__((aligned(256)));
 RTL8169_Desc  rx_desc[RX_DESC_COUNT] __attribute__((aligned(256)));
 
-void rtl8169_reset() {
-    rtl8169->Command = 0x10;
-    while (rtl8169->Command & 0x10)
-        __asm__ volatile("pause");
-}
-
-void rtl8169_setup_descriptors() {
-    rtl8169->TxDesc = (uint32_t)virt_to_phys((uint64_t)&tx_desc); // 设置 TX 描述符基地址
-    rtl8169->RxDesc = (uint32_t)&rx_desc;                         // 设置 RX 描述符基地址
-}
-
 void rtl8169_setup() {
     pcie_device_t *device = pcie_find_class(0x020000);
     if (device == NULL) {
@@ -50,10 +39,16 @@ void rtl8169_setup() {
         rtl8169 = phys_to_virt((uint64_t)rtl8169);
     }
 
-    rtl8169->Command = 0x0C;
-    rtl8169_setup_descriptors();
+    volatile uint32_t *rtl8169_mmio = (volatile uint32_t *)(((uint64_t)rtl8169) & ~0xF);
+
+    rtl8169_mmio[0x37 / 4] |= (1 << 4);
+    while (rtl8169_mmio[0x37 / 4] & (1 << 4)) {
+        __asm__("pause");
+    }
+    uint8_t mac[6];
+    for (int i = 0; i < 6; i++) {
+        mac[i] = (rtl8169_mmio[0x00 + i] & 0xFF);
+    }
 
-    kinfo("Rtl8169 mac: %x:%x:%x:%x:%x:%x", rtl8169->MAC[0] & 0xFF, (rtl8169->MAC[0] >> 8) & 0xFF,
-          (rtl8169->MAC[0] >> 16) & 0xFF, (rtl8169->MAC[0] >> 24) & 0xFF, rtl8169->MAC[1] & 0xFF,
-          (rtl8169->MAC[1] >> 8) & 0xFF);
+    kinfo("Rtl8169 mac: %x:%x:%x:%x:%x:%x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 }

src/x86_64/include/smp.h

@@ -8,6 +8,7 @@
 #include "limine.h"
 #include "lock_queue.h"
 #include "pcb.h"
+#include "page.h"
 
 typedef struct smp_cpu {
     uint8_t             flags; // 标志位, CPU是否启用
@@ -18,6 +19,7 @@ typedef struct smp_cpu {
     tss_stack_t         tss_stack;
     pcb_t               idle_pcb;
     pcb_t               current_pcb;
+    page_directory_t   *directory;
     lock_queue         *scheduler_queue; // 该核心的进程调度队列
     lock_node          *iter_node;       // 该核心当前迭代的节点
 } __attribute__((packed)) smp_cpu_t;