Merge branch 'interrupt-rework' into prog-loader

[lunaix-os.git] / lunaix-os / kernel / process / sched.c

diff --git a/lunaix-os/kernel/process/sched.c b/lunaix-os/kernel/process/sched.c
index 1c6bd977833145e61061d124eda41c96a7532818..ade13b31c6414f4e1e1588b26645f255475f2c6c 100644 (file)
--- a/lunaix-os/kernel/process/sched.c
+++ b/lunaix-os/kernel/process/sched.c
@@ -6,7 +6,6 @@
 
 #include <lunaix/fs/taskfs.h>
 #include <lunaix/mm/cake.h>
 
 #include <lunaix/fs/taskfs.h>
 #include <lunaix/mm/cake.h>

-#include <lunaix/mm/kalloc.h>

 #include <lunaix/mm/mmap.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/mmap.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>


@@ -19,6 +18,8 @@
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 

+#include <klibc/string.h>
+

 volatile struct proc_info* __current;
 
 static struct proc_info dummy_proc;
 volatile struct proc_info* __current;
 
 static struct proc_info dummy_proc;


@@ -59,23 +60,23 @@ sched_init_dummy()
     extern void my_dummy();
     static char dummy_stack[DUMMY_STACK_SIZE] __attribute__((aligned(16)));
 
     extern void my_dummy();
     static char dummy_stack[DUMMY_STACK_SIZE] __attribute__((aligned(16)));
 

-    // memset to 0
-    dummy_proc = (struct proc_info){};
-    dummy_proc.intr_ctx = (isr_param){
-        .registers = { .ds = KDATA_SEG,
-                       .es = KDATA_SEG,
-                       .fs = KDATA_SEG,
-                       .gs = KDATA_SEG,
-                       .esp = (void*)dummy_stack + DUMMY_STACK_SIZE - 20 },
+    struct exec_param* execp =
+      (void*)dummy_stack + DUMMY_STACK_SIZE - sizeof(struct exec_param);
+
+    *execp = (struct exec_param){

         .cs = KCODE_SEG,
         .cs = KCODE_SEG,

+        .eflags = cpu_reflags() | 0x0200,

         .eip = (void*)my_dummy,
         .ss = KDATA_SEG,
         .eip = (void*)my_dummy,
         .ss = KDATA_SEG,

-        .eflags = cpu_reflags() | 0x0200

     };
 
     };
 

-    *(u32_t*)(&dummy_stack[DUMMY_STACK_SIZE - 4]) = dummy_proc.intr_ctx.eflags;
-    *(u32_t*)(&dummy_stack[DUMMY_STACK_SIZE - 8]) = KCODE_SEG;
-    *(u32_t*)(&dummy_stack[DUMMY_STACK_SIZE - 12]) = dummy_proc.intr_ctx.eip;
+    // memset to 0
+    dummy_proc = (struct proc_info){};
+    dummy_proc.intr_ctx = (isr_param){ .registers = { .ds = KDATA_SEG,
+                                                      .es = KDATA_SEG,
+                                                      .fs = KDATA_SEG,
+                                                      .gs = KDATA_SEG },
+                                       .execp = execp };

 
     dummy_proc.page_table = cpu_rcr3();
     dummy_proc.state = PS_READY;
 
     dummy_proc.page_table = cpu_rcr3();
     dummy_proc.state = PS_READY;


@@ -98,7 +99,7 @@ run(struct proc_info* proc)
         由于这中间没有进行地址空间的交换，所以第二次跳转使用的是同一个内核栈，而之前默认tss.esp0的值是永远指向最顶部
         这样一来就有可能会覆盖更早的上下文信息（比如嵌套的信号捕获函数）
     */
         由于这中间没有进行地址空间的交换，所以第二次跳转使用的是同一个内核栈，而之前默认tss.esp0的值是永远指向最顶部
         这样一来就有可能会覆盖更早的上下文信息（比如嵌套的信号捕获函数）
     */

-    tss_update_esp(proc->intr_ctx.registers.esp);
+    tss_update_esp(proc->intr_ctx.esp);

 
     apic_done_servicing();
 
 
     apic_done_servicing();
 


@@ -325,6 +326,7 @@ alloc_process()
 
     proc->state = PS_CREATED;
     proc->pid = i;
 
     proc->state = PS_CREATED;
     proc->pid = i;

+    proc->mm.pid = i;

     proc->created = clock_systime();
     proc->pgid = proc->pid;
     proc->fdtable = vzalloc(sizeof(struct v_fdtable));
     proc->created = clock_systime();
     proc->pgid = proc->pid;
     proc->fdtable = vzalloc(sizeof(struct v_fdtable));


@@ -407,7 +409,7 @@ destroy_process(pid_t pid)
     llist_for_each(pos, n, &proc->mm.regions, head)
     {
         mem_sync_pages(VMS_MOUNT_1, pos, pos->start, pos->end - pos->start, 0);
     llist_for_each(pos, n, &proc->mm.regions, head)
     {
         mem_sync_pages(VMS_MOUNT_1, pos, pos->start, pos->end - pos->start, 0);

-        vfree(pos);
+        region_release(pos);

     }
 
     __del_pagetable(pid, VMS_MOUNT_1);
     }
 
     __del_pagetable(pid, VMS_MOUNT_1);