Changes in kernel/arch/ia32/src/mm/page.c [59fb782:40c8c17] in mainline

File:

• kernel/arch/ia32/src/mm/page.c (modified) (3 diffs)

kernel/arch/ia32/src/mm/page.c

@@ -71 +71 @@
         for (cur = 0; cur < min(config.identity_size, config.physmem_end);
             cur += FRAME_SIZE) {
-                flags = PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_WRITE | PAGE_READ;
+                flags = PAGE_CACHEABLE | PAGE_WRITE;
+                if ((PA2KA(cur) >= config.base) &&
+                    (PA2KA(cur) < config.base + config.kernel_size))
+                        flags |= PAGE_GLOBAL;
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         }
@@ -84 +87 @@
 void page_fault(unsigned int n __attribute__((unused)), istate_t *istate)
 {
-        uintptr_t badvaddr;
+        uintptr_t page;
         pf_access_t access;
         
-        badvaddr = read_cr2();
+        page = read_cr2();
                 
         if (istate->error_word & PFERR_CODE_RSVD)
@@ -97 +100 @@
                 access = PF_ACCESS_READ;
         
-        (void) as_page_fault(badvaddr, access, istate);
+        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
+                fault_if_from_uspace(istate, "Page fault: %#x.", page);
+                panic_memtrap(istate, access, page, NULL);
+        }
 }