Changes in kernel/arch/sparc64/src/mm/sun4u/tlb.c [0e78394:59fb782] in mainline

File:

• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (7 diffs)

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -58 +58 @@
 static void dtlb_pte_copy(pte_t *, size_t, bool);
 static void itlb_pte_copy(pte_t *, size_t);
-static void do_fast_instruction_access_mmu_miss_fault(istate_t *, uintptr_t,
-    const char *);
-static void do_fast_data_access_mmu_miss_fault(istate_t *, tlb_tag_access_reg_t,
-    const char *);
-static void do_fast_data_access_protection_fault(istate_t *,
-    tlb_tag_access_reg_t, const char *);
 
 const char *context_encoding[] = {
@@ -202 +196 @@
 void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
 {
-        uintptr_t page_16k = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
         size_t index = (istate->tpc >> MMU_PAGE_WIDTH) % MMU_PAGES_PER_PAGE;
         pte_t *t;
 
-        t = page_mapping_find(AS, page_16k, true);
+        t = page_mapping_find(AS, istate->tpc, true);
         if (t && PTE_EXECUTABLE(t)) {
                 /*
@@ -222 +215 @@
                  * handler.
                  */
-                if (as_page_fault(page_16k, PF_ACCESS_EXEC, istate) ==
-                    AS_PF_FAULT) {
-                        do_fast_instruction_access_mmu_miss_fault(istate,
-                            istate->tpc, __func__);
-                }
+                as_page_fault(istate->tpc, PF_ACCESS_EXEC, istate);
         }
 }
@@ -256 +245 @@
                 if (!tag.vpn) {
                         /* NULL access in kernel */
-                        do_fast_data_access_mmu_miss_fault(istate, tag,
-                            "Dereferencing NULL pointer.");
+                        panic("NULL pointer dereference.");
                 } else if (page_8k >= end_of_identity) {
                         /* Kernel non-identity. */
                         as = AS_KERNEL;
                 } else {
-                        do_fast_data_access_mmu_miss_fault(istate, tag,
-                    "Unexpected kernel page fault.");
+                        panic("Unexpected kernel page fault.");
                 }
         }
@@ -283 +270 @@
                  * handler.
                  */
-                if (as_page_fault(page_16k, PF_ACCESS_READ, istate) ==
-                    AS_PF_FAULT) {
-                        do_fast_data_access_mmu_miss_fault(istate, tag,
-                            __func__);
-                }
+                as_page_fault(page_16k, PF_ACCESS_READ, istate);
         }
 }
@@ -332 +315 @@
                  * handler.
                  */             
-                if (as_page_fault(page_16k, PF_ACCESS_WRITE, istate) ==
-                    AS_PF_FAULT) {
-                        do_fast_data_access_protection_fault(istate, tag,
-                            __func__);
-                }
+                as_page_fault(page_16k, PF_ACCESS_WRITE, istate);
         }
 }
@@ -428 +407 @@
 
 #endif
-
-void do_fast_instruction_access_mmu_miss_fault(istate_t *istate,
-    uintptr_t va, const char *str)
-{
-        fault_if_from_uspace(istate, "%s, address=%p.", str, (void *) va);
-        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
-}
-
-void do_fast_data_access_mmu_miss_fault(istate_t *istate,
-    tlb_tag_access_reg_t tag, const char *str)
-{
-        uintptr_t va;
-
-        va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
-            (void *) va, tag.context);
-        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
-}
-
-void do_fast_data_access_protection_fault(istate_t *istate,
-    tlb_tag_access_reg_t tag, const char *str)
-{
-        uintptr_t va;
-
-        va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
-            (void *) va, tag.context);
-        panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
-}
 
 void describe_dmmu_fault(void)