Changeset c99693a in mainline for kernel/arch/ppc32/src/mm/tlb.c

Timestamp:

2011-05-21T16:50:32Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b4ffe5bc

Parents:

235e6c7

Message:

Do not lock page tables on ppc32 during page fault.

File:

• kernel/arch/ppc32/src/mm/tlb.c (modified) (9 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.
@@ -62 +61 @@
     istate_t *istate, int *pfrc)
 {
-        ASSERT(mutex_locked(&as->lock));
-
         /*
          * Check if the mapping exists in page tables.
@@ -79 +76 @@
                  * Resort to higher-level page fault handler.
                  */
-                page_table_unlock(as, true);
-                
                 int rc = as_page_fault(badvaddr, access, istate);
                 switch (rc) {
@@ -88 +83 @@
                          * The mapping ought to be in place.
                          */
-                        page_table_lock(as, true);
                         pte = page_mapping_find(as, badvaddr, true);
                         ASSERT((pte) && (pte->present));
@@ -94 +88 @@
                         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;
@@ -214 +206 @@
                 badvaddr = istate->pc;
         
-        page_table_lock(as, true);
-        
         int pfrc;
         pte_t *pte = find_mapping_and_check(as, badvaddr,
@@ -223 +213 @@
                 switch (pfrc) {
                 case AS_PF_FAULT:
-                        page_table_unlock(as, true);
                         pht_refill_fail(badvaddr, istate);
                         return;
@@ -231 +220 @@
                          * or copy_to_uspace().
                          */
-                        page_table_unlock(as, true);
                         return;
                 default:
@@ -241 +229 @@
         pte->accessed = 1;
         pht_insert(badvaddr, pte);
-        
-        page_table_unlock(as, true);
 }