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 759db2c0d19906bdffd2a34e8639615659e50bdb..abd0ac0df4f3d925a6f7f171b2f8d9e67f4a37f7 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,31 +1,36 @@
-#include <arch/x86/boot/multiboot.h>
+#include <lunaix/block.h>

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

-#include <lunaix/lunistd.h>
+#include <lunaix/foptions.h>
+#include <lunaix/fs.h>
+#include <lunaix/fs/twifs.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();
 


@@ -38,58 +43,39 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
 void
 __do_reserved_memory(int unlock);
 

-//#define USE_DEMO
-#define DEMO_SIGNAL
-
-extern void
-_pconsole_main();
-
-extern void
-_signal_demo_main();
-
-extern void
-_lxinit_main();
-
-void __USER__
-__proc0_usr()
+int
+mount_bootmedium()

 {
 {

-    pid_t p;
-    if (!fork()) {
-        _pconsole_main();
+    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;

     }
 
     }
 

-    if (!(p = fork())) {
-#ifndef USE_DEMO
-        _exit(0);
-#elif defined DEMO_SIGNAL
-        _signal_demo_main();
-#else
-        _lxinit_main();
-#endif
+    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;

     }
 
     }
 

-    waitpid(p, 0, 0);
-
-    while (1) {
-        yield();
-    }
+    return 1;

 }
 
 }
 

-/**
- * @brief LunaixOS的零号进程，该进程永远为可执行。
- *
- * 这主要是为了保证调度器在没有进程可调度时依然有事可做。
- *
- * 同时，该进程也负责fork出我们的init进程。
- *
- */
-void
-__proc0()
+int
+exec_initd()

 {
 {

-    init_platform();
+    int errno = 0;
+    struct ld_param param;
+    char filename[] = "/mnt/lunaix-os/usr/init";

 
 

-    init_proc_user_space(__current);
+    ld_create_param(&param, __current, VMS_SELF);

 
 

+    if ((errno = exec_load_byname(&param, filename, NULL, NULL))) {
+        goto fail;
+    }
+
+    // user space

     asm volatile("movw %0, %%ax\n"
                  "movw %%ax, %%es\n"
                  "movw %%ax, %%ds\n"
     asm volatile("movw %0, %%ax\n"
                  "movw %%ax, %%es\n"
                  "movw %%ax, %%ds\n"


@@ -100,86 +86,91 @@ __proc0()
                  "pushl %2\n"
                  "pushl %3\n"
                  "retf" ::"i"(UDATA_SEG),
                  "pushl %2\n"
                  "pushl %3\n"
                  "retf" ::"i"(UDATA_SEG),

-                 "i"(USTACK_TOP & ~0xf),
+                 "r"(param.info.stack_top),

                  "i"(UCODE_SEG),
                  "i"(UCODE_SEG),

-                 "r"(__proc0_usr)
+                 "r"(param.info.entry)

                  : "eax", "memory");
                  : "eax", "memory");

-}

 
 

-extern uint8_t __kernel_start;            /* link/linker.ld */
-extern uint8_t __kernel_end;              /* link/linker.ld */
-extern uint8_t __init_hhk_end;            /* link/linker.ld */
-extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
+    fail("should not reach");

 
 

-char test_sequence[] = "Once upon a time, in a magical land of Equestria. "
-                       "There were two regal sisters who ruled together "
-                       "and created harmony for all the land.";
+fail:
+    kprintf(KERROR "fail to load initd. (%d)", errno);
+    return 0;
+}

 
 

+/**
+ * @brief LunaixOS的零号进程，该进程永远为可执行。
+ *
+ * 这主要是为了保证调度器在没有进程可调度时依然有事可做。
+ *
+ * 同时，该进程也负责fork出我们的init进程。
+ *
+ */

 void
 void

-__test_disk_io()
+__proc0()

 {
 {

-    struct hba_port* port = ahci_get_port(0);
-    char* buffer = vcalloc_dma(port->device->block_size);
-    strcpy(buffer, test_sequence);
-    kprintf("WRITE: %s\n", buffer);
-    int result;
-
-    // 写入第一扇区 (LBA=0)
-    result =
-      port->device->ops.write_buffer(port, 0, buffer, port->device->block_size);
-    if (!result) {
-        kprintf(KWARN "fail to write: %x\n", port->device->last_error);
-    }
+    init_platform();

 
 

-    memset(buffer, 0, port->device->block_size);
+    init_proc_user_space(__current);

 
 

-    // 读出我们刚刚写的内容！
-    result =
-      port->device->ops.read_buffer(port, 0, buffer, port->device->block_size);
-    kprintf(KDEBUG "%x, %x\n", port->regs[HBA_RPxIS], port->regs[HBA_RPxTFD]);
-    if (!result) {
-        kprintf(KWARN "fail to read: %x\n", port->device->last_error);
-    } else {
-        kprint_hex(buffer, 256);
+    if (!mount_bootmedium() || !exec_initd()) {
+        while (1) {
+            asm("hlt");
+        }
+        // should not reach

     }
     }

-
-    vfree_dma(buffer);

 }
 
 }
 

+extern uint8_t __kernel_start;            /* link/linker.ld */
+extern uint8_t __kernel_end;              /* link/linker.ld */
+extern uint8_t __init_hhk_end;            /* link/linker.ld */
+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();
 

-    cake_init();
-
-    assert_msg(kalloc_init(), "Fail to initialize heap");
-    valloc_init();
-
+    // 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();
     ahci_init();

-    ahci_list_device();
-
-    __test_disk_io();

 
 

-    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);
     }
 }


@@ -213,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);
                 }