X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/61bcf0c65dac58d2f29ab40e016489c89ec8eec0..9d62069fd52fa2108b677ffadc7f6138c7641757:/lunaix-os/kernel/proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 2331c9f..79ef12e 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -25,7 +25,29 @@ init_platform();
 void
 lock_reserved_memory();
 
-// #define ENABLE_USER_MODE
+void
+unlock_reserved_memory();
+
+void
+__do_reserved_memory(int unlock);
+
+//#define DEMO_SIGNAL
+
+void __USER__
+__proc0_usr()
+{
+    if (!fork()) {
+#ifdef DEMO_SIGNAL
+        asm("jmp _signal_demo_main");
+#else
+        asm("jmp _lxinit_main");
+#endif
+    }
+
+    while (1) {
+        yield();
+    }
+}
 
 /**
  * @brief LunaixOS的零号进程，该进程永远为可执行。
@@ -39,7 +61,9 @@ void
 __proc0()
 {
     init_platform();
-#ifdef ENABLE_USER_MODE
+
+    init_proc_user_space(__current);
+
     asm volatile("movw %0, %%ax\n"
                  "movw %%ax, %%es\n"
                  "movw %%ax, %%ds\n"
@@ -52,16 +76,8 @@ __proc0()
                  "retf" ::"i"(UDATA_SEG),
                  "i"(USTACK_TOP & ~0xf),
                  "i"(UCODE_SEG),
-                 "r"(&&usr));
-#endif
-usr:
-    if (!fork()) {
-        asm("jmp _lxinit_main");
-    }
-
-    while (1) {
-        yield();
-    }
+                 "r"(__proc0_usr)
+                 : "eax", "memory");
 }
 
 extern uint8_t __kernel_start;            /* link/linker.ld */
@@ -74,14 +90,11 @@ init_platform()
 {
     assert_msg(kalloc_init(), "Fail to initialize heap");
 
-    size_t hhk_init_pg_count = ((uintptr_t)(&__init_hhk_end)) >> PG_SIZE_BITS;
-    kprintf(KINFO "[MM] Releaseing %d pages from 0x0.\n", hhk_init_pg_count);
-
     // Fuck it, I will no longer bother this little 1MiB
     // I just release 4 pages for my APIC & IOAPIC remappings
-    for (size_t i = 0; i < 3; i++) {
-        vmm_del_mapping(PD_REFERENCED, (void*)(i << PG_SIZE_BITS));
-    }
+    // for (size_t i = 0; i < 3; i++) {
+    //     vmm_del_mapping(PD_REFERENCED, (void*)(i << PG_SIZE_BITS));
+    // }
 
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
@@ -93,8 +106,9 @@ init_platform()
     pmm_mark_page_occupied(KERNEL_PID, FLOOR(ioapic_addr, PG_SIZE_BITS), 0);
 
     vmm_set_mapping(
-      PD_REFERENCED, APIC_BASE_VADDR, __APIC_BASE_PADDR, PG_PREM_RW);
-    vmm_set_mapping(PD_REFERENCED, IOAPIC_BASE_VADDR, ioapic_addr, PG_PREM_RW);
+      PD_REFERENCED, MMIO_APIC, __APIC_BASE_PADDR, PG_PREM_RW, VMAP_NULL);
+    vmm_set_mapping(
+      PD_REFERENCED, MMIO_IOAPIC, ioapic_addr, PG_PREM_RW, VMAP_NULL);
 
     apic_init();
     ioapic_init();
@@ -104,32 +118,58 @@ init_platform()
 
     syscall_install();
 
-    for (size_t i = 256; i < hhk_init_pg_count; i++) {
-        vmm_del_mapping(PD_REFERENCED, (void*)(i << PG_SIZE_BITS));
+    unlock_reserved_memory();
+
+    for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
+        vmm_del_mapping(PD_REFERENCED, (void*)i);
+        pmm_free_page(KERNEL_PID, (void*)i);
     }
 }
 
 void
 lock_reserved_memory()
+{
+    __do_reserved_memory(0);
+}
+
+void
+unlock_reserved_memory()
+{
+    __do_reserved_memory(1);
+}
+
+void
+__do_reserved_memory(int unlock)
 {
     multiboot_memory_map_t* mmaps = _k_init_mb_info->mmap_addr;
     size_t map_size =
       _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
-    v_mapping mapping;
+    // v_mapping mapping;
     for (unsigned int i = 0; i < map_size; i++) {
         multiboot_memory_map_t mmap = mmaps[i];
-        if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE) {
+        uint8_t* pa = PG_ALIGN(mmap.addr_low);
+        if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE || pa <= MEM_4MB) {
+            // Don't fuck up our kernel code or any free area!
             continue;
         }
-        uint8_t* pa = PG_ALIGN(mmap.addr_low);
         size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
-        for (size_t j = 0; j < pg_num; j++) {
-            uintptr_t _pa = pa + (j << PG_SIZE_BITS);
-            if (vmm_lookup(_pa, &mapping) && *mapping.pte) {
-                continue;
+        size_t j = 0;
+        if (!unlock) {
+            for (; j < pg_num; j++) {
+                uintptr_t _pa = pa + (j << PG_SIZE_BITS);
+                if (_pa >= KERNEL_MM_BASE) {
+                    // Don't fuck up our kernel space!
+                    break;
+                }
+                vmm_set_mapping(PD_REFERENCED, _pa, _pa, PG_PREM_R, VMAP_NULL);
+            }
+            // Save the progress for later unmapping.
+            mmaps[i].len_low = j * PG_SIZE;
+        } else {
+            for (; j < pg_num; j++) {
+                uintptr_t _pa = pa + (j << PG_SIZE_BITS);
+                vmm_del_mapping(PD_REFERENCED, _pa);
             }
-            vmm_set_mapping(PD_REFERENCED, _pa, _pa, PG_PREM_R);
-            pmm_mark_page_occupied(KERNEL_PID, _pa >> 12, 0);
         }
     }
 }
\ No newline at end of file