Changes in kernel/arch/sparc64/src/mm/sun4v/tlb.c [9d58539:b2fa1204] in mainline

File:

• kernel/arch/sparc64/src/mm/sun4v/tlb.c (modified) (8 diffs)

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

@@ -46 +46 @@
 #include <arch.h>
 #include <print.h>
+#include <log.h>
 #include <typedefs.h>
 #include <config.h>
@@ -62 +63 @@
 static void itlb_pte_copy(pte_t *);
 static void dtlb_pte_copy(pte_t *, bool);
-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 *, uint64_t,
-    const char *);
-static void do_fast_data_access_protection_fault(istate_t *,
-    uint64_t, const char *);
 
 /*
@@ -235 +230 @@
                  * handler.
                  */
-                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        do_fast_instruction_access_mmu_miss_fault(istate,
-                            istate->tpc, __func__);
-                }
+                as_page_fault(va, PF_ACCESS_EXEC, istate);
         }
 }
@@ -260 +252 @@
         uintptr_t va = DMISS_ADDRESS(page_and_ctx);
         uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
+        as_t *as = AS;
 
         if (ctx == ASID_KERNEL) {
                 if (va == 0) {
                         /* NULL access in kernel */
-                        do_fast_data_access_mmu_miss_fault(istate, page_and_ctx,
-                            __func__);
+                        panic("NULL pointer dereference.");
+                } else if (va >= end_of_identity) {
+                        /* Kernel non-identity */
+                        as = AS_KERNEL;
+                } else {
+                        panic("Unexpected kernel page fault.");
                 }
-                do_fast_data_access_mmu_miss_fault(istate, page_and_ctx, "Unexpected "
-                    "kernel page fault.");
-        }
-
-        t = page_mapping_find(AS, va, true);
+        }
+
+        t = page_mapping_find(as, va, true);
         if (t) {
                 /*
@@ -287 +282 @@
                  * handler.
                  */             
-                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        do_fast_data_access_mmu_miss_fault(istate, page_and_ctx,
-                            __func__);
-                }
+                as_page_fault(va, PF_ACCESS_READ, istate);
         }
 }
@@ -309 +301 @@
         uintptr_t va = DMISS_ADDRESS(page_and_ctx);
         uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
-
-        t = page_mapping_find(AS, va, true);
+        as_t *as = AS;
+
+        if (ctx == ASID_KERNEL)
+                as = AS_KERNEL;
+
+        t = page_mapping_find(as, va, true);
         if (t && PTE_WRITABLE(t)) {
                 /*
@@ -329 +325 @@
                  * handler.
                  */             
-                if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                        do_fast_data_access_protection_fault(istate, page_and_ctx,
-                            __func__);
-                }
+                as_page_fault(va, PF_ACCESS_WRITE, istate);
         }
 }
@@ -343 +336 @@
 void tlb_print(void)
 {
-        printf("Operation not possible on Niagara.\n");
-}
-
-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,
-    uint64_t page_and_ctx, const char *str)
-{
-        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
-            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        panic_memtrap(istate, PF_ACCESS_UNKNOWN, DMISS_ADDRESS(page_and_ctx),
-            str);
-}
-
-void do_fast_data_access_protection_fault(istate_t *istate,
-    uint64_t page_and_ctx, const char *str)
-{
-        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
-            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
-            str);
+        log(LF_ARCH, LVL_WARN, "Operation not possible on Niagara.");
 }