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 23ce618604ebff3a6b19ab069d38d99d0270cae2..3b72326873570e426d4e4582ba47b5aeb13129fc 100644 (file)
--- a/osfmk/i386/mp.c
+++ b/osfmk/i386/mp.c
@@ -1,5 +1,5 @@
 /*
 /*

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

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


@@ -29,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>
 


@@ -40,54 +39,51 @@
 
 #include <kern/kern_types.h>
 #include <kern/startup.h>
 
 #include <kern/kern_types.h>
 #include <kern/startup.h>

+#include <kern/timer_queue.h>

 #include <kern/processor.h>
 #include <kern/cpu_number.h>
 #include <kern/cpu_data.h>
 #include <kern/assert.h>
 #include <kern/machine.h>
 #include <kern/pms.h>
 #include <kern/processor.h>
 #include <kern/cpu_number.h>
 #include <kern/cpu_data.h>
 #include <kern/assert.h>
 #include <kern/machine.h>
 #include <kern/pms.h>

+#include <kern/misc_protos.h>
+#include <kern/timer_call.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/mp.h>
-#include <i386/mp_events.h>
-#include <i386/mp_slave_boot.h>
-#include <i386/apic.h>
-#include <i386/ipl.h>
-#include <i386/fpu.h>
-#include <i386/cpuid.h>
+#include <i386/bit_routines.h>

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

-#include <i386/machine_cpu.h>
-#include <i386/misc_protos.h>
-#include <i386/mtrr.h>
-#include <i386/vmx/vmx_cpu.h>
-#include <i386/postcode.h>
-#include <i386/perfmon.h>

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

+#include <i386/misc_protos.h>

 #include <i386/trap.h>
 #include <i386/trap.h>

+#include <i386/postcode.h>

 #include <i386/machine_routines.h>
 #include <i386/machine_routines.h>

+#include <i386/mp.h>
+#include <i386/mp_events.h>
+#include <i386/lapic.h>
+#include <i386/cpuid.h>
+#include <i386/fpu.h>
+#include <i386/machine_cpu.h>

 #include <i386/pmCPU.h>
 #include <i386/pmCPU.h>

-#include <i386/hpet.h>
+#if CONFIG_MCA

 #include <i386/machine_check.h>
 #include <i386/machine_check.h>

-
-#include <chud/chud_xnu.h>
-#include <chud/chud_xnu_private.h>
+#endif
+#include <i386/acpi.h>

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

-#if MACH_KDB
-#include <i386/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)


@@ -97,130 +93,100 @@
 #define PAUSE
 #endif /* MP_DEBUG */
 
 #define PAUSE
 #endif /* MP_DEBUG */
 

-/* Initialize lapic_id so cpu_number() works on non SMP systems */
-unsigned long  lapic_id_initdata = 0;
-unsigned long  lapic_id = (unsigned long)&lapic_id_initdata;
-vm_offset_t    lapic_start;
+/* Debugging/test trace events: */
+#define        TRACE_MP_TLB_FLUSH              MACHDBG_CODE(DBG_MACH_MP, 0)
+#define        TRACE_MP_CPUS_CALL              MACHDBG_CODE(DBG_MACH_MP, 1)
+#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)

 
 

-static i386_intr_func_t        lapic_timer_func;
-static i386_intr_func_t        lapic_pmi_func;
-static i386_intr_func_t        lapic_thermal_func;
-
-/* TRUE if local APIC was enabled by the OS not by the BIOS */
-static boolean_t lapic_os_enabled = FALSE;
-
-/* Base vector for local APIC interrupt sources */
-int lapic_interrupt_base = LAPIC_DEFAULT_INTERRUPT_BASE;
+#define ABS(v)         (((v) > 0)?(v):-(v))

 
 void           slave_boot_init(void);
 
 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
-
-static void    mp_kdp_wait(boolean_t flush);
-static void    mp_rendezvous_action(void);
-static void    mp_broadcast_action(void);
+#if MACH_KDP
+static void    mp_kdp_wait(boolean_t flush, boolean_t isNMI);
+#endif /* MACH_KDP */

 
 

-static int             NMIInterruptHandler(x86_saved_state_t *regs);
+#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;
+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;
 volatile boolean_t     force_immediate_debugger_NMI = FALSE;
 volatile boolean_t     pmap_tlb_flush_timeout = FALSE;

+#if DEBUG || DEVELOPMENT
+boolean_t              mp_interrupt_watchdog_enabled = TRUE;
+uint32_t               mp_interrupt_watchdog_events = 0;
+#endif

 
 

-decl_simple_lock_data(,mp_kdp_lock);
+decl_simple_lock_data(,debugger_callback_lock);
+struct debugger_callback *debugger_callback = NULL;

 
 

-decl_mutex_data(static, mp_cpu_boot_lock);
+decl_lck_mtx_data(static, mp_cpu_boot_lock);
+lck_mtx_ext_t  mp_cpu_boot_lock_ext;

 
 /* Variables needed for MP rendezvous. */
 decl_simple_lock_data(,mp_rv_lock);
 
 /* Variables needed for MP rendezvous. */
 decl_simple_lock_data(,mp_rv_lock);

-static void            (*mp_rv_setup_func)(void *arg);
-static void            (*mp_rv_action_func)(void *arg);
-static void            (*mp_rv_teardown_func)(void *arg);
-static void            *mp_rv_func_arg;
-static int             mp_rv_ncpus;
+static void    (*mp_rv_setup_func)(void *arg);
+static void    (*mp_rv_action_func)(void *arg);
+static void    (*mp_rv_teardown_func)(void *arg);
+static void    *mp_rv_func_arg;
+static volatile int    mp_rv_ncpus;

                        /* Cache-aligned barriers: */
 static volatile long   mp_rv_entry    __attribute__((aligned(64)));
 static volatile long   mp_rv_exit     __attribute__((aligned(64)));
 static volatile long   mp_rv_complete __attribute__((aligned(64)));
 
                        /* Cache-aligned barriers: */
 static volatile long   mp_rv_entry    __attribute__((aligned(64)));
 static volatile long   mp_rv_exit     __attribute__((aligned(64)));
 static volatile long   mp_rv_complete __attribute__((aligned(64)));
 

+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;
+       void     *arg0, *arg1;
+       volatile long     ret;
+       volatile uint16_t cpu;
+} kdp_xcpu_call_func = {
+       .cpu  = KDP_XCPU_NONE
+};
+
+#endif
+

 /* Variables needed for MP broadcast. */
 static void        (*mp_bc_action_func)(void *arg);
 static void        *mp_bc_func_arg;
 /* Variables needed for MP broadcast. */
 static void        (*mp_bc_action_func)(void *arg);
 static void        *mp_bc_func_arg;

-static int     mp_bc_ncpus;
+static int             mp_bc_ncpus;

 static volatile long   mp_bc_count;
 static volatile long   mp_bc_count;

-decl_mutex_data(static, mp_bc_lock);
-
-static void    mp_cpus_call_action(void); 
-
-int            lapic_to_cpu[MAX_CPUS];
-int            cpu_to_lapic[MAX_CPUS];
-
-static void
-lapic_cpu_map_init(void)
-{
-       int     i;
-
-       for (i = 0; i < MAX_CPUS; i++) {
-               lapic_to_cpu[i] = -1;
-               cpu_to_lapic[i] = -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   NMI_count = 0;
+static NMI_reason_t    NMI_panic_reason = NONE;
+static int             vector_timed_out;

 
 

-void
-lapic_cpu_map(int apic_id, int cpu)
-{
-       cpu_to_lapic[cpu] = apic_id;
-       lapic_to_cpu[apic_id] = cpu;
-}
-
-/*
- * Retrieve the local apic ID a cpu.
- *
- * Returns the local apic ID for the given processor.
- * If the processor does not exist or apic not configured, returns -1.
- */
-
-uint32_t
-ml_get_apicid(uint32_t cpu)
-{
-       if(cpu >= (uint32_t)MAX_CPUS)
-               return 0xFFFFFFFF;      /* Return -1 if cpu too big */
-       
-       /* Return the apic ID (or -1 if not configured) */
-       return (uint32_t)cpu_to_lapic[cpu];
-
-}
+extern void    NMI_cpus(void);

 
 

-#ifdef MP_DEBUG
-static void
-lapic_cpu_map_dump(void)
-{
-       int     i;
+static void    mp_cpus_call_init(void); 
+static void    mp_cpus_call_action(void); 
+static void    mp_call_PM(void);

 
 

-       for (i = 0; i < MAX_CPUS; i++) {
-               if (cpu_to_lapic[i] == -1)
-                       continue;
-               kprintf("cpu_to_lapic[%d]: %d\n",
-                       i, cpu_to_lapic[i]);
-       }
-       for (i = 0; i < MAX_CPUS; i++) {
-               if (lapic_to_cpu[i] == -1)
-                       continue;
-               kprintf("lapic_to_cpu[%d]: %d\n",
-                       i, lapic_to_cpu[i]);
-       }
-}
-#define LAPIC_CPU_MAP_DUMP()   lapic_cpu_map_dump()
-#define LAPIC_DUMP()           lapic_dump()
-#else
-#define LAPIC_CPU_MAP_DUMP()
-#define LAPIC_DUMP()
-#endif /* MP_DEBUG */
+char           mp_slave_stack[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); // Temp stack for slave init

 
 

+/* PAL-related routines */
+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);
+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


@@ -240,562 +206,289 @@ struct profile_vars *_profile_vars_cpus[MAX_CPUS] = { &_profile_vars };
 #define GPROF_INIT()
 #endif /* GPROF */
 
 #define GPROF_INIT()
 #endif /* GPROF */
 

+static lck_grp_t       smp_lck_grp;
+static lck_grp_attr_t  smp_lck_grp_attr;
+
+#define NUM_CPU_WARM_CALLS     20
+struct timer_call      cpu_warm_call_arr[NUM_CPU_WARM_CALLS];
+queue_head_t           cpu_warm_call_list;
+decl_simple_lock_data(static, cpu_warm_lock);
+
+typedef struct cpu_warm_data {
+       timer_call_t    cwd_call;
+       uint64_t        cwd_deadline;
+       int             cwd_result;
+} *cpu_warm_data_t;
+
+static void            cpu_prewarm_init(void);
+static void            cpu_warm_timer_call_func(call_entry_param_t p0, call_entry_param_t p1);
+static void            _cpu_warm_setup(void *arg);
+static timer_call_t    grab_warm_timer_call(void);
+static void            free_warm_timer_call(timer_call_t call);
+

 void
 smp_init(void)
 {
 void
 smp_init(void)
 {

-       int             result;
-       vm_map_entry_t  entry;
-       uint32_t        lo;
-       uint32_t        hi;
-       boolean_t       is_boot_processor;
-       boolean_t       is_lapic_enabled;
-       vm_offset_t     lapic_base;
-
-       simple_lock_init(&mp_kdp_lock, 0);

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

-       mutex_init(&mp_cpu_boot_lock, 0);
-       mutex_init(&mp_bc_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_mtx_init_ext(&mp_bc_lock, &mp_bc_lock_ext, &smp_lck_grp, LCK_ATTR_NULL);

        console_init();
 
        console_init();
 

-       /* Local APIC? */
-       if (!lapic_probe())
+       if(!i386_smp_init(LAPIC_NMI_INTERRUPT, NMIInterruptHandler, 
+                               LAPIC_VECTOR(INTERPROCESSOR), cpu_signal_handler))

                return;
 
                return;
 

-       /* Examine the local APIC state */
-       rdmsr(MSR_IA32_APIC_BASE, lo, hi);
-       is_boot_processor = (lo & MSR_IA32_APIC_BASE_BSP) != 0;
-       is_lapic_enabled  = (lo & MSR_IA32_APIC_BASE_ENABLE) != 0;
-       lapic_base = (lo &  MSR_IA32_APIC_BASE_BASE);
-       kprintf("MSR_IA32_APIC_BASE 0x%x %s %s\n", lapic_base,
-               is_lapic_enabled ? "enabled" : "disabled",
-               is_boot_processor ? "BSP" : "AP");
-       if (!is_boot_processor || !is_lapic_enabled)
-               panic("Unexpected local APIC state\n");
-
-       /* Establish a map to the local apic */
-       lapic_start = vm_map_min(kernel_map);
-       result = vm_map_find_space(kernel_map,
-                                  (vm_map_address_t *) &lapic_start,
-                                  round_page(LAPIC_SIZE), 0,
-                                  VM_MAKE_TAG(VM_MEMORY_IOKIT), &entry);
-       if (result != KERN_SUCCESS) {
-               panic("smp_init: vm_map_find_entry FAILED (err=%d)", result);
-       }
-       vm_map_unlock(kernel_map);
-/* Map in the local APIC non-cacheable, as recommended by Intel
- * in section 8.4.1 of the "System Programming Guide".
- */
-       pmap_enter(pmap_kernel(),
-                       lapic_start,
-                       (ppnum_t) i386_btop(lapic_base),
-                       VM_PROT_READ|VM_PROT_WRITE,
-                       VM_WIMG_IO,
-                       TRUE);
-       lapic_id = (unsigned long)(lapic_start + LAPIC_ID);
-
-       if ((LAPIC_REG(VERSION)&LAPIC_VERSION_MASK) != 0x14) {
-               printf("Local APIC version not 0x14 as expected\n");
-       }
-
-       /* Set up the lapic_id <-> cpu_number map and add this boot processor */
-       lapic_cpu_map_init();
-       lapic_cpu_map((LAPIC_REG(ID)>>LAPIC_ID_SHIFT)&LAPIC_ID_MASK, 0);
-       kprintf("Boot cpu local APIC id 0x%x\n", cpu_to_lapic[0]);
-
-       lapic_init();
-

        cpu_thread_init();
 
        GPROF_INIT();
        DBGLOG_CPU_INIT(master_cpu);
 
        cpu_thread_init();
 
        GPROF_INIT();
        DBGLOG_CPU_INIT(master_cpu);
 

-       slave_boot_init();
+       mp_cpus_call_init();
+       mp_cpus_call_cpu_init(master_cpu);

 
 

-       smp_initialized = TRUE;
-
-       return;
-}
+#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",
+                                       &TSC_sync_margin, sizeof(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;

 
 

-static int
-lapic_esr_read(void)
-{
-       /* write-read register */
-       LAPIC_REG(ERROR_STATUS) = 0;
-       return LAPIC_REG(ERROR_STATUS);
-}
+       cpu_prewarm_init();

 
 

-static void 
-lapic_esr_clear(void)
-{
-       LAPIC_REG(ERROR_STATUS) = 0;
-       LAPIC_REG(ERROR_STATUS) = 0;
+       return;

 }
 
 }
 

-static const char *DM[8] = {
-       "Fixed",
-       "Lowest Priority",
-       "Invalid",
-       "Invalid",
-       "NMI",
-       "Reset",
-       "Invalid",
-       "ExtINT"};
+typedef struct {
+       int                     target_cpu;
+       int                     target_lapic;
+       int                     starter_cpu;
+} processor_start_info_t;
+static processor_start_info_t  start_info        __attribute__((aligned(64)));

 
 

-void
-lapic_dump(void)
-{
-       int     i;
-
-#define BOOL(a) ((a)?' ':'!')
-
-       kprintf("LAPIC %d at 0x%x version 0x%x\n", 
-               (LAPIC_REG(ID)>>LAPIC_ID_SHIFT)&LAPIC_ID_MASK,
-               lapic_start,
-               LAPIC_REG(VERSION)&LAPIC_VERSION_MASK);
-       kprintf("Priorities: Task 0x%x  Arbitration 0x%x  Processor 0x%x\n",
-               LAPIC_REG(TPR)&LAPIC_TPR_MASK,
-               LAPIC_REG(APR)&LAPIC_APR_MASK,
-               LAPIC_REG(PPR)&LAPIC_PPR_MASK);
-       kprintf("Destination Format 0x%x Logical Destination 0x%x\n",
-               LAPIC_REG(DFR)>>LAPIC_DFR_SHIFT,
-               LAPIC_REG(LDR)>>LAPIC_LDR_SHIFT);
-       kprintf("%cEnabled %cFocusChecking SV 0x%x\n",
-               BOOL(LAPIC_REG(SVR)&LAPIC_SVR_ENABLE),
-               BOOL(!(LAPIC_REG(SVR)&LAPIC_SVR_FOCUS_OFF)),
-               LAPIC_REG(SVR) & LAPIC_SVR_MASK);
-       kprintf("LVT_TIMER:   Vector 0x%02x %s %cmasked %s\n",
-               LAPIC_REG(LVT_TIMER)&LAPIC_LVT_VECTOR_MASK,
-               (LAPIC_REG(LVT_TIMER)&LAPIC_LVT_DS_PENDING)?"SendPending":"Idle",
-               BOOL(LAPIC_REG(LVT_TIMER)&LAPIC_LVT_MASKED),
-               (LAPIC_REG(LVT_TIMER)&LAPIC_LVT_PERIODIC)?"Periodic":"OneShot");
-       kprintf("  Initial Count: 0x%08x \n", LAPIC_REG(TIMER_INITIAL_COUNT));
-       kprintf("  Current Count: 0x%08x \n", LAPIC_REG(TIMER_CURRENT_COUNT));
-       kprintf("  Divide Config: 0x%08x \n", LAPIC_REG(TIMER_DIVIDE_CONFIG));
-       kprintf("LVT_PERFCNT: Vector 0x%02x [%s] %s %cmasked\n",
-               LAPIC_REG(LVT_PERFCNT)&LAPIC_LVT_VECTOR_MASK,
-               DM[(LAPIC_REG(LVT_PERFCNT)>>LAPIC_LVT_DM_SHIFT)&LAPIC_LVT_DM_MASK],
-               (LAPIC_REG(LVT_PERFCNT)&LAPIC_LVT_DS_PENDING)?"SendPending":"Idle",
-               BOOL(LAPIC_REG(LVT_PERFCNT)&LAPIC_LVT_MASKED));
-       kprintf("LVT_THERMAL: Vector 0x%02x [%s] %s %cmasked\n",
-               LAPIC_REG(LVT_THERMAL)&LAPIC_LVT_VECTOR_MASK,
-               DM[(LAPIC_REG(LVT_THERMAL)>>LAPIC_LVT_DM_SHIFT)&LAPIC_LVT_DM_MASK],
-               (LAPIC_REG(LVT_THERMAL)&LAPIC_LVT_DS_PENDING)?"SendPending":"Idle",
-               BOOL(LAPIC_REG(LVT_THERMAL)&LAPIC_LVT_MASKED));
-       kprintf("LVT_LINT0:   Vector 0x%02x [%s][%s][%s] %s %cmasked\n",
-               LAPIC_REG(LVT_LINT0)&LAPIC_LVT_VECTOR_MASK,
-               DM[(LAPIC_REG(LVT_LINT0)>>LAPIC_LVT_DM_SHIFT)&LAPIC_LVT_DM_MASK],
-               (LAPIC_REG(LVT_LINT0)&LAPIC_LVT_TM_LEVEL)?"Level":"Edge ",
-               (LAPIC_REG(LVT_LINT0)&LAPIC_LVT_IP_PLRITY_LOW)?"Low ":"High",
-               (LAPIC_REG(LVT_LINT0)&LAPIC_LVT_DS_PENDING)?"SendPending":"Idle",
-               BOOL(LAPIC_REG(LVT_LINT0)&LAPIC_LVT_MASKED));
-       kprintf("LVT_LINT1:   Vector 0x%02x [%s][%s][%s] %s %cmasked\n",
-               LAPIC_REG(LVT_LINT1)&LAPIC_LVT_VECTOR_MASK,
-               DM[(LAPIC_REG(LVT_LINT1)>>LAPIC_LVT_DM_SHIFT)&LAPIC_LVT_DM_MASK],
-               (LAPIC_REG(LVT_LINT1)&LAPIC_LVT_TM_LEVEL)?"Level":"Edge ",
-               (LAPIC_REG(LVT_LINT1)&LAPIC_LVT_IP_PLRITY_LOW)?"Low ":"High",
-               (LAPIC_REG(LVT_LINT1)&LAPIC_LVT_DS_PENDING)?"SendPending":"Idle",
-               BOOL(LAPIC_REG(LVT_LINT1)&LAPIC_LVT_MASKED));
-       kprintf("LVT_ERROR:   Vector 0x%02x %s %cmasked\n",
-               LAPIC_REG(LVT_ERROR)&LAPIC_LVT_VECTOR_MASK,
-               (LAPIC_REG(LVT_ERROR)&LAPIC_LVT_DS_PENDING)?"SendPending":"Idle",
-               BOOL(LAPIC_REG(LVT_ERROR)&LAPIC_LVT_MASKED));
-       kprintf("ESR: %08x \n", lapic_esr_read());
-       kprintf("       ");
-       for(i=0xf; i>=0; i--)
-               kprintf("%x%x%x%x",i,i,i,i);
-       kprintf("\n");
-       kprintf("TMR: 0x");
-       for(i=7; i>=0; i--)
-               kprintf("%08x",LAPIC_REG_OFFSET(TMR_BASE, i*0x10));
-       kprintf("\n");
-       kprintf("IRR: 0x");
-       for(i=7; i>=0; i--)
-               kprintf("%08x",LAPIC_REG_OFFSET(IRR_BASE, i*0x10));
-       kprintf("\n");
-       kprintf("ISR: 0x");
-       for(i=7; i >= 0; i--)
-               kprintf("%08x",LAPIC_REG_OFFSET(ISR_BASE, i*0x10));
-       kprintf("\n");
-}
+/* 
+ * Cache-alignment is to avoid cross-cpu false-sharing interference.
+ */
+static volatile long           tsc_entry_barrier __attribute__((aligned(64)));
+static volatile long           tsc_exit_barrier  __attribute__((aligned(64)));
+static volatile uint64_t       tsc_target        __attribute__((aligned(64)));

 
 

-#if MACH_KDB

 /*
 /*

- *     Displays apic junk
- *
- *     da
+ * Poll a CPU to see when it has marked itself as running.

  */
  */

-void 
-db_apic(__unused db_expr_t addr,
-       __unused int have_addr,
-       __unused db_expr_t count,
-       __unused char *modif)
+static void
+mp_wait_for_cpu_up(int slot_num, unsigned int iters, unsigned int usecdelay)

 {
 {

-
-       lapic_dump();
-
-       return;
+       while (iters-- > 0) {
+               if (cpu_datap(slot_num)->cpu_running)
+                       break;
+               delay(usecdelay);
+       }

 }
 
 }
 

-#endif
-
-boolean_t
-lapic_probe(void)
+/*
+ * Quickly bring a CPU back online which has been halted.
+ */
+kern_return_t
+intel_startCPU_fast(int slot_num)

 {
 {

-       uint32_t        lo;
-       uint32_t        hi;
-
-       if (cpuid_features() & CPUID_FEATURE_APIC)
-               return TRUE;
-
-       if (cpuid_family() == 6 || cpuid_family() == 15) {
-               /*
-                * Mobile Pentiums:
-                * There may be a local APIC which wasn't enabled by BIOS.
-                * So we try to enable it explicitly.
-                */
-               rdmsr(MSR_IA32_APIC_BASE, lo, hi);
-               lo &= ~MSR_IA32_APIC_BASE_BASE;
-               lo |= MSR_IA32_APIC_BASE_ENABLE | LAPIC_START;
-               lo |= MSR_IA32_APIC_BASE_ENABLE;
-               wrmsr(MSR_IA32_APIC_BASE, lo, hi);
+       kern_return_t   rc;

 
 

+       /*
+        * Try to perform a fast restart
+        */
+       rc = pmCPUExitHalt(slot_num);
+       if (rc != KERN_SUCCESS)

                /*
                /*

-                * Re-initialize cpu features info and re-check.
+                * The CPU was not eligible for a fast restart.

                 */
                 */

-               cpuid_set_info();
-               if (cpuid_features() & CPUID_FEATURE_APIC) {
-                       printf("Local APIC discovered and enabled\n");
-                       lapic_os_enabled = TRUE;
-                       lapic_interrupt_base = LAPIC_REDUCED_INTERRUPT_BASE;
-                       return TRUE;
-               }
-       }
+               return(rc);

 
 

-       return FALSE;
-}
-
-void
-lapic_shutdown(void)
-{
-       uint32_t lo;
-       uint32_t hi;
-       uint32_t value;
-
-       /* Shutdown if local APIC was enabled by OS */
-       if (lapic_os_enabled == FALSE)
-               return;
+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_FAST_START | DBG_FUNC_START,
+               slot_num, 0, 0, 0, 0);

 
 

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

        mp_disable_preemption();
        mp_disable_preemption();

+    
+       /*
+        * We use short pauses (1us) for low latency.  30,000 iterations is
+        * longer than a full restart would require so it should be more
+        * than long enough.
+        */

 
 

-       /* ExtINT: masked */
-       if (get_cpu_number() == master_cpu) {
-               value = LAPIC_REG(LVT_LINT0);
-               value |= LAPIC_LVT_MASKED;
-               LAPIC_REG(LVT_LINT0) = value;
-       }
-
-       /* Timer: masked */
-       LAPIC_REG(LVT_TIMER) |= LAPIC_LVT_MASKED;
-
-       /* Perfmon: masked */
-       LAPIC_REG(LVT_PERFCNT) |= LAPIC_LVT_MASKED;
-
-       /* Error: masked */
-       LAPIC_REG(LVT_ERROR) |= LAPIC_LVT_MASKED;
-
-       /* APIC software disabled */
-       LAPIC_REG(SVR) &= ~LAPIC_SVR_ENABLE;
-
-       /* Bypass the APIC completely and update cpu features */
-       rdmsr(MSR_IA32_APIC_BASE, lo, hi);
-       lo &= ~MSR_IA32_APIC_BASE_ENABLE;
-       wrmsr(MSR_IA32_APIC_BASE, lo, hi);
-       cpuid_set_info();
-
+       mp_wait_for_cpu_up(slot_num, 30000, 1);

        mp_enable_preemption();
        mp_enable_preemption();

-}
-
-void
-lapic_init(void)
-{
-       int     value;
-
-       /* Set flat delivery model, logical processor id */
-       LAPIC_REG(DFR) = LAPIC_DFR_FLAT;
-       LAPIC_REG(LDR) = (get_cpu_number()) << LAPIC_LDR_SHIFT;
-
-       /* Accept all */
-       LAPIC_REG(TPR) =  0;
-
-       LAPIC_REG(SVR) = LAPIC_VECTOR(SPURIOUS) | LAPIC_SVR_ENABLE;
-
-       /* ExtINT */
-       if (get_cpu_number() == master_cpu) {
-               value = LAPIC_REG(LVT_LINT0);
-               value &= ~LAPIC_LVT_MASKED;
-               value |= LAPIC_LVT_DM_EXTINT;
-               LAPIC_REG(LVT_LINT0) = value;
-       }
-
-       /* Timer: unmasked, one-shot */
-       LAPIC_REG(LVT_TIMER) = LAPIC_VECTOR(TIMER);
-
-       /* Perfmon: unmasked */
-       LAPIC_REG(LVT_PERFCNT) = LAPIC_VECTOR(PERFCNT);
-
-       /* Thermal: unmasked */
-       LAPIC_REG(LVT_THERMAL) = LAPIC_VECTOR(THERMAL);
-
-       lapic_esr_clear();
-
-       LAPIC_REG(LVT_ERROR) = LAPIC_VECTOR(ERROR);
-}
-
-void
-lapic_set_timer_func(i386_intr_func_t func)
-{
-       lapic_timer_func = func;
-}
-
-void
-lapic_set_timer(
-       boolean_t               interrupt,
-       lapic_timer_mode_t      mode,
-       lapic_timer_divide_t    divisor,
-       lapic_timer_count_t     initial_count)
-{
-       boolean_t       state;
-       uint32_t        timer_vector;
-
-       state = ml_set_interrupts_enabled(FALSE);
-       timer_vector = LAPIC_REG(LVT_TIMER);
-       timer_vector &= ~(LAPIC_LVT_MASKED|LAPIC_LVT_PERIODIC);;
-       timer_vector |= interrupt ? 0 : LAPIC_LVT_MASKED;
-       timer_vector |= (mode == periodic) ? LAPIC_LVT_PERIODIC : 0;
-       LAPIC_REG(LVT_TIMER) = timer_vector;
-       LAPIC_REG(TIMER_DIVIDE_CONFIG) = divisor;
-       LAPIC_REG(TIMER_INITIAL_COUNT) = initial_count;
-       ml_set_interrupts_enabled(state);
-}

 
 

-void
-lapic_get_timer(
-       lapic_timer_mode_t      *mode,
-       lapic_timer_divide_t    *divisor,
-       lapic_timer_count_t     *initial_count,
-       lapic_timer_count_t     *current_count)
-{
-       boolean_t       state;
-
-       state = ml_set_interrupts_enabled(FALSE);
-       if (mode)
-               *mode = (LAPIC_REG(LVT_TIMER) & LAPIC_LVT_PERIODIC) ?
-                               periodic : one_shot;
-       if (divisor)
-               *divisor = LAPIC_REG(TIMER_DIVIDE_CONFIG) & LAPIC_TIMER_DIVIDE_MASK;
-       if (initial_count)
-               *initial_count = LAPIC_REG(TIMER_INITIAL_COUNT);
-       if (current_count)
-               *current_count = LAPIC_REG(TIMER_CURRENT_COUNT);
-       ml_set_interrupts_enabled(state);
-} 
+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_FAST_START | DBG_FUNC_END,
+               slot_num, cpu_datap(slot_num)->cpu_running, 0, 0, 0);

 
 

-void
-lapic_set_pmi_func(i386_intr_func_t func)
-{
-       lapic_pmi_func = func;
+       /*
+        * Check to make sure that the CPU is really running.  If not,
+        * go through the slow path.
+        */
+       if (cpu_datap(slot_num)->cpu_running)
+               return(KERN_SUCCESS);
+       else
+               return(KERN_FAILURE);

 }
 
 }
 

-void
-lapic_set_thermal_func(i386_intr_func_t func)
+static void
+started_cpu(void)

 {
 {

-        lapic_thermal_func = func;
-}
+       /* Here on the started cpu with cpu_running set TRUE */

 
 

-static inline void
-_lapic_end_of_interrupt(void)
-{
-       LAPIC_REG(EOI) = 0;
+       if (TSC_sync_margin &&
+           start_info.target_cpu == cpu_number()) {
+               /*
+                * I've just started-up, synchronize again with the starter cpu
+                * and then snap my TSC.
+                */
+               tsc_target   = 0;
+               atomic_decl(&tsc_entry_barrier, 1);
+               while (tsc_entry_barrier != 0)
+                       ;       /* spin for starter and target at barrier */
+               tsc_target = rdtsc64();
+               atomic_decl(&tsc_exit_barrier, 1);
+       }

 }
 
 }
 

-void
-lapic_end_of_interrupt(void)
+static void
+start_cpu(void *arg)

 {
 {

-       _lapic_end_of_interrupt();
-}
+       int                     i = 1000;
+       processor_start_info_t  *psip = (processor_start_info_t *) arg;

 
 

-int
-lapic_interrupt(int interrupt, x86_saved_state_t *state)
-{
-       int     retval = 0;
-
-       /* Did we just field an interruption for the HPET comparator? */
-       if(x86_core()->HpetVec == ((uint32_t)interrupt - 0x40)) {
-               /* Yes, go handle it... */
-               retval = HPETInterrupt();
-               /* Was it really handled? */
-               if(retval) {
-                       /* If so, EOI the 'rupt */
-                       _lapic_end_of_interrupt();
-                       /*
-                        * and then leave,
-                        * indicating that this has been handled
-                        */
-                       return 1;
-               }
-       }
-
-       interrupt -= lapic_interrupt_base;
-       if (interrupt < 0) {
-               if (interrupt == (LAPIC_NMI_INTERRUPT - lapic_interrupt_base)) {
-                       retval = NMIInterruptHandler(state);
-                       _lapic_end_of_interrupt();
-                       return retval;
-               }
-               else
-                       return 0;
-       }
+       /* Ignore this if the current processor is not the starter */
+       if (cpu_number() != psip->starter_cpu)
+               return;

 
 

-       switch(interrupt) {
-       case LAPIC_PERFCNT_INTERRUPT:
-               if (lapic_pmi_func != NULL)
-                       (*lapic_pmi_func)(NULL);
-               /* Clear interrupt masked */
-               LAPIC_REG(LVT_PERFCNT) = LAPIC_VECTOR(PERFCNT);
-               _lapic_end_of_interrupt();
-               retval = 1;
-               break;
-       case LAPIC_TIMER_INTERRUPT:
-               _lapic_end_of_interrupt();
-               if (lapic_timer_func != NULL)
-                       (*lapic_timer_func)(state);
-               retval = 1;
-               break;
-       case LAPIC_THERMAL_INTERRUPT:
-               if (lapic_thermal_func != NULL)
-                       (*lapic_thermal_func)(NULL);
-               _lapic_end_of_interrupt();
-               retval = 1;
-               break;
-       case LAPIC_ERROR_INTERRUPT:
-               lapic_dump();
-               panic("Local APIC error\n");
-               _lapic_end_of_interrupt();
-               retval = 1;
-               break;
-       case LAPIC_SPURIOUS_INTERRUPT:
-               kprintf("SPIV\n");
-               /* No EOI required here */
-               retval = 1;
-               break;
-       case LAPIC_INTERPROCESSOR_INTERRUPT:
-               _lapic_end_of_interrupt();
-               cpu_signal_handler(state);
-               retval = 1;
-               break;
-       }
+       DBG("start_cpu(%p) about to start cpu %d, lapic %d\n",
+               arg, psip->target_cpu, psip->target_lapic);

 
 

-       return retval;
-}
+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPU_START | DBG_FUNC_START,
+               psip->target_cpu,
+               psip->target_lapic, 0, 0, 0);

 
 

-void
-lapic_smm_restore(void)
-{
-       boolean_t state;
+       i386_start_cpu(psip->target_lapic, psip->target_cpu);

 
 

-       if (lapic_os_enabled == FALSE)
-               return;
+#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);

 
 

-       state = ml_set_interrupts_enabled(FALSE);
+       mp_wait_for_cpu_up(psip->target_cpu, i*100, 100);

 
 

-       if (LAPIC_ISR_IS_SET(LAPIC_REDUCED_INTERRUPT_BASE, TIMER)) {
-               /*
-                * Bogus SMI handler enables interrupts but does not know about
-                * local APIC interrupt sources. When APIC timer counts down to
-                * zero while in SMM, local APIC will end up waiting for an EOI
-                * but no interrupt was delivered to the OS.
-                */
-               _lapic_end_of_interrupt();
+       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) {

                /*
                /*

-                * timer is one-shot, trigger another quick countdown to trigger
-                * another timer interrupt.
+                * Compare the TSC from the started processor with ours.
+                * Report and log/panic if it diverges by more than
+                * TSC_sync_margin (TSC_SYNC_MARGIN) ticks. This margin
+                * can be overriden by boot-arg (with 0 meaning no checking).

                 */
                 */

-               if (LAPIC_REG(TIMER_CURRENT_COUNT) == 0) {
-                       LAPIC_REG(TIMER_INITIAL_COUNT) = 1;
+               uint64_t        tsc_starter;
+               int64_t         tsc_delta;
+               atomic_decl(&tsc_entry_barrier, 1);
+               while (tsc_entry_barrier != 0)
+                       ;       /* spin for both processors at barrier */
+               tsc_starter = rdtsc64();
+               atomic_decl(&tsc_exit_barrier, 1);
+               while (tsc_exit_barrier != 0)
+                       ;       /* spin for target to store its TSC */
+               tsc_delta = tsc_target - tsc_starter;
+               kprintf("TSC sync for cpu %d: 0x%016llx delta 0x%llx (%lld)\n",
+                       psip->target_cpu, tsc_target, tsc_delta, tsc_delta);
+               if (ABS(tsc_delta) > (int64_t) TSC_sync_margin) { 
+#if DEBUG
+                       panic(
+#else
+                       printf(
+#endif
+                               "Unsynchronized  TSC for cpu %d: "
+                                       "0x%016llx, delta 0x%llx\n",
+                               psip->target_cpu, tsc_target, tsc_delta);

                }
                }

-
-               kprintf("lapic_smm_restore\n");

        }
        }

-
-       ml_set_interrupts_enabled(state);

 }
 
 kern_return_t
 intel_startCPU(
        int     slot_num)
 {
 }
 
 kern_return_t
 intel_startCPU(
        int     slot_num)
 {

-
-       int     i = 1000;
-       int     lapic = cpu_to_lapic[slot_num];
+       int             lapic = cpu_to_lapic[slot_num];
+       boolean_t       istate;

 
        assert(lapic != -1);
 
        DBGLOG_CPU_INIT(slot_num);
 
        DBG("intel_startCPU(%d) lapic_id=%d\n", slot_num, lapic);
 
        assert(lapic != -1);
 
        DBGLOG_CPU_INIT(slot_num);
 
        DBG("intel_startCPU(%d) lapic_id=%d\n", slot_num, lapic);

-       DBG("IdlePTD(%p): 0x%x\n", &IdlePTD, (int) IdlePTD);
+       DBG("IdlePTD(%p): 0x%x\n", &IdlePTD, (int) (uintptr_t)IdlePTD);

 
        /*
         * 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), FALSE);
-       else
-               cpu_desc_init(cpu_datap(slot_num), FALSE);
+       cpu_desc_init(cpu_datap(slot_num));

 
 

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

 
 

-       mp_disable_preemption();
+       istate = ml_set_interrupts_enabled(FALSE);

        if (slot_num == get_cpu_number()) {
        if (slot_num == get_cpu_number()) {

-               mp_enable_preemption();
-               mutex_unlock(&mp_cpu_boot_lock);
+               ml_set_interrupts_enabled(istate);
+               lck_mtx_unlock(&mp_cpu_boot_lock);

                return KERN_SUCCESS;
        }
 
                return KERN_SUCCESS;
        }
 

-       LAPIC_REG(ICRD) = lapic << LAPIC_ICRD_DEST_SHIFT;
-       LAPIC_REG(ICR) = LAPIC_ICR_DM_INIT;
-       delay(10000);
-
-       LAPIC_REG(ICRD) = lapic << LAPIC_ICRD_DEST_SHIFT;
-       LAPIC_REG(ICR) = LAPIC_ICR_DM_STARTUP|(MP_BOOT>>12);
-       delay(200);
+       start_info.starter_cpu  = cpu_number();
+       start_info.target_cpu   = slot_num;
+       start_info.target_lapic = lapic;
+       tsc_entry_barrier = 2;
+       tsc_exit_barrier = 2;

 
 

-       LAPIC_REG(ICRD) = lapic << LAPIC_ICRD_DEST_SHIFT;
-       LAPIC_REG(ICR) = LAPIC_ICR_DM_STARTUP|(MP_BOOT>>12);
-       delay(200);
+       /*
+        * Perform the processor startup sequence with all running
+        * processors rendezvous'ed. This is required during periods when
+        * the cache-disable bit is set for MTRR/PAT initialization.
+        */
+       mp_rendezvous_no_intrs(start_cpu, (void *) &start_info);

 
 

-#ifdef POSTCODE_DELAY
-       /* Wait much longer if postcodes are displayed for a delay period. */
-       i *= 10000;
-#endif
-       while(i-- > 0) {
-               if (cpu_datap(slot_num)->cpu_running)
-                       break;
-               delay(10000);
-       }
+       start_info.target_cpu = 0;

 
 

-       mp_enable_preemption();
-       mutex_unlock(&mp_cpu_boot_lock);
+       ml_set_interrupts_enabled(istate);
+       lck_mtx_unlock(&mp_cpu_boot_lock);

 
        if (!cpu_datap(slot_num)->cpu_running) {
                kprintf("Failed to start CPU %02d\n", slot_num);
                printf("Failed to start CPU %02d, rebooting...\n", slot_num);
                delay(1000000);
 
        if (!cpu_datap(slot_num)->cpu_running) {
                kprintf("Failed to start CPU %02d\n", slot_num);
                printf("Failed to start CPU %02d, rebooting...\n", slot_num);
                delay(1000000);

-               cpu_shutdown();
+               halt_cpu();

                return KERN_SUCCESS;
        } else {
                kprintf("Started cpu %d (lapic id %08x)\n", slot_num, lapic);
                return KERN_SUCCESS;
        } else {
                kprintf("Started cpu %d (lapic id %08x)\n", slot_num, lapic);


@@ -803,49 +496,6 @@ intel_startCPU(
        }
 }
 
        }
 }
 

-extern char    slave_boot_base[];
-extern char    slave_boot_end[];
-extern void    slave_pstart(void);
-
-void
-slave_boot_init(void)
-{
-       DBG("V(slave_boot_base)=%p P(slave_boot_base)=%p MP_BOOT=%p sz=0x%x\n",
-               slave_boot_base,
-               kvtophys((vm_offset_t) slave_boot_base),
-               MP_BOOT,
-               slave_boot_end-slave_boot_base);
-
-       /*
-        * Copy the boot entry code to the real-mode vector area MP_BOOT.
-        * This is in page 1 which has been reserved for this purpose by
-        * machine_startup() from the boot processor.
-        * The slave boot code is responsible for switching to protected
-        * mode and then jumping to the common startup, _start().
-        */
-       bcopy_phys(kvtophys((vm_offset_t) slave_boot_base),
-                  (addr64_t) MP_BOOT,
-                  slave_boot_end-slave_boot_base);
-
-       /*
-        * Zero a stack area above the boot code.
-        */
-       DBG("bzero_phys 0x%x sz 0x%x\n",MP_BOOTSTACK+MP_BOOT-0x400, 0x400);
-       bzero_phys((addr64_t)MP_BOOTSTACK+MP_BOOT-0x400, 0x400);
-
-       /*
-        * Set the location at the base of the stack to point to the
-        * common startup entry.
-        */
-       DBG("writing 0x%x at phys 0x%x\n",
-               kvtophys((vm_offset_t) &slave_pstart), MP_MACH_START+MP_BOOT);
-       ml_phys_write_word(MP_MACH_START+MP_BOOT,
-                          (unsigned int)kvtophys((vm_offset_t) &slave_pstart));
-       
-       /* Flush caches */
-       __asm__("wbinvd");
-}
-

 #if    MP_DEBUG
 cpu_signal_event_log_t *cpu_signal[MAX_CPUS];
 cpu_signal_event_log_t *cpu_handle[MAX_CPUS];
 #if    MP_DEBUG
 cpu_signal_event_log_t *cpu_signal[MAX_CPUS];
 cpu_signal_event_log_t *cpu_handle[MAX_CPUS];


@@ -854,25 +504,30 @@ MP_EVENT_NAME_DECL();
 
 #endif /* MP_DEBUG */
 
 
 #endif /* MP_DEBUG */
 

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

 cpu_signal_handler(x86_saved_state_t *regs)
 {
 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 */

 
 

-       mp_disable_preemption();
+       SCHED_STATS_IPI(current_processor());

 
        my_cpu = cpu_number();
 
        my_cpu = cpu_number();

-       my_word = &current_cpu_datap()->cpu_signals;
+       my_word = &cpu_data_ptr[my_cpu]->cpu_signals;
+       /* Store the initial set of signals for diagnostics. New
+        * signals could arrive while these are being processed
+        * so it's no more than a hint.
+        */
+
+       cpu_data_ptr[my_cpu]->cpu_prior_signals = *my_word;

 
        do {
 
        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);


@@ -881,123 +536,122 @@ cpu_signal_handler(x86_saved_state_t *regs)
  * current thread's stack (if any) is synchronized with the
  * context at the moment of the interrupt, to facilitate
  * access through the debugger.
  * current thread's stack (if any) is synchronized with the
  * context at the moment of the interrupt, to facilitate
  * access through the debugger.

- * XXX 64-bit state?

  */
  */

-                       sync_iss_to_iks(saved_state32(regs));
-                       mp_kdp_wait(TRUE);
+                       sync_iss_to_iks(regs);
+                       if (pmsafe_debug && !kdp_snapshot)
+                               pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
+                       mp_kdp_wait(TRUE, FALSE);
+                       if (pmsafe_debug && !kdp_snapshot)
+                               pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_NORMAL);

                } else
 #endif /* MACH_KDP */
                if (i_bit(MP_TLB_FLUSH, my_word)) {
                        DBGLOG(cpu_handle,my_cpu,MP_TLB_FLUSH);
                        i_bit_clear(MP_TLB_FLUSH, my_word);
                        pmap_update_interrupt();
                } else
 #endif /* MACH_KDP */
                if (i_bit(MP_TLB_FLUSH, my_word)) {
                        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);
                        mp_cpus_call_action();
                } else if (i_bit(MP_CALL, my_word)) {
                        DBGLOG(cpu_handle,my_cpu,MP_CALL);
                        i_bit_clear(MP_CALL, my_word);
                        mp_cpus_call_action();

+               } else if (i_bit(MP_CALL_PM, my_word)) {
+                       DBGLOG(cpu_handle,my_cpu,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);
 
                }
        } while (*my_word);
 

-       mp_enable_preemption();
-
+       return 0;

 }
 
 }
 

-/* We want this to show up in backtraces, hence marked noinline.
- */
-static int __attribute__((noinline))
+extern void kprintf_break_lock(void);
+static int

 NMIInterruptHandler(x86_saved_state_t *regs)
 {
 NMIInterruptHandler(x86_saved_state_t *regs)
 {

-       void    *stackptr;
-       
-       sync_iss_to_iks_unconditionally(regs);
-       __asm__ volatile("movl %%ebp, %0" : "=m" (stackptr));
+       void            *stackptr;
+       char            pstr[192];
+       uint64_t        now = mach_absolute_time();

 
 

-       if (pmap_tlb_flush_timeout == TRUE && current_cpu_datap()->cpu_tlb_invalid) {
-               panic_i386_backtrace(stackptr, 10, "Panic: Unresponsive processor\n", TRUE, regs);
-               panic_io_port_read();
-               mca_check_save();
+       if (panic_active() && !panicDebugging) {

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

-               for(;;) {
+               for(;;)

                        cpu_pause();
                        cpu_pause();

-               }

        }
        }

-       mp_kdp_wait(FALSE);
-       return 1;
-}
-
-#ifdef MP_DEBUG
-extern int     max_lock_loops;
-int            trappedalready = 0;     /* (BRINGUP */
-#endif /* MP_DEBUG */

 
 

-static void
-i386_cpu_IPI(int cpu)
-{
-       boolean_t       state;
-       
-#ifdef MP_DEBUG
-       if(cpu_datap(cpu)->cpu_signals & 6) {   /* (BRINGUP) */
-               kprintf("i386_cpu_IPI: sending enter debugger signal (%08X) to cpu %d\n", cpu_datap(cpu)->cpu_signals, cpu);
+       atomic_incl(&NMIPI_acks, 1);
+       atomic_incl(&NMI_count, 1);
+       sync_iss_to_iks_unconditionally(regs);
+       __asm__ volatile("movq %%rbp, %0" : "=m" (stackptr));
+
+       if (cpu_number() == debugger_cpu)
+               goto NMExit;
+
+       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);
+       } 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);
+       } 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);

        }
        }

-#endif /* MP_DEBUG */
-
-#if MACH_KDB
-#ifdef MP_DEBUG
-       if(!trappedalready && (cpu_datap(cpu)->cpu_signals & 6)) {      /* (BRINGUP) */
-               if(kdb_cpu != cpu_number()) {
-                       trappedalready = 1;
-                       panic("i386_cpu_IPI: sending enter debugger signal (%08X) to cpu %d and I do not own debugger, owner = %08X\n", 
-                               cpu_datap(cpu)->cpu_signals, cpu, kdb_cpu);
+       
+#if MACH_KDP
+       if (pmsafe_debug && !kdp_snapshot)
+               pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
+       current_cpu_datap()->cpu_NMI_acknowledged = TRUE;
+       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);

        }
        }

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

 #endif
 #endif

-
-       /* Wait for previous interrupt to be delivered... */
-#ifdef MP_DEBUG
-       int     pending_busy_count = 0;
-       while (LAPIC_REG(ICR) & LAPIC_ICR_DS_PENDING) {
-               if (++pending_busy_count > max_lock_loops)
-                       panic("i386_cpu_IPI() deadlock\n");
-#else
-       while (LAPIC_REG(ICR) & LAPIC_ICR_DS_PENDING) {
-#endif /* MP_DEBUG */
-               cpu_pause();
-       }
-
-       state = ml_set_interrupts_enabled(FALSE);
-       LAPIC_REG(ICRD) =
-               cpu_to_lapic[cpu] << LAPIC_ICRD_DEST_SHIFT;
-       LAPIC_REG(ICR)  =
-               LAPIC_VECTOR(INTERPROCESSOR) | LAPIC_ICR_DM_FIXED;
-       (void) ml_set_interrupts_enabled(state);
+NMExit:        
+       return 1;

 }
 
 }
 

+

 /*
  * cpu_interrupt is really just to be used by the scheduler to
  * get a CPU's attention it may not always issue an IPI.  If an
 /*
  * cpu_interrupt is really just to be used by the scheduler to
  * get a CPU's attention it may not always issue an IPI.  If an


@@ -1006,10 +660,15 @@ i386_cpu_IPI(int cpu)
 void
 cpu_interrupt(int cpu)
 {
 void
 cpu_interrupt(int cpu)
 {

+       boolean_t did_IPI = FALSE;
+

        if (smp_initialized
            && pmCPUExitIdle(cpu_datap(cpu))) {
                i386_cpu_IPI(cpu);
        if (smp_initialized
            && pmCPUExitIdle(cpu_datap(cpu))) {
                i386_cpu_IPI(cpu);

+               did_IPI = TRUE;

        }
        }

+
+       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_SCHED, MACH_REMOTE_AST), cpu, did_IPI, 0, 0, 0);

 }
 
 /*
 }
 
 /*


@@ -1018,22 +677,70 @@ cpu_interrupt(int cpu)
 void
 cpu_NMI_interrupt(int cpu)
 {
 void
 cpu_NMI_interrupt(int cpu)
 {

-       boolean_t       state;
-

        if (smp_initialized) {
        if (smp_initialized) {

-               state = ml_set_interrupts_enabled(FALSE);
-/* Program the interrupt command register */
-               LAPIC_REG(ICRD) =
-                       cpu_to_lapic[cpu] << LAPIC_ICRD_DEST_SHIFT;
-/* The vector is ignored in this case--the target CPU will enter on the
- * NMI vector.
- */
-               LAPIC_REG(ICR)  =
-                       LAPIC_VECTOR(INTERPROCESSOR) | LAPIC_ICR_DM_NMI;
-               (void) ml_set_interrupts_enabled(state);
+               i386_send_NMI(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
+mp_call_PM(void)
+{
+       assert(!ml_get_interrupts_enabled());
+
+       if (mp_PM_func != NULL)
+               mp_PM_func();
+}
+
+void
+cpu_PM_interrupt(int cpu)
+{
+       assert(!ml_get_interrupts_enabled());
+
+       if (mp_PM_func != NULL) {
+               if (cpu == cpu_number())
+                       mp_PM_func();
+               else
+                       i386_signal_cpu(cpu, MP_CALL_PM, ASYNC);

        }
 }
 
        }
 }
 

+void
+PM_interrupt_register(void (*fn)(void))
+{
+       mp_PM_func = fn;
+}
+

 void
 i386_signal_cpu(int cpu, mp_event_t event, mp_sync_t mode)
 {
 void
 i386_signal_cpu(int cpu, mp_event_t event, mp_sync_t mode)
 {


@@ -1045,7 +752,7 @@ i386_signal_cpu(int cpu, mp_event_t event, mp_sync_t mode)
                return;
 
        if (event == MP_TLB_FLUSH)
                return;
 
        if (event == MP_TLB_FLUSH)

-               KERNEL_DEBUG(0xef800020 | DBG_FUNC_START, cpu, 0, 0, 0, 0);
+               KERNEL_DEBUG(TRACE_MP_TLB_FLUSH | DBG_FUNC_START, cpu, 0, 0, 0, 0);

 
        DBGLOG(cpu_signal, cpu, event);
        
 
        DBGLOG(cpu_signal, cpu, event);
        


@@ -1053,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();
                }


@@ -1064,45 +773,60 @@ i386_signal_cpu(int cpu, mp_event_t event, mp_sync_t mode)
                }
        }
        if (event == MP_TLB_FLUSH)
                }
        }
        if (event == MP_TLB_FLUSH)

-               KERNEL_DEBUG(0xef800020 | DBG_FUNC_END, cpu, 0, 0, 0, 0);
+               KERNEL_DEBUG(TRACE_MP_TLB_FLUSH | DBG_FUNC_END, cpu, 0, 0, 0, 0);

 }
 
 /*
 }
 
 /*

- * 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(&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(&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;
+       } 

 }
 
 /*
 }
 
 /*


@@ -1120,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)


@@ -1132,21 +857,29 @@ 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 */
        if (mp_rv_action_func != NULL)
                mp_rv_action_func(mp_rv_func_arg);
        /* action function */
        if (mp_rv_action_func != NULL)
                mp_rv_action_func(mp_rv_func_arg);

+

        /* 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 */


@@ -1163,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)


@@ -1175,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;


@@ -1191,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 */


@@ -1251,44 +984,210 @@ mp_rendezvous_no_intrs(
              void (*action_func)(void *),
              void *arg)
 {
              void (*action_func)(void *),
              void *arg)
 {

-       mp_rendezvous(setup_disable_intrs,
-                     action_func,
-                     teardown_restore_intrs,
-                     arg);     
+       mp_rendezvous(setup_disable_intrs,
+                     action_func,
+                     teardown_restore_intrs,
+                     arg);     
+}
+
+
+typedef struct {
+       queue_chain_t   link;                   /* queue linkage */
+       void            (*func)(void *,void *); /* routine to call */
+       void            *arg0;                  /* routine's 1st arg */
+       void            *arg1;                  /* routine's 2nd arg */
+       cpumask_t       *maskp;                 /* completion response mask */
+} 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
+static mp_call_queue_t mp_cpus_call_freelist;
+static mp_call_queue_t mp_cpus_call_head[MAX_CPUS];
+
+static inline boolean_t
+mp_call_head_lock(mp_call_queue_t *cqp)
+{
+       boolean_t       intrs_enabled;
+
+       intrs_enabled = ml_set_interrupts_enabled(FALSE);
+       simple_lock(&cqp->lock);
+
+       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
+mp_call_head_is_locked(mp_call_queue_t *cqp)
+{
+       return !ml_get_interrupts_enabled() &&
+               hw_lock_held((hw_lock_t)&cqp->lock);
+}
+#endif
+
+static inline void
+mp_call_head_unlock(mp_call_queue_t *cqp, boolean_t intrs_enabled)
+{
+       simple_unlock(&cqp->lock);
+       ml_set_interrupts_enabled(intrs_enabled);
+}
+
+static inline mp_call_t *
+mp_call_alloc(void)
+{
+       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);
+
+       return callp;
+}
+
+static inline void
+mp_call_free(mp_call_t *callp)
+{
+       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 *
+mp_call_dequeue_locked(mp_call_queue_t *cqp)
+{
+       mp_call_t       *callp = NULL;
+
+       assert(mp_call_head_is_locked(cqp));
+       if (!queue_empty(&cqp->queue))
+               queue_remove_first(&cqp->queue, callp, typeof(callp), link);
+       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)
+{
+       mp_call_queue_t *cqp = &mp_cpus_call_freelist;
+
+       DBG("mp_cpus_call_init()\n");
+       simple_lock_init(&cqp->lock, 0);
+       queue_init(&cqp->queue);

 }
 
 }
 

+/*
+ * Called at processor registration to add call buffers to the free list
+ * and to initialize the per-cpu call queue.
+ */

 void
 void

-handle_pending_TLB_flushes(void)
+mp_cpus_call_cpu_init(int cpu)

 {
 {

-       volatile int    *my_word = &current_cpu_datap()->cpu_signals;
-
-       if (i_bit(MP_TLB_FLUSH, my_word)) {
-               DBGLOG(cpu_handle, cpu_number(), MP_TLB_FLUSH);
-               i_bit_clear(MP_TLB_FLUSH, my_word);
-               pmap_update_interrupt();
+       int             i;
+       mp_call_queue_t *cqp = &mp_cpus_call_head[cpu];
+       mp_call_t       *callp;
+
+       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));
+               mp_call_free(callp);

        }
        }

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

 }
 
 /*
  * This is called from cpu_signal_handler() to process an MP_CALL signal.
 }
 
 /*
  * This is called from cpu_signal_handler() to process an MP_CALL signal.

+ * And also from i386_deactivate_cpu() when a cpu is being taken offline.

  */
 static void
 mp_cpus_call_action(void)
 {
  */
 static void
 mp_cpus_call_action(void)
 {

-       if (mp_rv_action_func != NULL)
-               mp_rv_action_func(mp_rv_func_arg);
-       atomic_incl(&mp_rv_complete, 1);
+       mp_call_queue_t *cqp;
+       boolean_t       intrs_enabled;
+       mp_call_t       *callp;
+       mp_call_t       call;
+
+       assert(!ml_get_interrupts_enabled());
+       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) {
+                       mp_call_head_unlock(cqp, intrs_enabled);
+                       KERNEL_DEBUG_CONSTANT(
+                               TRACE_MP_CPUS_CALL_ACTION,
+                               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);
+                       (void) mp_call_head_lock(cqp);
+               }
+               if (call.maskp != NULL)
+                       i_bit_set(cpu_number(), call.maskp);
+       }
+       mp_call_head_unlock(cqp, intrs_enabled);

 }
 
 /*
  * mp_cpus_call() runs a given function on cpus specified in a given cpu mask.
 }
 
 /*
  * mp_cpus_call() runs a given function on cpus specified in a given cpu mask.

- * If the mode is SYNC, the function is called serially on the target cpus
- * in logical cpu order. If the mode is ASYNC, the function is called in
- * parallel over the specified cpus.
+ * Possible modes are:
+ *  SYNC:   function is called serially on target cpus in logical cpu order
+ *         waiting for each call to be acknowledged before proceeding
+ *  ASYNC:  function call is queued to the specified cpus
+ *         waiting for all calls to complete in parallel before returning
+ *  NOSYNC: function calls are queued
+ *         but we return before confirmation of calls completing. 

  * The action function may be NULL.
  * The cpu mask may include the local cpu. Offline cpus are ignored.
  * The action function may be NULL.
  * The cpu mask may include the local cpu. Offline cpus are ignored.

- * Return does not occur until the function has completed on all cpus.
- * The return value is the number of cpus on which the function was called.
+ * The return value is the number of cpus on which the call was made or queued.

  */
 cpu_t
 mp_cpus_call(
  */
 cpu_t
 mp_cpus_call(


@@ -1297,35 +1196,99 @@ mp_cpus_call(
         void           (*action_func)(void *),
         void           *arg)
 {
         void           (*action_func)(void *),
         void           *arg)
 {

-       cpu_t           cpu;
-       boolean_t       intrs_enabled = ml_get_interrupts_enabled();
+       return mp_cpus_call1(
+                       cpus,
+                       mode,
+                       (void (*)(void *,void *))action_func,
+                       arg,
+                       NULL,
+                       NULL);
+}
+
+static void
+mp_cpus_call_wait(boolean_t    intrs_enabled,
+                 cpumask_t     cpus_called,
+                 cpumask_t     *cpus_responded)
+{
+       mp_call_queue_t         *cqp;
+       uint64_t                tsc_spin_start;
+
+       assert(ml_get_interrupts_enabled() == 0 || get_preemption_level() != 0);
+       cqp = &mp_cpus_call_head[cpu_number()];
+
+       tsc_spin_start = rdtsc64();
+       while (*cpus_responded != cpus_called) {
+               if (!intrs_enabled) {
+                       /* Sniffing w/o locking */
+                       if (!queue_empty(&cqp->queue))
+                               mp_cpus_call_action();
+                       cpu_signal_handler(NULL);
+               }
+               if (mp_spin_timeout(tsc_spin_start)) {
+                       cpumask_t       cpus_unresponsive;
+
+                       cpus_unresponsive = cpus_called & ~(*cpus_responded);
+                       NMIPI_panic(cpus_unresponsive, CROSSCALL_TIMEOUT);
+                       panic("mp_cpus_call_wait() timeout, cpus: 0x%llx",
+                               cpus_unresponsive);
+               }
+       }
+}
+
+cpu_t
+mp_cpus_call1(
+       cpumask_t       cpus,
+       mp_sync_t       mode,
+        void           (*action_func)(void *, void *),
+        void           *arg0,
+        void           *arg1,
+       cpumask_t       *cpus_calledp)
+{
+       cpu_t           cpu = 0;
+       boolean_t       intrs_enabled = FALSE;

        boolean_t       call_self = FALSE;
        boolean_t       call_self = FALSE;

+       cpumask_t       cpus_called = 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,
+               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)

-                       return 0;
+                       goto out;

                if (action_func != NULL) {
                if (action_func != NULL) {

-                       (void) ml_set_interrupts_enabled(FALSE);
-                       action_func(arg);
+                       intrs_enabled = ml_set_interrupts_enabled(FALSE);
+                       action_func(arg0, arg1);

                        ml_set_interrupts_enabled(intrs_enabled);
                }
                        ml_set_interrupts_enabled(intrs_enabled);
                }

-               return 1;
+               call_self = TRUE;
+               goto out;

        }
        }

-               
-       /* obtain rendezvous lock */
-       simple_lock(&mp_rv_lock);
-
-       /* Use the rendezvous data structures for this call */
-       mp_rv_action_func = action_func;
-       mp_rv_func_arg = arg;
-       mp_rv_ncpus = 0;
-       mp_rv_complete = 0;

 
 

-       simple_lock(&x86_topo_lock);
+       /*
+        * Queue the call for each non-local requested cpu.
+        * 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,
                if (cpu == (cpu_t) cpu_number()) {
                        /*
                         * We don't IPI ourself and if calling asynchronously,


@@ -1333,70 +1296,105 @@ mp_cpus_call(
                         */
                        call_self = TRUE;
                        if (mode == SYNC && action_func != NULL) {
                         */
                        call_self = TRUE;
                        if (mode == SYNC && action_func != NULL) {

-                               (void) ml_set_interrupts_enabled(FALSE);
-                               action_func(arg);
-                               ml_set_interrupts_enabled(intrs_enabled);
+                               KERNEL_DEBUG_CONSTANT(
+                                       TRACE_MP_CPUS_CALL_LOCAL,
+                                       VM_KERNEL_UNSLIDE(action_func),
+                                       VM_KERNEL_UNSLIDE_OR_PERM(arg0), VM_KERNEL_UNSLIDE_OR_PERM(arg1), 0, 0);
+                               action_func(arg0, arg1);

                        }
                } else {
                        /*
                        }
                } else {
                        /*

-                        * Bump count of other cpus called and signal this cpu.
-                        * Note: we signal asynchronously regardless of mode
-                        * because we wait on mp_rv_complete either here
-                        * (if mode == SYNC) or later (if mode == ASYNC).
-                        * While spinning, poll for TLB flushes if interrupts
-                        * are disabled.
+                        * Here to queue a call to cpu and IPI.

                         */
                         */

-                       mp_rv_ncpus++;
+                       mp_call_t       *callp = NULL;
+                       mp_call_queue_t *cqp = &mp_cpus_call_head[cpu];
+                       boolean_t       intrs_inner;
+
+               queue_call:
+                       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();
+                                       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;
+                       }
+                       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);
                        i386_signal_cpu(cpu, MP_CALL, ASYNC);

+                       mp_call_head_unlock(cqp, intrs_inner);

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

-                               simple_unlock(&x86_topo_lock);
-                               while (mp_rv_complete < mp_rv_ncpus) {
-                                       if (!intrs_enabled)
-                                               handle_pending_TLB_flushes();
-                                       cpu_pause();
-                               }
-                               simple_lock(&x86_topo_lock);
+                               mp_cpus_call_wait(intrs_inner, cpus_called, &cpus_responded);

                        }
                }
        }
                        }
                }
        }

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

 
 

-       /*
-        * If calls are being made asynchronously,
-        * make the local call now if needed, and then
-        * wait for all other cpus to finish their calls.
-        */
-       if (mode == ASYNC) {
-               if (call_self && action_func != NULL) {
-                       (void) ml_set_interrupts_enabled(FALSE);
-                       action_func(arg);
+       /* Call locally if mode not SYNC */
+       if (mode != SYNC && call_self ) {
+               KERNEL_DEBUG_CONSTANT(
+                       TRACE_MP_CPUS_CALL_LOCAL,
+                       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);

                        ml_set_interrupts_enabled(intrs_enabled);
                }
                        ml_set_interrupts_enabled(intrs_enabled);
                }

-               while (mp_rv_complete < mp_rv_ncpus) {
-                       if (!intrs_enabled)
-                               handle_pending_TLB_flushes();
-                       cpu_pause();
-               }

        }
        }

-       
-       /* Determine the number of cpus called */
-       cpu = mp_rv_ncpus + (call_self ? 1 : 0);

 
 

-       simple_unlock(&mp_rv_lock);
+       /* For ASYNC, now wait for all signaled cpus to complete their calls */
+       if (mode == ASYNC)
+               mp_cpus_call_wait(intrs_enabled, cpus_called, &cpus_responded);
+
+       /* Safe to allow pre-emption now */
+       mp_enable_preemption();
+
+out:
+       if (call_self){
+               cpus_called |= cpu_to_cpumask(cpu);
+               cpus_call_count++;
+       }
+
+       if (cpus_calledp)
+               *cpus_calledp = cpus_called;

 
 

-       return cpu;
+       KERNEL_DEBUG_CONSTANT(
+               TRACE_MP_CPUS_CALL | DBG_FUNC_END,
+               cpus_call_count, cpus_called, 0, 0, 0);
+
+       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)
        mp_bc_action_func(mp_bc_func_arg);
 
    /* if we're the last one through, wake up the instigator */
 {
    /* call action function */
    if (mp_bc_action_func != NULL)
        mp_bc_action_func(mp_bc_func_arg);
 
    /* if we're the last one through, wake up the instigator */

-   if (atomic_decl_and_test((volatile long *)&mp_bc_count, 1))
-       thread_wakeup(((event_t)(unsigned int *) &mp_bc_count));
+   if (atomic_decl_and_test(&mp_bc_count, 1))
+       thread_wakeup(((event_t)(uintptr_t) &mp_bc_count));

 }
 
 /*
 }
 
 /*


@@ -1416,34 +1414,56 @@ mp_broadcast(
    }
        
    /* obtain broadcast lock */
    }
        
    /* obtain broadcast lock */

-   mutex_lock(&mp_bc_lock);
+   lck_mtx_lock(&mp_bc_lock);

 
    /* set static function pointers */
    mp_bc_action_func = action_func;
    mp_bc_func_arg = arg;
 
 
    /* set static function pointers */
    mp_bc_action_func = action_func;
    mp_bc_func_arg = arg;
 

-   assert_wait(&mp_bc_count, THREAD_UNINT);
+   assert_wait((event_t)(uintptr_t)&mp_bc_count, THREAD_UNINT);

 
    /*
     * 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
        clear_wait(current_thread(), THREAD_AWAKENED);
        
    /* release lock */
    if (mp_bc_ncpus > 1)
        thread_block(THREAD_CONTINUE_NULL);
    else
        clear_wait(current_thread(), THREAD_AWAKENED);
        
    /* release lock */

-   mutex_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
 }
 
 void


@@ -1458,9 +1478,11 @@ i386_activate_cpu(void)
                return;
        }
 
                return;
        }
 

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

        cdp->cpu_running = TRUE;
        cdp->cpu_running = TRUE;

+       started_cpu();

        simple_unlock(&x86_topo_lock);
        simple_unlock(&x86_topo_lock);

+       flush_tlb_raw();

 }
 
 void
 }
 
 void


@@ -1469,38 +1491,64 @@ i386_deactivate_cpu(void)
        cpu_data_t      *cdp = current_cpu_datap();
 
        assert(!ml_get_interrupts_enabled());
        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);
 
        /*

-        * In case a rendezvous/braodcast/call was initiated to this cpu
-        * before we cleared cpu_running, we must perform any actions due.
+        * 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);
+       mp_cpus_call(cpu_to_cpumask(master_cpu), ASYNC, timer_queue_expire_local, NULL);
+
+#if MONOTONIC
+       mt_cpu_down(cdp);
+#endif /* MONOTONIC */
+
+       /*
+        * Open an interrupt window
+        * and ensure any pending IPI or timer is serviced
+        */
+       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.

         */
         */

-       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 */
+       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 unsigned long         mp_kdp_ncpus;
+volatile boolean_t     mp_kdp_is_NMI = FALSE;
+volatile unsigned long mp_kdp_ncpus;

 boolean_t              mp_kdp_state;
 
 
 void
 boolean_t              mp_kdp_state;
 
 
 void

-mp_kdp_enter(void)
+mp_kdp_enter(boolean_t proceed_on_failure)

 {
        unsigned int    cpu;
 {
        unsigned int    cpu;

-       unsigned int    ncpus;
-       unsigned int    my_cpu = cpu_number();
+       unsigned int    ncpus = 0;
+       unsigned int    my_cpu;

        uint64_t        tsc_timeout;
 
        DBG("mp_kdp_enter()\n");
        uint64_t        tsc_timeout;
 
        DBG("mp_kdp_enter()\n");


@@ -1511,28 +1559,60 @@ mp_kdp_enter(void)
         * stopping others.
         */
        mp_kdp_state = ml_set_interrupts_enabled(FALSE);
         * stopping others.
         */
        mp_kdp_state = ml_set_interrupts_enabled(FALSE);

-       simple_lock(&mp_kdp_lock);
+       my_cpu = cpu_number();
+
+       if (my_cpu == (unsigned) debugger_cpu) {
+               kprintf("\n\nRECURSIVE DEBUGGER ENTRY DETECTED\n\n");
+               kdp_reset();
+               return;
+       }

 
 

-       if (pmsafe_debug)
-           pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
+       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;
+               }

 
 

-       while (mp_kdp_trap) {
-               simple_unlock(&mp_kdp_lock);
-               DBG("mp_kdp_enter() race lost\n");
-               mp_kdp_wait(TRUE);
-               simple_lock(&mp_kdp_lock);
+               if (locked && mp_kdp_trap) {
+                       simple_unlock(&x86_topo_lock);
+                       DBG("mp_kdp_enter() race lost\n");
+#if MACH_KDP
+                       mp_kdp_wait(TRUE, FALSE);
+#endif
+                       locked = FALSE;
+               }

        }
        }

-       mp_kdp_ncpus = 1;       /* self */
+
+       if (pmsafe_debug && !kdp_snapshot)
+               pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
+
+       debugger_cpu = my_cpu;
+       ncpus = 1;
+       atomic_incl((volatile long *)&mp_kdp_ncpus, 1);

        mp_kdp_trap = TRUE;
        mp_kdp_trap = TRUE;

-       simple_unlock(&mp_kdp_lock);
+       debugger_entry_time = cpu_datap(my_cpu)->debugger_entry_time;

 
        /*
         * Deliver a nudge to other cpus, counting how many
         */
        DBG("mp_kdp_enter() signaling other processors\n");
        if (force_immediate_debugger_NMI == FALSE) {
 
        /*
         * Deliver a nudge to other cpus, counting how many
         */
        DBG("mp_kdp_enter() signaling other processors\n");
        if (force_immediate_debugger_NMI == FALSE) {

-               for (ncpus = 1, cpu = 0; cpu < real_ncpus; cpu++) {
-                       if (cpu == my_cpu || !cpu_datap(cpu)->cpu_running)
+               for (cpu = 0; cpu < real_ncpus; cpu++) {
+                       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);


@@ -1548,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) {
                        /*


@@ -1561,26 +1641,47 @@ 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() %u processors done %s\n",
-           mp_kdp_ncpus, (mp_kdp_ncpus == ncpus) ? "OK" : "timed out");
+       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);
 }
        
        postcode(MP_KDP_ENTER);
 }


@@ -1595,23 +1696,52 @@ cpu_signal_pending(int cpu, mp_event_t event)
                retval = TRUE;
        return retval;
 }
                retval = TRUE;
        return retval;
 }

- 
+
+long kdp_x86_xcpu_invoke(const uint16_t lcpu, kdp_x86_xcpu_func_t func,
+                        void *arg0, void *arg1)
+{
+       if (lcpu > (real_ncpus - 1))
+               return -1;
+
+        if (func == NULL)
+               return -1;
+
+       kdp_xcpu_call_func.func = func;
+        kdp_xcpu_call_func.ret  = -1;
+       kdp_xcpu_call_func.arg0 = arg0;
+       kdp_xcpu_call_func.arg1 = arg1;
+       kdp_xcpu_call_func.cpu  = lcpu;
+       DBG("Invoking function %p on CPU %d\n", func, (int32_t)lcpu);
+       while (kdp_xcpu_call_func.cpu != KDP_XCPU_NONE)
+               cpu_pause();
+        return kdp_xcpu_call_func.ret;
+}
+
+static void
+kdp_x86_xcpu_poll(void)
+{
+       if ((uint16_t)cpu_number() == kdp_xcpu_call_func.cpu) {
+            kdp_xcpu_call_func.ret = 
+                   kdp_xcpu_call_func.func(kdp_xcpu_call_func.arg0,
+                                           kdp_xcpu_call_func.arg1,
+                                           cpu_number());
+               kdp_xcpu_call_func.cpu = KDP_XCPU_NONE;
+       }
+}

 
 static void
 
 static void

-mp_kdp_wait(boolean_t flush)
+mp_kdp_wait(boolean_t flush, boolean_t isNMI)

 {
        DBG("mp_kdp_wait()\n");
 {
        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 we've trapped due to a machine-check, save MCA registers */
        mca_check_save();

-
-       if (pmsafe_debug)
-           pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
+#endif

 
        atomic_incl((volatile long *)&mp_kdp_ncpus, 1);
 
        atomic_incl((volatile long *)&mp_kdp_ncpus, 1);

-       while (mp_kdp_trap) {
+       while (mp_kdp_trap || (isNMI == TRUE)) {

                /*
                 * A TLB shootdown request may be pending--this would result
                 * in the requesting processor waiting in PMAP_UPDATE_TLBS()
                /*
                 * A TLB shootdown request may be pending--this would result
                 * in the requesting processor waiting in PMAP_UPDATE_TLBS()


@@ -1620,12 +1750,11 @@ mp_kdp_wait(boolean_t flush)
                 */
                if (flush)
                        handle_pending_TLB_flushes();
                 */
                if (flush)
                        handle_pending_TLB_flushes();

+
+               kdp_x86_xcpu_poll();

                cpu_pause();
        }
 
                cpu_pause();
        }
 

-       if (pmsafe_debug)
-           pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_NORMAL);
-

        atomic_decl((volatile long *)&mp_kdp_ncpus, 1);
        DBG("mp_kdp_wait() done\n");
 }
        atomic_decl((volatile long *)&mp_kdp_ncpus, 1);
        DBG("mp_kdp_wait() done\n");
 }


@@ -1634,9 +1763,13 @@ void
 mp_kdp_exit(void)
 {
        DBG("mp_kdp_exit()\n");
 mp_kdp_exit(void)
 {
        DBG("mp_kdp_exit()\n");

+       debugger_cpu = -1;

        atomic_decl((volatile long *)&mp_kdp_ncpus, 1);
        atomic_decl((volatile long *)&mp_kdp_ncpus, 1);

+
+       debugger_exit_time = mach_absolute_time();
+

        mp_kdp_trap = FALSE;
        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");


@@ -1651,15 +1784,25 @@ mp_kdp_exit(void)
                cpu_pause();
        }
 
                cpu_pause();
        }
 

-       if (pmsafe_debug)
+       if (pmsafe_debug && !kdp_snapshot)

            pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_NORMAL);
 
            pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_NORMAL);
 

+       debugger_exit_time = mach_absolute_time();
+

        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 */
 
 #endif /* MACH_KDP */
 

+boolean_t
+mp_recent_debugger_activity(void) {
+       uint64_t abstime = mach_absolute_time();
+       return (((abstime - debugger_entry_time) < LastDebuggerEntryAllowance) ||
+           ((abstime - debugger_exit_time) < LastDebuggerEntryAllowance));
+}
+

 /*ARGSUSED*/
 void
 init_ast_check(
 /*ARGSUSED*/
 void
 init_ast_check(


@@ -1671,220 +1814,248 @@ void
 cause_ast_check(
        processor_t     processor)
 {
 cause_ast_check(
        processor_t     processor)
 {

-       int     cpu = PROCESSOR_DATA(processor, slot_num);
+       int     cpu = processor->cpu_id;

 
        if (cpu != cpu_number()) {
                i386_signal_cpu(cpu, MP_AST, ASYNC);
 
        if (cpu != cpu_number()) {
                i386_signal_cpu(cpu, MP_AST, ASYNC);

+               KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_SCHED, MACH_REMOTE_AST), cpu, 1, 0, 0, 0);

        }
 }
 
        }
 }
 

-#if MACH_KDB
-/*
- * invoke kdb on slave processors 
- */
-

 void
 void

-remote_kdb(void)
+slave_machine_init(void *param)

 {
 {

-       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);
+       /*
+        * Here in process context, but with interrupts disabled.
+        */
+       DBG("slave_machine_init() CPU%d\n", get_cpu_number());

 
 

-       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()
+       if (param == FULL_SLAVE_INIT) {
+               /*
+                * Cold start

                 */
                 */

-               handle_pending_TLB_flushes();
-
-               cpu_pause();
+               clock_init();

        }
        }

-       DBG("mp_kdp_enter() %d processors done %s\n",
-               mp_kdb_ncpus, (mp_kdb_ncpus == kdb_ncpus) ? "OK" : "timed out");
+       cpu_machine_init();     /* Interrupts enabled hereafter */
+}
+
+#undef cpu_number
+int cpu_number(void)
+{
+       return get_cpu_number();

 }
 
 static void
 }
 
 static void

-mp_kdb_wait(void)
+cpu_prewarm_init()

 {
 {

-       DBG("mp_kdb_wait()\n");
+       int i;

 
 

-       /* If an I/O port has been specified as a debugging aid, issue a read */
-       panic_io_port_read();
+       simple_lock_init(&cpu_warm_lock, 0);
+       queue_init(&cpu_warm_call_list);
+       for (i = 0; i < NUM_CPU_WARM_CALLS; i++) {
+               enqueue_head(&cpu_warm_call_list, (queue_entry_t)&cpu_warm_call_arr[i]);
+       }
+}

 
 

-       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();
+static timer_call_t
+grab_warm_timer_call()
+{
+       spl_t x;
+       timer_call_t call = NULL;

 
 

-               cpu_pause();
+       x = splsched();
+       simple_lock(&cpu_warm_lock);
+       if (!queue_empty(&cpu_warm_call_list)) {
+               call = (timer_call_t) dequeue_head(&cpu_warm_call_list);

        }
        }

-       atomic_decl((volatile long *)&mp_kdb_ncpus, 1);
-       DBG("mp_kdb_wait() done\n");
+       simple_unlock(&cpu_warm_lock);
+       splx(x);
+
+       return call;
+}
+
+static void
+free_warm_timer_call(timer_call_t call)
+{
+       spl_t x;
+
+       x = splsched();
+       simple_lock(&cpu_warm_lock);
+       enqueue_head(&cpu_warm_call_list, (queue_entry_t)call);
+       simple_unlock(&cpu_warm_lock);
+       splx(x);

 }
 
 /*
 }
 
 /*

- * Clear kdb interrupt
+ * Runs in timer call context (interrupts disabled).

  */
  */

-
-void
-clear_kdb_intr(void)
+static void
+cpu_warm_timer_call_func(
+               call_entry_param_t p0,
+               __unused call_entry_param_t p1)

 {
 {

-       mp_disable_preemption();
-       i_bit_clear(MP_KDB, &current_cpu_datap()->cpu_signals);
-       mp_enable_preemption();
+       free_warm_timer_call((timer_call_t)p0);
+       return;

 }
 
 }
 

-void
-mp_kdb_exit(void)
+/*
+ * Runs with interrupts disabled on the CPU we wish to warm (i.e. CPU 0).
+ */
+static void
+_cpu_warm_setup(
+               void *arg)

 {
 {

-       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_warm_data_t cwdp = (cpu_warm_data_t)arg;

 
 

-               cpu_pause();
-       }
+       timer_call_enter(cwdp->cwd_call, cwdp->cwd_deadline, TIMER_CALL_SYS_CRITICAL | TIMER_CALL_LOCAL);
+       cwdp->cwd_result = 0;

 
 

-       DBG("mp_kdb_exit() done\n");
+       return;

 }
 
 }
 

-#endif /* MACH_KDB */
-

 /*
 /*

- * i386_init_slave() is called from pstart.
- * We're in the cpu's interrupt stack with interrupts disabled.
- * At this point we are in legacy mode. We need to switch on IA32e
- * if the mode is set to 64-bits.
+ * Not safe to call with interrupts disabled.

  */
  */

-void
-i386_init_slave(void)
+kern_return_t
+ml_interrupt_prewarm(
+       uint64_t        deadline)

 {
 {

-       postcode(I386_INIT_SLAVE);
-
-       /* Ensure that caching and write-through are enabled */
-       set_cr0(get_cr0() & ~(CR0_NW|CR0_CD));
-
-       DBG("i386_init_slave() CPU%d: phys (%d) active.\n",
-               get_cpu_number(), get_cpu_phys_number());
-
-       assert(!ml_get_interrupts_enabled());
+       struct cpu_warm_data cwd;
+       timer_call_t call;
+       cpu_t ct;

 
 

-       cpu_mode_init(current_cpu_datap());
-
-       mca_cpu_init();
-
-       lapic_init();
-       LAPIC_DUMP();
-       LAPIC_CPU_MAP_DUMP();
-
-       init_fpu();
-
-       mtrr_update_cpu();
-
-       /* resume VT operation */
-       vmx_resume();
-
-       pat_init();
-
-       cpu_thread_init();      /* not strictly necessary */
-
-       cpu_init();     /* Sets cpu_running which starter cpu waits for */ 
-
-       slave_main();
+       if (ml_get_interrupts_enabled() == FALSE) {
+               panic("%s: Interrupts disabled?\n", __FUNCTION__);
+       }

 
 

-       panic("i386_init_slave() returned from slave_main()");
-}
+       /* 
+        * If the platform doesn't need our help, say that we succeeded. 
+        */
+       if (!ml_get_interrupt_prewake_applicable()) {
+               return KERN_SUCCESS;
+       }

 
 

-void
-slave_machine_init(void)
-{

        /*
        /*

-        * Here in process context, but with interrupts disabled.
+        * Grab a timer call to use.

         */
         */

-       DBG("slave_machine_init() CPU%d\n", get_cpu_number());
+       call = grab_warm_timer_call();
+       if (call == NULL) {
+               return KERN_RESOURCE_SHORTAGE;
+       }

 
 

-       clock_init();
+       timer_call_setup(call, cpu_warm_timer_call_func, call);
+       cwd.cwd_call = call;
+       cwd.cwd_deadline = deadline;
+       cwd.cwd_result = 0;

 
 

-       cpu_machine_init();             /* Interrupts enabled hereafter */
+       /*
+        * For now, non-local interrupts happen on the master processor.
+        */
+       ct = mp_cpus_call(cpu_to_cpumask(master_cpu), SYNC, _cpu_warm_setup, &cwd);
+       if (ct == 0) {
+               free_warm_timer_call(call);
+               return KERN_FAILURE;
+       } else {
+               return cwd.cwd_result;
+       }

 }
 
 }
 

-#undef cpu_number()
-int cpu_number(void)
+#if DEBUG || DEVELOPMENT
+void
+kernel_spin(uint64_t spin_ns)

 {
 {

-       return get_cpu_number();
-}
-
-#if    MACH_KDB
-#include <ddb/db_output.h>
-
-#define TRAP_DEBUG 0 /* Must match interrupt.s and spl.s */
-
+       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();

 
 

-#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];
+       cdp->cpu_int_event_time = 0;
+       cdp->cpu_int_state = NULL;

 
 

-void db_trap_hist(void);
+       ml_set_interrupts_enabled(istate);
+       kprintf("kernel_spin() continuing\n");
+}

 
 /*
 
 /*

- * 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
+ * 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
 void

-db_trap_hist(void)
+mp_interrupt_watchdog(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 */
+       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