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

File:

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

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

@@ -206 +206 @@
         pte_t *t;
 
+        page_table_lock(AS, true);
         t = page_mapping_find(AS, page_16k, true);
         if (t && PTE_EXECUTABLE(t)) {
@@ -217 +218 @@
                 itsb_pte_copy(t, index);
 #endif
+                page_table_unlock(AS, true);
         } else {
                 /*
@@ -222 +224 @@
                  * handler.
                  */
+                page_table_unlock(AS, true);
                 if (as_page_fault(page_16k, PF_ACCESS_EXEC, istate) ==
                     AS_PF_FAULT) {
@@ -247 +250 @@
         size_t index;
         pte_t *t;
-        as_t *as = AS;
 
         page_8k = (uint64_t) tag.vpn << MMU_PAGE_WIDTH;
@@ -259 +261 @@
                             "Dereferencing NULL pointer.");
                 } 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.");
+                        /*
+                         * The kernel is accessing the I/O space.
+                         * We still do identity mapping for I/O,
+                         * but without caching.
+                         */
+                        dtlb_insert_mapping(page_8k, KA2PA(page_8k),
+                            PAGESIZE_8K, false, false);
+                        return;
                 }
-        }
-
-        t = page_mapping_find(as, page_16k, true);
+                do_fast_data_access_mmu_miss_fault(istate, tag, "Unexpected "
+                    "kernel page fault.");
+        }
+
+        page_table_lock(AS, true);
+        t = page_mapping_find(AS, page_16k, true);
         if (t) {
                 /*
@@ -278 +286 @@
                 dtsb_pte_copy(t, index, true);
 #endif
+                page_table_unlock(AS, true);
         } else {
                 /*
                  * Forward the page fault to the address space page fault
                  * handler.
-                 */
+                 */             
+                page_table_unlock(AS, true);
                 if (as_page_fault(page_16k, PF_ACCESS_READ, istate) ==
                     AS_PF_FAULT) {
@@ -304 +314 @@
         size_t index;
         pte_t *t;
-        as_t *as = AS;
 
         page_16k = ALIGN_DOWN((uint64_t) tag.vpn << MMU_PAGE_WIDTH, PAGE_SIZE);
         index = tag.vpn % MMU_PAGES_PER_PAGE;   /* 16K-page emulation */
 
-        if (tag.context == ASID_KERNEL)
-                as = AS_KERNEL;
-
-        t = page_mapping_find(as, page_16k, true);
+        page_table_lock(AS, true);
+        t = page_mapping_find(AS, page_16k, true);
         if (t && PTE_WRITABLE(t)) {
                 /*
@@ -327 +334 @@
                 dtsb_pte_copy(t, index, false);
 #endif
+                page_table_unlock(AS, true);
         } else {
                 /*
@@ -332 +340 @@
                  * handler.
                  */             
+                page_table_unlock(AS, true);
                 if (as_page_fault(page_16k, PF_ACCESS_WRITE, istate) ==
                     AS_PF_FAULT) {