]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/i386/mp.c
xnu-3248.20.55.tar.gz
[apple/xnu.git] / osfmk / i386 / mp.c
index dc50b4848e2489e699a51d40bb7e3b310a9666d9..8d13b3645ba903750f3ff96a6c2419156feb7460 100644 (file)
 #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 <i386/bit_routines.h>
 #include <i386/proc_reg.h>
 #include <i386/cpu_threads.h>
 #include <i386/mp_desc.h>
@@ -167,10 +169,11 @@ volatile long      NMI_count = 0;
 extern void    NMI_cpus(void);
 
 static void    mp_cpus_call_init(void); 
-static void    mp_cpus_call_cpu_init(void); 
 static void    mp_cpus_call_action(void); 
 static void    mp_call_PM(void);
 
+static boolean_t       mp_cpus_call_wait_timeout = FALSE;
+
 char           mp_slave_stack[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); // Temp stack for slave init
 
 /* PAL-related routines */
@@ -239,7 +242,7 @@ smp_init(void)
        DBGLOG_CPU_INIT(master_cpu);
 
        mp_cpus_call_init();
-       mp_cpus_call_cpu_init();
+       mp_cpus_call_cpu_init(master_cpu);
 
        if (PE_parse_boot_argn("TSC_sync_margin",
                                        &TSC_sync_margin, sizeof(TSC_sync_margin))) {
@@ -487,6 +490,9 @@ MP_EVENT_NAME_DECL();
 
 #endif /* MP_DEBUG */
 
+/*
+ * Note: called with NULL state when polling for TLB flush and cross-calls.
+ */
 int
 cpu_signal_handler(x86_saved_state_t *regs)
 {
@@ -509,7 +515,7 @@ cpu_signal_handler(x86_saved_state_t *regs)
 
        do {
 #if    MACH_KDP
-               if (i_bit(MP_KDP, my_word) && regs != NULL) {
+               if (i_bit(MP_KDP, my_word)) {
                        DBGLOG(cpu_handle,my_cpu,MP_KDP);
                        i_bit_clear(MP_KDP, my_word);
 /* Ensure that the i386_kernel_state at the base of the
@@ -529,10 +535,6 @@ cpu_signal_handler(x86_saved_state_t *regs)
                        DBGLOG(cpu_handle,my_cpu,MP_TLB_FLUSH);
                        i_bit_clear(MP_TLB_FLUSH, my_word);
                        pmap_update_interrupt();
-               } 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));
                } else if (i_bit(MP_RENDEZVOUS, my_word)) {
                        DBGLOG(cpu_handle,my_cpu,MP_RENDEZVOUS);
                        i_bit_clear(MP_RENDEZVOUS, my_word);
@@ -554,15 +556,24 @@ cpu_signal_handler(x86_saved_state_t *regs)
                        i_bit_clear(MP_CALL_PM, my_word);
                        mp_call_PM();
                }
+               if (regs == NULL) {
+                       /* Called to poll only for cross-calls and TLB flush */
+                       break;
+               } else if (i_bit(MP_AST, my_word)) {
+                       DBGLOG(cpu_handle,my_cpu,MP_AST);
+                       i_bit_clear(MP_AST, my_word);
+                       ast_check(cpu_to_processor(my_cpu));
+               }
        } while (*my_word);
 
        return 0;
 }
 
+extern void kprintf_break_lock(void);
 static int
 NMIInterruptHandler(x86_saved_state_t *regs)
 {
-       void    *stackptr;
+       void            *stackptr;
 
        if (panic_active() && !panicDebugging) {
                if (pmsafe_debug)
@@ -577,23 +588,46 @@ NMIInterruptHandler(x86_saved_state_t *regs)
        __asm__ volatile("movq %%rbp, %0" : "=m" (stackptr));
 
        if (cpu_number() == debugger_cpu)
-                       goto NMExit;
+               goto NMExit;
 
        if (spinlock_timed_out) {
                char pstr[192];
                snprintf(&pstr[0], sizeof(pstr), "Panic(CPU %d): NMIPI for spinlock acquisition timeout, spinlock: %p, spinlock owner: %p, current_thread: %p, spinlock_owner_cpu: 0x%x\n", cpu_number(), spinlock_timed_out, (void *) spinlock_timed_out->interlock.lock_data, current_thread(), spinlock_owner_cpu);
                panic_i386_backtrace(stackptr, 64, &pstr[0], TRUE, regs);
+       } else if (mp_cpus_call_wait_timeout) {
+               char pstr[192];
+               snprintf(&pstr[0], sizeof(pstr), "Panic(CPU %d): Unresponsive processor, this CPU timed-out during cross-call\n", cpu_number());
+               panic_i386_backtrace(stackptr, 64, &pstr[0], TRUE, regs);
        } else if (pmap_tlb_flush_timeout == TRUE) {
                char pstr[128];
                snprintf(&pstr[0], sizeof(pstr), "Panic(CPU %d): Unresponsive processor (this CPU did not acknowledge interrupts) TLB state:0x%x\n", cpu_number(), current_cpu_datap()->cpu_tlb_invalid);
                panic_i386_backtrace(stackptr, 48, &pstr[0], TRUE, regs);
-       }
+       } 
 
 #if MACH_KDP
        if (pmsafe_debug && !kdp_snapshot)
                pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_SAFE);
        current_cpu_datap()->cpu_NMI_acknowledged = TRUE;
-       mp_kdp_wait(FALSE, pmap_tlb_flush_timeout || spinlock_timed_out || panic_active());
+       i_bit_clear(MP_KDP, &current_cpu_datap()->cpu_signals);
+       if (pmap_tlb_flush_timeout ||
+           spinlock_timed_out ||
+           mp_cpus_call_wait_timeout ||
+           panic_active()) {
+               mp_kdp_wait(FALSE, TRUE);
+       } else if (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.
+                */
+               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");
+       } else {
+               mp_kdp_wait(FALSE, FALSE);
+       }
        if (pmsafe_debug && !kdp_snapshot)
                pmSafeMode(&current_cpu_datap()->lcpu, PM_SAFE_FL_NORMAL);
 #endif
@@ -768,14 +802,14 @@ i386_active_cpus(void)
  * Helper function called when busy-waiting: panic if too long
  * a TSC-based time has elapsed since the start of the spin.
  */
-static void
-mp_spin_timeout_check(uint64_t tsc_start, const char *msg)
+static boolean_t
+mp_spin_timeout(uint64_t tsc_start)
 {
        uint64_t        tsc_timeout;
 
        cpu_pause();
        if (machine_timeout_suspended())
-               return;
+               return FALSE;
 
        /*
         * The timeout is 4 * the spinlock timeout period
@@ -784,8 +818,38 @@ mp_spin_timeout_check(uint64_t tsc_start, const char *msg)
         */
        tsc_timeout = disable_serial_output ? (uint64_t) LockTimeOutTSC << 2
                                            : (uint64_t) LockTimeOutTSC << 4;
-       if (rdtsc64() > tsc_start + tsc_timeout)
-               panic("%s: spin timeout", msg);
+       return  (rdtsc64() > tsc_start + tsc_timeout);
+}
+
+/*
+ * Helper function to take a spinlock while ensuring that incoming IPIs
+ * are still serviced if interrupts are masked while we spin.
+ */
+static boolean_t
+mp_safe_spin_lock(usimple_lock_t lock)
+{
+       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);
+                               panic("mp_safe_spin_lock() timed out,"
+                                     " lock: %p, owner thread: 0x%lx,"
+                                     " current_thread: %p, owner on CPU 0x%x",
+                                     lock, lowner,
+                                     current_thread(), lock_cpu);
+                       }
+               }
+               return FALSE;
+       } 
 }
 
 /*
@@ -821,8 +885,8 @@ mp_rendezvous_action(void)
                /* poll for pesky tlb flushes if interrupts disabled */
                if (!intrs_enabled)
                        handle_pending_TLB_flushes();
-               mp_spin_timeout_check(tsc_spin_start,
-                                     "mp_rendezvous_action() entry");
+               if (mp_spin_timeout(tsc_spin_start))
+                       panic("mp_rendezvous_action() entry");
        }
 
        /* action function */
@@ -835,8 +899,8 @@ mp_rendezvous_action(void)
        while (mp_rv_exit < mp_rv_ncpus) {
                if (!intrs_enabled)
                        handle_pending_TLB_flushes();
-               mp_spin_timeout_check(tsc_spin_start,
-                                     "mp_rendezvous_action() exit");
+               if (mp_spin_timeout(tsc_spin_start))
+                       panic("mp_rendezvous_action() exit");
        }
 
        /* teardown function */
@@ -866,7 +930,7 @@ mp_rendezvous(void (*setup_func)(void *),
        }
                
        /* 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;
@@ -882,7 +946,7 @@ mp_rendezvous(void (*setup_func)(void *),
         * signal other processors, which will call mp_rendezvous_action()
         * with interrupts disabled
         */
-       simple_lock(&x86_topo_lock);
+       (void) mp_safe_spin_lock(&x86_topo_lock);
        mp_rv_ncpus = i386_active_cpus();
        i386_signal_cpus(MP_RENDEZVOUS, ASYNC);
        simple_unlock(&x86_topo_lock);
@@ -897,7 +961,8 @@ mp_rendezvous(void (*setup_func)(void *),
         */
        tsc_spin_start = rdtsc64();
        while (mp_rv_complete < mp_rv_ncpus) {
-               mp_spin_timeout_check(tsc_spin_start, "mp_rendezvous()");
+               if (mp_spin_timeout(tsc_spin_start))
+                       panic("mp_rendezvous() timeout");
        }
        
        /* Tidy up */
@@ -955,7 +1020,7 @@ typedef struct {
        void            (*func)(void *,void *); /* routine to call */
        void            *arg0;                  /* routine's 1st arg */
        void            *arg1;                  /* routine's 2nd arg */
-       volatile long   *countp;                /* completion counter */
+       cpumask_t       *maskp;                 /* completion response mask */
 } mp_call_t;
 
 
@@ -978,12 +1043,28 @@ mp_call_head_lock(mp_call_queue_t *cqp)
        return intrs_enabled;
 }
 
+void
+mp_cpus_NMIPI(cpumask_t cpu_mask) {
+       unsigned int cpu, cpu_bit;
+       uint64_t deadline;
+
+       for (cpu = 0, cpu_bit = 1; cpu < real_ncpus; cpu++, cpu_bit <<= 1) {
+               if (cpu_mask & cpu_bit)
+                       cpu_NMI_interrupt(cpu);
+       }
+       deadline = mach_absolute_time() + (LockTimeOut);
+       while (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)
@@ -1049,20 +1130,16 @@ mp_cpus_call_init(void)
 }
 
 /*
- * Called by each processor to add call buffers to the free list
+ * Called at processor registration to add call buffers to the free list
  * and to initialize the per-cpu call queue.
- * Also called but ignored on slave processors on re-start/wake.
  */
-static void
-mp_cpus_call_cpu_init(void)
+void
+mp_cpus_call_cpu_init(int cpu)
 {
        int             i;
-       mp_call_queue_t *cqp = &mp_cpus_call_head[cpu_number()];
+       mp_call_queue_t *cqp = &mp_cpus_call_head[cpu];
        mp_call_t       *callp;
 
-       if (cqp->queue.next != NULL)
-               return; /* restart/wake case: called already */
-
        simple_lock_init(&cqp->lock, 0);
        queue_init(&cqp->queue);
        for (i = 0; i < MP_CPUS_CALL_BUFS_PER_CPU; i++) {
@@ -1070,7 +1147,7 @@ mp_cpus_call_cpu_init(void)
                mp_call_free(callp);
        }
 
-       DBG("mp_cpus_call_init() done on cpu %d\n", cpu_number());
+       DBG("mp_cpus_call_init(%d) done\n", cpu);
 }
 
 /*
@@ -1096,12 +1173,13 @@ mp_cpus_call_action(void)
                        mp_call_head_unlock(cqp, intrs_enabled);
                        KERNEL_DEBUG_CONSTANT(
                                TRACE_MP_CPUS_CALL_ACTION,
-                               call.func, call.arg0, call.arg1, call.countp, 0);
+                               VM_KERNEL_UNSLIDE(call.func), VM_KERNEL_UNSLIDE_OR_PERM(call.arg0),
+                               VM_KERNEL_UNSLIDE_OR_PERM(call.arg1), VM_KERNEL_ADDRPERM(call.maskp), 0);
                        call.func(call.arg0, call.arg1);
                        (void) mp_call_head_lock(cqp);
                }
-               if (call.countp != NULL)
-                       atomic_incl(call.countp, 1);
+               if (call.maskp != NULL)
+                       i_bit_set(cpu_number(), call.maskp);
        }
        mp_call_head_unlock(cqp, intrs_enabled);
 }
@@ -1138,8 +1216,8 @@ mp_cpus_call(
 
 static void
 mp_cpus_call_wait(boolean_t    intrs_enabled,
-                 long          mp_cpus_signals,
-                 volatile long *mp_cpus_calls)
+                 cpumask_t     cpus_called,
+                 cpumask_t     *cpus_responded)
 {
        mp_call_queue_t         *cqp;
        uint64_t                tsc_spin_start;
@@ -1147,14 +1225,22 @@ mp_cpus_call_wait(boolean_t     intrs_enabled,
        cqp = &mp_cpus_call_head[cpu_number()];
 
        tsc_spin_start = rdtsc64();
-       while (*mp_cpus_calls < mp_cpus_signals) {
+       while (*cpus_responded != cpus_called) {
                if (!intrs_enabled) {
                        /* Sniffing w/o locking */
                        if (!queue_empty(&cqp->queue))
                                mp_cpus_call_action();
-                       handle_pending_TLB_flushes();
+                       cpu_signal_handler(NULL);
+               }
+               if (mp_spin_timeout(tsc_spin_start)) {
+                       cpumask_t       cpus_unresponsive;
+
+                       mp_cpus_call_wait_timeout = TRUE;
+                       cpus_unresponsive = cpus_called & ~(*cpus_responded);
+                       mp_cpus_NMIPI(cpus_unresponsive);
+                       panic("mp_cpus_call_wait() timeout, cpus: 0x%llx",
+                               cpus_unresponsive);
                }
-               mp_spin_timeout_check(tsc_spin_start, "mp_cpus_call_wait()");
        }
 }
 
@@ -1173,13 +1259,14 @@ mp_cpus_call1(
        boolean_t       call_self = FALSE;
        cpumask_t       cpus_called = 0;
        cpumask_t       cpus_notcalled = 0;
-       long            mp_cpus_signals = 0;
-       volatile long   mp_cpus_calls = 0;
+       cpumask_t       cpus_responded = 0;
+       long            cpus_call_count = 0;
        uint64_t        tsc_spin_start;
+       boolean_t       topo_lock;
 
        KERNEL_DEBUG_CONSTANT(
                TRACE_MP_CPUS_CALL | DBG_FUNC_START,
-               cpus, mode, VM_KERNEL_UNSLIDE(action_func), arg0, arg1);
+               cpus, mode, VM_KERNEL_UNSLIDE(action_func), VM_KERNEL_UNSLIDE_OR_PERM(arg0), VM_KERNEL_UNSLIDE_OR_PERM(arg1));
 
        if (!smp_initialized) {
                if ((cpus & CPUMASK_SELF) == 0)
@@ -1195,28 +1282,35 @@ mp_cpus_call1(
 
        /*
         * Queue the call for each non-local requested cpu.
-        * The topo lock is not taken. Instead we sniff the cpu_running state
-        * and then re-check it after taking the call lock. A cpu being taken
-        * offline runs the action function after clearing the cpu_running.
+        * This is performed under the topo lock to prevent changes to
+        * cpus online state and to prevent concurrent rendezvouses --
+        * although an exception is made if we're calling only the master
+        * processor since that always remains active. Note: this exception
+        * is expected for longterm timer nosync cross-calls to the master cpu.
         */ 
-       mp_disable_preemption();        /* interrupts may be enabled */
-       tsc_spin_start = rdtsc64();
+       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) ||
                    !cpu_datap(cpu)->cpu_running)
                        continue;
+               tsc_spin_start = rdtsc64();
                if (cpu == (cpu_t) cpu_number()) {
                        /*
                         * We don't IPI ourself and if calling asynchronously,
                         * we defer our call until we have signalled all others.
                         */
                        call_self = TRUE;
-                       cpus_called |= cpu_to_cpumask(cpu);
                        if (mode == SYNC && action_func != NULL) {
                                KERNEL_DEBUG_CONSTANT(
                                        TRACE_MP_CPUS_CALL_LOCAL,
                                        VM_KERNEL_UNSLIDE(action_func),
-                                       arg0, arg1, 0, 0);
+                                       VM_KERNEL_UNSLIDE_OR_PERM(arg0), VM_KERNEL_UNSLIDE_OR_PERM(arg1), 0, 0);
                                action_func(arg0, arg1);
                        }
                } else {
@@ -1226,63 +1320,63 @@ mp_cpus_call1(
                         */
                        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_enabled = mp_call_head_lock(cqp);
-                       if (!cpu_datap(cpu)->cpu_running) {
-                               mp_call_head_unlock(cqp, intrs_enabled);
-                               continue;
-                       }
+                       intrs_inner = mp_call_head_lock(cqp);
                        if (mode == NOSYNC) {
                                if (callp == NULL) {
                                        cpus_notcalled |= cpu_to_cpumask(cpu);
-                                       mp_call_head_unlock(cqp, intrs_enabled);
+                                       mp_call_head_unlock(cqp, intrs_inner);
                                        KERNEL_DEBUG_CONSTANT(
                                                TRACE_MP_CPUS_CALL_NOBUF,
                                                cpu, 0, 0, 0, 0);
                                        continue;
                                }
-                               callp->countp = NULL;
+                               callp->maskp = NULL;
                        } else {
                                if (callp == NULL) {
-                                       mp_call_head_unlock(cqp, intrs_enabled);
+                                       mp_call_head_unlock(cqp, intrs_inner);
                                        KERNEL_DEBUG_CONSTANT(
                                                TRACE_MP_CPUS_CALL_NOBUF,
                                                cpu, 0, 0, 0, 0);
-                                       if (!intrs_enabled) {
+                                       if (!intrs_inner) {
                                                /* Sniffing w/o locking */
                                                if (!queue_empty(&cqp->queue))
                                                        mp_cpus_call_action();
                                                handle_pending_TLB_flushes();
                                        }
-                                       mp_spin_timeout_check(
-                                               tsc_spin_start,
-                                               "mp_cpus_call1()");
+                                       if (mp_spin_timeout(tsc_spin_start))
+                                               panic("mp_cpus_call1() timeout");
                                        goto queue_call;
                                }
-                               callp->countp = &mp_cpus_calls;
+                               callp->maskp = &cpus_responded;
                        }
                        callp->func = action_func;
                        callp->arg0 = arg0;
                        callp->arg1 = arg1;
                        mp_call_enqueue_locked(cqp, callp);
-                       mp_cpus_signals++;
+                       cpus_call_count++;
                        cpus_called |= cpu_to_cpumask(cpu);
                        i386_signal_cpu(cpu, MP_CALL, ASYNC);
-                       mp_call_head_unlock(cqp, intrs_enabled);
+                       mp_call_head_unlock(cqp, intrs_inner);
                        if (mode == SYNC) {
-                               mp_cpus_call_wait(intrs_enabled, mp_cpus_signals, &mp_cpus_calls);
+                               mp_cpus_call_wait(intrs_inner, cpus_called, &cpus_responded);
                        }
                }
        }
+       if (topo_lock) {
+               simple_unlock(&x86_topo_lock);
+               ml_set_interrupts_enabled(intrs_enabled);
+       }
 
        /* Call locally if mode not SYNC */
        if (mode != SYNC && call_self ) {
                KERNEL_DEBUG_CONSTANT(
                        TRACE_MP_CPUS_CALL_LOCAL,
-                       VM_KERNEL_UNSLIDE(action_func), arg0, arg1, 0, 0);
+                       VM_KERNEL_UNSLIDE(action_func), VM_KERNEL_UNSLIDE_OR_PERM(arg0), VM_KERNEL_UNSLIDE_OR_PERM(arg1), 0, 0);
                if (action_func != NULL) {
                        ml_set_interrupts_enabled(FALSE);
                        action_func(arg0, arg1);
@@ -1294,12 +1388,14 @@ mp_cpus_call1(
        mp_enable_preemption();
 
        /* For ASYNC, now wait for all signaled cpus to complete their calls */
-       if (mode == ASYNC) {
-               mp_cpus_call_wait(intrs_enabled, mp_cpus_signals, &mp_cpus_calls);
-       }
+       if (mode == ASYNC)
+               mp_cpus_call_wait(intrs_enabled, cpus_called, &cpus_responded);
 
 out:
-       cpu = (cpu_t) mp_cpus_signals + (call_self ? 1 : 0);
+       if (call_self){
+               cpus_called |= cpu_to_cpumask(cpu);
+               cpus_call_count++;
+       }
 
        if (cpus_calledp)
                *cpus_calledp = cpus_called;
@@ -1308,9 +1404,9 @@ out:
 
        KERNEL_DEBUG_CONSTANT(
                TRACE_MP_CPUS_CALL | DBG_FUNC_END,
-               cpu, cpus_called, cpus_notcalled, 0, 0);
+               cpus_call_count, cpus_called, cpus_notcalled, 0, 0);
 
-       return cpu;
+       return (cpu_t) cpus_call_count;
 }
 
 
@@ -1373,6 +1469,30 @@ mp_broadcast(
    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_datap(cpu)->cpu_running))
+               {
+                               continue;
+               }
+
+               lapic_send_ipi(cpu, LAPIC_VECTOR(KICK));
+       }
+
+       simple_unlock(&x86_topo_lock);
+       ml_set_interrupts_enabled(intrs_enabled);
+}
+
 void
 i386_activate_cpu(void)
 {
@@ -1706,11 +1826,8 @@ slave_machine_init(void *param)
                 * Cold start
                 */
                clock_init();
-               cpu_machine_init();     /* Interrupts enabled hereafter */
-               mp_cpus_call_cpu_init();
-       } else {
-               cpu_machine_init();     /* Interrupts enabled hereafter */
        }
+       cpu_machine_init();     /* Interrupts enabled hereafter */
 }
 
 #undef cpu_number