Changeset 402eda5 in mainline

Timestamp:

2010-06-22T12:19:45Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9539be6

Parents:

a49a1a1

Message:

Fix a newly introduced deadlock in the TLB shootdown algorithm.

Location:

kernel

Files:

• genarch/src/mm/asid.c (modified) (2 diffs)
• generic/include/mm/tlb.h (modified) (2 diffs)
• generic/src/mm/as.c (modified) (6 diffs)
• generic/src/mm/tlb.c (modified) (2 diffs)

kernel/genarch/src/mm/asid.c

@@ -126 +126 @@
                  * Get the system rid of the stolen ASID.
                  */
-                tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);
+                ipl_t ipl = tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);
                 tlb_invalidate_asid(asid);
-                tlb_shootdown_finalize();
+                tlb_shootdown_finalize(ipl);
         } else {
 
@@ -142 +142 @@
                  * Purge the allocated ASID from TLBs.
                  */
-                tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);
+                ipl_t ipl = tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);
                 tlb_invalidate_asid(asid);
-                tlb_shootdown_finalize();
+                tlb_shootdown_finalize(ipl);
         }
         

kernel/generic/include/mm/tlb.h

@@ -68 +68 @@
 
 #ifdef CONFIG_SMP
-extern void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid,
-    uintptr_t page, size_t count);
-extern void tlb_shootdown_finalize(void);
+extern ipl_t tlb_shootdown_start(tlb_invalidate_type_t, asid_t, uintptr_t,
+    size_t);
+extern void tlb_shootdown_finalize(ipl_t);
 extern void tlb_shootdown_ipi_recv(void);
 #else
-#define tlb_shootdown_start(w, x, y, z)
-#define tlb_shootdown_finalize()
+#define tlb_shootdown_start(w, x, y, z) (0)
+#define tlb_shootdown_finalize(i)       ((i) = (i));
 #define tlb_shootdown_ipi_recv()
 #endif /* CONFIG_SMP */
@@ -84 +84 @@
 
 extern void tlb_invalidate_all(void);
-extern void tlb_invalidate_asid(asid_t asid);
-extern void tlb_invalidate_pages(asid_t asid, uintptr_t page, size_t cnt);
+extern void tlb_invalidate_asid(asid_t);
+extern void tlb_invalidate_pages(asid_t, uintptr_t, size_t);
 #endif
 

kernel/generic/src/mm/as.c

@@ -433 +433 @@
                  *
                  */
-                tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base +
-                    pages * PAGE_SIZE, area->pages - pages);
+                ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid,
+                    area->base + pages * PAGE_SIZE, area->pages - pages);
                 
                 /*
@@ -528 +528 @@
                 as_invalidate_translation_cache(as, area->base +
                     pages * PAGE_SIZE, area->pages - pages);
-                tlb_shootdown_finalize();
+                tlb_shootdown_finalize(ipl);
                 
                 page_table_unlock(as, false);
@@ -578 +578 @@
          * Start TLB shootdown sequence.
          */
-        tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base, area->pages);
+        ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base,
+            area->pages);
         
         /*
@@ -625 +626 @@
          */
         as_invalidate_translation_cache(as, area->base, area->pages);
-        tlb_shootdown_finalize();
+        tlb_shootdown_finalize(ipl);
         
         page_table_unlock(as, false);
@@ -865 +866 @@
          *
          */
-        tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base, area->pages);
+        ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base,
+            area->pages);
         
         /*
@@ -912 +914 @@
          */
         as_invalidate_translation_cache(as, area->base, area->pages);
-        tlb_shootdown_finalize();
+        tlb_shootdown_finalize(ipl);
         
         page_table_unlock(as, false);

kernel/generic/src/mm/tlb.c

@@ -73 +73 @@
  * to all other processors.
  *
- * @param type Type describing scope of shootdown.
- * @param asid Address space, if required by type.
- * @param page Virtual page address, if required by type.
- * @param count Number of pages, if required by type.
+ * @param type          Type describing scope of shootdown.
+ * @param asid          Address space, if required by type.
+ * @param page          Virtual page address, if required by type.
+ * @param count         Number of pages, if required by type.
  *
+ * @return The interrupt priority level as it existed prior to this call.
  */
-void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid,
+ipl_t tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid,
     uintptr_t page, size_t count)
 {
+        ipl_t ipl;
+
+        ipl = interrupts_disable();
         CPU->tlb_active = false;
-        irq_spinlock_lock(&tlblock, true);
+        irq_spinlock_lock(&tlblock, false);
         
         size_t i;
@@ -123 +127 @@
                 if (cpus[i].tlb_active)
                         goto busy_wait;
+
+        return ipl;
 }
 
 /** Finish TLB shootdown sequence.
  *
+ * @param ipl           Previous interrupt priority level.
  */
-void tlb_shootdown_finalize(void)
+void tlb_shootdown_finalize(ipl_t ipl)
 {
-        irq_spinlock_unlock(&tlblock, true);
+        irq_spinlock_unlock(&tlblock, false);
         CPU->tlb_active = true;
+        interrupts_restore(ipl);
 }