feat: readdir fix and demo

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 4cc414c4d28cd92b8b91ae66b40bc2b496ecf6ab..4cf0c82abab874365577b2e25d3cad8d8703bc6c 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,7 +1,12 @@
 #include <arch/x86/boot/multiboot.h>
 #include <lunaix/common.h>
 #include <arch/x86/boot/multiboot.h>
 #include <lunaix/common.h>

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

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

+#include <lunaix/lxconsole.h>
+#include <lunaix/mm/cake.h>

 #include <lunaix/mm/pmm.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/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/proc.h>


@@ -11,8 +16,12 @@
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>

+#include <hal/ahci/ahci.h>

 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>

+#include <hal/pci.h>
+
+#include <klibc/string.h>

 
 LOG_MODULE("PROC0")
 
 
 LOG_MODULE("PROC0")
 


@@ -31,13 +40,44 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
 void
 __do_reserved_memory(int unlock);
 

+#define USE_DEMO
+// #define DEMO_SIGNAL
+#define DEMO_READDIR
+
+extern void
+_pconsole_main();
+
+extern void
+_signal_demo_main();
+
+extern void
+_lxinit_main();
+
+extern void
+_readdir_main();
+

 void __USER__
 __proc0_usr()
 {
 void __USER__
 __proc0_usr()
 {

+    pid_t p;

     if (!fork()) {
     if (!fork()) {

-        asm("jmp _lxinit_main");
+        _pconsole_main();
+    }
+
+    if (!(p = fork())) {
+#ifndef USE_DEMO
+        _exit(0);
+#elif defined DEMO_SIGNAL
+        _signal_demo_main();
+#elif defined DEMO_READDIR
+        _readdir_main();
+#else
+        _lxinit_main();
+#endif

     }
 
     }
 

+    waitpid(p, 0, 0);
+

     while (1) {
         yield();
     }
     while (1) {
         yield();
     }


@@ -79,39 +119,73 @@ 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 */
 
 extern uint8_t __init_hhk_end;            /* link/linker.ld */
 extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 

+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.";
+

 void
 void

-init_platform()
+__test_disk_io()

 {
 {

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

 
 

-    // 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));
-    // }
+    memset(buffer, 0, dev->block_size);

 
 

+    // 读出我们刚刚写的内容！
+    result = dev->ops.read_buffer(dev, 0, buffer, dev->block_size);
+    kprintf(KDEBUG "%x, %x\n", port->regs[HBA_RPxIS], port->regs[HBA_RPxTFD]);
+    if (!result) {
+        kprintf(KWARN "fail to read: %x\n", dev->last_error);
+    } else {
+        kprint_hex(buffer, 256);
+    }
+
+    vfree_dma(buffer);
+}
+
+void
+init_platform()
+{

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

-    acpi_init(_k_init_mb_info);
-    uintptr_t ioapic_addr = acpi_get_context()->madt.ioapic->ioapic_addr;
-    pmm_mark_page_occupied(
-      KERNEL_PID, FLOOR(__APIC_BASE_PADDR, PG_SIZE_BITS), 0);
-    pmm_mark_page_occupied(KERNEL_PID, FLOOR(ioapic_addr, PG_SIZE_BITS), 0);
-
-    vmm_set_mapping(
-      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);
+    assert_msg(kalloc_init(), "Fail to initialize heap");

 
 

+    acpi_init(_k_init_mb_info);

     apic_init();
     ioapic_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();
     apic_init();
     ioapic_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();

+    pci_init();
+    ahci_init();
+    // ahci_list_device();
+
+    fsm_init();
+    vfs_init();
+    twifs_init();
+
+    vfs_mount("/", "twifs", -1);
+
+    //__test_disk_io();
+
+    // cake_stats();

 
     syscall_install();
 
 
     syscall_install();
 

+    console_start_flushing();
+    console_flush();
+

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


@@ -156,6 +230,8 @@ __do_reserved_memory(int unlock)
                     break;
                 }
                 vmm_set_mapping(PD_REFERENCED, _pa, _pa, PG_PREM_R, VMAP_NULL);
                     break;
                 }
                 vmm_set_mapping(PD_REFERENCED, _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;
             }
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;


@@ -163,6 +239,9 @@ __do_reserved_memory(int unlock)
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(PD_REFERENCED, _pa);
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(PD_REFERENCED, _pa);

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

             }
         }
     }
             }
         }
     }