xnu-4570.71.2.tar.gz

[apple/xnu.git] / osfmk / i386 / mp.c

diff --git a/osfmk/i386/mp.c b/osfmk/i386/mp.c
index e90a298f9e104271bd8844efc16c2917002f043d..3b72326873570e426d4e4582ba47b5aeb13129fc 100644 (file)
--- a/osfmk/i386/mp.c
+++ b/osfmk/i386/mp.c
@@ -1,4 +1,5 @@
 /*
 /*

+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -28,9 +29,8 @@
  * @OSF_COPYRIGHT@
  */
 
  * @OSF_COPYRIGHT@
  */
 

-#include <mach_rt.h>
-#include <mach_kdb.h>

 #include <mach_kdp.h>
 #include <mach_kdp.h>

+#include <kdp/kdp_internal.h>

 #include <mach_ldebug.h>
 #include <gprof.h>
 
 #include <mach_ldebug.h>
 #include <gprof.h>
 


@@ -47,15 +47,17 @@
 #include <kern/machine.h>
 #include <kern/pms.h>
 #include <kern/misc_protos.h>
 #include <kern/machine.h>
 #include <kern/pms.h>
 #include <kern/misc_protos.h>

-#include <kern/etimer.h>
+#include <kern/timer_call.h>

 #include <kern/kalloc.h>
 #include <kern/queue.h>
 #include <kern/kalloc.h>
 #include <kern/queue.h>

+#include <prng/random.h>

 
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
 #include <profiling/profile-mk.h>
 
 
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
 #include <profiling/profile-mk.h>
 

+#include <i386/bit_routines.h>

 #include <i386/proc_reg.h>
 #include <i386/cpu_threads.h>
 #include <i386/mp_desc.h>
 #include <i386/proc_reg.h>
 #include <i386/cpu_threads.h>
 #include <i386/mp_desc.h>


@@ -75,20 +77,13 @@
 #endif
 #include <i386/acpi.h>
 
 #endif
 #include <i386/acpi.h>
 

-#include <chud/chud_xnu.h>
-#include <chud/chud_xnu_private.h>
-

 #include <sys/kdebug.h>
 #include <sys/kdebug.h>

-#if MACH_KDB
-#include <machine/db_machdep.h>
-#include <ddb/db_aout.h>
-#include <ddb/db_access.h>
-#include <ddb/db_sym.h>
-#include <ddb/db_variables.h>
-#include <ddb/db_command.h>
-#include <ddb/db_output.h>
-#include <ddb/db_expr.h>
-#endif
+
+#include <console/serial_protos.h>
+
+#if MONOTONIC
+#include <kern/monotonic.h>
+#endif /* MONOTONIC */

 
 #if    MP_DEBUG
 #define PAUSE          delay(1000000)
 
 #if    MP_DEBUG
 #define PAUSE          delay(1000000)


@@ -104,30 +99,35 @@
 #define        TRACE_MP_CPUS_CALL_LOCAL        MACHDBG_CODE(DBG_MACH_MP, 2)
 #define        TRACE_MP_CPUS_CALL_ACTION       MACHDBG_CODE(DBG_MACH_MP, 3)
 #define        TRACE_MP_CPUS_CALL_NOBUF        MACHDBG_CODE(DBG_MACH_MP, 4)
 #define        TRACE_MP_CPUS_CALL_LOCAL        MACHDBG_CODE(DBG_MACH_MP, 2)
 #define        TRACE_MP_CPUS_CALL_ACTION       MACHDBG_CODE(DBG_MACH_MP, 3)
 #define        TRACE_MP_CPUS_CALL_NOBUF        MACHDBG_CODE(DBG_MACH_MP, 4)

+#define        TRACE_MP_CPU_FAST_START         MACHDBG_CODE(DBG_MACH_MP, 5)
+#define        TRACE_MP_CPU_START              MACHDBG_CODE(DBG_MACH_MP, 6)
+#define        TRACE_MP_CPU_DEACTIVATE         MACHDBG_CODE(DBG_MACH_MP, 7)

 
 #define ABS(v)         (((v) > 0)?(v):-(v))
 
 void           slave_boot_init(void);
 void           i386_cpu_IPI(int cpu);
 
 
 #define ABS(v)         (((v) > 0)?(v):-(v))
 
 void           slave_boot_init(void);
 void           i386_cpu_IPI(int cpu);
 

-#if MACH_KDB
-static void    mp_kdb_wait(void);
-volatile boolean_t     mp_kdb_trap = FALSE;
-volatile long  mp_kdb_ncpus = 0;
-#endif
-
+#if MACH_KDP

 static void    mp_kdp_wait(boolean_t flush, boolean_t isNMI);
 static void    mp_kdp_wait(boolean_t flush, boolean_t isNMI);

-static void    mp_rendezvous_action(void);
-static void    mp_broadcast_action(void);
+#endif /* MACH_KDP */

 
 

+#if MACH_KDP

 static boolean_t       cpu_signal_pending(int cpu, mp_event_t event);
 static boolean_t       cpu_signal_pending(int cpu, mp_event_t event);

+#endif /* MACH_KDP */

 static int             NMIInterruptHandler(x86_saved_state_t *regs);
 
 boolean_t              smp_initialized = FALSE;
 uint32_t               TSC_sync_margin = 0xFFF;
 volatile boolean_t     force_immediate_debugger_NMI = FALSE;
 volatile boolean_t     pmap_tlb_flush_timeout = FALSE;
 static int             NMIInterruptHandler(x86_saved_state_t *regs);
 
 boolean_t              smp_initialized = FALSE;
 uint32_t               TSC_sync_margin = 0xFFF;
 volatile boolean_t     force_immediate_debugger_NMI = FALSE;
 volatile boolean_t     pmap_tlb_flush_timeout = FALSE;

-decl_simple_lock_data(,mp_kdp_lock);
+#if DEBUG || DEVELOPMENT
+boolean_t              mp_interrupt_watchdog_enabled = TRUE;
+uint32_t               mp_interrupt_watchdog_events = 0;
+#endif
+
+decl_simple_lock_data(,debugger_callback_lock);
+struct debugger_callback *debugger_callback = NULL;

 
 decl_lck_mtx_data(static, mp_cpu_boot_lock);
 lck_mtx_ext_t  mp_cpu_boot_lock_ext;
 
 decl_lck_mtx_data(static, mp_cpu_boot_lock);
 lck_mtx_ext_t  mp_cpu_boot_lock_ext;


@@ -147,7 +147,7 @@ static volatile long        mp_rv_complete __attribute__((aligned(64)));
 volatile       uint64_t        debugger_entry_time;
 volatile       uint64_t        debugger_exit_time;
 #if MACH_KDP
 volatile       uint64_t        debugger_entry_time;
 volatile       uint64_t        debugger_exit_time;
 #if MACH_KDP

-
+#include <kdp/kdp.h>

 extern int kdp_snapshot;
 static struct _kdp_xcpu_call_func {
        kdp_x86_xcpu_func_t func;
 extern int kdp_snapshot;
 static struct _kdp_xcpu_call_func {
        kdp_x86_xcpu_func_t func;


@@ -168,10 +168,14 @@ static volatile long   mp_bc_count;
 decl_lck_mtx_data(static, mp_bc_lock);
 lck_mtx_ext_t  mp_bc_lock_ext;
 static volatile int    debugger_cpu = -1;
 decl_lck_mtx_data(static, mp_bc_lock);
 lck_mtx_ext_t  mp_bc_lock_ext;
 static volatile int    debugger_cpu = -1;

-volatile long NMIPI_acks = 0;
+volatile long   NMIPI_acks = 0;
+volatile long   NMI_count = 0;
+static NMI_reason_t    NMI_panic_reason = NONE;
+static int             vector_timed_out;
+
+extern void    NMI_cpus(void);

 
 static void    mp_cpus_call_init(void); 
 
 static void    mp_cpus_call_init(void); 

-static void    mp_cpus_call_cpu_init(void); 

 static void    mp_cpus_call_action(void); 
 static void    mp_call_PM(void);
 
 static void    mp_cpus_call_action(void); 
 static void    mp_call_PM(void);
 


@@ -182,7 +186,7 @@ boolean_t i386_smp_init(int nmi_vector, i386_intr_func_t nmi_handler,
                int ipi_vector, i386_intr_func_t ipi_handler);
 void i386_start_cpu(int lapic_id, int cpu_num);
 void i386_send_NMI(int cpu);
                int ipi_vector, i386_intr_func_t ipi_handler);
 void i386_start_cpu(int lapic_id, int cpu_num);
 void i386_send_NMI(int cpu);

-
+void NMIPI_enable(boolean_t);

 #if GPROF
 /*
  * Initialize dummy structs for profiling. These aren't used but
 #if GPROF
 /*
  * Initialize dummy structs for profiling. These aren't used but


@@ -225,8 +229,8 @@ static void         free_warm_timer_call(timer_call_t call);
 void
 smp_init(void)
 {
 void
 smp_init(void)
 {

-       simple_lock_init(&mp_kdp_lock, 0);

        simple_lock_init(&mp_rv_lock, 0);
        simple_lock_init(&mp_rv_lock, 0);

+       simple_lock_init(&debugger_callback_lock, 0);

        lck_grp_attr_setdefault(&smp_lck_grp_attr);
        lck_grp_init(&smp_lck_grp, "i386_smp", &smp_lck_grp_attr);
        lck_mtx_init_ext(&mp_cpu_boot_lock, &mp_cpu_boot_lock_ext, &smp_lck_grp, LCK_ATTR_NULL);
        lck_grp_attr_setdefault(&smp_lck_grp_attr);
        lck_grp_init(&smp_lck_grp, "i386_smp", &smp_lck_grp_attr);
        lck_mtx_init_ext(&mp_cpu_boot_lock, &mp_cpu_boot_lock_ext, &smp_lck_grp, LCK_ATTR_NULL);


@@ -243,11 +247,24 @@ smp_init(void)
        DBGLOG_CPU_INIT(master_cpu);
 
        mp_cpus_call_init();
        DBGLOG_CPU_INIT(master_cpu);
 
        mp_cpus_call_init();

-       mp_cpus_call_cpu_init();
+       mp_cpus_call_cpu_init(master_cpu);
+
+#if DEBUG || DEVELOPMENT
+       if (PE_parse_boot_argn("interrupt_watchdog",
+                              &mp_interrupt_watchdog_enabled,
+                              sizeof(mp_interrupt_watchdog_enabled))) {
+               kprintf("Interrupt watchdog %sabled\n",
+                       mp_interrupt_watchdog_enabled ? "en" : "dis");
+       }
+#endif

 
        if (PE_parse_boot_argn("TSC_sync_margin",
 
        if (PE_parse_boot_argn("TSC_sync_margin",

-                               &TSC_sync_margin, sizeof(TSC_sync_margin)))
+                                       &TSC_sync_margin, sizeof(TSC_sync_margin))) {

                kprintf("TSC sync Margin 0x%x\n", TSC_sync_margin);
                kprintf("TSC sync Margin 0x%x\n", TSC_sync_margin);

+       } else if (cpuid_vmm_present()) {
+               kprintf("TSC sync margin disabled\n");
+               TSC_sync_margin = 0;
+       }

        smp_initialized = TRUE;
 
        cpu_prewarm_init();
        smp_initialized = TRUE;
 
        cpu_prewarm_init();


@@ -300,6 +317,10 @@ intel_startCPU_fast(int slot_num)
                 */
                return(rc);
 
                 */
                return(rc);
 

+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_FAST_START | DBG_FUNC_START,
+               slot_num, 0, 0, 0, 0);
+

        /*
         * Wait until the CPU is back online.
         */
        /*
         * Wait until the CPU is back online.
         */


@@ -314,6 +335,10 @@ intel_startCPU_fast(int slot_num)
        mp_wait_for_cpu_up(slot_num, 30000, 1);
        mp_enable_preemption();
 
        mp_wait_for_cpu_up(slot_num, 30000, 1);
        mp_enable_preemption();
 

+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_FAST_START | DBG_FUNC_END,
+               slot_num, cpu_datap(slot_num)->cpu_running, 0, 0, 0);
+

        /*
         * Check to make sure that the CPU is really running.  If not,
         * go through the slow path.
        /*
         * Check to make sure that the CPU is really running.  If not,
         * go through the slow path.


@@ -354,13 +379,30 @@ start_cpu(void *arg)
        if (cpu_number() != psip->starter_cpu)
                return;
 
        if (cpu_number() != psip->starter_cpu)
                return;
 

+       DBG("start_cpu(%p) about to start cpu %d, lapic %d\n",
+               arg, psip->target_cpu, psip->target_lapic);
+
+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_START | DBG_FUNC_START,
+               psip->target_cpu,
+               psip->target_lapic, 0, 0, 0);
+

        i386_start_cpu(psip->target_lapic, psip->target_cpu);
 
 #ifdef POSTCODE_DELAY
        /* Wait much longer if postcodes are displayed for a delay period. */
        i *= 10000;
 #endif
        i386_start_cpu(psip->target_lapic, psip->target_cpu);
 
 #ifdef POSTCODE_DELAY
        /* Wait much longer if postcodes are displayed for a delay period. */
        i *= 10000;
 #endif

+       DBG("start_cpu(%p) about to wait for cpu %d\n",
+               arg, psip->target_cpu);
+

        mp_wait_for_cpu_up(psip->target_cpu, i*100, 100);
        mp_wait_for_cpu_up(psip->target_cpu, i*100, 100);

+
+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_START | DBG_FUNC_END,
+               psip->target_cpu,
+               cpu_datap(psip->target_cpu)->cpu_running, 0, 0, 0);
+

        if (TSC_sync_margin &&
            cpu_datap(psip->target_cpu)->cpu_running) {
                /*
        if (TSC_sync_margin &&
            cpu_datap(psip->target_cpu)->cpu_running) {
                /*


@@ -394,12 +436,6 @@ start_cpu(void *arg)
        }
 }
 
        }
 }
 

-extern char    prot_mode_gdt[];
-extern char    slave_boot_base[];
-extern char real_mode_bootstrap_base[];
-extern char real_mode_bootstrap_end[];
-extern char    slave_boot_end[];
-

 kern_return_t
 intel_startCPU(
        int     slot_num)
 kern_return_t
 intel_startCPU(
        int     slot_num)


@@ -418,10 +454,7 @@ intel_startCPU(
         * Initialize (or re-initialize) the descriptor tables for this cpu.
         * Propagate processor mode to slave.
         */
         * Initialize (or re-initialize) the descriptor tables for this cpu.
         * Propagate processor mode to slave.
         */

-       if (cpu_mode_is64bit())
-               cpu_desc_init64(cpu_datap(slot_num));
-       else
-               cpu_desc_init(cpu_datap(slot_num));
+       cpu_desc_init(cpu_datap(slot_num));

 
        /* Serialize use of the slave boot stack, etc. */
        lck_mtx_lock(&mp_cpu_boot_lock);
 
        /* Serialize use of the slave boot stack, etc. */
        lck_mtx_lock(&mp_cpu_boot_lock);


@@ -471,14 +504,17 @@ MP_EVENT_NAME_DECL();
 
 #endif /* MP_DEBUG */
 
 
 #endif /* MP_DEBUG */
 

+/*
+ * Note: called with NULL state when polling for TLB flush and cross-calls.
+ */

 int
 cpu_signal_handler(x86_saved_state_t *regs)
 {
 int
 cpu_signal_handler(x86_saved_state_t *regs)
 {

+#if    !MACH_KDP
+#pragma unused (regs)
+#endif /* !MACH_KDP */

        int             my_cpu;
        volatile int    *my_word;
        int             my_cpu;
        volatile int    *my_word;

-#if    MACH_KDB && MACH_ASSERT
-       int             i=100;
-#endif /* MACH_KDB && MACH_ASSERT */

 
        SCHED_STATS_IPI(current_processor());
 
 
        SCHED_STATS_IPI(current_processor());
 


@@ -492,10 +528,6 @@ cpu_signal_handler(x86_saved_state_t *regs)
        cpu_data_ptr[my_cpu]->cpu_prior_signals = *my_word;
 
        do {
        cpu_data_ptr[my_cpu]->cpu_prior_signals = *my_word;
 
        do {

-#if    MACH_KDB && MACH_ASSERT
-               if (i-- <= 0)
-                   Debugger("cpu_signal_handler: signals did not clear");
-#endif /* MACH_KDB && MACH_ASSERT */

 #if    MACH_KDP
                if (i_bit(MP_KDP, my_word)) {
                        DBGLOG(cpu_handle,my_cpu,MP_KDP);
 #if    MACH_KDP
                if (i_bit(MP_KDP, my_word)) {
                        DBGLOG(cpu_handle,my_cpu,MP_KDP);


@@ -517,30 +549,6 @@ cpu_signal_handler(x86_saved_state_t *regs)
                        DBGLOG(cpu_handle,my_cpu,MP_TLB_FLUSH);
                        i_bit_clear(MP_TLB_FLUSH, my_word);
                        pmap_update_interrupt();
                        DBGLOG(cpu_handle,my_cpu,MP_TLB_FLUSH);
                        i_bit_clear(MP_TLB_FLUSH, my_word);
                        pmap_update_interrupt();

-               } else if (i_bit(MP_AST, my_word)) {
-                       DBGLOG(cpu_handle,my_cpu,MP_AST);
-                       i_bit_clear(MP_AST, my_word);
-                       ast_check(cpu_to_processor(my_cpu));
-#if    MACH_KDB
-               } else if (i_bit(MP_KDB, my_word)) {
-
-                       i_bit_clear(MP_KDB, my_word);
-                       current_cpu_datap()->cpu_kdb_is_slave++;
-                       mp_kdb_wait();
-                       current_cpu_datap()->cpu_kdb_is_slave--;
-#endif /* MACH_KDB */
-               } else if (i_bit(MP_RENDEZVOUS, my_word)) {
-                       DBGLOG(cpu_handle,my_cpu,MP_RENDEZVOUS);
-                       i_bit_clear(MP_RENDEZVOUS, my_word);
-                       mp_rendezvous_action();
-               } else if (i_bit(MP_BROADCAST, my_word)) {
-                       DBGLOG(cpu_handle,my_cpu,MP_BROADCAST);
-                       i_bit_clear(MP_BROADCAST, my_word);
-                       mp_broadcast_action();
-               } else if (i_bit(MP_CHUD, my_word)) {
-                       DBGLOG(cpu_handle,my_cpu,MP_CHUD);
-                       i_bit_clear(MP_CHUD, my_word);
-                       chudxnu_cpu_signal_handler();

                } else if (i_bit(MP_CALL, my_word)) {
                        DBGLOG(cpu_handle,my_cpu,MP_CALL);
                        i_bit_clear(MP_CALL, my_word);
                } else if (i_bit(MP_CALL, my_word)) {
                        DBGLOG(cpu_handle,my_cpu,MP_CALL);
                        i_bit_clear(MP_CALL, my_word);


@@ -550,15 +558,26 @@ cpu_signal_handler(x86_saved_state_t *regs)
                        i_bit_clear(MP_CALL_PM, my_word);
                        mp_call_PM();
                }
                        i_bit_clear(MP_CALL_PM, my_word);
                        mp_call_PM();
                }

+               if (regs == NULL) {
+                       /* Called to poll only for cross-calls and TLB flush */
+                       break;
+               } else if (i_bit(MP_AST, my_word)) {
+                       DBGLOG(cpu_handle,my_cpu,MP_AST);
+                       i_bit_clear(MP_AST, my_word);
+                       ast_check(cpu_to_processor(my_cpu));
+               }

        } while (*my_word);
 
        return 0;
 }
 
        } while (*my_word);
 
        return 0;
 }
 

+extern void kprintf_break_lock(void);

 static int
 NMIInterruptHandler(x86_saved_state_t *regs)
 {
 static int
 NMIInterruptHandler(x86_saved_state_t *regs)
 {

-       void    *stackptr;
+       void            *stackptr;
+       char            pstr[192];
+       uint64_t        now = mach_absolute_time();

 
        if (panic_active() && !panicDebugging) {
                if (pmsafe_debug)
 
        if (panic_active() && !panicDebugging) {
                if (pmsafe_debug)


@@ -568,31 +587,63 @@ NMIInterruptHandler(x86_saved_state_t *regs)
        }
 
        atomic_incl(&NMIPI_acks, 1);
        }
 
        atomic_incl(&NMIPI_acks, 1);

+       atomic_incl(&NMI_count, 1);

        sync_iss_to_iks_unconditionally(regs);
        sync_iss_to_iks_unconditionally(regs);

-#if defined (__i386__)
-       __asm__ volatile("movl %%ebp, %0" : "=m" (stackptr));
-#elif defined (__x86_64__)

        __asm__ volatile("movq %%rbp, %0" : "=m" (stackptr));
        __asm__ volatile("movq %%rbp, %0" : "=m" (stackptr));

-#endif

 
        if (cpu_number() == debugger_cpu)
 
        if (cpu_number() == debugger_cpu)

-                       goto NMExit;
+               goto NMExit;

 
 

-       if (spinlock_timed_out) {
-               char pstr[160];
-               snprintf(&pstr[0], sizeof(pstr), "Panic(CPU %d): NMIPI for spinlock acquisition timeout, spinlock: %p, spinlock owner: %p, current_thread: %p, spinlock_owner_cpu: 0x%x\n", cpu_number(), spinlock_timed_out, (void *) spinlock_timed_out->interlock.lock_data, current_thread(), spinlock_owner_cpu);
+       if (NMI_panic_reason == SPINLOCK_TIMEOUT) {
+               snprintf(&pstr[0], sizeof(pstr),
+                       "Panic(CPU %d, time %llu): NMIPI for spinlock acquisition timeout, spinlock: %p, spinlock owner: %p, current_thread: %p, spinlock_owner_cpu: 0x%x\n",
+                       cpu_number(), now, spinlock_timed_out, (void *) spinlock_timed_out->interlock.lock_data, current_thread(), spinlock_owner_cpu);

                panic_i386_backtrace(stackptr, 64, &pstr[0], TRUE, regs);
                panic_i386_backtrace(stackptr, 64, &pstr[0], TRUE, regs);

-       } else if (pmap_tlb_flush_timeout == TRUE) {
-               char pstr[128];
-               snprintf(&pstr[0], sizeof(pstr), "Panic(CPU %d): Unresponsive processor (this CPU did not acknowledge interrupts) TLB state:%d\n", cpu_number(), current_cpu_datap()->cpu_tlb_invalid);
+       } else if (NMI_panic_reason == TLB_FLUSH_TIMEOUT) {
+               snprintf(&pstr[0], sizeof(pstr),
+                       "Panic(CPU %d, time %llu): NMIPI for unresponsive processor: TLB flush timeout, TLB state:0x%x\n",
+                       cpu_number(), now, current_cpu_datap()->cpu_tlb_invalid);

                panic_i386_backtrace(stackptr, 48, &pstr[0], TRUE, regs);
                panic_i386_backtrace(stackptr, 48, &pstr[0], TRUE, regs);

+       } else if (NMI_panic_reason == CROSSCALL_TIMEOUT) {
+               snprintf(&pstr[0], sizeof(pstr),
+                       "Panic(CPU %d, time %llu): NMIPI for unresponsive processor: cross-call timeout\n",
+                       cpu_number(), now);
+               panic_i386_backtrace(stackptr, 64, &pstr[0], TRUE, regs);
+       } else if (NMI_panic_reason == INTERRUPT_WATCHDOG) {
+               snprintf(&pstr[0], sizeof(pstr),
+                       "Panic(CPU %d, time %llu): NMIPI for unresponsive processor: interrupt watchdog for vector 0x%x\n",
+                       cpu_number(), now, vector_timed_out);
+               panic_i386_backtrace(stackptr, 64, &pstr[0], TRUE, regs);

        }
        }

-
+       

 #if MACH_KDP
        if (pmsafe_debug && !kdp_snapshot)
                pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
        current_cpu_datap()->cpu_NMI_acknowledged = TRUE;
 #if MACH_KDP
        if (pmsafe_debug && !kdp_snapshot)
                pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
        current_cpu_datap()->cpu_NMI_acknowledged = TRUE;

-       mp_kdp_wait(FALSE, pmap_tlb_flush_timeout || spinlock_timed_out || panic_active());
+       i_bit_clear(MP_KDP, &current_cpu_datap()->cpu_signals);
+       if (panic_active() || NMI_panic_reason != NONE) {
+               mp_kdp_wait(FALSE, TRUE);
+       } else if (!mp_kdp_trap &&
+                  !mp_kdp_is_NMI &&
+                  virtualized && (debug_boot_arg & DB_NMI)) {
+               /*
+                * Under a VMM with the debug boot-arg set, drop into kdp.
+                * Since an NMI is involved, there's a risk of contending with
+                * a panic. And side-effects of NMIs may result in entry into, 
+                * and continuing from, the debugger being unreliable.
+                */
+               if (__sync_bool_compare_and_swap(&mp_kdp_is_NMI, FALSE, TRUE)) {
+                       kprintf_break_lock();
+                       kprintf("Debugger entry requested by NMI\n");
+                       kdp_i386_trap(T_DEBUG, saved_state64(regs), 0, 0);
+                       printf("Debugger entry requested by NMI\n");
+                       mp_kdp_is_NMI = FALSE;
+               } else {
+                       mp_kdp_wait(FALSE, FALSE);
+               }
+       } else {
+               mp_kdp_wait(FALSE, FALSE);
+       }

        if (pmsafe_debug && !kdp_snapshot)
                pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_NORMAL);
 #endif
        if (pmsafe_debug && !kdp_snapshot)
                pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_NORMAL);
 #endif


@@ -631,6 +682,35 @@ cpu_NMI_interrupt(int cpu)
        }
 }
 
        }
 }
 

+void
+NMI_cpus(void)
+{
+       unsigned int    cpu;
+       boolean_t       intrs_enabled;
+       uint64_t        tsc_timeout;
+
+       intrs_enabled = ml_set_interrupts_enabled(FALSE);
+
+       for (cpu = 0; cpu < real_ncpus; cpu++) {
+               if (!cpu_is_running(cpu))
+                       continue;
+               cpu_datap(cpu)->cpu_NMI_acknowledged = FALSE;
+               cpu_NMI_interrupt(cpu);
+               tsc_timeout = !machine_timeout_suspended() ?
+                               rdtsc64() + (1000 * 1000 * 1000 * 10ULL) :
+                               ~0ULL;
+               while (!cpu_datap(cpu)->cpu_NMI_acknowledged) {
+                       handle_pending_TLB_flushes();
+                       cpu_pause();
+                       if (rdtsc64() > tsc_timeout)
+                               panic("NMI_cpus() timeout cpu %d", cpu);
+               }
+               cpu_datap(cpu)->cpu_NMI_acknowledged = FALSE;
+       }
+
+       ml_set_interrupts_enabled(intrs_enabled);
+}
+

 static void    (* volatile mp_PM_func)(void) = NULL;
 
 static void
 static void    (* volatile mp_PM_func)(void) = NULL;
 
 static void


@@ -680,7 +760,9 @@ i386_signal_cpu(int cpu, mp_event_t event, mp_sync_t mode)
        i386_cpu_IPI(cpu);
        if (mode == SYNC) {
           again:
        i386_cpu_IPI(cpu);
        if (mode == SYNC) {
           again:

-               tsc_timeout = rdtsc64() + (1000*1000*1000);
+               tsc_timeout = !machine_timeout_suspended() ?
+                                       rdtsc64() + (1000*1000*1000) :
+                                       ~0ULL;

                while (i_bit(event, signals) && rdtsc64() < tsc_timeout) {
                        cpu_pause();
                }
                while (i_bit(event, signals) && rdtsc64() < tsc_timeout) {
                        cpu_pause();
                }


@@ -695,41 +777,56 @@ i386_signal_cpu(int cpu, mp_event_t event, mp_sync_t mode)
 }
 
 /*
 }
 
 /*

- * Send event to all running cpus.
- * Called with the topology locked.
+ * Helper function called when busy-waiting: panic if too long
+ * a TSC-based time has elapsed since the start of the spin.

  */
  */

-void
-i386_signal_cpus(mp_event_t event, mp_sync_t mode)
+static boolean_t
+mp_spin_timeout(uint64_t tsc_start)

 {
 {

-       unsigned int    cpu;
-       unsigned int    my_cpu = cpu_number();
+       uint64_t        tsc_timeout;

 
 

-       assert(hw_lock_held((hw_lock_t)&x86_topo_lock));
+       cpu_pause();
+       if (machine_timeout_suspended())
+               return FALSE;

 
 

-       for (cpu = 0; cpu < real_ncpus; cpu++) {
-               if (cpu == my_cpu || !cpu_datap(cpu)->cpu_running)
-                       continue;
-               i386_signal_cpu(cpu, event, mode);
-       }
+       /*
+        * The timeout is 4 * the spinlock timeout period
+        * unless we have serial console printing (kprintf) enabled
+        * in which case we allow an even greater margin.
+        */
+       tsc_timeout = disable_serial_output ? LockTimeOutTSC << 2
+                                           : LockTimeOutTSC << 4;
+       return  (rdtsc64() > tsc_start + tsc_timeout);

 }
 
 /*
 }
 
 /*

- * Return the number of running cpus.
- * Called with the topology locked.
+ * Helper function to take a spinlock while ensuring that incoming IPIs
+ * are still serviced if interrupts are masked while we spin.
+ * Returns current interrupt state.

  */
  */

-int
-i386_active_cpus(void)
+boolean_t
+mp_safe_spin_lock(usimple_lock_t lock)

 {
 {

-       unsigned int    cpu;
-       unsigned int    ncpus = 0;
-
-       assert(hw_lock_held((hw_lock_t)&x86_topo_lock));
-
-       for (cpu = 0; cpu < real_ncpus; cpu++) {
-               if (cpu_datap(cpu)->cpu_running)
-                       ncpus++;
-       }
-       return(ncpus);
+       if (ml_get_interrupts_enabled()) {
+               simple_lock(lock);
+               return TRUE;
+       } else {
+               uint64_t tsc_spin_start = rdtsc64();
+               while (!simple_lock_try(lock)) {
+                       cpu_signal_handler(NULL);
+                       if (mp_spin_timeout(tsc_spin_start)) {
+                               uint32_t lock_cpu;
+                               uintptr_t lowner = (uintptr_t)
+                                                  lock->interlock.lock_data;
+                               spinlock_timed_out = lock;
+                               lock_cpu = spinlock_timeout_NMI(lowner);
+                               NMIPI_panic(cpu_to_cpumask(lock_cpu), SPINLOCK_TIMEOUT);
+                               panic("mp_safe_spin_lock() timed out, lock: %p, owner thread: 0x%lx, current_thread: %p, owner on CPU 0x%x, time: %llu",
+                                     lock, lowner, current_thread(), lock_cpu, mach_absolute_time());
+                       }
+               }
+               return FALSE;
+       } 

 }
 
 /*
 }
 
 /*


@@ -747,9 +844,10 @@ i386_active_cpus(void)
  */
 
 static void
  */
 
 static void

-mp_rendezvous_action(void)
+mp_rendezvous_action(__unused void *null)

 {
 {

-       boolean_t intrs_enabled;
+       boolean_t       intrs_enabled;
+       uint64_t        tsc_spin_start;

 
        /* setup function */
        if (mp_rv_setup_func != NULL)
 
        /* setup function */
        if (mp_rv_setup_func != NULL)


@@ -759,11 +857,15 @@ mp_rendezvous_action(void)
 
        /* spin on entry rendezvous */
        atomic_incl(&mp_rv_entry, 1);
 
        /* spin on entry rendezvous */
        atomic_incl(&mp_rv_entry, 1);

+       tsc_spin_start = rdtsc64();
+

        while (mp_rv_entry < mp_rv_ncpus) {
                /* poll for pesky tlb flushes if interrupts disabled */
                if (!intrs_enabled)
                        handle_pending_TLB_flushes();
        while (mp_rv_entry < mp_rv_ncpus) {
                /* poll for pesky tlb flushes if interrupts disabled */
                if (!intrs_enabled)
                        handle_pending_TLB_flushes();

-               cpu_pause();
+               if (mp_spin_timeout(tsc_spin_start)) {
+                       panic("mp_rv_action() entry: %ld of %d responses, start: 0x%llx, cur: 0x%llx", mp_rv_entry, mp_rv_ncpus, tsc_spin_start, rdtsc64());
+               }

        }
 
        /* action function */
        }
 
        /* action function */


@@ -772,10 +874,12 @@ mp_rendezvous_action(void)
 
        /* spin on exit rendezvous */
        atomic_incl(&mp_rv_exit, 1);
 
        /* spin on exit rendezvous */
        atomic_incl(&mp_rv_exit, 1);

+       tsc_spin_start = rdtsc64();

        while (mp_rv_exit < mp_rv_ncpus) {
                if (!intrs_enabled)
                        handle_pending_TLB_flushes();
        while (mp_rv_exit < mp_rv_ncpus) {
                if (!intrs_enabled)
                        handle_pending_TLB_flushes();

-               cpu_pause();
+               if (mp_spin_timeout(tsc_spin_start))
+                       panic("mp_rv_action() exit: %ld of %d responses, start: 0x%llx, cur: 0x%llx", mp_rv_exit, mp_rv_ncpus, tsc_spin_start, rdtsc64());

        }
 
        /* teardown function */
        }
 
        /* teardown function */


@@ -792,6 +896,7 @@ mp_rendezvous(void (*setup_func)(void *),
              void (*teardown_func)(void *),
              void *arg)
 {
              void (*teardown_func)(void *),
              void *arg)
 {

+       uint64_t        tsc_spin_start;

 
        if (!smp_initialized) {
                if (setup_func != NULL)
 
        if (!smp_initialized) {
                if (setup_func != NULL)


@@ -804,7 +909,7 @@ mp_rendezvous(void (*setup_func)(void *),
        }
                
        /* obtain rendezvous lock */
        }
                
        /* obtain rendezvous lock */

-       simple_lock(&mp_rv_lock);
+       (void) mp_safe_spin_lock(&mp_rv_lock);

 
        /* set static function pointers */
        mp_rv_setup_func = setup_func;
 
        /* set static function pointers */
        mp_rv_setup_func = setup_func;


@@ -820,21 +925,20 @@ mp_rendezvous(void (*setup_func)(void *),
         * signal other processors, which will call mp_rendezvous_action()
         * with interrupts disabled
         */
         * signal other processors, which will call mp_rendezvous_action()
         * with interrupts disabled
         */

-       simple_lock(&x86_topo_lock);
-       mp_rv_ncpus = i386_active_cpus();
-       i386_signal_cpus(MP_RENDEZVOUS, ASYNC);
-       simple_unlock(&x86_topo_lock);
+       mp_rv_ncpus = mp_cpus_call(CPUMASK_OTHERS, NOSYNC, &mp_rendezvous_action, NULL) + 1;

 
        /* call executor function on this cpu */
 
        /* call executor function on this cpu */

-       mp_rendezvous_action();
+       mp_rendezvous_action(NULL);

 
        /*
         * Spin for everyone to complete.
         * This is necessary to ensure that all processors have proceeded
         * from the exit barrier before we release the rendezvous structure.
         */
 
        /*
         * Spin for everyone to complete.
         * This is necessary to ensure that all processors have proceeded
         * from the exit barrier before we release the rendezvous structure.
         */

+       tsc_spin_start = rdtsc64();

        while (mp_rv_complete < mp_rv_ncpus) {
        while (mp_rv_complete < mp_rv_ncpus) {

-               cpu_pause();
+               if (mp_spin_timeout(tsc_spin_start))
+                       panic("mp_rendezvous() timeout: %ld of %d responses, start: 0x%llx, cur: 0x%llx", mp_rv_complete, mp_rv_ncpus, tsc_spin_start, rdtsc64());

        }
        
        /* Tidy up */
        }
        
        /* Tidy up */


@@ -892,107 +996,150 @@ typedef struct {
        void            (*func)(void *,void *); /* routine to call */
        void            *arg0;                  /* routine's 1st arg */
        void            *arg1;                  /* routine's 2nd arg */
        void            (*func)(void *,void *); /* routine to call */
        void            *arg0;                  /* routine's 1st arg */
        void            *arg1;                  /* routine's 2nd arg */

-       volatile long   *countp;                /* completion counter */
+       cpumask_t       *maskp;                 /* completion response mask */

 } mp_call_t;
 } mp_call_t;

-       
+
+
+typedef struct {
+       queue_head_t            queue;
+       decl_simple_lock_data(, lock);
+} mp_call_queue_t;

 #define MP_CPUS_CALL_BUFS_PER_CPU      MAX_CPUS
 #define MP_CPUS_CALL_BUFS_PER_CPU      MAX_CPUS

-static queue_head_t    mp_cpus_call_freelist;
-static queue_head_t    mp_cpus_call_queue[MAX_CPUS];
-/*
- * The free list and the per-cpu call queues are protected by the following
- * lock which is taken wil interrupts disabled.
- */
-decl_simple_lock_data(,mp_cpus_call_lock);
+static mp_call_queue_t mp_cpus_call_freelist;
+static mp_call_queue_t mp_cpus_call_head[MAX_CPUS];

 
 static inline boolean_t
 
 static inline boolean_t

-mp_call_lock(void)
+mp_call_head_lock(mp_call_queue_t *cqp)

 {
        boolean_t       intrs_enabled;
 
        intrs_enabled = ml_set_interrupts_enabled(FALSE);
 {
        boolean_t       intrs_enabled;
 
        intrs_enabled = ml_set_interrupts_enabled(FALSE);

-       simple_lock(&mp_cpus_call_lock);
+       simple_lock(&cqp->lock);

 
        return intrs_enabled;
 }
 
 
        return intrs_enabled;
 }
 

+/*
+ * Deliver an NMIPI to a set of processors to cause them to panic .
+ */
+void
+NMIPI_panic(cpumask_t cpu_mask, NMI_reason_t why) {
+       unsigned int cpu, cpu_bit;
+       uint64_t deadline;
+
+       NMIPI_enable(TRUE);
+       NMI_panic_reason = why;
+
+       for (cpu = 0, cpu_bit = 1; cpu < real_ncpus; cpu++, cpu_bit <<= 1) {
+               if ((cpu_mask & cpu_bit) == 0)
+                       continue;
+               cpu_datap(cpu)->cpu_NMI_acknowledged = FALSE;
+               cpu_NMI_interrupt(cpu);
+       }
+
+       /* Wait (only so long) for NMi'ed cpus to respond */
+       deadline = mach_absolute_time() + LockTimeOut;
+       for (cpu = 0, cpu_bit = 1; cpu < real_ncpus; cpu++, cpu_bit <<= 1) {
+               if ((cpu_mask & cpu_bit) == 0)
+                       continue;
+               while (!cpu_datap(cpu)->cpu_NMI_acknowledged &&
+                       mach_absolute_time() < deadline) {
+                       cpu_pause();
+               }
+       }
+}
+
+#if MACH_ASSERT

 static inline boolean_t
 static inline boolean_t

-mp_call_is_locked(void)
+mp_call_head_is_locked(mp_call_queue_t *cqp)

 {
        return !ml_get_interrupts_enabled() &&
 {
        return !ml_get_interrupts_enabled() &&

-               hw_lock_held((hw_lock_t)&mp_cpus_call_lock);
+               hw_lock_held((hw_lock_t)&cqp->lock);

 }
 }

+#endif

 
 static inline void
 
 static inline void

-mp_call_unlock(boolean_t intrs_enabled)
+mp_call_head_unlock(mp_call_queue_t *cqp, boolean_t intrs_enabled)

 {
 {

-       simple_unlock(&mp_cpus_call_lock);
+       simple_unlock(&cqp->lock);

        ml_set_interrupts_enabled(intrs_enabled);
 }
 
 static inline mp_call_t *
 mp_call_alloc(void)
 {
        ml_set_interrupts_enabled(intrs_enabled);
 }
 
 static inline mp_call_t *
 mp_call_alloc(void)
 {

-       mp_call_t       *callp;
+       mp_call_t       *callp = NULL;
+       boolean_t       intrs_enabled;
+       mp_call_queue_t *cqp = &mp_cpus_call_freelist;
+
+       intrs_enabled = mp_call_head_lock(cqp);
+       if (!queue_empty(&cqp->queue))
+               queue_remove_first(&cqp->queue, callp, typeof(callp), link);
+       mp_call_head_unlock(cqp, intrs_enabled);

 
 

-       assert(mp_call_is_locked());
-       if (queue_empty(&mp_cpus_call_freelist))
-               return NULL;
-       queue_remove_first(&mp_cpus_call_freelist, callp, typeof(callp), link);

        return callp;
 }
 
 static inline void
 mp_call_free(mp_call_t *callp)
 {
        return callp;
 }
 
 static inline void
 mp_call_free(mp_call_t *callp)
 {

-       assert(mp_call_is_locked());
-       queue_enter_first(&mp_cpus_call_freelist, callp, typeof(callp), link);
+       boolean_t       intrs_enabled;
+       mp_call_queue_t *cqp = &mp_cpus_call_freelist;
+
+       intrs_enabled = mp_call_head_lock(cqp);
+       queue_enter_first(&cqp->queue, callp, typeof(callp), link);
+       mp_call_head_unlock(cqp, intrs_enabled);

 }
 
 static inline mp_call_t *
 }
 
 static inline mp_call_t *

-mp_call_dequeue(queue_t call_queue)
+mp_call_dequeue_locked(mp_call_queue_t *cqp)

 {
 {

-       mp_call_t       *callp;
+       mp_call_t       *callp = NULL;

 
 

-       assert(mp_call_is_locked());
-       if (queue_empty(call_queue))
-               return NULL;
-       queue_remove_first(call_queue, callp, typeof(callp), link);
+       assert(mp_call_head_is_locked(cqp));
+       if (!queue_empty(&cqp->queue))
+               queue_remove_first(&cqp->queue, callp, typeof(callp), link);

        return callp;
 }
 
        return callp;
 }
 

+static inline void
+mp_call_enqueue_locked(
+       mp_call_queue_t *cqp,
+       mp_call_t       *callp)
+{
+       queue_enter(&cqp->queue, callp, typeof(callp), link);
+}
+

 /* Called on the boot processor to initialize global structures */
 static void
 mp_cpus_call_init(void)
 {
 /* Called on the boot processor to initialize global structures */
 static void
 mp_cpus_call_init(void)
 {

+       mp_call_queue_t *cqp = &mp_cpus_call_freelist;
+

        DBG("mp_cpus_call_init()\n");
        DBG("mp_cpus_call_init()\n");

-       simple_lock_init(&mp_cpus_call_lock, 0);
-       queue_init(&mp_cpus_call_freelist);
+       simple_lock_init(&cqp->lock, 0);
+       queue_init(&cqp->queue);

 }
 
 /*
 }
 
 /*

- * Called by each processor to add call buffers to the free list
+ * Called at processor registration to add call buffers to the free list

  * and to initialize the per-cpu call queue.
  * and to initialize the per-cpu call queue.

- * Also called but ignored on slave processors on re-start/wake.

  */
  */

-static void
-mp_cpus_call_cpu_init(void)
+void
+mp_cpus_call_cpu_init(int cpu)

 {
 {

-       boolean_t       intrs_enabled;

        int             i;
        int             i;

+       mp_call_queue_t *cqp = &mp_cpus_call_head[cpu];

        mp_call_t       *callp;
 
        mp_call_t       *callp;
 

-       if (mp_cpus_call_queue[cpu_number()].next != NULL)
-               return; /* restart/wake case: called already */
-
-       queue_init(&mp_cpus_call_queue[cpu_number()]);
+       simple_lock_init(&cqp->lock, 0);
+       queue_init(&cqp->queue);

        for (i = 0; i < MP_CPUS_CALL_BUFS_PER_CPU; i++) {
                callp = (mp_call_t *) kalloc(sizeof(mp_call_t));
        for (i = 0; i < MP_CPUS_CALL_BUFS_PER_CPU; i++) {
                callp = (mp_call_t *) kalloc(sizeof(mp_call_t));

-               intrs_enabled = mp_call_lock();

                mp_call_free(callp);
                mp_call_free(callp);

-               mp_call_unlock(intrs_enabled);

        }
 
        }
 

-       DBG("mp_cpus_call_init() done on cpu %d\n", cpu_number());
+       DBG("mp_cpus_call_init(%d) done\n", cpu);

 }
 
 /*
 }
 
 /*


@@ -1002,56 +1149,31 @@ mp_cpus_call_cpu_init(void)
 static void
 mp_cpus_call_action(void)
 {
 static void
 mp_cpus_call_action(void)
 {

-       queue_t         cpu_head;
+       mp_call_queue_t *cqp;

        boolean_t       intrs_enabled;
        mp_call_t       *callp;
        mp_call_t       call;
 
        assert(!ml_get_interrupts_enabled());
        boolean_t       intrs_enabled;
        mp_call_t       *callp;
        mp_call_t       call;
 
        assert(!ml_get_interrupts_enabled());

-       cpu_head = &mp_cpus_call_queue[cpu_number()];
-       intrs_enabled = mp_call_lock();
-       while ((callp = mp_call_dequeue(cpu_head)) != NULL) {
+       cqp = &mp_cpus_call_head[cpu_number()];
+       intrs_enabled = mp_call_head_lock(cqp);
+       while ((callp = mp_call_dequeue_locked(cqp)) != NULL) {

                /* Copy call request to the stack to free buffer */
                call = *callp;
                mp_call_free(callp);
                if (call.func != NULL) {
                /* Copy call request to the stack to free buffer */
                call = *callp;
                mp_call_free(callp);
                if (call.func != NULL) {

-                       mp_call_unlock(intrs_enabled);
+                       mp_call_head_unlock(cqp, intrs_enabled);

                        KERNEL_DEBUG_CONSTANT(
                                TRACE_MP_CPUS_CALL_ACTION,
                        KERNEL_DEBUG_CONSTANT(
                                TRACE_MP_CPUS_CALL_ACTION,

-                               call.func, call.arg0, call.arg1, call.countp, 0);
+                               VM_KERNEL_UNSLIDE(call.func), VM_KERNEL_UNSLIDE_OR_PERM(call.arg0),
+                               VM_KERNEL_UNSLIDE_OR_PERM(call.arg1), VM_KERNEL_ADDRPERM(call.maskp), 0);

                        call.func(call.arg0, call.arg1);
                        call.func(call.arg0, call.arg1);

-                       (void) mp_call_lock();
+                       (void) mp_call_head_lock(cqp);

                }
                }

-               if (call.countp != NULL)
-                       atomic_incl(call.countp, 1);
+               if (call.maskp != NULL)
+                       i_bit_set(cpu_number(), call.maskp);

        }
        }

-       mp_call_unlock(intrs_enabled);
-}
-
-static boolean_t
-mp_call_queue(
-       int             cpu, 
-        void           (*action_func)(void *, void *),
-        void           *arg0,
-        void           *arg1,
-       volatile long   *countp)
-{
-       queue_t         cpu_head = &mp_cpus_call_queue[cpu];
-       mp_call_t       *callp;
-
-       assert(mp_call_is_locked());
-       callp = mp_call_alloc();
-       if (callp == NULL)
-               return FALSE;
-
-       callp->func = action_func;
-       callp->arg0 = arg0;
-       callp->arg1 = arg1;
-       callp->countp = countp;
-
-       queue_enter(cpu_head, callp, typeof(callp), link);
-
-       return TRUE;
+       mp_call_head_unlock(cqp, intrs_enabled);

 }
 
 /*
 }
 
 /*


@@ -1080,27 +1202,36 @@ mp_cpus_call(
                        (void (*)(void *,void *))action_func,
                        arg,
                        NULL,
                        (void (*)(void *,void *))action_func,
                        arg,
                        NULL,

-                       NULL,

                        NULL);
 }
 
 static void
                        NULL);
 }
 
 static void

-mp_cpus_call_wait(boolean_t intrs_enabled,
-                 long mp_cpus_signals,
-                 volatile long *mp_cpus_calls)
+mp_cpus_call_wait(boolean_t    intrs_enabled,
+                 cpumask_t     cpus_called,
+                 cpumask_t     *cpus_responded)

 {
 {

-       queue_t         cpu_head;
+       mp_call_queue_t         *cqp;
+       uint64_t                tsc_spin_start;

 
 

-       cpu_head = &mp_cpus_call_queue[cpu_number()];
+       assert(ml_get_interrupts_enabled() == 0 || get_preemption_level() != 0);
+       cqp = &mp_cpus_call_head[cpu_number()];

 
 

-       while (*mp_cpus_calls < mp_cpus_signals) {
+       tsc_spin_start = rdtsc64();
+       while (*cpus_responded != cpus_called) {

                if (!intrs_enabled) {
                if (!intrs_enabled) {

-                       if (!queue_empty(cpu_head))
+                       /* Sniffing w/o locking */
+                       if (!queue_empty(&cqp->queue))

                                mp_cpus_call_action();
                                mp_cpus_call_action();

+                       cpu_signal_handler(NULL);
+               }
+               if (mp_spin_timeout(tsc_spin_start)) {
+                       cpumask_t       cpus_unresponsive;

 
 

-                       handle_pending_TLB_flushes();
+                       cpus_unresponsive = cpus_called & ~(*cpus_responded);
+                       NMIPI_panic(cpus_unresponsive, CROSSCALL_TIMEOUT);
+                       panic("mp_cpus_call_wait() timeout, cpus: 0x%llx",
+                               cpus_unresponsive);

                }
                }

-               cpu_pause();

        }
 }
 
        }
 }
 


@@ -1111,20 +1242,20 @@ mp_cpus_call1(
         void           (*action_func)(void *, void *),
         void           *arg0,
         void           *arg1,
         void           (*action_func)(void *, void *),
         void           *arg0,
         void           *arg1,

-       cpumask_t       *cpus_calledp,
-       cpumask_t       *cpus_notcalledp)
+       cpumask_t       *cpus_calledp)

 {
 {

-       cpu_t           cpu;
+       cpu_t           cpu = 0;

        boolean_t       intrs_enabled = FALSE;
        boolean_t       call_self = FALSE;
        cpumask_t       cpus_called = 0;
        boolean_t       intrs_enabled = FALSE;
        boolean_t       call_self = FALSE;
        cpumask_t       cpus_called = 0;

-       cpumask_t       cpus_notcalled = 0;
-       long            mp_cpus_signals = 0;
-       volatile long   mp_cpus_calls = 0;
+       cpumask_t       cpus_responded = 0;
+       long            cpus_call_count = 0;
+       uint64_t        tsc_spin_start;
+       boolean_t       topo_lock;

 
        KERNEL_DEBUG_CONSTANT(
                TRACE_MP_CPUS_CALL | DBG_FUNC_START,
 
        KERNEL_DEBUG_CONSTANT(
                TRACE_MP_CPUS_CALL | DBG_FUNC_START,

-               cpus, mode, action_func, arg0, arg1);
+               cpus, mode, VM_KERNEL_UNSLIDE(action_func), VM_KERNEL_UNSLIDE_OR_PERM(arg0), VM_KERNEL_UNSLIDE_OR_PERM(arg1));

 
        if (!smp_initialized) {
                if ((cpus & CPUMASK_SELF) == 0)
 
        if (!smp_initialized) {
                if ((cpus & CPUMASK_SELF) == 0)


@@ -1140,78 +1271,89 @@ mp_cpus_call1(
 
        /*
         * Queue the call for each non-local requested cpu.
 
        /*
         * Queue the call for each non-local requested cpu.

-        * The topo lock is not taken. Instead we sniff the cpu_running state
-        * and then re-check it after taking the call lock. A cpu being taken
-        * offline runs the action function after clearing the cpu_running.
+        * This is performed under the topo lock to prevent changes to
+        * cpus online state and to prevent concurrent rendezvouses --
+        * although an exception is made if we're calling only the master
+        * processor since that always remains active. Note: this exception
+        * is expected for longterm timer nosync cross-calls to the master cpu.

         */ 
         */ 

+       mp_disable_preemption();
+       intrs_enabled = ml_get_interrupts_enabled();
+       topo_lock = (cpus != cpu_to_cpumask(master_cpu));
+       if (topo_lock) {
+               ml_set_interrupts_enabled(FALSE);
+               (void) mp_safe_spin_lock(&x86_topo_lock);
+       }

        for (cpu = 0; cpu < (cpu_t) real_ncpus; cpu++) {
                if (((cpu_to_cpumask(cpu) & cpus) == 0) ||
        for (cpu = 0; cpu < (cpu_t) real_ncpus; cpu++) {
                if (((cpu_to_cpumask(cpu) & cpus) == 0) ||

-                   !cpu_datap(cpu)->cpu_running)
+                   !cpu_is_running(cpu))

                        continue;
                        continue;

+               tsc_spin_start = rdtsc64();

                if (cpu == (cpu_t) cpu_number()) {
                        /*
                         * We don't IPI ourself and if calling asynchronously,
                         * we defer our call until we have signalled all others.
                         */
                        call_self = TRUE;
                if (cpu == (cpu_t) cpu_number()) {
                        /*
                         * We don't IPI ourself and if calling asynchronously,
                         * we defer our call until we have signalled all others.
                         */
                        call_self = TRUE;

-                       cpus_called |= cpu_to_cpumask(cpu);

                        if (mode == SYNC && action_func != NULL) {
                                KERNEL_DEBUG_CONSTANT(
                                        TRACE_MP_CPUS_CALL_LOCAL,
                        if (mode == SYNC && action_func != NULL) {
                                KERNEL_DEBUG_CONSTANT(
                                        TRACE_MP_CPUS_CALL_LOCAL,

-                                       action_func, arg0, arg1, 0, 0);
+                                       VM_KERNEL_UNSLIDE(action_func),
+                                       VM_KERNEL_UNSLIDE_OR_PERM(arg0), VM_KERNEL_UNSLIDE_OR_PERM(arg1), 0, 0);

                                action_func(arg0, arg1);
                        }
                } else {
                        /*
                         * Here to queue a call to cpu and IPI.
                                action_func(arg0, arg1);
                        }
                } else {
                        /*
                         * Here to queue a call to cpu and IPI.

-                        * Spinning for request buffer unless NOSYNC.

                         */
                         */

+                       mp_call_t       *callp = NULL;
+                       mp_call_queue_t *cqp = &mp_cpus_call_head[cpu];
+                       boolean_t       intrs_inner;
+

                queue_call:
                queue_call:

-                       intrs_enabled = mp_call_lock();
-                       if (!cpu_datap(cpu)->cpu_running) {
-                               mp_call_unlock(intrs_enabled);
-                               continue;
-                       }
-                       if (mode == NOSYNC) {
-                               if (!mp_call_queue(cpu, action_func, arg0, arg1,
-                                                  NULL)) {
-                                       cpus_notcalled |= cpu_to_cpumask(cpu);
-                                       mp_call_unlock(intrs_enabled);
-                                       KERNEL_DEBUG_CONSTANT(
-                                               TRACE_MP_CPUS_CALL_NOBUF,
-                                               cpu, 0, 0, 0, 0);
-                                       continue;
-                               }
-                       } else {
-                               if (!mp_call_queue(cpu, action_func, arg0, arg1,
-                                                     &mp_cpus_calls)) {
-                                       mp_call_unlock(intrs_enabled);
-                                       KERNEL_DEBUG_CONSTANT(
-                                               TRACE_MP_CPUS_CALL_NOBUF,
-                                               cpu, 0, 0, 0, 0);
-                                       if (!intrs_enabled) {
+                       if (callp == NULL)
+                               callp = mp_call_alloc();
+                       intrs_inner = mp_call_head_lock(cqp);
+                       if (callp == NULL) {
+                               mp_call_head_unlock(cqp, intrs_inner);
+                               KERNEL_DEBUG_CONSTANT(
+                                       TRACE_MP_CPUS_CALL_NOBUF,
+                                       cpu, 0, 0, 0, 0);
+                               if (!intrs_inner) {
+                                       /* Sniffing w/o locking */
+                                       if (!queue_empty(&cqp->queue))

                                                mp_cpus_call_action();
                                                mp_cpus_call_action();

-                                               handle_pending_TLB_flushes();
-                                       }
-                                       cpu_pause();
-                                       goto queue_call;
+                                       handle_pending_TLB_flushes();

                                }
                                }

+                               if (mp_spin_timeout(tsc_spin_start))
+                                       panic("mp_cpus_call1() timeout start: 0x%llx, cur: 0x%llx",
+                                             tsc_spin_start, rdtsc64());
+                               goto queue_call;

                        }
                        }

-                       mp_cpus_signals++;
+                       callp->maskp = (mode == NOSYNC) ? NULL : &cpus_responded;
+                       callp->func = action_func;
+                       callp->arg0 = arg0;
+                       callp->arg1 = arg1;
+                       mp_call_enqueue_locked(cqp, callp);
+                       cpus_call_count++;

                        cpus_called |= cpu_to_cpumask(cpu);
                        i386_signal_cpu(cpu, MP_CALL, ASYNC);
                        cpus_called |= cpu_to_cpumask(cpu);
                        i386_signal_cpu(cpu, MP_CALL, ASYNC);

-                       mp_call_unlock(intrs_enabled);
+                       mp_call_head_unlock(cqp, intrs_inner);

                        if (mode == SYNC) {
                        if (mode == SYNC) {

-                               mp_cpus_call_wait(intrs_enabled, mp_cpus_signals, &mp_cpus_calls);
+                               mp_cpus_call_wait(intrs_inner, cpus_called, &cpus_responded);

                        }
                }
        }
                        }
                }
        }

+       if (topo_lock) {
+               simple_unlock(&x86_topo_lock);
+               ml_set_interrupts_enabled(intrs_enabled);
+       }

 
        /* Call locally if mode not SYNC */
        if (mode != SYNC && call_self ) {
                KERNEL_DEBUG_CONSTANT(
                        TRACE_MP_CPUS_CALL_LOCAL,
 
        /* Call locally if mode not SYNC */
        if (mode != SYNC && call_self ) {
                KERNEL_DEBUG_CONSTANT(
                        TRACE_MP_CPUS_CALL_LOCAL,

-                       action_func, arg0, arg1, 0, 0);
+                       VM_KERNEL_UNSLIDE(action_func), VM_KERNEL_UNSLIDE_OR_PERM(arg0), VM_KERNEL_UNSLIDE_OR_PERM(arg1), 0, 0);

                if (action_func != NULL) {
                        ml_set_interrupts_enabled(FALSE);
                        action_func(arg0, arg1);
                if (action_func != NULL) {
                        ml_set_interrupts_enabled(FALSE);
                        action_func(arg0, arg1);


@@ -1220,28 +1362,31 @@ mp_cpus_call1(
        }
 
        /* For ASYNC, now wait for all signaled cpus to complete their calls */
        }
 
        /* For ASYNC, now wait for all signaled cpus to complete their calls */

-       if (mode == ASYNC) {
-               mp_cpus_call_wait(intrs_enabled, mp_cpus_signals, &mp_cpus_calls);
-       }
+       if (mode == ASYNC)
+               mp_cpus_call_wait(intrs_enabled, cpus_called, &cpus_responded);
+
+       /* Safe to allow pre-emption now */
+       mp_enable_preemption();

 
 out:
 
 out:

-       cpu = (cpu_t) mp_cpus_signals + (call_self ? 1 : 0);
+       if (call_self){
+               cpus_called |= cpu_to_cpumask(cpu);
+               cpus_call_count++;
+       }

 
        if (cpus_calledp)
                *cpus_calledp = cpus_called;
 
        if (cpus_calledp)
                *cpus_calledp = cpus_called;

-       if (cpus_notcalledp)
-               *cpus_notcalledp = cpus_notcalled;

 
        KERNEL_DEBUG_CONSTANT(
                TRACE_MP_CPUS_CALL | DBG_FUNC_END,
 
        KERNEL_DEBUG_CONSTANT(
                TRACE_MP_CPUS_CALL | DBG_FUNC_END,

-               cpu, cpus_called, cpus_notcalled, 0, 0);
+               cpus_call_count, cpus_called, 0, 0, 0);

 
 

-       return cpu;
+       return (cpu_t) cpus_call_count;

 }
 
 
 static void
 }
 
 
 static void

-mp_broadcast_action(void)
+mp_broadcast_action(__unused void *null)

 {
    /* call action function */
    if (mp_bc_action_func != NULL)
 {
    /* call action function */
    if (mp_bc_action_func != NULL)


@@ -1280,16 +1425,14 @@ mp_broadcast(
    /*
     * signal other processors, which will call mp_broadcast_action()
     */
    /*
     * signal other processors, which will call mp_broadcast_action()
     */

-   simple_lock(&x86_topo_lock);
-   mp_bc_ncpus = i386_active_cpus();   /* total including this cpu */
-   mp_bc_count = mp_bc_ncpus;
-   i386_signal_cpus(MP_BROADCAST, ASYNC);
+   mp_bc_count = real_ncpus;                           /* assume max possible active */
+   mp_bc_ncpus = mp_cpus_call(CPUMASK_OTHERS, NOSYNC, *mp_broadcast_action, NULL) + 1;
+   atomic_decl(&mp_bc_count, real_ncpus - mp_bc_ncpus);        /* subtract inactive */

 
    /* call executor function on this cpu */
 
    /* call executor function on this cpu */

-   mp_broadcast_action();
-   simple_unlock(&x86_topo_lock);
+   mp_broadcast_action(NULL);

 
 

-   /* block for all cpus to have run action_func */
+   /* block for other cpus to have run action_func */

    if (mp_bc_ncpus > 1)
        thread_block(THREAD_CONTINUE_NULL);
    else
    if (mp_bc_ncpus > 1)
        thread_block(THREAD_CONTINUE_NULL);
    else


@@ -1299,6 +1442,30 @@ mp_broadcast(
    lck_mtx_unlock(&mp_bc_lock);
 }
 
    lck_mtx_unlock(&mp_bc_lock);
 }
 

+void
+mp_cpus_kick(cpumask_t cpus)
+{
+       cpu_t           cpu;
+       boolean_t       intrs_enabled = FALSE;
+
+       intrs_enabled = ml_set_interrupts_enabled(FALSE);
+       mp_safe_spin_lock(&x86_topo_lock);
+
+       for (cpu = 0; cpu < (cpu_t) real_ncpus; cpu++) {
+               if ((cpu == (cpu_t) cpu_number())
+                       || ((cpu_to_cpumask(cpu) & cpus) == 0)
+                       || !cpu_is_running(cpu))
+               {
+                               continue;
+               }
+
+               lapic_send_ipi(cpu, LAPIC_VECTOR(KICK));
+       }
+
+       simple_unlock(&x86_topo_lock);
+       ml_set_interrupts_enabled(intrs_enabled);
+}
+

 void
 i386_activate_cpu(void)
 {
 void
 i386_activate_cpu(void)
 {


@@ -1311,52 +1478,73 @@ i386_activate_cpu(void)
                return;
        }
 
                return;
        }
 

-       simple_lock(&x86_topo_lock);
+       mp_safe_spin_lock(&x86_topo_lock);

        cdp->cpu_running = TRUE;
        started_cpu();
        simple_unlock(&x86_topo_lock);
        cdp->cpu_running = TRUE;
        started_cpu();
        simple_unlock(&x86_topo_lock);

+       flush_tlb_raw();

 }
 
 }
 

-extern void etimer_timer_expire(void   *arg);
-

 void
 i386_deactivate_cpu(void)
 {
        cpu_data_t      *cdp = current_cpu_datap();
 
        assert(!ml_get_interrupts_enabled());
 void
 i386_deactivate_cpu(void)
 {
        cpu_data_t      *cdp = current_cpu_datap();
 
        assert(!ml_get_interrupts_enabled());

+ 
+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_DEACTIVATE | DBG_FUNC_START,
+               0, 0, 0, 0, 0);

 
 

-       simple_lock(&x86_topo_lock);
+       mp_safe_spin_lock(&x86_topo_lock);

        cdp->cpu_running = FALSE;
        simple_unlock(&x86_topo_lock);
 
        cdp->cpu_running = FALSE;
        simple_unlock(&x86_topo_lock);
 

+       /*
+        * Move all of this cpu's timers to the master/boot cpu,
+        * and poke it in case there's a sooner deadline for it to schedule.
+        */

        timer_queue_shutdown(&cdp->rtclock_timer.queue);
        timer_queue_shutdown(&cdp->rtclock_timer.queue);

-       cdp->rtclock_timer.deadline = EndOfAllTime;
-       mp_cpus_call(cpu_to_cpumask(master_cpu), ASYNC, etimer_timer_expire, NULL);
+       mp_cpus_call(cpu_to_cpumask(master_cpu), ASYNC, timer_queue_expire_local, NULL);
+
+#if MONOTONIC
+       mt_cpu_down(cdp);
+#endif /* MONOTONIC */

 
        /*
 
        /*

-        * In case a rendezvous/braodcast/call was initiated to this cpu
-        * before we cleared cpu_running, we must perform any actions due.
+        * Open an interrupt window
+        * and ensure any pending IPI or timer is serviced

         */
         */

-       if (i_bit(MP_RENDEZVOUS, &cdp->cpu_signals))
-               mp_rendezvous_action();
-       if (i_bit(MP_BROADCAST, &cdp->cpu_signals))
-               mp_broadcast_action();
-       if (i_bit(MP_CALL, &cdp->cpu_signals))
-               mp_cpus_call_action();
-       cdp->cpu_signals = 0;                   /* all clear */
+       mp_disable_preemption();
+       ml_set_interrupts_enabled(TRUE);
+
+       while (cdp->cpu_signals && x86_lcpu()->rtcDeadline != EndOfAllTime)
+               cpu_pause();
+       /*
+        * Ensure there's no remaining timer deadline set
+        * - AICPM may have left one active.
+        */
+       setPop(0);
+
+       ml_set_interrupts_enabled(FALSE);
+       mp_enable_preemption();
+
+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_DEACTIVATE | DBG_FUNC_END,
+               0, 0, 0, 0, 0);

 }
 
 int    pmsafe_debug    = 1;
 
 #if    MACH_KDP
 volatile boolean_t     mp_kdp_trap = FALSE;
 }
 
 int    pmsafe_debug    = 1;
 
 #if    MACH_KDP
 volatile boolean_t     mp_kdp_trap = FALSE;

+volatile boolean_t     mp_kdp_is_NMI = FALSE;

 volatile unsigned long mp_kdp_ncpus;
 boolean_t              mp_kdp_state;
 
 
 void
 volatile unsigned long mp_kdp_ncpus;
 boolean_t              mp_kdp_state;
 
 
 void

-mp_kdp_enter(void)
+mp_kdp_enter(boolean_t proceed_on_failure)

 {
        unsigned int    cpu;
        unsigned int    ncpus = 0;
 {
        unsigned int    cpu;
        unsigned int    ncpus = 0;


@@ -1372,26 +1560,51 @@ mp_kdp_enter(void)
         */
        mp_kdp_state = ml_set_interrupts_enabled(FALSE);
        my_cpu = cpu_number();
         */
        mp_kdp_state = ml_set_interrupts_enabled(FALSE);
        my_cpu = cpu_number();

-       cpu_datap(my_cpu)->debugger_entry_time = mach_absolute_time();
-       simple_lock(&mp_kdp_lock);

 
 

-       if (pmsafe_debug && !kdp_snapshot)
-           pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
+       if (my_cpu == (unsigned) debugger_cpu) {
+               kprintf("\n\nRECURSIVE DEBUGGER ENTRY DETECTED\n\n");
+               kdp_reset();
+               return;
+       }

 
 

-       while (mp_kdp_trap) {
-               simple_unlock(&mp_kdp_lock);
-               DBG("mp_kdp_enter() race lost\n");
+       uint64_t start_time = cpu_datap(my_cpu)->debugger_entry_time = mach_absolute_time();
+       int locked = 0;
+       while (!locked || mp_kdp_trap) {
+               if (locked) {
+                       simple_unlock(&x86_topo_lock);
+               }
+               if (proceed_on_failure) {
+                       if (mach_absolute_time() - start_time > 500000000ll) {
+                               kprintf("mp_kdp_enter() can't get x86_topo_lock! Debugging anyway! #YOLO\n");
+                               break;
+                       }
+                       locked = simple_lock_try(&x86_topo_lock);
+                       if (!locked) {
+                               cpu_pause();
+                       }
+               } else {
+                       mp_safe_spin_lock(&x86_topo_lock);
+                       locked = TRUE;
+               }
+
+               if (locked && mp_kdp_trap) {
+                       simple_unlock(&x86_topo_lock);
+                       DBG("mp_kdp_enter() race lost\n");

 #if MACH_KDP
 #if MACH_KDP

-               mp_kdp_wait(TRUE, FALSE);
+                       mp_kdp_wait(TRUE, FALSE);

 #endif
 #endif

-               simple_lock(&mp_kdp_lock);
+                       locked = FALSE;
+               }

        }
        }

+
+       if (pmsafe_debug && !kdp_snapshot)
+               pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
+

        debugger_cpu = my_cpu;
        ncpus = 1;
        debugger_cpu = my_cpu;
        ncpus = 1;

-       mp_kdp_ncpus = 1;       /* self */
+       atomic_incl((volatile long *)&mp_kdp_ncpus, 1);

        mp_kdp_trap = TRUE;
        debugger_entry_time = cpu_datap(my_cpu)->debugger_entry_time;
        mp_kdp_trap = TRUE;
        debugger_entry_time = cpu_datap(my_cpu)->debugger_entry_time;

-       simple_unlock(&mp_kdp_lock);

 
        /*
         * Deliver a nudge to other cpus, counting how many
 
        /*
         * Deliver a nudge to other cpus, counting how many


@@ -1399,7 +1612,7 @@ mp_kdp_enter(void)
        DBG("mp_kdp_enter() signaling other processors\n");
        if (force_immediate_debugger_NMI == FALSE) {
                for (cpu = 0; cpu < real_ncpus; cpu++) {
        DBG("mp_kdp_enter() signaling other processors\n");
        if (force_immediate_debugger_NMI == FALSE) {
                for (cpu = 0; cpu < real_ncpus; cpu++) {

-                       if (cpu == my_cpu || !cpu_datap(cpu)->cpu_running)
+                       if (cpu == my_cpu || !cpu_is_running(cpu))

                                continue;
                        ncpus++;
                        i386_signal_cpu(cpu, MP_KDP, ASYNC);
                                continue;
                        ncpus++;
                        i386_signal_cpu(cpu, MP_KDP, ASYNC);


@@ -1415,7 +1628,7 @@ mp_kdp_enter(void)
                 * "unsafe-to-interrupt" points such as the trampolines,
                 * but neither do we want to lose state by waiting too long.
                 */
                 * "unsafe-to-interrupt" points such as the trampolines,
                 * but neither do we want to lose state by waiting too long.
                 */

-               tsc_timeout = rdtsc64() + (ncpus * 1000 * 1000);
+               tsc_timeout = rdtsc64() + (LockTimeOutTSC);

 
                while (mp_kdp_ncpus != ncpus && rdtsc64() < tsc_timeout) {
                        /*
 
                while (mp_kdp_ncpus != ncpus && rdtsc64() < tsc_timeout) {
                        /*


@@ -1428,25 +1641,46 @@ mp_kdp_enter(void)
                        cpu_pause();
                }
                /* If we've timed out, and some processor(s) are still unresponsive,
                        cpu_pause();
                }
                /* If we've timed out, and some processor(s) are still unresponsive,

-                * interrupt them with an NMI via the local APIC.
+                * interrupt them with an NMI via the local APIC, iff a panic is
+                * in progress.

                 */
                 */

+               if (panic_active()) {
+                       NMIPI_enable(TRUE);
+               }

                if (mp_kdp_ncpus != ncpus) {
                if (mp_kdp_ncpus != ncpus) {

+                       cpumask_t cpus_NMI_pending = 0;
+                       DBG("mp_kdp_enter() timed-out on cpu %d, NMI-ing\n", my_cpu);

                        for (cpu = 0; cpu < real_ncpus; cpu++) {
                        for (cpu = 0; cpu < real_ncpus; cpu++) {

-                               if (cpu == my_cpu || !cpu_datap(cpu)->cpu_running)
+                               if (cpu == my_cpu || !cpu_is_running(cpu))

                                        continue;
                                        continue;

-                               if (cpu_signal_pending(cpu, MP_KDP))
+                               if (cpu_signal_pending(cpu, MP_KDP)) {
+                                       cpus_NMI_pending |= cpu_to_cpumask(cpu);

                                        cpu_NMI_interrupt(cpu);
                                        cpu_NMI_interrupt(cpu);

+                               }
+                       }
+                       /* Wait again for the same timeout */
+                       tsc_timeout = rdtsc64() + (LockTimeOutTSC);
+                       while (mp_kdp_ncpus != ncpus && rdtsc64() < tsc_timeout) {
+                               handle_pending_TLB_flushes();
+                               cpu_pause();
+                       }
+                       if (mp_kdp_ncpus != ncpus) {
+                               kdb_printf("mp_kdp_enter(): %llu, %lu, %u TIMED-OUT WAITING FOR NMI-ACK, PROCEEDING\n", cpus_NMI_pending, mp_kdp_ncpus, ncpus);

                        }
                }
        }
        else
                for (cpu = 0; cpu < real_ncpus; cpu++) {
                        }
                }
        }
        else
                for (cpu = 0; cpu < real_ncpus; cpu++) {

-                       if (cpu == my_cpu || !cpu_datap(cpu)->cpu_running)
+                       if (cpu == my_cpu || !cpu_is_running(cpu))

                                continue;
                        cpu_NMI_interrupt(cpu);
                }
 
                                continue;
                        cpu_NMI_interrupt(cpu);
                }
 

-       DBG("mp_kdp_enter() %lu processors done %s\n",
+       if (locked) {
+               simple_unlock(&x86_topo_lock);
+       }
+
+       DBG("mp_kdp_enter() %d processors done %s\n",

            (int)mp_kdp_ncpus, (mp_kdp_ncpus == ncpus) ? "OK" : "timed out");
        
        postcode(MP_KDP_ENTER);
            (int)mp_kdp_ncpus, (mp_kdp_ncpus == ncpus) ? "OK" : "timed out");
        
        postcode(MP_KDP_ENTER);


@@ -1499,9 +1733,8 @@ static void
 mp_kdp_wait(boolean_t flush, boolean_t isNMI)
 {
        DBG("mp_kdp_wait()\n");
 mp_kdp_wait(boolean_t flush, boolean_t isNMI)
 {
        DBG("mp_kdp_wait()\n");

-       /* If an I/O port has been specified as a debugging aid, issue a read */
-       panic_io_port_read();

 
 

+       current_cpu_datap()->debugger_ipi_time = mach_absolute_time();

 #if CONFIG_MCA
        /* If we've trapped due to a machine-check, save MCA registers */
        mca_check_save();
 #if CONFIG_MCA
        /* If we've trapped due to a machine-check, save MCA registers */
        mca_check_save();


@@ -1536,7 +1769,7 @@ mp_kdp_exit(void)
        debugger_exit_time = mach_absolute_time();
 
        mp_kdp_trap = FALSE;
        debugger_exit_time = mach_absolute_time();
 
        mp_kdp_trap = FALSE;

-       __asm__ volatile("mfence");
+       mfence();

 
        /* Wait other processors to stop spinning. XXX needs timeout */
        DBG("mp_kdp_exit() waiting for processors to resume\n");
 
        /* Wait other processors to stop spinning. XXX needs timeout */
        DBG("mp_kdp_exit() waiting for processors to resume\n");


@@ -1558,12 +1791,13 @@ mp_kdp_exit(void)
 
        DBG("mp_kdp_exit() done\n");
        (void) ml_set_interrupts_enabled(mp_kdp_state);
 
        DBG("mp_kdp_exit() done\n");
        (void) ml_set_interrupts_enabled(mp_kdp_state);

-       postcode(0);
+       postcode(MP_KDP_EXIT);

 }
 }

+

 #endif /* MACH_KDP */
 
 boolean_t
 #endif /* MACH_KDP */
 
 boolean_t

-mp_recent_debugger_activity() {
+mp_recent_debugger_activity(void) {

        uint64_t abstime = mach_absolute_time();
        return (((abstime - debugger_entry_time) < LastDebuggerEntryAllowance) ||
            ((abstime - debugger_exit_time) < LastDebuggerEntryAllowance));
        uint64_t abstime = mach_absolute_time();
        return (((abstime - debugger_entry_time) < LastDebuggerEntryAllowance) ||
            ((abstime - debugger_exit_time) < LastDebuggerEntryAllowance));


@@ -1588,104 +1822,6 @@ cause_ast_check(
        }
 }
 
        }
 }
 

-#if MACH_KDB
-/*
- * invoke kdb on slave processors 
- */
-
-void
-remote_kdb(void)
-{
-       unsigned int    my_cpu = cpu_number();
-       unsigned int    cpu;
-       int kdb_ncpus;
-       uint64_t tsc_timeout = 0;
-       
-       mp_kdb_trap = TRUE;
-       mp_kdb_ncpus = 1;
-       for (kdb_ncpus = 1, cpu = 0; cpu < real_ncpus; cpu++) {
-               if (cpu == my_cpu || !cpu_datap(cpu)->cpu_running)
-                       continue;
-               kdb_ncpus++;
-               i386_signal_cpu(cpu, MP_KDB, ASYNC);
-       }
-       DBG("remote_kdb() waiting for (%d) processors to suspend\n",kdb_ncpus);
-
-       tsc_timeout = rdtsc64() + (kdb_ncpus * 100 * 1000 * 1000);
-
-       while (mp_kdb_ncpus != kdb_ncpus && rdtsc64() < tsc_timeout) {
-               /*
-                * a TLB shootdown request may be pending... this would result in the requesting
-                * processor waiting in PMAP_UPDATE_TLBS() until this processor deals with it.
-                * Process it, so it can now enter mp_kdp_wait()
-                */
-               handle_pending_TLB_flushes();
-
-               cpu_pause();
-       }
-       DBG("mp_kdp_enter() %lu processors done %s\n",
-               mp_kdb_ncpus, (mp_kdb_ncpus == kdb_ncpus) ? "OK" : "timed out");
-}
-
-static void
-mp_kdb_wait(void)
-{
-       DBG("mp_kdb_wait()\n");
-
-       /* If an I/O port has been specified as a debugging aid, issue a read */
-       panic_io_port_read();
-
-       atomic_incl(&mp_kdb_ncpus, 1);
-       while (mp_kdb_trap) {
-               /*
-                * a TLB shootdown request may be pending... this would result in the requesting
-                * processor waiting in PMAP_UPDATE_TLBS() until this processor deals with it.
-                * Process it, so it can now enter mp_kdp_wait()
-                */
-               handle_pending_TLB_flushes();
-
-               cpu_pause();
-       }
-       atomic_decl((volatile long *)&mp_kdb_ncpus, 1);
-       DBG("mp_kdb_wait() done\n");
-}
-
-/*
- * Clear kdb interrupt
- */
-
-void
-clear_kdb_intr(void)
-{
-       mp_disable_preemption();
-       i_bit_clear(MP_KDB, &current_cpu_datap()->cpu_signals);
-       mp_enable_preemption();
-}
-
-void
-mp_kdb_exit(void)
-{
-       DBG("mp_kdb_exit()\n");
-       atomic_decl((volatile long *)&mp_kdb_ncpus, 1);
-       mp_kdb_trap = FALSE;
-       __asm__ volatile("mfence");
-
-       while (mp_kdb_ncpus > 0) {
-               /*
-                * a TLB shootdown request may be pending... this would result in the requesting
-                * processor waiting in PMAP_UPDATE_TLBS() until this processor deals with it.
-                * Process it, so it can now enter mp_kdp_wait()
-                */
-               handle_pending_TLB_flushes();
-
-               cpu_pause();
-       }
-
-       DBG("mp_kdb_exit() done\n");
-}
-
-#endif /* MACH_KDB */
-

 void
 slave_machine_init(void *param)
 {
 void
 slave_machine_init(void *param)
 {


@@ -1699,9 +1835,8 @@ slave_machine_init(void *param)
                 * Cold start
                 */
                clock_init();
                 * Cold start
                 */
                clock_init();

-               cpu_machine_init();     /* Interrupts enabled hereafter */
-               mp_cpus_call_cpu_init();

        }
        }

+       cpu_machine_init();     /* Interrupts enabled hereafter */

 }
 
 #undef cpu_number
 }
 
 #undef cpu_number


@@ -1710,54 +1845,6 @@ int cpu_number(void)
        return get_cpu_number();
 }
 
        return get_cpu_number();
 }
 

-#if    MACH_KDB
-#include <ddb/db_output.h>
-
-#define TRAP_DEBUG 0 /* Must match interrupt.s and spl.s */
-
-
-#if    TRAP_DEBUG
-#define MTRAPS 100
-struct mp_trap_hist_struct {
-       unsigned char type;
-       unsigned char data[5];
-} trap_hist[MTRAPS], *cur_trap_hist = trap_hist,
-    *max_trap_hist = &trap_hist[MTRAPS];
-
-void db_trap_hist(void);
-
-/*
- * SPL:
- *     1: new spl
- *     2: old spl
- *     3: new tpr
- *     4: old tpr
- * INT:
- *     1: int vec
- *     2: old spl
- *     3: new spl
- *     4: post eoi tpr
- *     5: exit tpr
- */
-
-void
-db_trap_hist(void)
-{
-       int i,j;
-       for(i=0;i<MTRAPS;i++)
-           if (trap_hist[i].type == 1 || trap_hist[i].type == 2) {
-                   db_printf("%s%s",
-                             (&trap_hist[i]>=cur_trap_hist)?"*":" ",
-                             (trap_hist[i].type == 1)?"SPL":"INT");
-                   for(j=0;j<5;j++)
-                       db_printf(" %02x", trap_hist[i].data[j]);
-                   db_printf("\n");
-           }
-               
-}
-#endif /* TRAP_DEBUG */
-#endif /* MACH_KDB */
-

 static void
 cpu_prewarm_init()
 {
 static void
 cpu_prewarm_init()
 {


@@ -1820,7 +1907,7 @@ _cpu_warm_setup(
 {
        cpu_warm_data_t cwdp = (cpu_warm_data_t)arg;
 
 {
        cpu_warm_data_t cwdp = (cpu_warm_data_t)arg;
 

-       timer_call_enter(cwdp->cwd_call, cwdp->cwd_deadline, TIMER_CALL_CRITICAL | TIMER_CALL_LOCAL);
+       timer_call_enter(cwdp->cwd_call, cwdp->cwd_deadline, TIMER_CALL_SYS_CRITICAL | TIMER_CALL_LOCAL);

        cwdp->cwd_result = 0;
 
        return;
        cwdp->cwd_result = 0;
 
        return;


@@ -1872,3 +1959,103 @@ ml_interrupt_prewarm(
                return cwd.cwd_result;
        }
 }
                return cwd.cwd_result;
        }
 }

+
+#if DEBUG || DEVELOPMENT
+void
+kernel_spin(uint64_t spin_ns)
+{
+       boolean_t       istate;
+       uint64_t        spin_abs;
+       uint64_t        deadline;
+       cpu_data_t      *cdp;
+
+       kprintf("kernel_spin(%llu) spinning uninterruptibly\n", spin_ns);
+       istate = ml_set_interrupts_enabled(FALSE);
+       cdp = current_cpu_datap();
+       nanoseconds_to_absolutetime(spin_ns, &spin_abs);
+
+       /* Fake interrupt handler entry for testing mp_interrupt_watchdog() */
+       cdp->cpu_int_event_time = mach_absolute_time();
+       cdp->cpu_int_state = (void *) USER_STATE(current_thread());
+
+       deadline = mach_absolute_time() + spin_ns;
+       while (mach_absolute_time() < deadline)
+               cpu_pause();
+
+       cdp->cpu_int_event_time = 0;
+       cdp->cpu_int_state = NULL;
+
+       ml_set_interrupts_enabled(istate);
+       kprintf("kernel_spin() continuing\n");
+}
+
+/*
+ * Called from the scheduler's maintenance thread,
+ * scan running processors for long-running ISRs and:
+ *  - panic if longer than LockTimeOut, or
+ *  - log if more than a quantum.
+ */
+void
+mp_interrupt_watchdog(void)
+{
+       cpu_t                   cpu;
+       boolean_t               intrs_enabled = FALSE;
+       uint16_t                cpu_int_num;
+       uint64_t                cpu_int_event_time;
+       uint64_t                cpu_rip;
+       uint64_t                cpu_int_duration;
+       uint64_t                now;
+       x86_saved_state_t       *cpu_int_state;
+
+       if (__improbable(!mp_interrupt_watchdog_enabled))
+               return;
+
+       intrs_enabled = ml_set_interrupts_enabled(FALSE);
+       now = mach_absolute_time();
+       /*
+        * While timeouts are not suspended,
+        * check all other processors for long outstanding interrupt handling.
+        */
+       for (cpu = 0;
+            cpu < (cpu_t) real_ncpus && !machine_timeout_suspended();
+            cpu++) {
+               if ((cpu == (cpu_t) cpu_number()) ||
+                   (!cpu_is_running(cpu)))
+                       continue;
+               cpu_int_event_time = cpu_datap(cpu)->cpu_int_event_time;
+               if (cpu_int_event_time == 0)
+                       continue;
+               if (__improbable(now < cpu_int_event_time))
+                       continue;       /* skip due to inter-processor skew */
+               cpu_int_state = cpu_datap(cpu)->cpu_int_state;
+               if (__improbable(cpu_int_state == NULL))
+                       /* The interrupt may have been dismissed */
+                       continue;
+
+               /* Here with a cpu handling an interrupt */
+
+               cpu_int_duration = now - cpu_int_event_time;
+               if (__improbable(cpu_int_duration > LockTimeOut)) {
+                       cpu_int_num = saved_state64(cpu_int_state)->isf.trapno;
+                       cpu_rip = saved_state64(cpu_int_state)->isf.rip;
+                       vector_timed_out = cpu_int_num;
+                       NMIPI_panic(cpu_to_cpumask(cpu), INTERRUPT_WATCHDOG);
+                       panic("Interrupt watchdog, "
+                               "cpu: %d interrupt: 0x%x time: %llu..%llu state: %p RIP: 0x%llx",
+                               cpu, cpu_int_num, cpu_int_event_time, now, cpu_int_state, cpu_rip);
+                       /* NOT REACHED */
+               } else if (__improbable(cpu_int_duration > (uint64_t) std_quantum)) {
+                       mp_interrupt_watchdog_events++;
+                       cpu_int_num = saved_state64(cpu_int_state)->isf.trapno;
+                       cpu_rip = saved_state64(cpu_int_state)->isf.rip;
+                       ml_set_interrupts_enabled(intrs_enabled);
+                       printf("Interrupt watchdog, "
+                               "cpu: %d interrupt: 0x%x time: %llu..%llu RIP: 0x%llx\n",
+                               cpu, cpu_int_num, cpu_int_event_time, now, cpu_rip);
+                       return;
+               }
+       }
+
+       ml_set_interrupts_enabled(intrs_enabled);
+}
+#endif