X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/8c06c883e7b13c115d5ff207f79d4b68fccd5ad6..965940833071025bf0d386f4a9c70a5258453dbd:/lunaix-os/arch/i386/mm/pfault.c

diff --git a/lunaix-os/arch/i386/mm/pfault.c b/lunaix-os/arch/i386/mm/pfault.c
index 2533d0b..d0dd56c 100644
--- a/lunaix-os/arch/i386/mm/pfault.c
+++ b/lunaix-os/arch/i386/mm/pfault.c
@@ -9,30 +9,13 @@
 #include <lunaix/trace.h>
 
 #include <sys/interrupts.h>
+#include <sys/mm/mm_defs.h>
 
 #include <klibc/string.h>
 
-static u32_t
-get_ptattr(struct mm_region* vmr)
-{
-    u32_t vmr_attr = vmr->attr;
-    u32_t ptattr = PG_PRESENT | PG_ALLOW_USER;
-
-    if ((vmr_attr & PROT_WRITE)) {
-        ptattr |= PG_WRITE;
-    }
+LOG_MODULE("pf")
 
-    return ptattr & 0xfff;
-}
 
-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)
 
@@ -42,6 +25,12 @@ __print_panic_msg(const char* msg, const isr_param* param);
 void
 intr_routine_page_fault(const isr_param* param)
 {
+    if (param->depth > 10) {
+        // Too many nested fault! we must messed up something
+        // XXX should we failed silently?
+        spin();
+    }
+
     uint32_t errcode = param->execp->err_code;
     ptr_t ptr = cpu_ldeaddr();
     if (!ptr) {
@@ -55,7 +44,14 @@ intr_routine_page_fault(const isr_param* param)
 
     // XXX do kernel trigger pfault?
 
-    vm_regions_t* vmr = (vm_regions_t*)&__current->mm.regions;
+    volatile x86_pte_t* pte = &PTE_MOUNTED(VMS_SELF, ptr >> 12);
+
+    if (guardian_page(*pte)) {
+        ERROR("memory region over-running");
+        goto segv_term;
+    }
+    
+    vm_regions_t* vmr = vmregions(__current);
     struct mm_region* hit_region = region_get(vmr, ptr);
 
     if (!hit_region) {
@@ -63,23 +59,22 @@ intr_routine_page_fault(const isr_param* param)
         goto segv_term;
     }
 
-    volatile x86_pte_t* pte = &PTE_MOUNTED(VMS_SELF, ptr >> 12);
     if (PG_IS_PRESENT(*pte)) {
         if (((errcode ^ mapping.flags) & PG_ALLOW_USER)) {
             // invalid access
-            kprintf(KDEBUG "invalid user access. (%p->%p, attr:0x%x)",
-                    mapping.va,
-                    mapping.pa,
-                    mapping.flags);
+            DEBUG("invalid user access. (%p->%p, attr:0x%x)",
+                  mapping.va,
+                  mapping.pa,
+                  mapping.flags);
             goto segv_term;
         }
         if ((hit_region->attr & COW_MASK) == COW_MASK) {
             // normal page fault, do COW
             cpu_flush_page((ptr_t)pte);
 
-            ptr_t pa = (ptr_t)vmm_dup_page(__current->pid, PG_ENTRY_ADDR(*pte));
+            ptr_t pa = (ptr_t)vmm_dup_page(PG_ENTRY_ADDR(*pte));
 
-            pmm_free_page(__current->pid, *pte & ~0xFFF);
+            pmm_free_page(*pte & ~0xFFF);
             *pte = (*pte & 0xFFF & ~PG_DIRTY) | pa | PG_WRITE;
 
             goto resolved;
@@ -94,12 +89,12 @@ intr_routine_page_fault(const isr_param* param)
         if (!PG_IS_PRESENT(*pte)) {
             cpu_flush_page((ptr_t)pte);
 
-            ptr_t pa = pmm_alloc_page(__current->pid, 0);
+            ptr_t pa = pmm_alloc_page(0);
             if (!pa) {
                 goto oom;
             }
 
-            *pte = *pte | pa | get_ptattr(hit_region);
+            *pte = pa | region_ptattr(hit_region);
             memset((void*)PG_ALIGN(ptr), 0, PG_SIZE);
             goto resolved;
         }
@@ -115,25 +110,21 @@ intr_routine_page_fault(const isr_param* param)
 
         u32_t mseg_off = (ptr - hit_region->start);
         u32_t mfile_off = mseg_off + hit_region->foff;
-        ptr_t pa = pmm_alloc_page(__current->pid, 0);
+        ptr_t pa = pmm_alloc_page(0);
 
         if (!pa) {
             goto oom;
         }
 
         cpu_flush_page((ptr_t)pte);
-        *pte = (*pte & 0xFFF) | pa | get_ptattr(hit_region);
+        *pte = pa | region_ptattr(hit_region);
 
         memset((void*)ptr, 0, PG_SIZE);
 
-        int errno = 0;
-        if (mseg_off < hit_region->flen) {
-            errno =
-              file->ops->read_page(file->inode, (void*)ptr, PG_SIZE, mfile_off);
-        }
+        int errno = file->ops->read_page(file->inode, (void*)ptr, mfile_off);
 
         if (errno < 0) {
-            kprintf(KERROR "fail to populate page (%d)", errno);
+            ERROR("fail to populate page (%d)", errno);
             goto segv_term;
         }
 
@@ -148,20 +139,26 @@ intr_routine_page_fault(const isr_param* param)
         ;
 
 oom:
-    kprintf(KERROR "out of memory");
+    ERROR("out of memory");
 
 segv_term:
-    kprintf(KERROR "(pid: %d) Segmentation fault on %p (%p:%p,e=0x%x)",
-            __current->pid,
-            ptr,
-            param->execp->cs,
-            param->execp->eip,
-            param->execp->err_code);
-
-    sigset_add(__current->sigctx.sig_pending, _SIGSEGV);
+    ERROR("(pid: %d) Segmentation fault on %p (%p:%p,e=0x%x)",
+          __current->pid,
+          ptr,
+          param->execp->cs,
+          param->execp->eip,
+          param->execp->err_code);
 
     trace_printstack_isr(param);
 
+    if (kernel_context(param)) {
+        ERROR("[page fault on kernel]");
+        // halt kernel if segv comes from kernel space
+        spin();
+    }
+
+    thread_setsignal(current_thread, _SIGSEGV);
+
     schedule();
     // should not reach
     while (1)