refactor: full rewrite of signal feature

[lunaix-os.git] / lunaix-os / kernel / k_init.c

diff --git a/lunaix-os/kernel/k_init.c b/lunaix-os/kernel/k_init.c
index eee475fc604d0dbb7786c174a7bd530df1368ca9..71adb3098cadb369e9fdd7ced62e64c8ea218edf 100644 (file)
--- a/lunaix-os/kernel/k_init.c
+++ b/lunaix-os/kernel/k_init.c
@@ -1,18 +1,21 @@
 #include <lunaix/common.h>
 #include <lunaix/common.h>

-#include <lunaix/tty/tty.h>
-
-#include <lunaix/clock.h>
-#include <lunaix/mm/kalloc.h>
+#include <lunaix/device.h>
+#include <lunaix/foptions.h>
+#include <lunaix/input.h>
+#include <lunaix/isrm.h>
+#include <lunaix/lxconsole.h>
+#include <lunaix/mm/cake.h>
+#include <lunaix/mm/mmio.h>

 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/page.h>
 #include <lunaix/mm/pmm.h>

+#include <lunaix/mm/valloc.h>

 #include <lunaix/mm/vmm.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/spike.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/spike.h>

-#include <lunaix/syslog.h>
-#include <lunaix/timer.h>
-
-#include <hal/rtc.h>
+#include <lunaix/syscall.h>
+#include <lunaix/tty/tty.h>
+#include <lunaix/types.h>

 
 #include <arch/x86/boot/multiboot.h>
 #include <arch/x86/idt.h>
 
 #include <arch/x86/boot/multiboot.h>
 #include <arch/x86/idt.h>


@@ -21,12 +24,9 @@
 #include <klibc/stdio.h>
 #include <klibc/string.h>
 
 #include <klibc/stdio.h>
 #include <klibc/string.h>
 

-#include <stddef.h>
-#include <stdint.h>
-
-extern uint8_t __kernel_start;
-extern uint8_t __kernel_end;
-extern uint8_t __init_hhk_end;
+extern u8_t __kernel_start;
+extern u8_t __kernel_end;
+extern u8_t __init_hhk_end;

 
 #define PP_KERN_SHARED (PP_FGSHARED | PP_TKERN)
 
 
 #define PP_KERN_SHARED (PP_FGSHARED | PP_TKERN)
 


@@ -35,10 +35,6 @@ multiboot_info_t* _k_init_mb_info;
 
 x86_page_table* __kernel_ptd;
 
 
 x86_page_table* __kernel_ptd;
 

-struct proc_info tmp;
-
-LOG_MODULE("BOOT");
-

 extern void
 __proc0(); /* proc0.c */
 
 extern void
 __proc0(); /* proc0.c */
 


@@ -51,48 +47,57 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size);
 void
 _kernel_pre_init()
 {
 void
 _kernel_pre_init()
 {

+    // interrupts

     _init_idt();
     _init_idt();

+    isrm_init();

     intr_routine_init();
 
     intr_routine_init();
 

+    // memory

     pmm_init(MEM_1MB + (_k_init_mb_info->mem_upper << 10));
     vmm_init();
     pmm_init(MEM_1MB + (_k_init_mb_info->mem_upper << 10));
     vmm_init();

-    rtc_init();
-
-    tty_init((void*)VGA_BUFFER_PADDR);
-    tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);

 
 

-    __kernel_ptd = cpu_rcr3();
-
-    tmp = (struct proc_info){ .page_table = __kernel_ptd };
+    unsigned int map_size =
+      _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);

 
 

-    __current = &tmp;
+    setup_memory((multiboot_memory_map_t*)_k_init_mb_info->mmap_addr, map_size);

 }
 
 void
 _kernel_init()
 {
 }
 
 void
 _kernel_init()
 {

-    kprintf("[MM] Mem: %d KiB, Extended Mem: %d KiB\n",
-            _k_init_mb_info->mem_lower,
-            _k_init_mb_info->mem_upper);
+    int errno = 0;

 
 

-    unsigned int map_size =
-      _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
+    // allocators
+    cake_init();
+    valloc_init();

 
 

-    setup_memory((multiboot_memory_map_t*)_k_init_mb_info->mmap_addr, map_size);
+    sched_init();

 
 

-    // 为内核创建一个专属栈空间。
-    for (size_t i = 0; i < (KSTACK_SIZE >> PG_SIZE_BITS); i++) {
-        vmm_alloc_page(KERNEL_PID,
-                       (void*)(KSTACK_START + (i << PG_SIZE_BITS)),
-                       NULL,
-                       PG_PREM_RW,
-                       0);
+    // crt
+    tty_init(ioremap(VGA_FRAMEBUFFER, PG_SIZE));
+    tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
+
+    // file system & device subsys
+    vfs_init();
+    fsm_init();
+    input_init();
+
+    vfs_export_attributes();
+
+    lxconsole_init();
+
+    if ((errno = vfs_mount_root("ramfs", NULL))) {
+        panickf("Fail to mount root. (errno=%d)", errno);

     }
     }

-    kprintf(KINFO "[MM] Allocated %d pages for stack start at %p\n",
-            KSTACK_SIZE >> PG_SIZE_BITS,
-            KSTACK_START);

 
 

-    sched_init();
+    vfs_mount("/dev", "devfs", NULL, 0);
+    vfs_mount("/sys", "twifs", NULL, MNT_RO);
+    vfs_mount("/task", "taskfs", NULL, MNT_RO);
+
+    lxconsole_spawn_ttydev();
+    device_init_builtin();
+
+    syscall_install();

 
     spawn_proc0();
 }
 
     spawn_proc0();
 }


@@ -104,7 +109,7 @@ _kernel_init()
 void
 spawn_proc0()
 {
 void
 spawn_proc0()
 {

-    struct proc_info proc0;
+    struct proc_info* proc0 = alloc_process();

 
     /**
      * @brief
 
     /**
      * @brief


@@ -118,46 +123,57 @@ spawn_proc0()
      *      2. 将_kernel_post_init搬进proc0进程
      * （_kernel_post_init已经更名为init_platform）
      *
      *      2. 将_kernel_post_init搬进proc0进程
      * （_kernel_post_init已经更名为init_platform）
      *

-     * 目前的解决方案是两者都使用
+     * 目前的解决方案是2

      */
 
      */
 

-    init_proc(&proc0);
-    proc0.intr_ctx = (isr_param){ .registers.esp = KSTACK_TOP - 20,
-                                  .cs = KCODE_SEG,
-                                  .eip = (void*)__proc0,
+    proc0->intr_ctx = (isr_param){ .registers = { .ds = KDATA_SEG,
+                                                  .es = KDATA_SEG,
+                                                  .fs = KDATA_SEG,
+                                                  .gs = KDATA_SEG } };
+    proc0->parent = proc0;
+
+    // 方案1：必须在读取eflags之后禁用。否则当进程被调度时，中断依然是关闭的！
+    // cpu_disable_interrupt();
+
+    /* Ok... 首先fork进我们的零号进程，而后由那里，我们fork进init进程。 */
+
+    // 把当前虚拟地址空间（内核）复制一份。
+    proc0->page_table = vmm_dup_vmspace(proc0->pid);
+
+    // 直接切换到新的拷贝，进行配置。
+    cpu_lcr3(proc0->page_table);
+
+    // 为内核创建一个专属栈空间。
+    for (size_t i = 0; i < (KSTACK_SIZE >> PG_SIZE_BITS); i++) {
+        ptr_t pa = pmm_alloc_page(KERNEL_PID, 0);
+        vmm_set_mapping(VMS_SELF,
+                        KSTACK_START + (i << PG_SIZE_BITS),
+                        pa,
+                        PG_PREM_RW,
+                        VMAP_NULL);
+    }
+
+    struct exec_param* execp =
+      (struct exec_param*)(KSTACK_TOP - sizeof(struct exec_param));
+
+    *execp = (struct exec_param){ .cs = KCODE_SEG,
+                                  .eip = (ptr_t)__proc0,

                                   .ss = KDATA_SEG,
                                   .eflags = cpu_reflags() };
                                   .ss = KDATA_SEG,
                                   .eflags = cpu_reflags() };

+    proc0->intr_ctx.execp = execp;

 
 

-    // 必须在读取eflags之后禁用。否则当进程被调度时，中断依然是关闭的！
-    cpu_disable_interrupt();
-    setup_proc_mem(&proc0, PD_REFERENCED);
-
-    // Ok... 首先fork进我们的零号进程，而后由那里，我们fork进init进程。
-    /*
-        这里是一些栈的设置，因为我们将切换到一个新的地址空间里，并且使用一个全新的栈。
-        让iret满意！
-    */
-    asm volatile("movl %%cr3, %%eax\n"
-                 "movl %%esp, %%ebx\n"
-                 "movl %0, %%cr3\n"
-                 "movl %1, %%esp\n"
-                 "pushf\n"
-                 "pushl %2\n"
-                 "pushl %3\n"
-                 "pushl $0\n"
-                 "pushl $0\n"
-                 "movl %%eax, %%cr3\n"
-                 "movl %%ebx, %%esp\n" ::"r"(proc0.page_table),
-                 "i"(KSTACK_TOP),
-                 "i"(KCODE_SEG),
-                 "r"(proc0.intr_ctx.eip)
-                 : "%eax", "%ebx", "memory");
+    // 加载x87默认配置
+    asm volatile("fninit\n"
+                 "fxsave (%%eax)" ::"a"(proc0->fxstate)
+                 : "memory");

 
     // 向调度器注册进程。
 
     // 向调度器注册进程。

-    push_process(&proc0);
+    commit_process(proc0);

 
 

-    // 由于时钟中断未就绪，我们需要手动通知调度器进行第一次调度。这里也会同时隐式地恢复我们的eflags.IF位
-    schedule();
+    // 由于时钟中断与APIC未就绪，我们需要手动进行第一次调度。这里也会同时隐式地恢复我们的eflags.IF位
+    proc0->state = PS_RUNNING;
+    asm volatile("pushl %0\n"
+                 "jmp switch_to\n" ::"r"(proc0));

 
     /* Should not return */
     assert_msg(0, "Unexpected Return");
 
     /* Should not return */
     assert_msg(0, "Unexpected Return");


@@ -171,42 +187,20 @@ setup_memory(multiboot_memory_map_t* map, size_t map_size)
     // First pass, to mark the physical pages
     for (unsigned int i = 0; i < map_size; i++) {
         multiboot_memory_map_t mmap = map[i];
     // First pass, to mark the physical pages
     for (unsigned int i = 0; i < map_size; i++) {
         multiboot_memory_map_t mmap = map[i];

-        kprintf("[MM] Base: 0x%x, len: %u KiB, type: %u\n",
-                map[i].addr_low,
-                map[i].len_low >> 10,
-                map[i].type);

         if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE) {
             // 整数向上取整除法
         if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE) {
             // 整数向上取整除法

-            uintptr_t pg = map[i].addr_low + 0x0fffU;
+            ptr_t pg = map[i].addr_low + 0x0fffU;

             pmm_mark_chunk_free(pg >> PG_SIZE_BITS,
                                 map[i].len_low >> PG_SIZE_BITS);
             pmm_mark_chunk_free(pg >> PG_SIZE_BITS,
                                 map[i].len_low >> PG_SIZE_BITS);

-            kprintf(KINFO "[MM] Freed %u pages start from 0x%x\n",
-                    map[i].len_low >> PG_SIZE_BITS,
-                    pg & ~0x0fffU);

         }
     }
 
     // 将内核占据的页，包括前1MB，hhk_init 设为已占用
     size_t pg_count = V2P(&__kernel_end) >> PG_SIZE_BITS;
         }
     }
 
     // 将内核占据的页，包括前1MB，hhk_init 设为已占用
     size_t pg_count = V2P(&__kernel_end) >> PG_SIZE_BITS;

-    pmm_mark_chunk_occupied(KERNEL_PID, 0, pg_count, 0);
-    kprintf(KINFO "[MM] Allocated %d pages for kernel.\n", pg_count);
-
-    size_t vga_buf_pgs = VGA_BUFFER_SIZE >> PG_SIZE_BITS;
-
-    // 首先，标记VGA部分为已占用
-    pmm_mark_chunk_occupied(
-      KERNEL_PID, VGA_BUFFER_PADDR >> PG_SIZE_BITS, vga_buf_pgs, 0);
+    pmm_mark_chunk_occupied(KERNEL_PID, 0, pg_count, PP_FGLOCKED);

 
 

-    // 重映射VGA文本缓冲区（以后会变成显存，i.e., framebuffer）
-    for (size_t i = 0; i < vga_buf_pgs; i++) {
-        vmm_map_page(KERNEL_PID,
-                     (void*)(VGA_BUFFER_VADDR + (i << PG_SIZE_BITS)),
-                     (void*)(VGA_BUFFER_PADDR + (i << PG_SIZE_BITS)),
-                     PG_PREM_URW);
+    // reserve higher half
+    for (size_t i = L1_INDEX(KERNEL_MM_BASE); i < 1023; i++) {
+        assert(vmm_set_mapping(VMS_SELF, i << 22, 0, 0, VMAP_NOMAP));

     }
     }

-
-    // 更新VGA缓冲区位置至虚拟地址
-    tty_set_buffer((void*)VGA_BUFFER_VADDR);
-
-    kprintf(KINFO "[MM] Mapped VGA to %p.\n", VGA_BUFFER_VADDR);

 }
 }