xnu-2422.90.20.tar.gz

[apple/xnu.git] / osfmk / kern / machine.c

diff --git a/osfmk/kern/machine.c b/osfmk/kern/machine.c
index 72d91647efd89207cb2c4ec6a96773a7b6eff2a0..c0caa55114d52b7c43896aa23bf61dfbc4d0b3b7 100644 (file)
--- a/osfmk/kern/machine.c
+++ b/osfmk/kern/machine.c
@@ -88,6 +88,8 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 
+#include <machine/commpage.h>
+
 #if HIBERNATION
 #include <IOKit/IOHibernatePrivate.h>
 #endif
@@ -120,11 +122,14 @@ processor_up(
        init_ast_check(processor);
        pset = processor->processor_set;
        pset_lock(pset);
-       if (++pset->processor_count == 1)
-               pset->low_pri = pset->low_count = processor;
+       if (++pset->online_processor_count == 1) {
+               pset_pri_init_hint(pset, processor);
+               pset_count_init_hint(pset, processor);
+       }
        enqueue_tail(&pset->active_queue, (queue_entry_t)processor);
        processor->state = PROCESSOR_RUNNING;
        (void)hw_atomic_add(&processor_avail_count, 1);
+       commpage_update_active_cpus();
        pset_unlock(pset);
        ml_cpu_up();
        splx(s);
@@ -214,10 +219,10 @@ processor_shutdown(
        }
 
        if (processor->state == PROCESSOR_IDLE)
-               remqueue(&pset->idle_queue, (queue_entry_t)processor);
+               remqueue((queue_entry_t)processor);
        else
        if (processor->state == PROCESSOR_RUNNING)
-               remqueue(&pset->active_queue, (queue_entry_t)processor);
+               remqueue((queue_entry_t)processor);
 
        processor->state = PROCESSOR_SHUTDOWN;
 
@@ -232,7 +237,7 @@ processor_shutdown(
 }
 
 /*
- * Called at splsched.
+ * Called with interrupts disabled.
  */
 void
 processor_doshutdown(
@@ -240,6 +245,7 @@ processor_doshutdown(
 {
        thread_t                        old_thread, self = current_thread();
        processor_t                     prev;
+       processor_set_t                 pset;
 
        /*
         *      Get onto the processor to shutdown
@@ -247,18 +253,29 @@ processor_doshutdown(
        prev = thread_bind(processor);
        thread_block(THREAD_CONTINUE_NULL);
 
-#if HIBERNATION
-       if (processor_avail_count < 2)
-               hibernate_vm_lock();
-#endif
-
        assert(processor->state == PROCESSOR_SHUTDOWN);
 
+       ml_cpu_down();
+
 #if HIBERNATION
-       if (processor_avail_count < 2)
+       if (processor_avail_count < 2) {
+               hibernate_vm_lock();
                hibernate_vm_unlock();
+       }
 #endif
 
+       pset = processor->processor_set;
+       pset_lock(pset);
+       processor->state = PROCESSOR_OFF_LINE;
+       if (--pset->online_processor_count == 0) {
+               pset_pri_init_hint(pset, PROCESSOR_NULL);
+               pset_count_init_hint(pset, PROCESSOR_NULL);
+       }
+       (void)hw_atomic_sub(&processor_avail_count, 1);
+       commpage_update_active_cpus();
+       SCHED(processor_queue_shutdown)(processor);
+       /* pset lock dropped */
+
        /*
         *      Continue processor shutdown in shutdown context.
         */
@@ -269,7 +286,7 @@ processor_doshutdown(
 }
 
 /*
- *     Complete the shutdown and place the processor offline.
+ *Complete the shutdown and place the processor offline.
  *
  *     Called at splsched in the shutdown context.
  */
@@ -278,11 +295,11 @@ processor_offline(
        processor_t                     processor)
 {
        thread_t                        new_thread, old_thread = processor->active_thread;
-       processor_set_t         pset;
 
        new_thread = processor->idle_thread;
        processor->active_thread = new_thread;
        processor->current_pri = IDLEPRI;
+       processor->current_thmode = TH_MODE_NONE;
        processor->deadline = UINT64_MAX;
        new_thread->last_processor = processor;
 
@@ -295,17 +312,6 @@ processor_offline(
 
        PMAP_DEACTIVATE_KERNEL(processor->cpu_id);
 
-       pset = processor->processor_set;
-       pset_lock(pset);
-       processor->state = PROCESSOR_OFF_LINE;
-       if (--pset->processor_count == 0)
-               pset->low_pri = pset->low_count = PROCESSOR_NULL;
-       (void)hw_atomic_sub(&processor_avail_count, 1);
-       processor_queue_shutdown(processor);
-       /* pset lock dropped */
-
-       ml_cpu_down();
-
        cpu_sleep();
        panic("zombie processor");
        /*NOTREACHED*/