feat: shell and signal demo as loadable user executable

[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 0d5131f53def4ce02ea288afdaf1efa1391fdb9c..897a7dd2a197a6ac7c1f5d4b66bd8740a8181f9e 100644 (file)
--- a/lunaix-os/kernel/asm/x86/pfault.c
+++ b/lunaix-os/kernel/asm/x86/pfault.c
@@ -38,7 +38,7 @@ intr_routine_page_fault(const isr_param* param)
         goto segv_term;
     }
 
-    if (!SEL_RPL(param->cs)) {
+    if (!SEL_RPL(param->execp->cs)) {
         // 如果是内核页错误……
         if (do_kernel(&mapping)) {
             return;
@@ -79,6 +79,7 @@ intr_routine_page_fault(const isr_param* param)
             }
 
             *pte = *pte | pa | PG_PRESENT;
+            memset(PG_ALIGN(ptr), 0, PG_SIZE);
             goto resolved;
         }
         // permission denied on anon page (e.g., write on readonly page)
@@ -88,8 +89,11 @@ intr_routine_page_fault(const isr_param* param)
     // if mfile is set (Non-anonymous), then it is a mem map
     if (hit_region->mfile && !PG_IS_PRESENT(*pte)) {
         struct v_file* file = hit_region->mfile;
-        u32_t offset =
-          (ptr - hit_region->start) & (PG_SIZE - 1) + hit_region->foff;
+
+        ptr = PG_ALIGN(ptr);
+
+        u32_t mseg_off = (ptr - hit_region->start);
+        u32_t mfile_off = mseg_off + hit_region->foff;
         uintptr_t pa = pmm_alloc_page(__current->pid, 0);
 
         if (!pa) {
@@ -99,14 +103,11 @@ intr_routine_page_fault(const isr_param* param)
         cpu_invplg(pte);
         *pte = (*pte & 0xFFF) | pa | PG_PRESENT;
 
-        ptr = PG_ALIGN(ptr);
         memset(ptr, 0, PG_SIZE);
 
         int errno = 0;
-        if (hit_region->init_page) {
-            errno = hit_region->init_page(hit_region, ptr, offset);
-        } else {
-            errno = file->ops->read_page(file->inode, ptr, PG_SIZE, offset);
+        if (mseg_off < hit_region->flen) {
+            errno = file->ops->read_page(file->inode, ptr, PG_SIZE, mfile_off);
         }
 
         if (errno < 0) {
@@ -130,8 +131,8 @@ segv_term:
     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