Changeset 730ff63 in mainline

Timestamp:

2013-09-03T19:13:37Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b3cf946

Parents:

1b34360

Message:

Do not create kernel identity over the entire address space on sun4v.

Location:

kernel/arch/sparc64

Files:

• include/arch/mm/frame.h (modified) (1 diff)
• include/arch/mm/sun4u/frame.h (modified) (1 diff)
• include/arch/mm/sun4v/frame.h (modified) (1 diff)
• include/arch/trap/sun4v/mmu.h (modified) (1 diff)
• src/mm/sun4v/frame.c (modified) (1 diff)
• src/mm/sun4v/tlb.c (modified) (3 diffs)
• src/sun4v/start.S (modified) (1 diff)

kernel/arch/sparc64/include/arch/mm/frame.h

@@ -46 +46 @@
 #endif
 
+#ifndef __ASM__
+
+#include <typedefs.h>
+
+extern uintptr_t end_of_identity;
+
+extern void frame_low_arch_init(void);
+extern void frame_high_arch_init(void);
+#define physmem_print()
+
+#endif
+
 #endif
 

kernel/arch/sparc64/include/arch/mm/sun4u/frame.h

@@ -72 +72 @@
 typedef union frame_address frame_address_t;
 
-extern uintptr_t end_of_identity;
-
-extern void frame_low_arch_init(void);
-extern void frame_high_arch_init(void);
-#define physmem_print()
-
 #endif
 

kernel/arch/sparc64/include/arch/mm/sun4v/frame.h

@@ -42 +42 @@
 #define FRAME_SIZE              (1 << FRAME_WIDTH)
 
-#ifndef __ASM__
-
-#include <typedefs.h>
-
-extern void frame_low_arch_init(void);
-extern void frame_high_arch_init(void);
-#define physmem_print()
-
-#endif
-
 #endif
 

kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h

@@ -102 +102 @@
         nop
 
+        /* exclude pages beyond the end of memory from the identity mapping */
+        sethi %hi(end_of_identity), %g4
+        ldx [%g4 + %lo(end_of_identity)], %g4
+        cmp %g1, %g4
+        bgeu %xcc, 0f
+        nop
+
         /*
          * Installing the identity does not fit into 32 instructions, call

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

@@ -101 +101 @@
          */
         frame_mark_unavailable(ADDR2PFN(KA2PA(PFN2ADDR(0))), 1);
+
+        /* PA2KA will work only on low-memory. */
+        end_of_identity = PA2KA(config.physmem_end - FRAME_SIZE) + PAGE_SIZE;
 }
 

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

@@ -251 +251 @@
         uintptr_t va = DMISS_ADDRESS(page_and_ctx);
         uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
+        as_t *as = AS;
 
         if (ctx == ASID_KERNEL) {
@@ -256 +257 @@
                         /* NULL access in kernel */
                         panic("NULL pointer dereference.");
+                } else if (va >= end_of_identity) {
+                        /* Kernel non-identity */
+                        as = AS_KERNEL;
+                } else {
+                        panic("Unexpected kernel page fault.");
                 }
-                panic("Unexpected kernel page fault.");
-        }
-
-        t = page_mapping_find(AS, va, true);
+        }
+
+        t = page_mapping_find(as, va, true);
         if (t) {
                 /*
@@ -295 +300 @@
         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)) {
                 /*

kernel/arch/sparc64/src/sun4v/start.S

@@ -345 +345 @@
         .quad 0
 
+/*
+ * This variable is used by the fast_data_access_MMU_miss trap handler.
+ * In runtime, it is modified to contain the address of the end of physical
+ * memory.
+ */
+.global end_of_identity
+end_of_identity:
+        .quad -1
+
 .global kernel_8k_tlb_data_template
 kernel_8k_tlb_data_template: