Changes in kernel/generic/src/mm/tlb.c [98000fb:49eb681] in mainline

File:

• kernel/generic/src/mm/tlb.c (modified) (8 diffs)

kernel/generic/src/mm/tlb.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       Generic TLB shootdown algorithm.
+ * @brief Generic TLB shootdown algorithm.
  *
  * The algorithm implemented here is based on the CMU TLB shootdown
@@ -53 +53 @@
 #include <cpu.h>
 
-/**
- * This lock is used for synchronisation between sender and
- * recipients of TLB shootdown message. It must be acquired
- * before CPU structure lock.
- */
-SPINLOCK_INITIALIZE(tlblock);
-
 void tlb_init(void)
 {
@@ -67 +60 @@
 #ifdef CONFIG_SMP
 
+/**
+ * This lock is used for synchronisation between sender and
+ * recipients of TLB shootdown message. It must be acquired
+ * before CPU structure lock.
+ *
+ */
+IRQ_SPINLOCK_STATIC_INITIALIZE(tlblock);
+
 /** Send TLB shootdown message.
  *
@@ -72 +73 @@
  * to all other processors.
  *
- * This function must be called with interrupts disabled.
+ * @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)
 {
-        unsigned int i;
-
-        CPU->tlb_active = 0;
-        spinlock_lock(&tlblock);
+        ipl_t ipl = interrupts_disable();
+        CPU->tlb_active = false;
+        irq_spinlock_lock(&tlblock, false);
         
+        size_t i;
         for (i = 0; i < config.cpu_count; i++) {
-                cpu_t *cpu;
-                
                 if (i == CPU->id)
                         continue;
-
-                cpu = &cpus[i];
-                spinlock_lock(&cpu->lock);
+                
+                cpu_t *cpu = &cpus[i];
+                
+                irq_spinlock_lock(&cpu->lock, false);
                 if (cpu->tlb_messages_count == TLB_MESSAGE_QUEUE_LEN) {
                         /*
@@ -115 +116 @@
                         cpu->tlb_messages[idx].count = count;
                 }
-                spinlock_unlock(&cpu->lock);
+                irq_spinlock_unlock(&cpu->lock, false);
         }
         
         tlb_shootdown_ipi_send();
-
-busy_wait:      
-        for (i = 0; i < config.cpu_count; i++)
+        
+busy_wait:
+        for (i = 0; i < config.cpu_count; i++) {
                 if (cpus[i].tlb_active)
                         goto busy_wait;
+        }
+        
+        return ipl;
 }
 
-/** Finish TLB shootdown sequence. */
-void tlb_shootdown_finalize(void)
+/** Finish TLB shootdown sequence.
+ *
+ * @param ipl Previous interrupt priority level.
+ *
+ */
+void tlb_shootdown_finalize(ipl_t ipl)
 {
-        spinlock_unlock(&tlblock);
-        CPU->tlb_active = 1;
+        irq_spinlock_unlock(&tlblock, false);
+        CPU->tlb_active = true;
+        interrupts_restore(ipl);
 }
 
@@ -138 +147 @@
 }
 
-/** Receive TLB shootdown message. */
+/** Receive TLB shootdown message.
+ *
+ */
 void tlb_shootdown_ipi_recv(void)
 {
-        tlb_invalidate_type_t type;
-        asid_t asid;
-        uintptr_t page;
-        size_t count;
-        unsigned int i;
-        
         ASSERT(CPU);
         
-        CPU->tlb_active = 0;
-        spinlock_lock(&tlblock);
-        spinlock_unlock(&tlblock);
+        CPU->tlb_active = false;
+        irq_spinlock_lock(&tlblock, false);
+        irq_spinlock_unlock(&tlblock, false);
         
-        spinlock_lock(&CPU->lock);
+        irq_spinlock_lock(&CPU->lock, false);
         ASSERT(CPU->tlb_messages_count <= TLB_MESSAGE_QUEUE_LEN);
-
+        
+        size_t i;
         for (i = 0; i < CPU->tlb_messages_count; CPU->tlb_messages_count--) {
-                type = CPU->tlb_messages[i].type;
-                asid = CPU->tlb_messages[i].asid;
-                page = CPU->tlb_messages[i].page;
-                count = CPU->tlb_messages[i].count;
-
+                tlb_invalidate_type_t type = CPU->tlb_messages[i].type;
+                asid_t asid = CPU->tlb_messages[i].asid;
+                uintptr_t page = CPU->tlb_messages[i].page;
+                size_t count = CPU->tlb_messages[i].count;
+                
                 switch (type) {
                 case TLB_INVL_ALL:
@@ -170 +176 @@
                         break;
                 case TLB_INVL_PAGES:
-                        ASSERT(count);
+                        ASSERT(count);
                         tlb_invalidate_pages(asid, page, count);
                         break;
@@ -177 +183 @@
                         break;
                 }
+                
                 if (type == TLB_INVL_ALL)
                         break;
         }
         
-        spinlock_unlock(&CPU->lock);
-        CPU->tlb_active = 1;
+        irq_spinlock_unlock(&CPU->lock, false);
+        CPU->tlb_active = true;
 }