Changes in kernel/arch/ppc32/src/mm/tlb.c [c99693a:26aafe8] in mainline

File:

• kernel/arch/ppc32/src/mm/tlb.c (modified) (8 diffs)

kernel/arch/ppc32/src/mm/tlb.c

@@ -49 +49 @@
  *
  * @param as       Address space.
+ * @param lock     Lock/unlock the address space.
  * @param badvaddr Faulting virtual address.
  * @param access   Access mode that caused the fault.
@@ -61 +62 @@
     istate_t *istate, int *pfrc)
 {
+        ASSERT(mutex_locked(&as->lock));
+
         /*
          * Check if the mapping exists in page tables.
          */
-        pte_t *pte = page_mapping_find(as, badvaddr, true);
+        pte_t *pte = page_mapping_find(as, badvaddr);
         if ((pte) && (pte->present)) {
                 /*
@@ -76 +79 @@
                  * Resort to higher-level page fault handler.
                  */
+                page_table_unlock(as, true);
+                
                 int rc = as_page_fault(badvaddr, access, istate);
                 switch (rc) {
@@ -83 +88 @@
                          * The mapping ought to be in place.
                          */
-                        pte = page_mapping_find(as, badvaddr, true);
+                        page_table_lock(as, true);
+                        pte = page_mapping_find(as, badvaddr);
                         ASSERT((pte) && (pte->present));
                         *pfrc = 0;
                         return pte;
                 case AS_PF_DEFER:
+                        page_table_lock(as, true);
                         *pfrc = rc;
                         return NULL;
                 case AS_PF_FAULT:
+                        page_table_lock(as, true);
                         *pfrc = rc;
                         return NULL;
@@ -206 +214 @@
                 badvaddr = istate->pc;
         
+        page_table_lock(as, true);
+        
         int pfrc;
         pte_t *pte = find_mapping_and_check(as, badvaddr,
@@ -213 +223 @@
                 switch (pfrc) {
                 case AS_PF_FAULT:
+                        page_table_unlock(as, true);
                         pht_refill_fail(badvaddr, istate);
                         return;
@@ -220 +231 @@
                          * or copy_to_uspace().
                          */
+                        page_table_unlock(as, true);
                         return;
                 default:
@@ -229 +241 @@
         pte->accessed = 1;
         pht_insert(badvaddr, pte);
+        
+        page_table_unlock(as, true);
 }