]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/kern/processor.c
projects / apple / xnu.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
xnu-4570.20.62.tar.gz
[apple/xnu.git] / osfmk / kern / processor.c
diff --git a/osfmk/kern/processor.c b/osfmk/kern/processor.c
index 4e00eef381be2a40151e6fb5b1833673d747b4b4..5aad73e37180b7a20e2cc8c793a1b92cf8211b45 100644 (file)
--- a/osfmk/kern/processor.c
+++ b/osfmk/kern/processor.c
@@ -1,23 +1,29 @@
 /*
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
  *
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -54,11 +60,9 @@
  *     processor.c: processor and processor_set manipulation routines.
  */
 
  *     processor.c: processor and processor_set manipulation routines.
  */
 
-#include <cpus.h>
-#include <mach_host.h>
-
 #include <mach/boolean.h>
 #include <mach/policy.h>
 #include <mach/boolean.h>
 #include <mach/policy.h>
+#include <mach/processor.h>
 #include <mach/processor_info.h>
 #include <mach/vm_param.h>
 #include <kern/cpu_number.h>
 #include <mach/processor_info.h>
 #include <mach/vm_param.h>
 #include <kern/cpu_number.h>
@@ -74,475 +78,535 @@
 #include <ipc/ipc_port.h>
 #include <kern/kalloc.h>
 
 #include <ipc/ipc_port.h>
 #include <kern/kalloc.h>
 
-#if    MACH_HOST
-#include <kern/zalloc.h>
-zone_t pset_zone;
-#endif /* MACH_HOST */
+#include <security/mac_mach_internal.h>
 
 
-#include <kern/sf.h>
-#include <kern/mk_sp.h>        /*** ??? fix so this can be removed ***/
 
 /*
  * Exported interface
  */
 #include <mach/mach_host_server.h>
 
 /*
  * Exported interface
  */
 #include <mach/mach_host_server.h>
+#include <mach/processor_set_server.h>
 
 
-/*
- *     Exported variables.
- */
-struct processor_set default_pset;
-struct processor processor_array[NCPUS];
-
-processor_t    master_processor;
-processor_t    processor_ptr[NCPUS];
+struct processor_set   pset0;
+struct pset_node               pset_node0;
+decl_simple_lock_data(static,pset_node_lock)
 
 
-/* Forwards */
-void   pset_init(
-               processor_set_t pset);
+queue_head_t                   tasks;
+queue_head_t                   terminated_tasks;       /* To be used ONLY for stackshot. */
+queue_head_t                   corpse_tasks;
+int                                            tasks_count;
+int                                            terminated_tasks_count;
+queue_head_t                   threads;
+int                                            threads_count;
+decl_lck_mtx_data(,tasks_threads_lock)
+decl_lck_mtx_data(,tasks_corpse_lock)
 
 
-void   processor_init(
-               register processor_t    pr,
-               int                     slot_num);
+processor_t                            processor_list;
+unsigned int                   processor_count;
+static processor_t             processor_list_tail;
+decl_simple_lock_data(,processor_list_lock)
 
 
-void   quantum_set(
-               processor_set_t         pset);
+uint32_t                               processor_avail_count;
 
 
-kern_return_t  processor_set_base(
-               processor_set_t         pset,
-               policy_t                policy,
-               policy_base_t           base,
-               boolean_t               change);
+processor_t            master_processor;
+int                    master_cpu = 0;
+boolean_t              sched_stats_active = FALSE;
 
 
-kern_return_t  processor_set_limit(
-               processor_set_t         pset,
-               policy_t                policy,
-               policy_limit_t          limit,
-               boolean_t               change);
+processor_t            processor_array[MAX_SCHED_CPUS] = { 0 };
 
 
-kern_return_t  processor_set_things(
-               processor_set_t         pset,
-               mach_port_t             **thing_list,
-               mach_msg_type_number_t  *count,
-               int                     type);
 
 
 
 
-/*
- *     Bootstrap the processor/pset system so the scheduler can run.
- */
 void
 void
-pset_sys_bootstrap(void)
+processor_bootstrap(void)
 {
 {
-       register int    i;
+       pset_init(&pset0, &pset_node0);
+       pset_node0.psets = &pset0;
 
 
-       pset_init(&default_pset);
-       for (i = 0; i < NCPUS; i++) {
-               /*
-                *      Initialize processor data structures.
-                *      Note that cpu_to_processor(i) is processor_ptr[i].
-                */
-               processor_ptr[i] = &processor_array[i];
-               processor_init(processor_ptr[i], i);
-       }
-       master_processor = cpu_to_processor(master_cpu);
-       default_pset.active = TRUE;
-}
+       simple_lock_init(&pset_node_lock, 0);
 
 
-/*
- *     Initialize the given processor_set structure.
- */
+       queue_init(&tasks);
+       queue_init(&terminated_tasks);
+       queue_init(&threads);
+       queue_init(&corpse_tasks);
 
 
-void pset_init(
-       register processor_set_t        pset)
-{
-       int     i;
-
-       /* setup run-queues */
-       simple_lock_init(&pset->runq.lock, ETAP_THREAD_PSET_RUNQ);
-       pset->runq.count = 0;
-       for (i = 0; i < NRQBM; i++) {
-           pset->runq.bitmap[i] = 0;
-       }
-       setbit(MAXPRI - IDLEPRI, pset->runq.bitmap); 
-       pset->runq.highq = IDLEPRI;
-       for (i = 0; i < NRQS; i++) {
-           queue_init(&(pset->runq.queues[i]));
-       }
+       simple_lock_init(&processor_list_lock, 0);
 
 
-       queue_init(&pset->idle_queue);
-       pset->idle_count = 0;
-       simple_lock_init(&pset->idle_lock, ETAP_THREAD_PSET_IDLE);
-       pset->mach_factor = pset->load_average = 0;
-       pset->sched_load = 0;
-       queue_init(&pset->processors);
-       pset->processor_count = 0;
-       simple_lock_init(&pset->processors_lock, ETAP_THREAD_PSET);
-       queue_init(&pset->tasks);
-       pset->task_count = 0;
-       queue_init(&pset->threads);
-       pset->thread_count = 0;
-       pset->ref_count = 1;
-       pset->active = FALSE;
-       mutex_init(&pset->lock, ETAP_THREAD_PSET);
-       pset->pset_self = IP_NULL;
-       pset->pset_name_self = IP_NULL;
-       pset->max_priority = MAXPRI_STANDARD;
-       pset->policies = POLICY_TIMESHARE | POLICY_FIFO | POLICY_RR;
-       pset->set_quantum = min_quantum;
-
-       pset->quantum_adj_index = 0;
-       simple_lock_init(&pset->quantum_adj_lock, ETAP_THREAD_PSET_QUANT);
-
-       for (i = 0; i <= NCPUS; i++) {
-           pset->machine_quantum[i] = min_quantum;
-       }
+       master_processor = cpu_to_processor(master_cpu);
 
 
-       pset->policy_default = POLICY_TIMESHARE;
-       pset->policy_limit.ts.max_priority = MAXPRI_STANDARD;
-       pset->policy_limit.rr.max_priority = MAXPRI_STANDARD;
-       pset->policy_limit.fifo.max_priority = MAXPRI_STANDARD;
-       pset->policy_base.ts.base_priority = BASEPRI_DEFAULT;
-       pset->policy_base.rr.base_priority = BASEPRI_DEFAULT;
-       pset->policy_base.rr.quantum = min_quantum;
-       pset->policy_base.fifo.base_priority = BASEPRI_DEFAULT;
+       processor_init(master_processor, master_cpu, &pset0);
 }
 
 /*
 }
 
 /*
- *     Initialize the given processor structure for the processor in
- *     the slot specified by slot_num.
+ *     Initialize the given processor for the cpu
+ *     indicated by cpu_id, and assign to the
+ *     specified processor set.
  */
 void
 processor_init(
  */
 void
 processor_init(
-       register processor_t    pr,
-       int                     slot_num)
+       processor_t                     processor,
+       int                                     cpu_id,
+       processor_set_t         pset)
 {
 {
-       int     i;
+       spl_t           s;
 
 
-       /* setup run-queues */
-       simple_lock_init(&pr->runq.lock, ETAP_THREAD_PROC_RUNQ);
-       pr->runq.count = 0;
-       for (i = 0; i < NRQBM; i++) {
-           pr->runq.bitmap[i] = 0;
+       if (processor != master_processor) {
+               /* Scheduler state for master_processor initialized in sched_init() */
+               SCHED(processor_init)(processor);
        }
        }
-       setbit(MAXPRI - IDLEPRI, pr->runq.bitmap); 
-       pr->runq.highq = IDLEPRI;
-       for (i = 0; i < NRQS; i++) {
-           queue_init(&(pr->runq.queues[i]));
+
+       processor->state = PROCESSOR_OFF_LINE;
+       processor->active_thread = processor->next_thread = processor->idle_thread = THREAD_NULL;
+       processor->processor_set = pset;
+       processor_state_update_idle(processor);
+       processor->starting_pri = MINPRI;
+       processor->cpu_id = cpu_id;
+       timer_call_setup(&processor->quantum_timer, thread_quantum_expire, processor);
+       processor->quantum_end = UINT64_MAX;
+       processor->deadline = UINT64_MAX;
+       processor->first_timeslice = FALSE;
+       processor->processor_primary = processor; /* no SMT relationship known at this point */
+       processor->processor_secondary = NULL;
+       processor->is_SMT = FALSE;
+       processor->is_recommended = (pset->recommended_bitmask & (1ULL << cpu_id)) ? TRUE : FALSE;
+       processor->processor_self = IP_NULL;
+       processor_data_init(processor);
+       processor->processor_list = NULL;
+
+       s = splsched();
+       pset_lock(pset);
+       bit_set(pset->cpu_bitmask, cpu_id);
+       if (pset->cpu_set_count++ == 0)
+               pset->cpu_set_low = pset->cpu_set_hi = cpu_id;
+       else {
+               pset->cpu_set_low = (cpu_id < pset->cpu_set_low)? cpu_id: pset->cpu_set_low;
+               pset->cpu_set_hi = (cpu_id > pset->cpu_set_hi)? cpu_id: pset->cpu_set_hi;
        }
        }
+       pset_unlock(pset);
+       splx(s);
 
 
-       queue_init(&pr->processor_queue);
-       pr->state = PROCESSOR_OFF_LINE;
-       pr->next_thread = THREAD_NULL;
-       pr->idle_thread = THREAD_NULL;
-       pr->quantum = 0;
-       pr->first_quantum = FALSE;
-       pr->last_quantum = 0;
-       pr->processor_set = PROCESSOR_SET_NULL;
-       pr->processor_set_next = PROCESSOR_SET_NULL;
-       queue_init(&pr->processors);
-       simple_lock_init(&pr->lock, ETAP_THREAD_PROC);
-       pr->processor_self = IP_NULL;
-       pr->slot_num = slot_num;
+       simple_lock(&processor_list_lock);
+       if (processor_list == NULL)
+               processor_list = processor;
+       else
+               processor_list_tail->processor_list = processor;
+       processor_list_tail = processor;
+       processor_count++;
+       assert(cpu_id < MAX_SCHED_CPUS);
+       processor_array[cpu_id] = processor;
+       simple_unlock(&processor_list_lock);
 }
 
 }
 
-/*
- *     pset_remove_processor() removes a processor from a processor_set.
- *     It can only be called on the current processor.  Caller must
- *     hold lock on current processor and processor set.
- */
 void
 void
-pset_remove_processor(
-       processor_set_t pset,
-       processor_t     processor)
+processor_set_primary(
+       processor_t             processor,
+       processor_t             primary)
 {
 {
-       if (pset != processor->processor_set)
-               panic("pset_remove_processor: wrong pset");
-
-       queue_remove(&pset->processors, processor, processor_t, processors);
-       processor->processor_set = PROCESSOR_SET_NULL;
-       pset->processor_count--;
-       quantum_set(pset);
+       assert(processor->processor_primary == primary || processor->processor_primary == processor);
+       /* Re-adjust primary point for this (possibly) secondary processor */
+       processor->processor_primary = primary;
+
+       assert(primary->processor_secondary == NULL || primary->processor_secondary == processor);
+       if (primary != processor) {
+               /* Link primary to secondary, assumes a 2-way SMT model
+                * We'll need to move to a queue if any future architecture
+                * requires otherwise.
+                */
+               assert(processor->processor_secondary == NULL);
+               primary->processor_secondary = processor;
+               /* Mark both processors as SMT siblings */
+               primary->is_SMT = TRUE;
+               processor->is_SMT = TRUE;
+       }
 }
 
 }
 
-/*
- *     pset_add_processor() adds a  processor to a processor_set.
- *     It can only be called on the current processor.  Caller must
- *     hold lock on curent processor and on pset.  No reference counting on
- *     processors.  Processor reference to pset is implicit.
- */
-void
-pset_add_processor(
-       processor_set_t pset,
+processor_set_t
+processor_pset(
        processor_t     processor)
 {
        processor_t     processor)
 {
-       queue_enter(&pset->processors, processor, processor_t, processors);
-       processor->processor_set = pset;
-       pset->processor_count++;
-       quantum_set(pset);
+       return (processor->processor_set);
 }
 
 }
 
-/*
- *     pset_remove_task() removes a task from a processor_set.
- *     Caller must hold locks on pset and task.  Pset reference count
- *     is not decremented; caller must explicitly pset_deallocate.
- */
 void
 void
-pset_remove_task(
-       processor_set_t pset,
-       task_t          task)
+processor_state_update_idle(processor_t processor)
 {
 {
-       if (pset != task->processor_set)
-               return;
-
-       queue_remove(&pset->tasks, task, task_t, pset_tasks);
-       task->processor_set = PROCESSOR_SET_NULL;
-       pset->task_count--;
+    processor->current_pri = IDLEPRI;
+    processor->current_sfi_class = SFI_CLASS_KERNEL;
+    processor->current_recommended_pset_type = PSET_SMP;
+    processor->current_perfctl_class = PERFCONTROL_CLASS_IDLE;
 }
 
 }
 
-/*
- *     pset_add_task() adds a  task to a processor_set.
- *     Caller must hold locks on pset and task.  Pset references to
- *     tasks are implicit.
- */
 void
 void
-pset_add_task(
-       processor_set_t pset,
-       task_t          task)
+processor_state_update_from_thread(processor_t processor, thread_t thread)
 {
 {
-       queue_enter(&pset->tasks, task, task_t, pset_tasks);
-       task->processor_set = pset;
-       pset->task_count++;
-       pset->ref_count++;
+    processor->current_pri = thread->sched_pri;
+    processor->current_sfi_class = thread->sfi_class;
+    processor->current_recommended_pset_type = recommended_pset_type(thread);
+    processor->current_perfctl_class = thread_get_perfcontrol_class(thread);
 }
 
 }
 
-/*
- *     pset_remove_thread() removes a thread from a processor_set.
- *     Caller must hold locks on pset and thread.  Pset reference count
- *     is not decremented; caller must explicitly pset_deallocate.
- */
 void
 void
-pset_remove_thread(
-       processor_set_t pset,
-       thread_t        thread)
+processor_state_update_explicit(processor_t processor, int pri, sfi_class_id_t sfi_class, 
+       pset_cluster_type_t pset_type, perfcontrol_class_t perfctl_class)
 {
 {
-       queue_remove(&pset->threads, thread, thread_t, pset_threads);
-       thread->processor_set = PROCESSOR_SET_NULL;
-       pset->thread_count--;
+    processor->current_pri = pri;
+    processor->current_sfi_class = sfi_class;
+    processor->current_recommended_pset_type = pset_type;
+    processor->current_perfctl_class = perfctl_class;
 }
 
 }
 
-/*
- *     pset_add_thread() adds a  thread to a processor_set.
- *     Caller must hold locks on pset and thread.  Pset references to
- *     threads are implicit.
- */
-void
-pset_add_thread(
-       processor_set_t pset,
-       thread_t        thread)
+pset_node_t
+pset_node_root(void)
 {
 {
-       queue_enter(&pset->threads, thread, thread_t, pset_threads);
-       thread->processor_set = pset;
-       pset->thread_count++;
-       pset->ref_count++;
+       return &pset_node0;
 }
 
 }
 
-/*
- *     thread_change_psets() changes the pset of a thread.  Caller must
- *     hold locks on both psets and thread.  The old pset must be
- *     explicitly pset_deallocat()'ed by caller.
- */
-void
-thread_change_psets(
-       thread_t        thread,
-       processor_set_t old_pset,
-       processor_set_t new_pset)
+processor_set_t
+pset_create(
+       pset_node_t                     node)
 {
 {
-       queue_remove(&old_pset->threads, thread, thread_t, pset_threads);
-       old_pset->thread_count--;
-       queue_enter(&new_pset->threads, thread, thread_t, pset_threads);
-       thread->processor_set = new_pset;
-       new_pset->thread_count++;
-       new_pset->ref_count++;
-}      
+       /* some schedulers do not support multiple psets */
+       if (SCHED(multiple_psets_enabled) == FALSE)
+               return processor_pset(master_processor);
 
 
-/*
- *     pset_deallocate:
- *
- *     Remove one reference to the processor set.  Destroy processor_set
- *     if this was the last reference.
- */
-void
-pset_deallocate(
-       processor_set_t pset)
-{
-       if (pset == PROCESSOR_SET_NULL)
-               return;
+       processor_set_t         *prev, pset = kalloc(sizeof (*pset));
 
 
-       pset_lock(pset);
-       if (--pset->ref_count > 0) {
-               pset_unlock(pset);
-               return;
+       if (pset != PROCESSOR_SET_NULL) {
+               pset_init(pset, node);
+
+               simple_lock(&pset_node_lock);
+
+               prev = &node->psets;
+               while (*prev != PROCESSOR_SET_NULL)
+                       prev = &(*prev)->pset_list;
+
+               *prev = pset;
+
+               simple_unlock(&pset_node_lock);
        }
 
        }
 
-       panic("pset_deallocate: default_pset destroyed");
+       return (pset);
 }
 
 /*
 }
 
 /*
- *     pset_reference:
- *
- *     Add one reference to the processor set.
+ *     Find processor set in specified node with specified cluster_id.
+ *     Returns default_pset if not found.
  */
  */
-void
-pset_reference(
-       processor_set_t pset)
+processor_set_t
+pset_find(
+       uint32_t cluster_id,
+       processor_set_t default_pset)
 {
 {
-       pset_lock(pset);
-       pset->ref_count++;
-       pset_unlock(pset);
+       simple_lock(&pset_node_lock);
+       pset_node_t node = &pset_node0;
+       processor_set_t pset = NULL;
+
+       do {
+               pset = node->psets;
+               while (pset != NULL) {
+                       if (pset->pset_cluster_id == cluster_id)
+                               break;
+                       pset = pset->pset_list;
+               }
+       } while ((node = node->node_list) != NULL);
+       simple_unlock(&pset_node_lock);
+       if (pset == NULL)
+               return default_pset;
+       return (pset);
 }
 
 }
 
+/*
+ *     Initialize the given processor_set structure.
+ */
+void
+pset_init(
+       processor_set_t         pset,
+       pset_node_t                     node)
+{
+       if (pset != &pset0) {
+               /* Scheduler state for pset0 initialized in sched_init() */
+               SCHED(pset_init)(pset);
+               SCHED(rt_init)(pset);
+       }
+
+       queue_init(&pset->active_queue);
+       queue_init(&pset->idle_queue);
+       queue_init(&pset->idle_secondary_queue);
+       queue_init(&pset->unused_queue);
+       pset->online_processor_count = 0;
+       pset->active_processor_count = 0;
+       pset->load_average = 0;
+       pset->cpu_set_low = pset->cpu_set_hi = 0;
+       pset->cpu_set_count = 0;
+       pset->cpu_bitmask = 0;
+       pset->recommended_bitmask = ~0ULL;
+       pset->pending_AST_cpu_mask = 0;
+#if defined(CONFIG_SCHED_DEFERRED_AST)
+       pset->pending_deferred_AST_cpu_mask = 0;
+#endif
+       pset->pending_spill_cpu_mask = 0;
+       pset_lock_init(pset);
+       pset->pset_self = IP_NULL;
+       pset->pset_name_self = IP_NULL;
+       pset->pset_list = PROCESSOR_SET_NULL;
+       pset->node = node;
+       pset->pset_cluster_type = PSET_SMP;
+       pset->pset_cluster_id = 0;
+}
 
 kern_return_t
 processor_info_count(
 
 kern_return_t
 processor_info_count(
-       processor_flavor_t      flavor,
+       processor_flavor_t              flavor,
        mach_msg_type_number_t  *count)
 {
        mach_msg_type_number_t  *count)
 {
-       kern_return_t           kr;
-
        switch (flavor) {
        switch (flavor) {
+
        case PROCESSOR_BASIC_INFO:
                *count = PROCESSOR_BASIC_INFO_COUNT;
        case PROCESSOR_BASIC_INFO:
                *count = PROCESSOR_BASIC_INFO_COUNT;
-               return KERN_SUCCESS;
+               break;
+
        case PROCESSOR_CPU_LOAD_INFO:
                *count = PROCESSOR_CPU_LOAD_INFO_COUNT;
        case PROCESSOR_CPU_LOAD_INFO:
                *count = PROCESSOR_CPU_LOAD_INFO_COUNT;
-               return KERN_SUCCESS;
+               break;
+
        default:
        default:
-               kr = cpu_info_count(flavor, count);
-               return kr;
+               return (cpu_info_count(flavor, count));
        }
        }
+
+       return (KERN_SUCCESS);
 }
 
 
 kern_return_t
 processor_info(
 }
 
 
 kern_return_t
 processor_info(
-       register processor_t    processor,
-       processor_flavor_t      flavor,
-       host_t                  *host,
-       processor_info_t        info,
+       processor_t     processor,
+       processor_flavor_t              flavor,
+       host_t                                  *host,
+       processor_info_t                info,
        mach_msg_type_number_t  *count)
 {
        mach_msg_type_number_t  *count)
 {
-       register int    i, slot_num, state;
-       register processor_basic_info_t         basic_info;
-       register processor_cpu_load_info_t      cpu_load_info;
-       kern_return_t   kr;
+       int     cpu_id, state;
+       kern_return_t   result;
 
        if (processor == PROCESSOR_NULL)
 
        if (processor == PROCESSOR_NULL)
-               return(KERN_INVALID_ARGUMENT);
+               return (KERN_INVALID_ARGUMENT);
 
 
-       slot_num = processor->slot_num;
+       cpu_id = processor->cpu_id;
 
        switch (flavor) {
 
        case PROCESSOR_BASIC_INFO:
 
        switch (flavor) {
 
        case PROCESSOR_BASIC_INFO:
-         {
-           if (*count < PROCESSOR_BASIC_INFO_COUNT)
-             return(KERN_FAILURE);
-
-           basic_info = (processor_basic_info_t) info;
-           basic_info->cpu_type = machine_slot[slot_num].cpu_type;
-           basic_info->cpu_subtype = machine_slot[slot_num].cpu_subtype;
-           state = processor->state;
-           if (state == PROCESSOR_OFF_LINE)
-             basic_info->running = FALSE;
-           else
-             basic_info->running = TRUE;
-           basic_info->slot_num = slot_num;
-           if (processor == master_processor) 
-             basic_info->is_master = TRUE;
-           else
-             basic_info->is_master = FALSE;
-
-           *count = PROCESSOR_BASIC_INFO_COUNT;
-           *host = &realhost;
-           return(KERN_SUCCESS);
-         }
+       {
+               processor_basic_info_t          basic_info;
+
+               if (*count < PROCESSOR_BASIC_INFO_COUNT)
+                       return (KERN_FAILURE);
+
+               basic_info = (processor_basic_info_t) info;
+               basic_info->cpu_type = slot_type(cpu_id);
+               basic_info->cpu_subtype = slot_subtype(cpu_id);
+               state = processor->state;
+               if (state == PROCESSOR_OFF_LINE)
+                       basic_info->running = FALSE;
+               else
+                       basic_info->running = TRUE;
+               basic_info->slot_num = cpu_id;
+               if (processor == master_processor) 
+                       basic_info->is_master = TRUE;
+               else
+                       basic_info->is_master = FALSE;
+
+               *count = PROCESSOR_BASIC_INFO_COUNT;
+               *host = &realhost;
+
+           return (KERN_SUCCESS);
+       }
+
        case PROCESSOR_CPU_LOAD_INFO:
        case PROCESSOR_CPU_LOAD_INFO:
-         {
-           if (*count < PROCESSOR_CPU_LOAD_INFO_COUNT)
-             return(KERN_FAILURE);
+       {
+               processor_cpu_load_info_t       cpu_load_info;
+               timer_t         idle_state;
+               uint64_t        idle_time_snapshot1, idle_time_snapshot2;
+               uint64_t        idle_time_tstamp1, idle_time_tstamp2;
+
+               /*
+                * We capture the accumulated idle time twice over
+                * the course of this function, as well as the timestamps
+                * when each were last updated. Since these are
+                * all done using non-atomic racy mechanisms, the
+                * most we can infer is whether values are stable.
+                * timer_grab() is the only function that can be
+                * used reliably on another processor's per-processor
+                * data.
+                */
+
+               if (*count < PROCESSOR_CPU_LOAD_INFO_COUNT)
+                       return (KERN_FAILURE);
+
+               cpu_load_info = (processor_cpu_load_info_t) info;
+               if (precise_user_kernel_time) {
+                       cpu_load_info->cpu_ticks[CPU_STATE_USER] =
+                                                       (uint32_t)(timer_grab(&PROCESSOR_DATA(processor, user_state)) / hz_tick_interval);
+                       cpu_load_info->cpu_ticks[CPU_STATE_SYSTEM] =
+                                                       (uint32_t)(timer_grab(&PROCESSOR_DATA(processor, system_state)) / hz_tick_interval);
+               } else {
+                       uint64_t tval = timer_grab(&PROCESSOR_DATA(processor, user_state)) +
+                               timer_grab(&PROCESSOR_DATA(processor, system_state));
+
+                       cpu_load_info->cpu_ticks[CPU_STATE_USER] = (uint32_t)(tval / hz_tick_interval);
+                       cpu_load_info->cpu_ticks[CPU_STATE_SYSTEM] = 0;
+               }
+
+               idle_state = &PROCESSOR_DATA(processor, idle_state);
+               idle_time_snapshot1 = timer_grab(idle_state);
+               idle_time_tstamp1 = idle_state->tstamp;
 
 
-           cpu_load_info = (processor_cpu_load_info_t) info;
-           for (i=0;i<CPU_STATE_MAX;i++)
-             cpu_load_info->cpu_ticks[i] = machine_slot[slot_num].cpu_ticks[i];
+               /*
+                * Idle processors are not continually updating their
+                * per-processor idle timer, so it may be extremely
+                * out of date, resulting in an over-representation
+                * of non-idle time between two measurement
+                * intervals by e.g. top(1). If we are non-idle, or
+                * have evidence that the timer is being updated
+                * concurrently, we consider its value up-to-date.
+                */
+               if (PROCESSOR_DATA(processor, current_state) != idle_state) {
+                       cpu_load_info->cpu_ticks[CPU_STATE_IDLE] =
+                                                       (uint32_t)(idle_time_snapshot1 / hz_tick_interval);
+               } else if ((idle_time_snapshot1 != (idle_time_snapshot2 = timer_grab(idle_state))) ||
+                                  (idle_time_tstamp1 != (idle_time_tstamp2 = idle_state->tstamp))){
+                       /* Idle timer is being updated concurrently, second stamp is good enough */
+                       cpu_load_info->cpu_ticks[CPU_STATE_IDLE] =
+                                                       (uint32_t)(idle_time_snapshot2 / hz_tick_interval);
+               } else {
+                       /*
+                        * Idle timer may be very stale. Fortunately we have established
+                        * that idle_time_snapshot1 and idle_time_tstamp1 are unchanging
+                        */
+                       idle_time_snapshot1 += mach_absolute_time() - idle_time_tstamp1;
+                               
+                       cpu_load_info->cpu_ticks[CPU_STATE_IDLE] =
+                               (uint32_t)(idle_time_snapshot1 / hz_tick_interval);
+               }
+
+               cpu_load_info->cpu_ticks[CPU_STATE_NICE] = 0;
 
            *count = PROCESSOR_CPU_LOAD_INFO_COUNT;
            *host = &realhost;
 
            *count = PROCESSOR_CPU_LOAD_INFO_COUNT;
            *host = &realhost;
-           return(KERN_SUCCESS);
-         }
+
+           return (KERN_SUCCESS);
+       }
+
        default:
        default:
-         {
-           kr=cpu_info(flavor, slot_num, info, count);
-           if (kr == KERN_SUCCESS)
-               *host = &realhost;                 
-           return(kr);
-         }
+           result = cpu_info(flavor, cpu_id, info, count);
+           if (result == KERN_SUCCESS)
+                       *host = &realhost;                 
+
+           return (result);
        }
 }
 
 kern_return_t
 processor_start(
        }
 }
 
 kern_return_t
 processor_start(
-       processor_t     processor)
+       processor_t                     processor)
 {
 {
-       int     state;
-       spl_t   s;
-       kern_return_t   kr;
+       processor_set_t         pset;
+       thread_t                        thread;   
+       kern_return_t           result;
+       spl_t                           s;
 
 
-       if (processor == PROCESSOR_NULL)
-               return(KERN_INVALID_ARGUMENT);
+       if (processor == PROCESSOR_NULL || processor->processor_set == PROCESSOR_SET_NULL)
+               return (KERN_INVALID_ARGUMENT);
 
 
-       if (processor == master_processor)
-               return(cpu_start(processor->slot_num));
+       if (processor == master_processor) {
+               processor_t             prev;
 
 
-       s = splsched();
-       processor_lock(processor);
+               prev = thread_bind(processor);
+               thread_block(THREAD_CONTINUE_NULL);
 
 
-       state = processor->state;
-       if (state != PROCESSOR_OFF_LINE) {
-               processor_unlock(processor);
+               result = cpu_start(processor->cpu_id);
+
+               thread_bind(prev);
+
+               return (result);
+       }
+
+       s = splsched();
+       pset = processor->processor_set;
+       pset_lock(pset);
+       if (processor->state != PROCESSOR_OFF_LINE) {
+               pset_unlock(pset);
                splx(s);
                splx(s);
-               return(KERN_FAILURE);
+
+               return (KERN_FAILURE);
        }
        }
+
        processor->state = PROCESSOR_START;
        processor->state = PROCESSOR_START;
-       processor_unlock(processor);
+       pset_unlock(pset);
        splx(s);
 
        splx(s);
 
-       if (processor->next_thread == THREAD_NULL) {
-               thread_t                thread;   
-               extern void             start_cpu_thread(void);
-       
-               thread = kernel_thread_with_priority(kernel_task, MAXPRI_KERNBAND,
-                                                                               start_cpu_thread, FALSE);   
+       /*
+        *      Create the idle processor thread.
+        */
+       if (processor->idle_thread == THREAD_NULL) {
+               result = idle_thread_create(processor);
+               if (result != KERN_SUCCESS) {
+                       s = splsched();
+                       pset_lock(pset);
+                       processor->state = PROCESSOR_OFF_LINE;
+                       pset_unlock(pset);
+                       splx(s);
+
+                       return (result);
+               }
+       }
+
+       /*
+        *      If there is no active thread, the processor
+        *      has never been started.  Create a dedicated
+        *      start up thread.
+        */
+       if (    processor->active_thread == THREAD_NULL         &&
+                       processor->next_thread == THREAD_NULL           ) {
+               result = kernel_thread_create((thread_continue_t)processor_start_thread, NULL, MAXPRI_KERNEL, &thread);
+               if (result != KERN_SUCCESS) {
+                       s = splsched();
+                       pset_lock(pset);
+                       processor->state = PROCESSOR_OFF_LINE;
+                       pset_unlock(pset);
+                       splx(s);
+
+                       return (result);
+               }
 
                s = splsched();
                thread_lock(thread);
 
                s = splsched();
                thread_lock(thread);
-               thread_bind_locked(thread, processor);
-               thread_go_locked(thread, THREAD_AWAKENED);
-               (void)rem_runq(thread);
+               thread->bound_processor = processor;
                processor->next_thread = thread;
                processor->next_thread = thread;
+               thread->state = TH_RUN;
+               thread->last_made_runnable_time = mach_absolute_time();
                thread_unlock(thread);
                splx(s);
                thread_unlock(thread);
                splx(s);
+
+               thread_deallocate(thread);
        }
 
        }
 
-       kr = cpu_start(processor->slot_num);
+       if (processor->processor_self == IP_NULL)
+               ipc_processor_init(processor);
 
 
-       if (kr != KERN_SUCCESS) {
+       result = cpu_start(processor->cpu_id);
+       if (result != KERN_SUCCESS) {
                s = splsched();
                s = splsched();
-               processor_lock(processor);
+               pset_lock(pset);
                processor->state = PROCESSOR_OFF_LINE;
                processor->state = PROCESSOR_OFF_LINE;
-               processor_unlock(processor);
+               pset_unlock(pset);
                splx(s);
                splx(s);
+
+               return (result);
        }
 
        }
 
-       return(kr);
+       ipc_processor_enable(processor);
+
+       return (KERN_SUCCESS);
 }
 
 kern_return_t
 }
 
 kern_return_t
@@ -564,56 +628,22 @@ processor_control(
        if (processor == PROCESSOR_NULL)
                return(KERN_INVALID_ARGUMENT);
 
        if (processor == PROCESSOR_NULL)
                return(KERN_INVALID_ARGUMENT);
 
-       return(cpu_control(processor->slot_num, info, count));
-}
-
-/*
- *     Precalculate the appropriate system quanta based on load.  The
- *     index into machine_quantum is the number of threads on the
- *     processor set queue.  It is limited to the number of processors in
- *     the set.
- */
-
-void
-quantum_set(
-       processor_set_t         pset)
-{
-#if NCPUS > 1
-       register int    i, ncpus;
-
-       ncpus = pset->processor_count;
-
-       for (i=1; i <= ncpus; i++)
-               pset->machine_quantum[i] = ((min_quantum * ncpus) + (i / 2)) / i ;
-
-       pset->machine_quantum[0] = pset->machine_quantum[1];
-
-       i = (pset->runq.count > ncpus) ? ncpus : pset->runq.count;
-       pset->set_quantum = pset->machine_quantum[i];
-#else   /* NCPUS > 1 */
-       default_pset.set_quantum = min_quantum;
-#endif  /* NCPUS > 1 */
+       return(cpu_control(processor->cpu_id, info, count));
 }
            
 kern_return_t
 processor_set_create(
 }
            
 kern_return_t
 processor_set_create(
-       host_t  host,
-       processor_set_t *new_set,
-       processor_set_t *new_name)
+       __unused host_t         host,
+       __unused processor_set_t        *new_set,
+       __unused processor_set_t        *new_name)
 {
 {
-#ifdef lint
-       host++; new_set++; new_name++;
-#endif /* lint */
        return(KERN_FAILURE);
 }
 
 kern_return_t
 processor_set_destroy(
        return(KERN_FAILURE);
 }
 
 kern_return_t
 processor_set_destroy(
-       processor_set_t pset)
+       __unused processor_set_t        pset)
 {
 {
-#ifdef lint
-       pset++;
-#endif /* lint */
        return(KERN_FAILURE);
 }
 
        return(KERN_FAILURE);
 }
 
@@ -622,14 +652,17 @@ processor_get_assignment(
        processor_t     processor,
        processor_set_t *pset)
 {
        processor_t     processor,
        processor_set_t *pset)
 {
-       int state;
+       int state;
+
+       if (processor == PROCESSOR_NULL)
+               return(KERN_INVALID_ARGUMENT);
 
        state = processor->state;
        if (state == PROCESSOR_SHUTDOWN || state == PROCESSOR_OFF_LINE)
                return(KERN_FAILURE);
 
 
        state = processor->state;
        if (state == PROCESSOR_SHUTDOWN || state == PROCESSOR_OFF_LINE)
                return(KERN_FAILURE);
 
-       *pset = processor->processor_set;
-       pset_reference(*pset);
+       *pset = &pset0;
+
        return(KERN_SUCCESS);
 }
 
        return(KERN_SUCCESS);
 }
 
@@ -645,131 +678,106 @@ processor_set_info(
                return(KERN_INVALID_ARGUMENT);
 
        if (flavor == PROCESSOR_SET_BASIC_INFO) {
                return(KERN_INVALID_ARGUMENT);
 
        if (flavor == PROCESSOR_SET_BASIC_INFO) {
-               register processor_set_basic_info_t     basic_info;
+               processor_set_basic_info_t      basic_info;
 
                if (*count < PROCESSOR_SET_BASIC_INFO_COUNT)
                        return(KERN_FAILURE);
 
                basic_info = (processor_set_basic_info_t) info;
 
                if (*count < PROCESSOR_SET_BASIC_INFO_COUNT)
                        return(KERN_FAILURE);
 
                basic_info = (processor_set_basic_info_t) info;
-
-               pset_lock(pset);
-               simple_lock(&pset->processors_lock);
-               basic_info->processor_count = pset->processor_count;
-               simple_unlock(&pset->processors_lock);
-               basic_info->default_policy = pset->policy_default;
-               pset_unlock(pset);
+               basic_info->processor_count = processor_avail_count;
+               basic_info->default_policy = POLICY_TIMESHARE;
 
                *count = PROCESSOR_SET_BASIC_INFO_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_TIMESHARE_DEFAULT) {
 
                *count = PROCESSOR_SET_BASIC_INFO_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_TIMESHARE_DEFAULT) {
-               register policy_timeshare_base_t        ts_base;
+               policy_timeshare_base_t ts_base;
 
                if (*count < POLICY_TIMESHARE_BASE_COUNT)
                        return(KERN_FAILURE);
 
                ts_base = (policy_timeshare_base_t) info;
 
                if (*count < POLICY_TIMESHARE_BASE_COUNT)
                        return(KERN_FAILURE);
 
                ts_base = (policy_timeshare_base_t) info;
-
-               pset_lock(pset);
-               *ts_base = pset->policy_base.ts;
-               pset_unlock(pset);
+               ts_base->base_priority = BASEPRI_DEFAULT;
 
                *count = POLICY_TIMESHARE_BASE_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_FIFO_DEFAULT) {
 
                *count = POLICY_TIMESHARE_BASE_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_FIFO_DEFAULT) {
-               register policy_fifo_base_t             fifo_base;
+               policy_fifo_base_t              fifo_base;
 
                if (*count < POLICY_FIFO_BASE_COUNT)
                        return(KERN_FAILURE);
 
                fifo_base = (policy_fifo_base_t) info;
 
                if (*count < POLICY_FIFO_BASE_COUNT)
                        return(KERN_FAILURE);
 
                fifo_base = (policy_fifo_base_t) info;
-
-               pset_lock(pset);
-               *fifo_base = pset->policy_base.fifo;
-               pset_unlock(pset);
+               fifo_base->base_priority = BASEPRI_DEFAULT;
 
                *count = POLICY_FIFO_BASE_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_RR_DEFAULT) {
 
                *count = POLICY_FIFO_BASE_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_RR_DEFAULT) {
-               register policy_rr_base_t               rr_base;
+               policy_rr_base_t                rr_base;
 
                if (*count < POLICY_RR_BASE_COUNT)
                        return(KERN_FAILURE);
 
                rr_base = (policy_rr_base_t) info;
 
                if (*count < POLICY_RR_BASE_COUNT)
                        return(KERN_FAILURE);
 
                rr_base = (policy_rr_base_t) info;
-
-               pset_lock(pset);
-               *rr_base = pset->policy_base.rr;
-               pset_unlock(pset);
+               rr_base->base_priority = BASEPRI_DEFAULT;
+               rr_base->quantum = 1;
 
                *count = POLICY_RR_BASE_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_TIMESHARE_LIMITS) {
 
                *count = POLICY_RR_BASE_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_TIMESHARE_LIMITS) {
-               register policy_timeshare_limit_t       ts_limit;
+               policy_timeshare_limit_t        ts_limit;
 
                if (*count < POLICY_TIMESHARE_LIMIT_COUNT)
                        return(KERN_FAILURE);
 
                ts_limit = (policy_timeshare_limit_t) info;
 
                if (*count < POLICY_TIMESHARE_LIMIT_COUNT)
                        return(KERN_FAILURE);
 
                ts_limit = (policy_timeshare_limit_t) info;
-
-               pset_lock(pset);
-               *ts_limit = pset->policy_limit.ts;
-               pset_unlock(pset);
+               ts_limit->max_priority = MAXPRI_KERNEL;
 
                *count = POLICY_TIMESHARE_LIMIT_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_FIFO_LIMITS) {
 
                *count = POLICY_TIMESHARE_LIMIT_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_FIFO_LIMITS) {
-               register policy_fifo_limit_t            fifo_limit;
+               policy_fifo_limit_t             fifo_limit;
 
                if (*count < POLICY_FIFO_LIMIT_COUNT)
                        return(KERN_FAILURE);
 
                fifo_limit = (policy_fifo_limit_t) info;
 
                if (*count < POLICY_FIFO_LIMIT_COUNT)
                        return(KERN_FAILURE);
 
                fifo_limit = (policy_fifo_limit_t) info;
-
-               pset_lock(pset);
-               *fifo_limit = pset->policy_limit.fifo;
-               pset_unlock(pset);
+               fifo_limit->max_priority = MAXPRI_KERNEL;
 
                *count = POLICY_FIFO_LIMIT_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_RR_LIMITS) {
 
                *count = POLICY_FIFO_LIMIT_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_RR_LIMITS) {
-               register policy_rr_limit_t              rr_limit;
+               policy_rr_limit_t               rr_limit;
 
                if (*count < POLICY_RR_LIMIT_COUNT)
                        return(KERN_FAILURE);
 
                rr_limit = (policy_rr_limit_t) info;
 
                if (*count < POLICY_RR_LIMIT_COUNT)
                        return(KERN_FAILURE);
 
                rr_limit = (policy_rr_limit_t) info;
-
-               pset_lock(pset);
-               *rr_limit = pset->policy_limit.rr;
-               pset_unlock(pset);
+               rr_limit->max_priority = MAXPRI_KERNEL;
 
                *count = POLICY_RR_LIMIT_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_ENABLED_POLICIES) {
 
                *count = POLICY_RR_LIMIT_COUNT;
                *host = &realhost;
                return(KERN_SUCCESS);
        }
        else if (flavor == PROCESSOR_SET_ENABLED_POLICIES) {
-               register int                            *enabled;
+               int                             *enabled;
 
                if (*count < (sizeof(*enabled)/sizeof(int)))
                        return(KERN_FAILURE);
 
                enabled = (int *) info;
 
                if (*count < (sizeof(*enabled)/sizeof(int)))
                        return(KERN_FAILURE);
 
                enabled = (int *) info;
-
-               pset_lock(pset);
-               *enabled = pset->policies;
-               pset_unlock(pset);
+               *enabled = POLICY_TIMESHARE | POLICY_RR | POLICY_FIFO;
 
                *count = sizeof(*enabled)/sizeof(int);
                *host = &realhost;
 
                *count = sizeof(*enabled)/sizeof(int);
                *host = &realhost;
@@ -793,31 +801,28 @@ processor_set_statistics(
        processor_set_info_t    info,
        mach_msg_type_number_t  *count)
 {
        processor_set_info_t    info,
        mach_msg_type_number_t  *count)
 {
-        if (pset == PROCESSOR_SET_NULL)
-                return (KERN_INVALID_PROCESSOR_SET);
+       if (pset == PROCESSOR_SET_NULL || pset != &pset0)
+               return (KERN_INVALID_PROCESSOR_SET);
+
+       if (flavor == PROCESSOR_SET_LOAD_INFO) {
+               processor_set_load_info_t     load_info;
 
 
-        if (flavor == PROCESSOR_SET_LOAD_INFO) {
-                register processor_set_load_info_t     load_info;
+               if (*count < PROCESSOR_SET_LOAD_INFO_COUNT)
+                       return(KERN_FAILURE);
 
 
-                if (*count < PROCESSOR_SET_LOAD_INFO_COUNT)
-                        return(KERN_FAILURE);
+               load_info = (processor_set_load_info_t) info;
 
 
-                load_info = (processor_set_load_info_t) info;
+               load_info->mach_factor = sched_mach_factor;
+               load_info->load_average = sched_load_average;
 
 
-                pset_lock(pset);
-                load_info->task_count = pset->task_count;
-                load_info->thread_count = pset->thread_count;
-                               simple_lock(&pset->processors_lock);
-                load_info->mach_factor = pset->mach_factor;
-                load_info->load_average = pset->load_average;
-                               simple_unlock(&pset->processors_lock);
-                pset_unlock(pset);
+               load_info->task_count = tasks_count;
+               load_info->thread_count = threads_count;
 
 
-                *count = PROCESSOR_SET_LOAD_INFO_COUNT;
-                return(KERN_SUCCESS);
-        }
+               *count = PROCESSOR_SET_LOAD_INFO_COUNT;
+               return(KERN_SUCCESS);
+       }
 
 
-        return(KERN_INVALID_ARGUMENT);
+       return(KERN_INVALID_ARGUMENT);
 }
 
 /*
 }
 
 /*
@@ -829,9 +834,9 @@ processor_set_statistics(
  */
 kern_return_t
 processor_set_max_priority(
  */
 kern_return_t
 processor_set_max_priority(
-       processor_set_t pset,
-       int             max_priority,
-       boolean_t       change_threads)
+       __unused processor_set_t        pset,
+       __unused int                    max_priority,
+       __unused boolean_t              change_threads)
 {
        return (KERN_INVALID_ARGUMENT);
 }
 {
        return (KERN_INVALID_ARGUMENT);
 }
@@ -844,8 +849,8 @@ processor_set_max_priority(
 
 kern_return_t
 processor_set_policy_enable(
 
 kern_return_t
 processor_set_policy_enable(
-       processor_set_t pset,
-       int             policy)
+       __unused processor_set_t        pset,
+       __unused int                    policy)
 {
        return (KERN_INVALID_ARGUMENT);
 }
 {
        return (KERN_INVALID_ARGUMENT);
 }
@@ -858,16 +863,13 @@ processor_set_policy_enable(
  */
 kern_return_t
 processor_set_policy_disable(
  */
 kern_return_t
 processor_set_policy_disable(
-       processor_set_t pset,
-       int             policy,
-       boolean_t       change_threads)
+       __unused processor_set_t        pset,
+       __unused int                    policy,
+       __unused boolean_t              change_threads)
 {
        return (KERN_INVALID_ARGUMENT);
 }
 
 {
        return (KERN_INVALID_ARGUMENT);
 }
 
-#define THING_TASK     0
-#define THING_THREAD   1
-
 /*
  *     processor_set_things:
  *
 /*
  *     processor_set_things:
  *
@@ -875,169 +877,228 @@ processor_set_policy_disable(
  */
 kern_return_t
 processor_set_things(
  */
 kern_return_t
 processor_set_things(
-       processor_set_t         pset,
-       mach_port_t             **thing_list,
-       mach_msg_type_number_t  *count,
-       int                     type)
+       processor_set_t pset,
+       void **thing_list,
+       mach_msg_type_number_t *count,
+       int type)
 {
 {
-       unsigned int actual;    /* this many things */
-       int i;
+       unsigned int i;
+       task_t task;
+       thread_t thread;
+
+       task_t *task_list;
+       unsigned int actual_tasks;
+       vm_size_t task_size, task_size_needed;
 
 
+       thread_t *thread_list;
+       unsigned int actual_threads;
+       vm_size_t thread_size, thread_size_needed;
+
+       void *addr, *newaddr;
        vm_size_t size, size_needed;
        vm_size_t size, size_needed;
-       vm_offset_t addr;
 
 
-       if (pset == PROCESSOR_SET_NULL)
-               return KERN_INVALID_ARGUMENT;
+       if (pset == PROCESSOR_SET_NULL || pset != &pset0)
+               return (KERN_INVALID_ARGUMENT);
 
 
-       size = 0; addr = 0;
+       task_size = 0;
+       task_size_needed = 0;
+       task_list = NULL;
+       actual_tasks = 0;
 
 
-       for (;;) {
-               pset_lock(pset);
-               if (!pset->active) {
-                       pset_unlock(pset);
-                       return KERN_FAILURE;
-               }
+       thread_size = 0;
+       thread_size_needed = 0;
+       thread_list = NULL;
+       actual_threads = 0;
 
 
-               if (type == THING_TASK)
-                       actual = pset->task_count;
-               else
-                       actual = pset->thread_count;
+       for (;;) {
+               lck_mtx_lock(&tasks_threads_lock);
 
                /* do we have the memory we need? */
 
                /* do we have the memory we need? */
+               if (type == PSET_THING_THREAD)
+                       thread_size_needed = threads_count * sizeof(void *);
+#if !CONFIG_MACF
+               else
+#endif
+                       task_size_needed = tasks_count * sizeof(void *);
 
 
-               size_needed = actual * sizeof(mach_port_t);
-               if (size_needed <= size)
+               if (task_size_needed <= task_size &&
+                   thread_size_needed <= thread_size)
                        break;
 
                        break;
 
-               /* unlock the pset and allocate more memory */
-               pset_unlock(pset);
+               /* unlock and allocate more memory */
+               lck_mtx_unlock(&tasks_threads_lock);
 
 
-               if (size != 0)
-                       kfree(addr, size);
+               /* grow task array */
+               if (task_size_needed > task_size) {
+                       if (task_size != 0)
+                               kfree(task_list, task_size);
 
 
-               assert(size_needed > 0);
-               size = size_needed;
+                       assert(task_size_needed > 0);
+                       task_size = task_size_needed;
 
 
-               addr = kalloc(size);
-               if (addr == 0)
-                       return KERN_RESOURCE_SHORTAGE;
-       }
+                       task_list = (task_t *)kalloc(task_size);
+                       if (task_list == NULL) {
+                               if (thread_size != 0)
+                                       kfree(thread_list, thread_size);
+                               return (KERN_RESOURCE_SHORTAGE);
+                       }
+               }
 
 
-       /* OK, have memory and the processor_set is locked & active */
+               /* grow thread array */
+               if (thread_size_needed > thread_size) {
+                       if (thread_size != 0)
+                               kfree(thread_list, thread_size);
 
 
-       switch (type) {
-           case THING_TASK: {
-               task_t *tasks = (task_t *) addr;
-               task_t task;
+                       assert(thread_size_needed > 0);
+                       thread_size = thread_size_needed;
 
 
-               for (i = 0, task = (task_t) queue_first(&pset->tasks);
-                    i < actual;
-                    i++, task = (task_t) queue_next(&task->pset_tasks)) {
-                       /* take ref for convert_task_to_port */
-                       task_reference(task);
-                       tasks[i] = task;
+                       thread_list = (thread_t *)kalloc(thread_size);
+                       if (thread_list == 0) {
+                               if (task_size != 0)
+                                       kfree(task_list, task_size);
+                               return (KERN_RESOURCE_SHORTAGE);
+                       }
                }
                }
-               assert(queue_end(&pset->tasks, (queue_entry_t) task));
-               break;
-           }
-
-           case THING_THREAD: {
-               thread_act_t *thr_acts = (thread_act_t *) addr;
-               thread_t thread;
-               thread_act_t thr_act;
-               queue_head_t *list;
-
-               list = &pset->threads;
-               thread = (thread_t) queue_first(list);
-               i = 0;
-               while (i < actual && !queue_end(list, (queue_entry_t)thread)) {
-                       thr_act = thread_lock_act(thread);
-                       if (thr_act && thr_act->ref_count > 0) {
-                               /* take ref for convert_act_to_port */
-                               act_locked_act_reference(thr_act);
-                               thr_acts[i] = thr_act;
-                               i++;
+       }
+
+       /* OK, have memory and the list locked */
+
+       /* If we need it, get the thread list */
+       if (type == PSET_THING_THREAD) {
+               for (thread = (thread_t)queue_first(&threads);
+                    !queue_end(&threads, (queue_entry_t)thread);
+                    thread = (thread_t)queue_next(&thread->threads)) {
+#if defined(SECURE_KERNEL)
+                       if (thread->task != kernel_task) {
+#endif
+                               thread_reference_internal(thread);
+                               thread_list[actual_threads++] = thread;
+#if defined(SECURE_KERNEL)
                        }
                        }
-                       thread_unlock_act(thread);
-                       thread = (thread_t) queue_next(&thread->pset_threads);
+#endif
                }
                }
-               if (i < actual) {
-                       actual = i;
-                       size_needed = actual * sizeof(mach_port_t);
+       }
+#if !CONFIG_MACF
+         else {
+#endif
+               /* get a list of the tasks */
+               for (task = (task_t)queue_first(&tasks);
+                    !queue_end(&tasks, (queue_entry_t)task);
+                    task = (task_t)queue_next(&task->tasks)) {
+#if defined(SECURE_KERNEL)
+                       if (task != kernel_task) {
+#endif
+                               task_reference_internal(task);
+                               task_list[actual_tasks++] = task;
+#if defined(SECURE_KERNEL)
+                       }
+#endif
                }
                }
-               break;
-           }
+#if !CONFIG_MACF
        }
        }
+#endif
 
 
-       /* can unlock processor set now that we have the task/thread refs */
-       pset_unlock(pset);
+       lck_mtx_unlock(&tasks_threads_lock);
 
 
-       if (actual == 0) {
-               /* no things, so return null pointer and deallocate memory */
-               *thing_list = 0;
-               *count = 0;
-
-               if (size != 0)
-                       kfree(addr, size);
-       } else {
-               /* if we allocated too much, must copy */
+#if CONFIG_MACF
+       unsigned int j, used;
 
 
-               if (size_needed < size) {
-                       vm_offset_t newaddr;
-
-                       newaddr = kalloc(size_needed);
-                       if (newaddr == 0) {
-                               switch (type) {
-                                   case THING_TASK: {
-                                       task_t *tasks = (task_t *) addr;
+       /* for each task, make sure we are allowed to examine it */
+       for (i = used = 0; i < actual_tasks; i++) {
+               if (mac_task_check_expose_task(task_list[i])) {
+                       task_deallocate(task_list[i]);
+                       continue;
+               }
+               task_list[used++] = task_list[i];
+       }
+       actual_tasks = used;
+       task_size_needed = actual_tasks * sizeof(void *);
 
 
-                                       for (i = 0; i < actual; i++)
-                                               task_deallocate(tasks[i]);
-                                       break;
-                                   }
+       if (type == PSET_THING_THREAD) {
 
 
-                                   case THING_THREAD: {
-                                       thread_t *threads = (thread_t *) addr;
+               /* for each thread (if any), make sure it's task is in the allowed list */
+               for (i = used = 0; i < actual_threads; i++) {
+                       boolean_t found_task = FALSE;
 
 
-                                       for (i = 0; i < actual; i++)
-                                               thread_deallocate(threads[i]);
+                       task = thread_list[i]->task;
+                       for (j = 0; j < actual_tasks; j++) {
+                               if (task_list[j] == task) {
+                                       found_task = TRUE;
                                        break;
                                        break;
-                                   }
                                }
                                }
-                               kfree(addr, size);
-                               return KERN_RESOURCE_SHORTAGE;
                        }
                        }
-
-                       bcopy((char *) addr, (char *) newaddr, size_needed);
-                       kfree(addr, size);
-                       addr = newaddr;
+                       if (found_task)
+                               thread_list[used++] = thread_list[i];
+                       else
+                               thread_deallocate(thread_list[i]);
                }
                }
+               actual_threads = used;
+               thread_size_needed = actual_threads * sizeof(void *);
+
+               /* done with the task list */
+               for (i = 0; i < actual_tasks; i++)
+                       task_deallocate(task_list[i]);
+               kfree(task_list, task_size);
+               task_size = 0;
+               actual_tasks = 0;
+               task_list = NULL;
+       }
+#endif
+
+       if (type == PSET_THING_THREAD) {
+               if (actual_threads == 0) {
+                       /* no threads available to return */
+                       assert(task_size == 0);
+                       if (thread_size != 0)
+                               kfree(thread_list, thread_size);
+                       *thing_list = NULL;
+                       *count = 0;
+                       return KERN_SUCCESS;
+               }
+               size_needed = actual_threads * sizeof(void *);
+               size = thread_size;
+               addr = thread_list;
+       } else {
+               if (actual_tasks == 0) {
+                       /* no tasks available to return */
+                       assert(thread_size == 0);
+                       if (task_size != 0)
+                               kfree(task_list, task_size);
+                       *thing_list = NULL;
+                       *count = 0;
+                       return KERN_SUCCESS;
+               } 
+               size_needed = actual_tasks * sizeof(void *);
+               size = task_size;
+               addr = task_list;
+       }
 
 
-               *thing_list = (mach_port_t *) addr;
-               *count = actual;
-
-               /* do the conversion that Mig should handle */
-
-               switch (type) {
-                   case THING_TASK: {
-                       task_t *tasks = (task_t *) addr;
-
-                       for (i = 0; i < actual; i++)
-                               (*thing_list)[i] = convert_task_to_port(tasks[i]);
-                       break;
-                   }
+       /* if we allocated too much, must copy */
+       if (size_needed < size) {
+               newaddr = kalloc(size_needed);
+               if (newaddr == 0) {
+                       for (i = 0; i < actual_tasks; i++) {
+                               if (type == PSET_THING_THREAD)
+                                       thread_deallocate(thread_list[i]);
+                               else
+                                       task_deallocate(task_list[i]);
+                       }
+                       if (size)
+                               kfree(addr, size);
+                       return (KERN_RESOURCE_SHORTAGE);
+               }
 
 
-                   case THING_THREAD: {
-                       thread_act_t *thr_acts = (thread_act_t *) addr;
+               bcopy((void *) addr, (void *) newaddr, size_needed);
+               kfree(addr, size);
 
 
-                       for (i = 0; i < actual; i++)
-                               (*thing_list)[i] = convert_act_to_port(thr_acts[i]);
-                       break;
-                   }
-               }
+               addr = newaddr;
+               size = size_needed;
        }
 
        }
 
-       return(KERN_SUCCESS);
+       *thing_list = (void **)addr;
+       *count = (unsigned int)size / sizeof(void *);
+
+       return (KERN_SUCCESS);
 }
 
 
 }
 
 
@@ -1052,7 +1113,17 @@ processor_set_tasks(
        task_array_t            *task_list,
        mach_msg_type_number_t  *count)
 {
        task_array_t            *task_list,
        mach_msg_type_number_t  *count)
 {
-    return(processor_set_things(pset, (mach_port_t **)task_list, count, THING_TASK));
+       kern_return_t ret;
+       mach_msg_type_number_t i;
+
+       ret = processor_set_things(pset, (void **)task_list, count, PSET_THING_TASK);
+       if (ret != KERN_SUCCESS)
+               return ret;
+
+       /* do the conversion that Mig should handle */
+       for (i = 0; i < *count; i++)
+               (*task_list)[i] = (task_t)convert_task_to_port((*task_list)[i]);
+       return KERN_SUCCESS;
 }
 
 /*
 }
 
 /*
@@ -1060,48 +1131,44 @@ processor_set_tasks(
  *
  *     List all threads in the processor set.
  */
  *
  *     List all threads in the processor set.
  */
+#if defined(SECURE_KERNEL)
 kern_return_t
 processor_set_threads(
 kern_return_t
 processor_set_threads(
-       processor_set_t         pset,
-       thread_array_t          *thread_list,
-       mach_msg_type_number_t  *count)
+       __unused processor_set_t                pset,
+       __unused thread_array_t         *thread_list,
+       __unused mach_msg_type_number_t *count)
 {
 {
-    return(processor_set_things(pset, (mach_port_t **)thread_list, count, THING_THREAD));
+    return KERN_FAILURE;
 }
 }
-
-/*
- *      processor_set_base:
- *
- *      Specify per-policy base priority for a processor set.  Set processor
- *     set default policy to the given policy. This affects newly created
- *      and assigned threads.  Optionally change existing ones.
- */
+#elif defined(CONFIG_EMBEDDED)
 kern_return_t
 kern_return_t
-processor_set_base(
-       processor_set_t         pset,
-       policy_t                policy,
-        policy_base_t           base,
-       boolean_t               change)
+processor_set_threads(
+       __unused processor_set_t                pset,
+       __unused thread_array_t         *thread_list,
+       __unused mach_msg_type_number_t *count)
 {
 {
-       return (KERN_INVALID_ARGUMENT);
+    return KERN_NOT_SUPPORTED;
 }
 }
-
-/*
- *      processor_set_limit:
- *
- *      Specify per-policy limits for a processor set.  This affects
- *      newly created and assigned threads.  Optionally change existing
- *      ones.
- */
+#else
 kern_return_t
 kern_return_t
-processor_set_limit(
-       processor_set_t         pset,
-       policy_t                policy,
-        policy_limit_t         limit,
-       boolean_t               change)
+processor_set_threads(
+       processor_set_t         pset,
+       thread_array_t          *thread_list,
+       mach_msg_type_number_t  *count)
 {
 {
-       return (KERN_POLICY_LIMIT);
+       kern_return_t ret;
+       mach_msg_type_number_t i;
+
+       ret = processor_set_things(pset, (void **)thread_list, count, PSET_THING_THREAD);
+       if (ret != KERN_SUCCESS)
+               return ret;
+
+       /* do the conversion that Mig should handle */
+       for (i = 0; i < *count; i++)
+               (*thread_list)[i] = (thread_t)convert_thread_to_port((*thread_list)[i]);
+       return KERN_SUCCESS;
 }
 }
+#endif
 
 /*
  *     processor_set_policy_control
 
 /*
  *     processor_set_policy_control
@@ -1112,11 +1179,36 @@ processor_set_limit(
  */
 kern_return_t
 processor_set_policy_control(
  */
 kern_return_t
 processor_set_policy_control(
-       processor_set_t         pset,
-       int                     flavor,
-       processor_set_info_t    policy_info,
-       mach_msg_type_number_t  count,
-       boolean_t               change)
+       __unused processor_set_t                pset,
+       __unused int                            flavor,
+       __unused processor_set_info_t   policy_info,
+       __unused mach_msg_type_number_t count,
+       __unused boolean_t                      change)
 {
        return (KERN_INVALID_ARGUMENT);
 }
 {
        return (KERN_INVALID_ARGUMENT);
 }
+
+#undef pset_deallocate
+void pset_deallocate(processor_set_t pset);
+void
+pset_deallocate(
+__unused processor_set_t       pset)
+{
+       return;
+}
+
+#undef pset_reference
+void pset_reference(processor_set_t pset);
+void
+pset_reference(
+__unused processor_set_t       pset)
+{
+       return;
+}
+
+pset_cluster_type_t
+recommended_pset_type(thread_t thread)
+{
+       (void)thread;
+       return PSET_SMP;
+}
mirror of XNU