chore: fix almost *ALL* warnings.

[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 bbaf59f407655225f86794fd6c0025e3af7c7374..0d5a6fa661b908d901e625a5911f61dddabd6f3a 100644 (file)
--- a/lunaix-os/kernel/asm/x86/pfault.c
+++ b/lunaix-os/kernel/asm/x86/pfault.c
@@ -1,11 +1,11 @@
 #include <arch/x86/interrupts.h>
 #include <lunaix/common.h>
 #include <arch/x86/interrupts.h>
 #include <lunaix/common.h>

-#include <lunaix/lxsignal.h>

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

+#include <lunaix/signal.h>

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


@@ -28,7 +28,7 @@ __print_panic_msg(const char* msg, const isr_param* param);
 void
 intr_routine_page_fault(const isr_param* param)
 {
 void
 intr_routine_page_fault(const isr_param* param)
 {

-    uintptr_t ptr = cpu_rcr2();
+    ptr_t ptr = cpu_rcr2();

     if (!ptr) {
         goto segv_term;
     }
     if (!ptr) {
         goto segv_term;
     }


@@ -38,30 +38,29 @@ intr_routine_page_fault(const isr_param* param)
         goto segv_term;
     }
 
         goto segv_term;
     }
 

-    if (!SEL_RPL(param->cs)) {
-        // 如果是内核页错误……
-        if (do_kernel(&mapping)) {
-            return;
-        }
-        // 如果不是，那么看看内核是不是需要用户页。
+    if (!SEL_RPL(param->execp->cs)) {
+        // TODO if kernel pfault

     }
 
     }
 

-    struct mm_region* hit_region = region_get(&__current->mm.regions, ptr);
+    vm_regions_t* vmr = (vm_regions_t*)&__current->mm.regions;
+    struct mm_region* hit_region = region_get(vmr, ptr);

 
     if (!hit_region) {
         // 当你凝视深渊时……
         goto segv_term;
     }
 
 
     if (!hit_region) {
         // 当你凝视深渊时……
         goto segv_term;
     }
 

-    volatile x86_pte_t* pte = &PTE_MOUNTED(PD_REFERENCED, ptr >> 12);
-    if (PG_PRESENTED(*pte)) {
+    volatile x86_pte_t* pte = &PTE_MOUNTED(VMS_SELF, ptr >> 12);
+    if (PG_IS_PRESENT(*pte)) {

         if ((hit_region->attr & COW_MASK) == COW_MASK) {
             // normal page fault, do COW
         if ((hit_region->attr & COW_MASK) == COW_MASK) {
             // normal page fault, do COW

-            cpu_invplg(pte);
-            uintptr_t pa =
-              (uintptr_t)vmm_dup_page(__current->pid, PG_ENTRY_ADDR(*pte));
+            cpu_invplg((ptr_t)pte);
+
+            ptr_t pa = (ptr_t)vmm_dup_page(__current->pid, PG_ENTRY_ADDR(*pte));
+

             pmm_free_page(__current->pid, *pte & ~0xFFF);
             pmm_free_page(__current->pid, *pte & ~0xFFF);

-            *pte = (*pte & 0xFFF) | pa | PG_WRITE;
+            *pte = (*pte & 0xFFF & ~PG_DIRTY) | pa | PG_WRITE;
+

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


@@ -71,43 +70,54 @@ intr_routine_page_fault(const isr_param* param)
     // an anonymous page and not present
     //   -> a new page need to be alloc
     if ((hit_region->attr & REGION_ANON)) {
     // an anonymous page and not present
     //   -> a new page need to be alloc
     if ((hit_region->attr & REGION_ANON)) {

-        if (!PG_PRESENTED(*pte)) {
-            cpu_invplg(pte);
-            uintptr_t pa = pmm_alloc_page(__current->pid, 0);
+        if (!PG_IS_PRESENT(*pte)) {
+            cpu_invplg((ptr_t)pte);
+
+            ptr_t pa = pmm_alloc_page(__current->pid, 0);

             if (!pa) {
                 goto oom;
             }
 
             *pte = *pte | pa | PG_PRESENT;
             if (!pa) {
                 goto oom;
             }
 
             *pte = *pte | pa | PG_PRESENT;

+            memset((void*)PG_ALIGN(ptr), 0, PG_SIZE);

             goto resolved;
         }
             goto resolved;
         }

-        // permission denied on anon page
+        // permission denied on anon page (e.g., write on readonly page)

         goto segv_term;
     }
 
     // if mfile is set (Non-anonymous), then it is a mem map
         goto segv_term;
     }
 
     // if mfile is set (Non-anonymous), then it is a mem map

-    if (hit_region->mfile && !PG_PRESENTED(*pte)) {
+    if (hit_region->mfile && !PG_IS_PRESENT(*pte)) {

         struct v_file* file = hit_region->mfile;
         struct v_file* file = hit_region->mfile;

-        u32_t offset =
-          (ptr - hit_region->start) & (PG_SIZE - 1) + hit_region->offset;
-        uintptr_t pa = pmm_alloc_page(__current->pid, 0);
+
+        ptr = PG_ALIGN(ptr);
+
+        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);

 
         if (!pa) {
             goto oom;
         }
 
 
         if (!pa) {
             goto oom;
         }
 

-        cpu_invplg(pte);
+        cpu_invplg((ptr_t)pte);

         *pte = (*pte & 0xFFF) | pa | PG_PRESENT;
 
         *pte = (*pte & 0xFFF) | pa | PG_PRESENT;
 

-        ptr = ptr & ~(PG_SIZE - 1);
-        memset(ptr, 0, PG_SIZE);
+        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, ptr, PG_SIZE, offset);

         if (errno < 0) {
         if (errno < 0) {

-            kprintf(KERROR "fail to read page (%d)\n", errno);
+            kprintf(KERROR "fail to populate page (%d)\n", errno);

             goto segv_term;
         }
 
             goto segv_term;
         }
 

+        *pte &= ~PG_DIRTY;
+

         goto resolved;
     }
 
         goto resolved;
     }
 


@@ -122,8 +132,8 @@ segv_term:
     kprintf(KERROR "(pid: %d) Segmentation fault on %p (%p:%p)\n",
             __current->pid,
             ptr,
     kprintf(KERROR "(pid: %d) Segmentation fault on %p (%p:%p)\n",
             __current->pid,
             ptr,

-            param->cs,
-            param->eip);
+            param->execp->cs,
+            param->execp->eip);

     __SIGSET(__current->sig_pending, _SIGSEGV);
     schedule();
     // should not reach
     __SIGSET(__current->sig_pending, _SIGSEGV);
     schedule();
     // should not reach


@@ -133,16 +143,4 @@ segv_term:
 resolved:
     cpu_invplg(ptr);
     return;
 resolved:
     cpu_invplg(ptr);
     return;

-}
-
-int
-do_kernel(v_mapping* mapping)
-{
-    uintptr_t addr = mapping->va;
-
-    // TODO
-
-    return 0;
-done:
-    return 1;

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