Merge branch 'master' into prog-loader

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 5fac5f86f609e3efc078701234451291fe7ca454..abd0ac0df4f3d925a6f7f171b2f8d9e67f4a37f7 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,35 +1,36 @@
-#include <arch/x86/boot/multiboot.h>

 #include <lunaix/block.h>
 #include <lunaix/common.h>
 #include <lunaix/block.h>
 #include <lunaix/common.h>

-#include <lunaix/fctrl.h>
+#include <lunaix/foptions.h>

 #include <lunaix/fs.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/fs.h>
 #include <lunaix/fs/twifs.h>

-#include <lunaix/lunistd.h>
+#include <lunaix/ld.h>

 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>

-#include <lunaix/proc.h>
+#include <lunaix/peripheral/serial.h>

 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>

-#include <stddef.h>
+#include <lunaix/types.h>
+
+#include <sdbg/protocol.h>

 
 #include <hal/acpi/acpi.h>
 #include <hal/ahci/ahci.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>
 
 #include <hal/acpi/acpi.h>
 #include <hal/ahci/ahci.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>

+#include <hal/rtc.h>
+
+#include <arch/x86/boot/multiboot.h>

 
 #include <klibc/string.h>
 
 LOG_MODULE("PROC0")
 
 
 #include <klibc/string.h>
 
 LOG_MODULE("PROC0")
 

-extern void
-_lxinit_main(); /* lxinit.c */
-

 void
 init_platform();
 
 void
 init_platform();
 


@@ -42,59 +43,59 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
 void
 __do_reserved_memory(int unlock);
 

-#define USE_DEMO
-// #define DEMO_SIGNAL
-// #define DEMO_READDIR
-#define DEMO_IOTEST
-
-extern void
-_pconsole_main();
+int
+mount_bootmedium()
+{
+    struct v_dnode* dnode;
+    int errno = 0;
+    if ((errno = vfs_walk_proc("/dev/sdb", &dnode, NULL, 0))) {
+        kprintf(KERROR "fail to acquire device. (%d)", errno);
+        return 0;
+    }

 
 

-extern void
-_signal_demo_main();
+    struct device* dev = (struct device*)dnode->inode->data;
+    if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {
+        kprintf(KERROR "fail to boot medium. (%d)", errno);
+        return 0;
+    }

 
 

-extern void
-_lxinit_main();
+    return 1;
+}

 
 

-extern void
-_readdir_main();
+int
+exec_initd()
+{
+    int errno = 0;
+    struct ld_param param;
+    char filename[] = "/mnt/lunaix-os/usr/init";

 
 

-extern void
-_iotest_main();
+    ld_create_param(&param, __current, VMS_SELF);

 
 

-void __USER__
-__proc0_usr()
-{
-    // 打开tty设备(控制台)，作为标准输入输出。
-    //  tty设备属于序列设备（Sequential Device），该类型设备的上层读写
-    //  无须经过Lunaix的缓存层，而是直接下发到底层驱动。（不受FO_DIRECT的影响）
-    int stdout = open("/dev/tty", 0);
-    int stdin = dup2(stdout, 1);
-
-    pid_t p;
-    if (!fork()) {
-        _pconsole_main();
+    if ((errno = exec_load_byname(&param, filename, NULL, NULL))) {
+        goto fail;

     }
 
     }
 

-    if (!(p = fork())) {
-#ifndef USE_DEMO
-        _exit(0);
-#elif defined DEMO_SIGNAL
-        _signal_demo_main();
-#elif defined DEMO_READDIR
-        _readdir_main();
-#elif defined DEMO_IOTEST
-        _iotest_main();
-#else
-        _lxinit_main();
-#endif
-    }
+    // user space
+    asm volatile("movw %0, %%ax\n"
+                 "movw %%ax, %%es\n"
+                 "movw %%ax, %%ds\n"
+                 "movw %%ax, %%fs\n"
+                 "movw %%ax, %%gs\n"
+                 "pushl %0\n"
+                 "pushl %1\n"
+                 "pushl %2\n"
+                 "pushl %3\n"
+                 "retf" ::"i"(UDATA_SEG),
+                 "r"(param.info.stack_top),
+                 "i"(UCODE_SEG),
+                 "r"(param.info.entry)
+                 : "eax", "memory");

 
 

-    waitpid(p, 0, 0);
+    fail("should not reach");

 
 

-    while (1) {
-        yield();
-    }
+fail:
+    kprintf(KERROR "fail to load initd. (%d)", errno);
+    return 0;

 }
 
 /**
 }
 
 /**


@@ -112,20 +113,12 @@ __proc0()
 
     init_proc_user_space(__current);
 
 
     init_proc_user_space(__current);
 

-    asm volatile("movw %0, %%ax\n"
-                 "movw %%ax, %%es\n"
-                 "movw %%ax, %%ds\n"
-                 "movw %%ax, %%fs\n"
-                 "movw %%ax, %%gs\n"
-                 "pushl %0\n"
-                 "pushl %1\n"
-                 "pushl %2\n"
-                 "pushl %3\n"
-                 "retf" ::"i"(UDATA_SEG),
-                 "i"(USTACK_TOP & ~0xf),
-                 "i"(UCODE_SEG),
-                 "r"(__proc0_usr)
-                 : "eax", "memory");
+    if (!mount_bootmedium() || !exec_initd()) {
+        while (1) {
+            asm("hlt");
+        }
+        // should not reach
+    }

 }
 
 extern uint8_t __kernel_start;            /* link/linker.ld */
 }
 
 extern uint8_t __kernel_start;            /* link/linker.ld */


@@ -136,32 +129,48 @@ extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 void
 init_platform()
 {
 void
 init_platform()
 {

+    kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
+            __VERSION__,
+            __TIME__);
+

     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 

-    assert_msg(kalloc_init(), "Fail to initialize heap");
-
+    // firmware

     acpi_init(_k_init_mb_info);
     acpi_init(_k_init_mb_info);

+
+    // die

     apic_init();
     ioapic_init();
     apic_init();
     ioapic_init();

+
+    // debugger
+    serial_init();
+    sdbg_init();
+
+    // timers & clock
+    rtc_init();

     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();

+
+    // peripherals & chipset features

     ps2_kbd_init();
     ps2_kbd_init();

-    pci_init();

     block_init();
     ahci_init();
     block_init();
     ahci_init();

-    // ahci_list_device();
-    // cake_stats();

 
 

-    syscall_install();
+    pci_init();

 
 

+    // console

     console_start_flushing();
     console_flush();
 
     console_start_flushing();
     console_flush();
 

+    // expose cake allocator states to vfs
+    cake_export();
+

     unlock_reserved_memory();
 
     unlock_reserved_memory();
 

+    // clean up

     for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
     for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {

-        vmm_del_mapping(PD_REFERENCED, (void*)i);
+        vmm_del_mapping(VMS_SELF, (void*)i);

         pmm_free_page(KERNEL_PID, (void*)i);
     }
 }
         pmm_free_page(KERNEL_PID, (void*)i);
     }
 }


@@ -195,22 +204,30 @@ __do_reserved_memory(int unlock)
         size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
         size_t j = 0;
         if (!unlock) {
         size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
         size_t j = 0;
         if (!unlock) {

+            kprintf("mem: freeze: %p..%p type=%x\n",
+                    pa,
+                    pa + pg_num * PG_SIZE,
+                    mmap.type);

             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;
                 }
             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);
+                vmm_set_mapping(VMS_SELF, _pa, _pa, PG_PREM_R, VMAP_NULL);

                 pmm_mark_page_occupied(
                   KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);
             }
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
         } else {
                 pmm_mark_page_occupied(
                   KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);
             }
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
         } else {

+            kprintf("mem: reclaim: %p..%p type=%x\n",
+                    pa,
+                    pa + pg_num * PG_SIZE,
+                    mmap.type);

             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);

-                vmm_del_mapping(PD_REFERENCED, _pa);
+                vmm_del_mapping(VMS_SELF, _pa);

                 if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
                     pmm_mark_page_free(_pa >> PG_SIZE_BITS);
                 }
                 if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
                     pmm_mark_page_free(_pa >> PG_SIZE_BITS);
                 }