Changes in kernel/generic/src/mm/as.c [c964521:1624aae] in mainline

File:

• kernel/generic/src/mm/as.c (modified) (14 diffs)

kernel/generic/src/mm/as.c

@@ -422 +422 @@
                  * No need to check for overlaps.
                  */
-
-                page_table_lock(as, false);
 
                 /*
@@ -488 +486 @@
                                         pte_t *pte;
                         
+                                        page_table_lock(as, false);
                                         pte = page_mapping_find(as, b +
                                             i * PAGE_SIZE);
@@ -500 +499 @@
                                         page_mapping_remove(as, b +
                                             i * PAGE_SIZE);
+                                        page_table_unlock(as, false);
                                 }
                         }
@@ -510 +510 @@
                 tlb_invalidate_pages(as->asid, area->base + pages * PAGE_SIZE,
                     area->pages - pages);
-
                 /*
                  * Invalidate software translation caches (e.g. TSB on sparc64).
@@ -517 +516 @@
                     pages * PAGE_SIZE, area->pages - pages);
                 tlb_shootdown_finalize();
-
-                page_table_unlock(as, false);
                 
         } else {
@@ -568 +565 @@
 
         base = area->base;
-
-        page_table_lock(as, false);
 
         /*
@@ -591 +586 @@
                         
                         for (j = 0; j < (size_t) node->value[i]; j++) {
+                                page_table_lock(as, false);
                                 pte = page_mapping_find(as, b + j * PAGE_SIZE);
                                 ASSERT(pte && PTE_VALID(pte) &&
@@ -600 +596 @@
                                 }
                                 page_mapping_remove(as, b + j * PAGE_SIZE);                             
+                                page_table_unlock(as, false);
                         }
                 }
@@ -609 +606 @@
 
         tlb_invalidate_pages(as->asid, area->base, area->pages);
-
         /*
          * Invalidate potential software translation caches (e.g. TSB on
@@ -616 +612 @@
         as_invalidate_translation_cache(as, area->base, area->pages);
         tlb_shootdown_finalize();
-
-        page_table_unlock(as, false);
         
         btree_destroy(&area->used_space);
@@ -864 +858 @@
         old_frame = malloc(used_pages * sizeof(uintptr_t), 0);
 
-        page_table_lock(as, false);
-
         /*
          * Start TLB shootdown sequence.
@@ -889 +881 @@
                         
                         for (j = 0; j < (size_t) node->value[i]; j++) {
+                                page_table_lock(as, false);
                                 pte = page_mapping_find(as, b + j * PAGE_SIZE);
                                 ASSERT(pte && PTE_VALID(pte) &&
@@ -896 +889 @@
                                 /* Remove old mapping */
                                 page_mapping_remove(as, b + j * PAGE_SIZE);
+                                page_table_unlock(as, false);
                         }
                 }
@@ -912 +906 @@
         as_invalidate_translation_cache(as, area->base, area->pages);
         tlb_shootdown_finalize();
-
-        page_table_unlock(as, false);
 
         /*