Changeset 2299914 in mainline for arch/mips32/src/mm/tlb.c

Timestamp:

2006-03-16T12:57:31Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e898a8d7

Parents:

b7dcabb

Message:

Page table locking.

File:

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

arch/mips32/src/mm/tlb.c

@@ -88 +88 @@
 {
         entry_lo_t lo;
-        entry_hi_t hi;  
+        entry_hi_t hi;
+        asid_t asid;
         __address badvaddr;
         pte_t *pte;
@@ -94 +95 @@
         badvaddr = cp0_badvaddr_read();
 
-        spinlock_lock(&AS->lock);               
+        spinlock_lock(&AS->lock);
+        asid = AS->asid;
+        spinlock_unlock(&AS->lock);
+
+        page_table_lock(AS, true);
 
         pte = find_mapping_and_check(badvaddr);
@@ -105 +110 @@
         pte->a = 1;
 
-        prepare_entry_hi(&hi, AS->asid, badvaddr);
+        prepare_entry_hi(&hi, asid, badvaddr);
         prepare_entry_lo(&lo, pte->g, pte->p, pte->d, pte->cacheable, pte->pfn);
 
@@ -123 +128 @@
         tlbwr();
 
-        spinlock_unlock(&AS->lock);
+        page_table_unlock(AS, true);
         return;
         
 fail:
-        spinlock_unlock(&AS->lock);
+        page_table_unlock(AS, true);
         tlb_refill_fail(istate);
 }
@@ -155 +160 @@
         tlbp();
         index.value = cp0_index_read();
-        
-        spinlock_lock(&AS->lock);       
+
+        page_table_lock(AS, true);      
         
         /*
@@ -192 +197 @@
         tlbwi();
 
-        spinlock_unlock(&AS->lock);     
+        page_table_unlock(AS, true);
         return;
         
 fail:
-        spinlock_unlock(&AS->lock);
+        page_table_unlock(AS, true);
         tlb_invalid_fail(istate);
 }
@@ -224 +229 @@
         tlbp();
         index.value = cp0_index_read();
-        
-        spinlock_lock(&AS->lock);       
+
+        page_table_lock(AS, true);      
         
         /*
@@ -268 +273 @@
         tlbwi();
 
-        spinlock_unlock(&AS->lock);     
+        page_table_unlock(AS, true);
         return;
         
 fail:
-        spinlock_unlock(&AS->lock);
+        page_table_unlock(AS, true);
         tlb_modified_fail(istate);
 }
@@ -350 +355 @@
                  * Resort to higher-level page fault handler.
                  */
+                page_table_unlock(AS, true);
                 if (as_page_fault(badvaddr)) {
                         /*
@@ -355 +361 @@
                          * The mapping ought to be in place.
                          */
+                        page_table_lock(AS, true);
                         pte = page_mapping_find(AS, badvaddr);
                         ASSERT(pte && pte->p);
                         return pte;
+                } else {
+                        page_table_lock(AS, true);
+                        printf("Page fault.\n");
+                        return NULL;
                 }
-        }
-
-        /*
-         * Handler cannot succeed if badvaddr has no mapping.
-         */
-        if (!pte) {
-                printf("No such mapping.\n");
-                return NULL;
-        }
-
-        /*
-         * Handler cannot succeed if the mapping is marked as invalid.
-         */
-        if (!pte->p) {
-                printf("Invalid mapping.\n");
-                return NULL;
-        }
-
-        return pte;
+                
+        }
 }