Changeset a820bf7 in mainline

Timestamp:

2010-05-31T19:02:12Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3ce39b

Parents:

ada559c

Message:

The kernel address space must locked in find_mapping_and_check() too.

File:

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

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

@@ -51 +51 @@
  *
  * Try to find PTE for faulting address.
- * The as->lock must be held on entry to this function
- * if lock is true.
+ * The as->lock must be held on entry to this function.
  *
  * @param as       Address space.
@@ -65 +64 @@
  *
  */
-static pte_t *find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr,
-    int access, istate_t *istate, int *pfrc)
+static pte_t *find_mapping_and_check(as_t *as, uintptr_t badvaddr, int access,
+    istate_t *istate, int *pfrc)
 {
         /*
@@ -83 +82 @@
                  * Resort to higher-level page fault handler.
                  */
-                page_table_unlock(as, lock);
+                page_table_unlock(as, true);
                 
                 int rc = as_page_fault(badvaddr, access, istate);
@@ -92 +91 @@
                          * The mapping ought to be in place.
                          */
-                        page_table_lock(as, lock);
+                        page_table_lock(as, true);
                         pte = page_mapping_find(as, badvaddr);
                         ASSERT((pte) && (pte->present));
@@ -98 +97 @@
                         return pte;
                 case AS_PF_DEFER:
-                        page_table_lock(as, lock);
+                        page_table_lock(as, true);
                         *pfrc = rc;
                         return NULL;
                 case AS_PF_FAULT:
-                        page_table_lock(as, lock);
+                        page_table_lock(as, true);
                         *pfrc = rc;
                         return NULL;
@@ -213 +212 @@
 void pht_refill(int n, istate_t *istate)
 {
-        as_t *as;
-        bool lock;
-        
-        if (AS == NULL) {
-                as = AS_KERNEL;
-                lock = false;
-        } else {
-                as = AS;
-                lock = true;
-        }
-        
+        as_t *as = (AS == NULL) ? AS_KERNEL : AS;
         uintptr_t badvaddr;
         
@@ -231 +220 @@
                 badvaddr = istate->pc;
         
-        page_table_lock(as, lock);
+        page_table_lock(as, true);
         
         int pfrc;
-        pte_t *pte = find_mapping_and_check(as, lock, badvaddr,
+        pte_t *pte = find_mapping_and_check(as, badvaddr,
             PF_ACCESS_READ /* FIXME */, istate, &pfrc);
         
@@ -247 +236 @@
                          * or copy_to_uspace().
                          */
-                        page_table_unlock(as, lock);
+                        page_table_unlock(as, true);
                         return;
                 default:
@@ -258 +247 @@
         pht_insert(badvaddr, pte);
         
-        page_table_unlock(as, lock);
+        page_table_unlock(as, true);
         return;
         
 fail:
-        page_table_unlock(as, lock);
+        page_table_unlock(as, true);
         pht_refill_fail(badvaddr, istate);
 }