refactor: keep in mind the stack layout is crucial. Move context switching & signal...

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / pfault.c

diff --git a/lunaix-os/kernel/asm/x86/pfault.c b/lunaix-os/kernel/asm/x86/pfault.c
index c16385a892c05a487b50465fbbbcea48112be00a..9d5e1d1bdbe2bc10fab8514bec0fe71f6b915bb7 100644 (file)
--- a/lunaix-os/kernel/asm/x86/pfault.c
+++ b/lunaix-os/kernel/asm/x86/pfault.c
@@ -1,19 +1,27 @@
 #include <arch/x86/interrupts.h>
 #include <arch/x86/interrupts.h>

-#include <lunaix/mm/pmm.h>
+#include <lunaix/common.h>

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

+#include <lunaix/mm/pmm.h>

 #include <lunaix/mm/region.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/mm/region.h>
 #include <lunaix/mm/vmm.h>

-#include <lunaix/common.h>
-#include <lunaix/syslog.h>
-#include <lunaix/status.h>

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

+#include <lunaix/status.h>
+#include <lunaix/syslog.h>

 
 

-static void kprintf(const char* fmt, ...) { va_list args; va_start(args, fmt); __kprintf("PFAULT", fmt, args); va_end(args); }
+static void
+kprintf(const char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    __kprintf("PFAULT", fmt, args);
+    va_end(args);
+}

 
 

-extern void __print_panic_msg(const char* msg, const isr_param* param);
+extern void
+__print_panic_msg(const char* msg, const isr_param* param);

 
 void
 
 void

-intr_routine_page_fault (const isr_param* param) 
+intr_routine_page_fault(const isr_param* param)

 {
     uintptr_t ptr = cpu_rcr2();
     if (!ptr) {
 {
     uintptr_t ptr = cpu_rcr2();
     if (!ptr) {


@@ -27,18 +35,17 @@ intr_routine_page_fault (const isr_param* param)
         goto segv_term;
     }
 
         goto segv_term;
     }
 

-    // if (param->eip == ptr && !(hit_region->attr & REGION_EXEC)) {
-    //     goto segv_term;
-    // }
-
-    x86_pte_t* pte = CURPROC_PTE(ptr >> 12);
+    x86_pte_t* pte = PTE_MOUNTED(PD_REFERENCED, ptr >> 12);

     if (*pte & PG_PRESENT) {
     if (*pte & PG_PRESENT) {

-        if ((hit_region->attr & REGION_PERM_MASK) == (REGION_RSHARED | REGION_READ)) {
+        if ((hit_region->attr & REGION_PERM_MASK) ==
+            (REGION_RSHARED | REGION_READ)) {

             // normal page fault, do COW
             // normal page fault, do COW

-                uintptr_t pa = (uintptr_t)vmm_dup_page(__current->pid, PG_ENTRY_ADDR(*pte));
-                pmm_free_page(__current->pid, *pte & ~0xFFF);
-                *pte = (*pte & 0xFFF) | pa | PG_WRITE;
-                return;
+            cpu_invplg(pte);
+            uintptr_t pa =
+              (uintptr_t)vmm_dup_page(__current->pid, PG_ENTRY_ADDR(*pte));
+            pmm_free_page(__current->pid, *pte & ~0xFFF);
+            *pte = (*pte & 0xFFF) | pa | PG_WRITE;
+            return;

         }
         // impossible cases or accessing privileged page
         goto segv_term;
         }
         // impossible cases or accessing privileged page
         goto segv_term;


@@ -49,18 +56,25 @@ intr_routine_page_fault (const isr_param* param)
         goto segv_term;
     }
     uintptr_t loc = *pte & ~0xfff;
         goto segv_term;
     }
     uintptr_t loc = *pte & ~0xfff;

-    // a writable page, not present, pte attr is not null and no indication of cached page -> a new page need to be alloc
+    // a writable page, not present, pte attr is not null
+    //   and no indication of cached page -> a new page need to be alloc

     if ((hit_region->attr & REGION_WRITE) && (*pte & 0xfff) && !loc) {
     if ((hit_region->attr & REGION_WRITE) && (*pte & 0xfff) && !loc) {

+        cpu_invplg(pte);

         uintptr_t pa = pmm_alloc_page(__current->pid, 0);
         *pte = *pte | pa | PG_PRESENT;
         return;
     }
     // page not present, bring it from disk or somewhere else
     __print_panic_msg("WIP page fault route", param);
         uintptr_t pa = pmm_alloc_page(__current->pid, 0);
         *pte = *pte | pa | PG_PRESENT;
         return;
     }
     // page not present, bring it from disk or somewhere else
     __print_panic_msg("WIP page fault route", param);

-    while (1);
+    while (1)
+        ;

 
 segv_term:
 
 segv_term:

-    kprintf(KERROR "(pid: %d) Segmentation fault on %p (%p:%p)\n", __current->pid, ptr, param->cs, param->eip);
+    kprintf(KERROR "(pid: %d) Segmentation fault on %p (%p:%p)\n",
+            __current->pid,
+            ptr,
+            param->cs,
+            param->eip);

     terminate_proc(LXSEGFAULT);
     // should not reach
 }
\ No newline at end of file
     terminate_proc(LXSEGFAULT);
     // should not reach
 }
\ No newline at end of file