Changeset cefb126 in mainline for kernel/arch/sparc64/src/mm/sun4v/tlb.c

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -28 +28 @@
  */
 
-/** @addtogroup sparc64mm       
+/** @addtogroup sparc64mm
  * @{
  */
@@ -62 +62 @@
 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 *, const char *);
+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 *);
@@ -235 +236 @@
                  * Forward the page fault to the address space page fault
                  * handler.
-                 */             
+                 */
                 page_table_unlock(AS, true);
                 if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
                         do_fast_instruction_access_mmu_miss_fault(istate,
-                            __func__);
+                            istate->tpc, __func__);
                 }
         }
@@ -354 +355 @@
 }
 
-void do_fast_instruction_access_mmu_miss_fault(istate_t *istate,
+void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, uintptr_t va,
     const char *str)
 {
-        fault_if_from_uspace(istate, "%s.", str);
-        dump_istate(istate);
-        panic("%s.", str);
+        fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
+        panic_memtrap(istate, PF_ACCESS_EXEC, va, "%s.", str);
 }
 
@@ -365 +365 @@
     uint64_t page_and_ctx, const char *str)
 {
-        if (DMISS_CONTEXT(page_and_ctx)) {
-                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, DMISS_ADDRESS(page_and_ctx),
-                    DMISS_CONTEXT(page_and_ctx));
-        }
-        dump_istate(istate);
-        printf("Faulting page: %p, ASID=%d\n", DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        panic("%s\n", str);
+        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
+            DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
+        panic_memtrap(istate, PF_ACCESS_READ, DMISS_ADDRESS(page_and_ctx),
+            "%s.");
 }
 
@@ -377 +374 @@
     uint64_t page_and_ctx, const char *str)
 {
-        if (DMISS_CONTEXT(page_and_ctx)) {
-                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d)\n", str, DMISS_ADDRESS(page_and_ctx),
-                    DMISS_CONTEXT(page_and_ctx));
-        }
-        printf("Faulting page: %p, ASID=%d\n", DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        dump_istate(istate);
-        panic("%s\n", str);
+        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
+            DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
+        panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
+            "%s.");
 }