Changeset da1bafb in mainline for kernel/generic/src/mm/tlb.c

Timestamp:

2010-05-24T18:57:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

File:

• kernel/generic/src/mm/tlb.c (modified) (10 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)
 {
@@ -66 +59 @@
 
 #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.
@@ -78 +79 @@
  * @param page Virtual page address, if required by type.
  * @param count Number of pages, if required by type.
+ *
  */
 void 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);
+        CPU->tlb_active = false;
+        irq_spinlock_lock(&tlblock, false);
         
+        size_t i;
         for (i = 0; i < config.cpu_count; i++) {
                 cpu_t *cpu;
@@ -92 +93 @@
                 if (i == CPU->id)
                         continue;
-
+                
                 cpu = &cpus[i];
-                spinlock_lock(&cpu->lock);
+                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:      
+        
+busy_wait:
         for (i = 0; i < config.cpu_count; i++)
                 if (cpus[i].tlb_active)
@@ -126 +127 @@
 }
 
-/** Finish TLB shootdown sequence. */
+/** Finish TLB shootdown sequence.
+ *
+ */
 void tlb_shootdown_finalize(void)
 {
-        spinlock_unlock(&tlblock);
-        CPU->tlb_active = 1;
+        irq_spinlock_unlock(&tlblock, false);
+        CPU->tlb_active = true;
 }
 
@@ -138 +141 @@
 }
 
-/** 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 +170 @@
                         break;
                 case TLB_INVL_PAGES:
-                        ASSERT(count);
+                        ASSERT(count);
                         tlb_invalidate_pages(asid, page, count);
                         break;
@@ -177 +177 @@
                         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;
 }