Changes in kernel/arch/sparc64/src/mm/sun4v/tlb.c [560b81c:cade9c1] in mainline

File:

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

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

@@ -211 +211 @@
 {
         uintptr_t va = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
-        pte_t t;
-
-        bool found = page_mapping_find(AS, va, true, &t);
-        if (found && PTE_EXECUTABLE(&t)) {
-                ASSERT(t.p);
-
+        pte_t *t;
+
+        t = page_mapping_find(AS, va, true);
+
+        if (t && PTE_EXECUTABLE(t)) {
                 /*
                  * The mapping was found in the software page hash table.
                  * Insert it into ITLB.
                  */
-                t.a = true;
-                itlb_pte_copy(&t);
+                t->a = true;
+                itlb_pte_copy(t);
 #ifdef CONFIG_TSB
-                itsb_pte_copy(&t);
-#endif
-                page_mapping_update(AS, va, true, &t);
+                itsb_pte_copy(t);
+#endif
         } else {
                 /*
@@ -246 +244 @@
 void fast_data_access_mmu_miss(unsigned int tt, istate_t *istate)
 {
-        pte_t t;
+        pte_t *t;
         uintptr_t va = DMISS_ADDRESS(istate->tlb_tag_access);
         uint16_t ctx = DMISS_CONTEXT(istate->tlb_tag_access);
@@ -263 +261 @@
         }
 
-        bool found = page_mapping_find(as, va, true, &t);
-        if (found) {
-                ASSERT(t.p);
-
+        t = page_mapping_find(as, va, true);
+        if (t) {
                 /*
                  * The mapping was found in the software page hash table.
                  * Insert it into DTLB.
                  */
-                t.a = true;
-                dtlb_pte_copy(&t, true);
+                t->a = true;
+                dtlb_pte_copy(t, true);
 #ifdef CONFIG_TSB
-                dtsb_pte_copy(&t, true);
-#endif
-                page_mapping_update(as, va, true, &t);
+                dtsb_pte_copy(t, true);
+#endif
         } else {
                 /*
@@ -293 +288 @@
 void fast_data_access_protection(unsigned int tt, istate_t *istate)
 {
-        pte_t t;
+        pte_t *t;
         uintptr_t va = DMISS_ADDRESS(istate->tlb_tag_access);
         uint16_t ctx = DMISS_CONTEXT(istate->tlb_tag_access);
@@ -301 +296 @@
                 as = AS_KERNEL;
 
-        bool found = page_mapping_find(as, va, true, &t);
-        if (found && PTE_WRITABLE(&t)) {
-                ASSERT(t.p);
-
+        t = page_mapping_find(as, va, true);
+        if (t && PTE_WRITABLE(t)) {
                 /*
                  * The mapping was found in the software page hash table and is
@@ -310 +303 @@
                  * into DTLB.
                  */
-                t.a = true;
-                t.d = true;
+                t->a = true;
+                t->d = true;
                 mmu_demap_page(va, ctx, MMU_FLAG_DTLB);
-                dtlb_pte_copy(&t, false);
+                dtlb_pte_copy(t, false);
 #ifdef CONFIG_TSB
-                dtsb_pte_copy(&t, false);
-#endif
-                page_mapping_update(as, va, true, &t);
+                dtsb_pte_copy(t, false);
+#endif
         } else {
                 /*
@@ -391 +383 @@
 
         for (i = 0; i < cnt; i++) {
-                __hypercall_fast5(MMU_DEMAP_PAGE, 0, 0, page + i * PAGE_SIZE,
-                    asid, MMU_FLAG_DTLB | MMU_FLAG_ITLB);
+                __hypercall_fast5(MMU_DEMAP_PAGE, 0, 0, page, asid,
+                        MMU_FLAG_DTLB | MMU_FLAG_ITLB);
         }