Changes in kernel/arch/ia32/src/mm/page.c [f1a2c6e:7e752b2] in mainline

File:

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

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

@@ -39 +39 @@
 #include <mm/page.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <config.h>
@@ -61 +61 @@
                  * PA2KA(identity) mapping for all frames until last_frame.
                  */
+                page_table_lock(AS_KERNEL, true);
                 for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
                         flags = PAGE_CACHEABLE | PAGE_WRITE;
@@ -67 +68 @@
                         page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
                 }
+                page_table_unlock(AS_KERNEL, true);
                 
-                exc_register(14, "page_fault", (iroutine) page_fault);
+                exc_register(14, "page_fault", true, (iroutine_t) page_fault);
                 write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
         } else
@@ -80 +82 @@
 {
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%d bytes).", physaddr, size);
+                panic("Unable to map physical memory %p (%zu bytes).",
+                    (void *) physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);
         pfn_t i;
+        page_table_lock(AS_KERNEL, true);
         for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
                 uintptr_t addr = PFN2ADDR(i);
                 page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr, PAGE_NOT_CACHEABLE | PAGE_WRITE);
         }
+        page_table_unlock(AS_KERNEL, true);
         
         last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
@@ -94 +99 @@
 }
 
-void page_fault(int n __attribute__((unused)), istate_t *istate)
+void page_fault(unsigned int n __attribute__((unused)), istate_t *istate)
 {
         uintptr_t page;
@@ -111 +116 @@
         if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault: %#x.", page);
-                
-                decode_istate(istate);
-                printf("page fault address: %#lx\n", page);
-                panic("Page fault.");
+                panic_memtrap(istate, access, page, NULL);
         }
 }