Changes in kernel/arch/mips32/src/mm/tlb.c [bd81386:54a7a20] in mainline

File:

• kernel/arch/mips32/src/mm/tlb.c (modified) (14 diffs)

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

@@ -73 +73 @@
                 tlbwi();
         }
-                
+        
         /*
          * The kernel is going to make use of some wired
@@ -99 +99 @@
         asid = AS->asid;
         mutex_unlock(&AS->lock);
-        
-        page_table_lock(AS, true);
         
         pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate, &pfrc);
@@ -113 +111 @@
                          * or copy_to_uspace().
                          */
-                        page_table_unlock(AS, true);
                         return;
                 default:
@@ -144 +141 @@
         tlbwr();
 
-        page_table_unlock(AS, true);
         return;
         
 fail:
-        page_table_unlock(AS, true);
         tlb_refill_fail(istate);
 }
@@ -176 +171 @@
         index.value = cp0_index_read();
 
-        page_table_lock(AS, true);      
-        
         /*
          * Fail if the entry is not in TLB.
@@ -197 +190 @@
                          * or copy_to_uspace().
                          */
-                        page_table_unlock(AS, true);                     
                         return;
                 default:
@@ -227 +219 @@
         tlbwi();
 
-        page_table_unlock(AS, true);
         return;
         
 fail:
-        page_table_unlock(AS, true);
         tlb_invalid_fail(istate);
 }
@@ -259 +249 @@
         index.value = cp0_index_read();
 
-        page_table_lock(AS, true);      
-        
         /*
          * Fail if the entry is not in TLB.
@@ -280 +268 @@
                          * or copy_to_uspace().
                          */
-                        page_table_unlock(AS, true);                     
                         return;
                 default:
@@ -311 +298 @@
         tlbwi();
 
-        page_table_unlock(AS, true);
         return;
         
 fail:
-        page_table_unlock(AS, true);
         tlb_modified_fail(istate);
 }
@@ -364 +349 @@
         pte_t *pte;
 
-        ASSERT(mutex_locked(&AS->lock));
-
         hi.value = cp0_entry_hi_read();
 
@@ -379 +362 @@
          * Check if the mapping exists in page tables.
          */     
-        pte = page_mapping_find(AS, badvaddr);
+        pte = page_mapping_find(AS, badvaddr, true);
         if (pte && pte->p && (pte->w || access != PF_ACCESS_WRITE)) {
                 /*
@@ -393 +376 @@
                  * Resort to higher-level page fault handler.
                  */
-                page_table_unlock(AS, true);
                 switch (rc = as_page_fault(badvaddr, access, istate)) {
                 case AS_PF_OK:
@@ -400 +382 @@
                          * The mapping ought to be in place.
                          */
-                        page_table_lock(AS, true);
-                        pte = page_mapping_find(AS, badvaddr);
+                        pte = page_mapping_find(AS, badvaddr, true);
                         ASSERT(pte && pte->p);
                         ASSERT(pte->w || access != PF_ACCESS_WRITE);
                         return pte;
-                        break;
                 case AS_PF_DEFER:
-                        page_table_lock(AS, true);
                         *pfrc = AS_PF_DEFER;
                         return NULL;
-                        break;
                 case AS_PF_FAULT:
-                        page_table_lock(AS, true);
                         *pfrc = AS_PF_FAULT;
                         return NULL;
-                        break;
                 default:
                         panic("Unexpected rc (%d).", rc);