Changeset c964521 in mainline

Timestamp:

2010-05-13T09:44:07Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ba4a63b8

Parents:

2e4e706

Message:

Lock the page tables before initiating the TLB shootdown, avoiding thus possible
blocking while holding a spinlock.

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);
 
                 /*
@@ -486 +488 @@
                                         pte_t *pte;
                         
-                                        page_table_lock(as, false);
                                         pte = page_mapping_find(as, b +
                                             i * PAGE_SIZE);
@@ -499 +500 @@
                                         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).
@@ -516 +517 @@
                     pages * PAGE_SIZE, area->pages - pages);
                 tlb_shootdown_finalize();
+
+                page_table_unlock(as, false);
                 
         } else {
@@ -565 +568 @@
 
         base = area->base;
+
+        page_table_lock(as, false);
 
         /*
@@ -586 +591 @@
                         
                         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) &&
@@ -596 +600 @@
                                 }
                                 page_mapping_remove(as, b + j * PAGE_SIZE);                             
-                                page_table_unlock(as, false);
                         }
                 }
@@ -606 +609 @@
 
         tlb_invalidate_pages(as->asid, area->base, area->pages);
+
         /*
          * Invalidate potential software translation caches (e.g. TSB on
@@ -612 +616 @@
         as_invalidate_translation_cache(as, area->base, area->pages);
         tlb_shootdown_finalize();
+
+        page_table_unlock(as, false);
         
         btree_destroy(&area->used_space);
@@ -858 +864 @@
         old_frame = malloc(used_pages * sizeof(uintptr_t), 0);
 
+        page_table_lock(as, false);
+
         /*
          * Start TLB shootdown sequence.
@@ -881 +889 @@
                         
                         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) &&
@@ -889 +896 @@
                                 /* Remove old mapping */
                                 page_mapping_remove(as, b + j * PAGE_SIZE);
-                                page_table_unlock(as, false);
                         }
                 }
@@ -906 +912 @@
         as_invalidate_translation_cache(as, area->base, area->pages);
         tlb_shootdown_finalize();
+
+        page_table_unlock(as, false);
 
         /*