X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/86a9cfeadbbe180abf6c8bd8c64c86957fdacfeb..2803826a2373620dbfce8a5bff1e6a01dd594953:/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 c16385a..30fd498 100644
--- a/lunaix-os/kernel/asm/x86/pfault.c
+++ b/lunaix-os/kernel/asm/x86/pfault.c
@@ -1,44 +1,65 @@
 #include <arch/x86/interrupts.h>
-#include <lunaix/mm/pmm.h>
+#include <lunaix/common.h>
 #include <lunaix/mm/mm.h>
+#include <lunaix/mm/pmm.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/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); }
+#define COW_MASK (REGION_RSHARED | REGION_READ | REGION_WRITE)
 
-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
-intr_routine_page_fault (const isr_param* param) 
+intr_routine_page_fault(const isr_param* param)
 {
     uintptr_t ptr = cpu_rcr2();
     if (!ptr) {
         goto segv_term;
     }
 
-    struct mm_region* hit_region = region_get(__current, ptr);
+    v_mapping mapping;
+    if (!vmm_lookup(ptr, &mapping)) {
+        goto segv_term;
+    }
+
+    if (!SEL_RPL(param->cs)) {
+        // 如果是内核页错误……
+        if (do_kernel(&mapping)) {
+            return;
+        }
+        goto segv_term;
+    }
+
+    struct mm_region* hit_region = region_get(&__current->mm.regions, ptr);
 
     if (!hit_region) {
         // Into the void...
         goto segv_term;
     }
 
-    // if (param->eip == ptr && !(hit_region->attr & REGION_EXEC)) {
-    //     goto segv_term;
-    // }
-
-    x86_pte_t* pte = CURPROC_PTE(ptr >> 12);
-    if (*pte & PG_PRESENT) {
-        if ((hit_region->attr & REGION_PERM_MASK) == (REGION_RSHARED | REGION_READ)) {
+    x86_pte_t* pte = &PTE_MOUNTED(PD_REFERENCED, ptr >> 12);
+    if ((*pte & PG_PRESENT)) {
+        if ((hit_region->attr & COW_MASK) == COW_MASK) {
             // 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;
+            goto resolved;
         }
         // impossible cases or accessing privileged page
         goto segv_term;
@@ -48,19 +69,53 @@ intr_routine_page_fault (const isr_param* param)
         // Invalid location
         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, not cached, pte attr is not null
+    //   -> a new page need to be alloc
     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;
+        goto resolved;
     }
+
     // page not present, bring it from disk or somewhere else
     __print_panic_msg("WIP page fault route", param);
-    while (1);
+    while (1)
+        ;
 
 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
+    while (1)
+        ;
+
+resolved:
+    cpu_invplg(ptr);
+    return;
+}
+
+int
+do_kernel(v_mapping* mapping)
+{
+    uintptr_t addr = mapping->va;
+    if (addr >= KHEAP_START && addr < PROC_START) {
+        // This is kernel heap page
+        uintptr_t pa = pmm_alloc_page(KERNEL_PID, 0);
+        *mapping->pte = (*mapping->pte & 0xfff) | pa | PG_PRESENT;
+        cpu_invplg(mapping->pte);
+        cpu_invplg(addr);
+        goto done;
+    }
+
+    return 0;
+done:
+    return 1;
 }
\ No newline at end of file