Changeset 2a2fbc8 in mainline for kernel/arch/sparc64/src

Timestamp:

2016-09-01T17:05:13Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

42d08592

Parents:

f126c87 (diff), fb63c06 (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 from lp:~jakub/helenos/pt

Location:

kernel/arch/sparc64/src/mm

Files:

• sun4u/tlb.c (modified) (6 diffs)
• sun4v/tlb.c (modified) (6 diffs)

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

@@ -197 +197 @@
 {
         size_t index = (istate->tpc >> MMU_PAGE_WIDTH) % MMU_PAGES_PER_PAGE;
-        pte_t *t;
-
-        t = page_mapping_find(AS, istate->tpc, true);
-        if (t && PTE_EXECUTABLE(t)) {
+        pte_t t;
+
+        bool found = page_mapping_find(AS, istate->tpc, true, &t);
+        if (found && PTE_EXECUTABLE(&t)) {
                 /*
                  * The mapping was found in the software page hash table.
                  * Insert it into ITLB.
                  */
-                t->a = true;
-                itlb_pte_copy(t, index);
+                t.a = true;
+                itlb_pte_copy(&t, index);
 #ifdef CONFIG_TSB
-                itsb_pte_copy(t, index);
-#endif
+                itsb_pte_copy(&t, index);
+#endif
+                page_mapping_update(AS, istate->tpc, true, &t);
         } else {
                 /*
@@ -233 +234 @@
         uintptr_t page_16k;
         size_t index;
-        pte_t *t;
+        pte_t t;
         as_t *as = AS;
 
@@ -253 +254 @@
         }
 
-        t = page_mapping_find(as, page_16k, true);
-        if (t) {
+        bool found = page_mapping_find(as, page_16k, true, &t);
+        if (found) {
                 /*
                  * The mapping was found in the software page hash table.
                  * Insert it into DTLB.
                  */
-                t->a = true;
-                dtlb_pte_copy(t, index, true);
+                t.a = true;
+                dtlb_pte_copy(&t, index, true);
 #ifdef CONFIG_TSB
-                dtsb_pte_copy(t, index, true);
-#endif
+                dtsb_pte_copy(&t, index, true);
+#endif
+                page_mapping_update(as, page_16k, true, &t);
         } else {
                 /*
@@ -283 +285 @@
         uintptr_t page_16k;
         size_t index;
-        pte_t *t;
+        pte_t t;
         as_t *as = AS;
 
@@ -293 +295 @@
                 as = AS_KERNEL;
 
-        t = page_mapping_find(as, page_16k, true);
-        if (t && PTE_WRITABLE(t)) {
+        bool found = page_mapping_find(as, page_16k, true, &t);
+        if (found && PTE_WRITABLE(&t)) {
                 /*
                  * The mapping was found in the software page hash table and is
@@ -300 +302 @@
                  * into DTLB.
                  */
-                t->a = true;
-                t->d = true;
+                t.a = true;
+                t.d = true;
                 dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_SECONDARY,
                     page_16k + index * MMU_PAGE_SIZE);
-                dtlb_pte_copy(t, index, false);
+                dtlb_pte_copy(&t, index, false);
 #ifdef CONFIG_TSB
-                dtsb_pte_copy(t, index, false);
-#endif
+                dtsb_pte_copy(&t, index, false);
+#endif
+                page_mapping_update(as, page_16k, true, &t);
         } else {
                 /*

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

@@ -211 +211 @@
 {
         uintptr_t va = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
-        pte_t *t;
-
-        t = page_mapping_find(AS, va, true);
-
-        if (t && PTE_EXECUTABLE(t)) {
+        pte_t t;
+
+        bool found = page_mapping_find(AS, va, true, &t);
+        if (found && 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
+                itsb_pte_copy(&t);
+#endif
+                page_mapping_update(AS, va, true, &t);
         } else {
                 /*
@@ -244 +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);
@@ -261 +261 @@
         }
 
-        t = page_mapping_find(as, va, true);
-        if (t) {
+        bool found = page_mapping_find(as, va, true, &t);
+        if (found) {
                 /*
                  * 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
+                dtsb_pte_copy(&t, true);
+#endif
+                page_mapping_update(as, va, true, &t);
         } else {
                 /*
@@ -288 +289 @@
 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);
@@ -296 +297 @@
                 as = AS_KERNEL;
 
-        t = page_mapping_find(as, va, true);
-        if (t && PTE_WRITABLE(t)) {
+        bool found = page_mapping_find(as, va, true, &t);
+        if (found && PTE_WRITABLE(&t)) {
                 /*
                  * The mapping was found in the software page hash table and is
@@ -303 +304 @@
                  * 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
+                dtsb_pte_copy(&t, false);
+#endif
+                page_mapping_update(as, va, true, &t);
         } else {
                 /*