feat: kernel stack tracing

[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 5789927f27cf79b24ad4e4e84d3677675ab0dd98..31a94ee08f3ce7f8fe6be03d0b81084cf7b4a7e4 100644 (file)
--- a/lunaix-os/kernel/process/sched.c
+++ b/lunaix-os/kernel/process/sched.c
@@ -1,8 +1,9 @@
-#include <arch/x86/interrupts.h>
-#include <arch/x86/tss.h>
+#include <sys/abi.h>
+#include <sys/interrupts.h>
+#include <sys/mm/mempart.h>

 
 

-#include <hal/apic.h>
-#include <hal/cpu.h>
+#include <sys/cpu.h>
+#include <hal/intc.h>

 
 #include <lunaix/fs/taskfs.h>
 #include <lunaix/mm/cake.h>
 
 #include <lunaix/fs/taskfs.h>
 #include <lunaix/mm/cake.h>


@@ -60,25 +61,13 @@ 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)));
 

-    struct exec_param* execp =
-      (void*)dummy_stack + DUMMY_STACK_SIZE - sizeof(struct exec_param);
+    ptr_t stktop = (ptr_t)dummy_stack + DUMMY_STACK_SIZE;

 
 

-    *execp = (struct exec_param){
-        .cs = KCODE_SEG,
-        .eflags = cpu_reflags() | 0x0200,
-        .eip = (ptr_t)my_dummy,
-        .ss = KDATA_SEG,
-    };
-
-    // memset to 0

     dummy_proc = (struct proc_info){};
     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();
+    proc_init_transfer(&dummy_proc, stktop, (ptr_t)my_dummy, TRANSFER_IE);
+
+    dummy_proc.page_table = cpu_ldvmspace();

     dummy_proc.state = PS_READY;
     dummy_proc.parent = &dummy_proc;
     dummy_proc.pid = KERNEL_PID;
     dummy_proc.state = PS_READY;
     dummy_proc.parent = &dummy_proc;
     dummy_proc.pid = KERNEL_PID;


@@ -91,21 +80,8 @@ run(struct proc_info* proc)
 {
     proc->state = PS_RUNNING;
 
 {
     proc->state = PS_RUNNING;
 

-    /*
-        将tss.esp0设置为上次调度前的esp值。
-        当处理信号时，上下文信息是不会恢复的，而是保存在用户栈中，然后直接跳转进位于用户空间的sig_wrapper进行
-          信号的处理。当用户自定义的信号处理函数返回时，sigreturn的系统调用才开始进行上下文的恢复（或者说是进行
-          另一次调度。
-        由于这中间没有进行地址空间的交换，所以第二次跳转使用的是同一个内核栈，而之前默认tss.esp0的值是永远指向最顶部
-        这样一来就有可能会覆盖更早的上下文信息（比如嵌套的信号捕获函数）
-    */
-    tss_update_esp(proc->intr_ctx.esp);
-
-    apic_done_servicing();
-
-    asm volatile("pushl %0\n"
-                 "jmp switch_to\n" ::"r"(proc)
-                 : "memory"); // kernel/asm/x86/interrupt.S
+    intc_notify_eos(0);
+    switch_context(proc);

 }
 
 int
 }
 
 int


@@ -139,7 +115,7 @@ check_sleepers()
     time_t now = clock_systime();
     llist_for_each(pos, n, &leader->sleep.sleepers, sleep.sleepers)
     {
     time_t now = clock_systime();
     llist_for_each(pos, n, &leader->sleep.sleepers, sleep.sleepers)
     {

-        if (PROC_TERMINATED(pos->state)) {
+        if (proc_terminated(pos)) {

             goto del;
         }
 
             goto del;
         }
 


@@ -206,7 +182,7 @@ void
 sched_yieldk()
 {
     cpu_enable_interrupt();
 sched_yieldk()
 {
     cpu_enable_interrupt();

-    cpu_int(LUNAIX_SCHED);
+    cpu_trap_sched();

 }
 
 __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
 }
 
 __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)


@@ -220,13 +196,13 @@ __DEFINE_LXSYSCALL1(unsigned int, sleep, unsigned int, seconds)
     }
 
     struct proc_info* root_proc = sched_ctx._procs[0];
     }
 
     struct proc_info* root_proc = sched_ctx._procs[0];

-    __current->sleep.wakeup_time = clock_systime() + seconds * 1000;
+    __current->sleep.wakeup_time = clock_systime() + seconds;

 
     if (llist_empty(&__current->sleep.sleepers)) {
         llist_append(&root_proc->sleep.sleepers, &__current->sleep.sleepers);
     }
 
 
     if (llist_empty(&__current->sleep.sleepers)) {
         llist_append(&root_proc->sleep.sleepers, &__current->sleep.sleepers);
     }
 

-    __current->intr_ctx.registers.eax = seconds;
+    store_retval(seconds);

 
     block_current();
     schedule();
 
     block_current();
     schedule();


@@ -239,7 +215,7 @@ __DEFINE_LXSYSCALL1(unsigned int, alarm, unsigned int, seconds)
     time_t prev_ddl = __current->sleep.alarm_time;
     time_t now = clock_systime();
 
     time_t prev_ddl = __current->sleep.alarm_time;
     time_t now = clock_systime();
 

-    __current->sleep.alarm_time = seconds ? now + seconds * 1000 : 0;
+    __current->sleep.alarm_time = seconds ? now + seconds : 0;

 
     struct proc_info* root_proc = sched_ctx._procs[0];
     if (llist_empty(&__current->sleep.sleepers)) {
 
     struct proc_info* root_proc = sched_ctx._procs[0];
     if (llist_empty(&__current->sleep.sleepers)) {


@@ -340,8 +316,6 @@ alloc_process()
     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));

-    proc->fxstate =
-      vzalloc_dma(512); // FXSAVE需要十六位对齐地址，使用DMA块（128位对齐）

 
     llist_init_head(&proc->mm.regions);
     llist_init_head(&proc->tasks);
 
     llist_init_head(&proc->mm.regions);
     llist_init_head(&proc->tasks);


@@ -412,7 +386,6 @@ destroy_process(pid_t pid)
     }
 
     vfree(proc->fdtable);
     }
 
     vfree(proc->fdtable);

-    vfree_dma(proc->fxstate);

 
     vmm_mount_pd(VMS_MOUNT_1, proc->page_table);
 
 
     vmm_mount_pd(VMS_MOUNT_1, proc->page_table);
 


@@ -463,5 +436,5 @@ orphaned_proc(pid_t pid)
 
     // 如果其父进程的状态是terminated 或 destroy中的一种
     // 或者其父进程是在该进程之后创建的，那么该进程为孤儿进程
 
     // 如果其父进程的状态是terminated 或 destroy中的一种
     // 或者其父进程是在该进程之后创建的，那么该进程为孤儿进程

-    return PROC_TERMINATED(parent->state) || parent->created > proc->created;
+    return proc_terminated(parent) || parent->created > proc->created;

 }
\ No newline at end of file
 }
\ No newline at end of file