Changeset 4ffa9e0 in mainline

Timestamp:

2005-02-23T11:48:52Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3418c41

Parents:

b109ebb

Message:

New IPI for waking up idle CPU's halted in scheduler.
Added architecture-independent ipi_broadcast().

Files:

• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/include/interrupt.h (modified) (2 diffs)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/ia32/src/interrupt.c (modified) (1 diff)
• arch/ia32/src/mm/tlb.c (modified) (1 diff)
• arch/ia32/src/smp/ipi.c (added)
• src/mm/tlb.c (modified) (2 diffs)
• src/proc/thread.c (modified) (3 diffs)

arch/ia32/Makefile.inc

@@ -27 +27 @@
         arch/smp/mp.c \
         arch/smp/atomic.S \
+        arch/smp/ipi.c \
         arch/ia32.c \
         arch/interrupt.c \

arch/ia32/include/interrupt.h

@@ -59 +59 @@
 #define VECTOR_KBD              (IVT_IRQBASE+IRQ_KBD)
 
-#define VECTOR_SYSCALL          (IVT_FREEBASE+0)
-#define VECTOR_TLB_SHOOTDOWN    (IVT_FREEBASE+1)
+#define VECTOR_SYSCALL                  (IVT_FREEBASE+0)
+#define VECTOR_TLB_SHOOTDOWN_IPI        (IVT_FREEBASE+1)
+#define VECTOR_WAKEUP_IPI               (IVT_FREEBASE+2)
 
 typedef void (* iroutine)(__u8 n, __u32 stack[]);
@@ -79 +80 @@
 extern void syscall(__u8 n, __u32 stack[]);
 extern void tlb_shootdown_ipi(__u8 n, __u32 stack[]);
+extern void wakeup_ipi(__u8 n, __u32 stack[]);
 
 extern void trap_virtual_enable_irqs(__u16 irqmask);

arch/ia32/src/ia32.c

@@ -59 +59 @@
                 
                 #ifdef __SMP__
-                trap_register(VECTOR_TLB_SHOOTDOWN, tlb_shootdown_ipi);
+                trap_register(VECTOR_TLB_SHOOTDOWN_IPI, tlb_shootdown_ipi);
+                trap_register(VECTOR_WAKEUP_IPI, wakeup_ipi);
                 #endif /* __SMP__ */
         }

arch/ia32/src/interrupt.c

@@ -101 +101 @@
 }
 
+void wakeup_ipi(__u8 n, __u32 stack[])
+{
+        trap_virtual_eoi();
+}
+
 void trap_virtual_enable_irqs(__u16 irqmask)
 {

arch/ia32/src/mm/tlb.c

@@ -30 +30 @@
 #include <arch/asm.h>
 
-#ifdef __SMP__
-#include <arch/apic.h>
-#include <arch/interrupt.h>
-#endif /* __SMP__ */
-
 void tlb_invalidate(int asid)
 {
         cpu_write_dba(cpu_read_dba());
 }
-
-#ifdef __SMP__
-void tlb_shootdown_ipi_send(void)
-{
-        (void) l_apic_broadcast_custom_ipi(VECTOR_TLB_SHOOTDOWN);
-}
-#endif /* __SMP__ */

src/mm/tlb.c

@@ -28 +28 @@
 
 #include <mm/tlb.h>
+#include <smp/ipi.h>
 #include <synch/spinlock.h>
 #include <typedefs.h>
 #include <arch/atomic.h>
+#include <arch/interrupt.h>
 #include <config.h>
 
@@ -60 +62 @@
 }
 
+void tlb_shootdown_ipi_send(void)
+{
+        ipi_broadcast(VECTOR_TLB_SHOOTDOWN_IPI);
+}
+
 void tlb_shootdown_ipi_recv(void)
 {

src/proc/thread.c

@@ -46 +46 @@
 #include <time/clock.h>
 #include <list.h>
+#include <config.h>
+
+#ifdef __SMP__
+#include <arch/interrupt.h>
+#include <arch/apic.h>
+#endif /* __SMP__ */
 
 char *thread_states[] = {"Invalid", "Running", "Sleeping", "Ready", "Entering", "Exiting"};
@@ -89 +95 @@
         runq_t *r;
         pri_t pri;
-        int i;
+        int i, avg, send_ipi = 0;
 
         pri = cpu_priority_high();
@@ -113 +119 @@
 
         spinlock_lock(&nrdylock);
-        nrdy++;
+        avg = ++nrdy / config.cpu_active;
         spinlock_unlock(&nrdylock);
 
         spinlock_lock(&cpu->lock);
-        cpu->nrdy++;
+        if ((++cpu->nrdy) > avg && (config.cpu_active == config.cpu_count)) {
+                /*
+                 * If there are idle halted CPU's, this will wake them up.
+                 */
+                #ifdef __SMP__
+                l_apic_broadcast_custom_ipi(VECTOR_WAKEUP_IPI);
+                #endif /* __SMP__  */
+        }       
         spinlock_unlock(&cpu->lock);