]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/kern/thread.c
xnu-3248.30.4.tar.gz
[apple/xnu.git] / osfmk / kern / thread.c
index a8811ca947a281826688d4881b1647fb0c9b80c4..535d1e319972f16be4116ced05a026433164a0c6 100644 (file)
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2015 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
 #include <kern/assert.h>
 #include <kern/exc_resource.h>
 #include <kern/telemetry.h>
 #include <kern/assert.h>
 #include <kern/exc_resource.h>
 #include <kern/telemetry.h>
+#include <corpses/task_corpse.h>
 #if KPC
 #include <kern/kpc.h>
 #endif
 
 #include <ipc/ipc_kmsg.h>
 #include <ipc/ipc_port.h>
 #if KPC
 #include <kern/kpc.h>
 #endif
 
 #include <ipc/ipc_kmsg.h>
 #include <ipc/ipc_port.h>
+#include <bank/bank_types.h>
 
 #include <vm/vm_kern.h>
 #include <vm/vm_pageout.h>
 
 #include <sys/kdebug.h>
 
 #include <vm/vm_kern.h>
 #include <vm/vm_pageout.h>
 
 #include <sys/kdebug.h>
-
+#include <sys/bsdtask_info.h>
 #include <mach/sdt.h>
 
 /*
 #include <mach/sdt.h>
 
 /*
 #include <mach/thread_act_server.h>
 #include <mach/mach_host_server.h>
 #include <mach/host_priv_server.h>
 #include <mach/thread_act_server.h>
 #include <mach/mach_host_server.h>
 #include <mach/host_priv_server.h>
+#include <mach/mach_voucher_server.h>
 
 static struct zone                     *thread_zone;
 static lck_grp_attr_t          thread_lck_grp_attr;
 lck_attr_t                                     thread_lck_attr;
 lck_grp_t                                      thread_lck_grp;
 
 
 static struct zone                     *thread_zone;
 static lck_grp_attr_t          thread_lck_grp_attr;
 lck_attr_t                                     thread_lck_attr;
 lck_grp_t                                      thread_lck_grp;
 
+struct zone                                    *thread_qos_override_zone;
+
 decl_simple_lock_data(static,thread_stack_lock)
 static queue_head_t            thread_stack_queue;
 
 decl_simple_lock_data(static,thread_terminate_lock)
 static queue_head_t            thread_terminate_queue;
 
 decl_simple_lock_data(static,thread_stack_lock)
 static queue_head_t            thread_stack_queue;
 
 decl_simple_lock_data(static,thread_terminate_lock)
 static queue_head_t            thread_terminate_queue;
 
+static queue_head_t            crashed_threads_queue;
+
 static struct thread   thread_template, init_thread;
 
 static void            sched_call_null(
 static struct thread   thread_template, init_thread;
 
 static void            sched_call_null(
@@ -164,17 +171,22 @@ extern char *   proc_name_address(void *p);
 #endif /* MACH_BSD */
 
 extern int disable_exc_resource;
 #endif /* MACH_BSD */
 
 extern int disable_exc_resource;
+extern int audio_active;
 extern int debug_task;
 int thread_max = CONFIG_THREAD_MAX;    /* Max number of threads */
 int task_threadmax = CONFIG_THREAD_MAX;
 
 extern int debug_task;
 int thread_max = CONFIG_THREAD_MAX;    /* Max number of threads */
 int task_threadmax = CONFIG_THREAD_MAX;
 
-static uint64_t                thread_unique_id = 0;
+static uint64_t                thread_unique_id = 100;
 
 struct _thread_ledger_indices thread_ledgers = { -1 };
 static ledger_template_t thread_ledger_template = NULL;
 void init_thread_ledgers(void);
 int task_disable_cpumon(task_t task);
 
 
 struct _thread_ledger_indices thread_ledgers = { -1 };
 static ledger_template_t thread_ledger_template = NULL;
 void init_thread_ledgers(void);
 int task_disable_cpumon(task_t task);
 
+#if CONFIG_JETSAM
+void jetsam_on_ledger_cpulimit_exceeded(void);
+#endif
+
 /*
  * Level (in terms of percentage of the limit) at which the CPU usage monitor triggers telemetry.
  *
 /*
  * Level (in terms of percentage of the limit) at which the CPU usage monitor triggers telemetry.
  *
@@ -205,7 +217,7 @@ thread_bootstrap(void)
        thread_template.reason = AST_NONE;
        thread_template.at_safe_point = FALSE;
        thread_template.wait_event = NO_EVENT64;
        thread_template.reason = AST_NONE;
        thread_template.at_safe_point = FALSE;
        thread_template.wait_event = NO_EVENT64;
-       thread_template.wait_queue = WAIT_QUEUE_NULL;
+       thread_template.waitq = NULL;
        thread_template.wait_result = THREAD_WAITING;
        thread_template.options = THREAD_ABORTSAFE;
        thread_template.state = TH_WAIT | TH_UNINT;
        thread_template.wait_result = THREAD_WAITING;
        thread_template.options = THREAD_ABORTSAFE;
        thread_template.state = TH_WAIT | TH_UNINT;
@@ -219,26 +231,39 @@ thread_bootstrap(void)
        thread_template.saved_mode = TH_MODE_NONE;
        thread_template.safe_release = 0;
 
        thread_template.saved_mode = TH_MODE_NONE;
        thread_template.safe_release = 0;
 
-       thread_template.priority = 0;
+       thread_template.sfi_class = SFI_CLASS_UNSPECIFIED;
+       thread_template.sfi_wait_class = SFI_CLASS_UNSPECIFIED;
+
+       thread_template.active = 0;
+       thread_template.started = 0;
+       thread_template.static_param = 0;
+       thread_template.policy_reset = 0;
+
+       thread_template.base_pri = 0;
        thread_template.sched_pri = 0;
        thread_template.max_priority = 0;
        thread_template.task_priority = 0;
        thread_template.promotions = 0;
        thread_template.pending_promoter_index = 0;
        thread_template.sched_pri = 0;
        thread_template.max_priority = 0;
        thread_template.task_priority = 0;
        thread_template.promotions = 0;
        thread_template.pending_promoter_index = 0;
-       thread_template.pending_promoter[0] =
+       thread_template.pending_promoter[0] = NULL;
        thread_template.pending_promoter[1] = NULL;
        thread_template.rwlock_count = 0;
 
        thread_template.pending_promoter[1] = NULL;
        thread_template.rwlock_count = 0;
 
+#if MACH_ASSERT
+       thread_template.SHARE_COUNT = 0;
+       thread_template.BG_COUNT = 0;
+#endif /* MACH_ASSERT */       
+
        thread_template.realtime.deadline = UINT64_MAX;
 
        thread_template.realtime.deadline = UINT64_MAX;
 
-       thread_template.current_quantum = 0;
+       thread_template.quantum_remaining = 0;
        thread_template.last_run_time = 0;
        thread_template.last_run_time = 0;
-       thread_template.last_quantum_refill_time = 0;
+       thread_template.last_made_runnable_time = 0;
 
        thread_template.computation_metered = 0;
        thread_template.computation_epoch = 0;
 
 
        thread_template.computation_metered = 0;
        thread_template.computation_epoch = 0;
 
-#if defined(CONFIG_SCHED_TRADITIONAL)
+#if defined(CONFIG_SCHED_TIMESHARE_CORE)
        thread_template.sched_stamp = 0;
        thread_template.pri_shift = INT8_MAX;
        thread_template.sched_usage = 0;
        thread_template.sched_stamp = 0;
        thread_template.pri_shift = INT8_MAX;
        thread_template.sched_usage = 0;
@@ -259,16 +284,15 @@ thread_bootstrap(void)
        thread_template.vtimer_prof_save = 0;
        thread_template.vtimer_rlim_save = 0;
 
        thread_template.vtimer_prof_save = 0;
        thread_template.vtimer_rlim_save = 0;
 
+#if CONFIG_SCHED_SFI
+       thread_template.wait_sfi_begin_time = 0;
+#endif
+
        thread_template.wait_timer_is_set = FALSE;
        thread_template.wait_timer_active = 0;
 
        thread_template.depress_timer_active = 0;
 
        thread_template.wait_timer_is_set = FALSE;
        thread_template.wait_timer_active = 0;
 
        thread_template.depress_timer_active = 0;
 
-       thread_template.special_handler.handler = special_handler;
-       thread_template.special_handler.next = NULL;
-
-       thread_template.funnel_lock = THR_FUNNEL_NULL;
-       thread_template.funnel_state = 0;
        thread_template.recover = (vm_offset_t)NULL;
        
        thread_template.map = VM_MAP_NULL;
        thread_template.recover = (vm_offset_t)NULL;
        
        thread_template.map = VM_MAP_NULL;
@@ -283,7 +307,17 @@ thread_bootstrap(void)
        thread_template.kpc_buf = NULL;
 #endif
 
        thread_template.kpc_buf = NULL;
 #endif
 
+#if HYPERVISOR
+       thread_template.hv_thread_target = NULL;
+#endif /* HYPERVISOR */
+
        thread_template.t_chud = 0;
        thread_template.t_chud = 0;
+
+#if (DEVELOPMENT || DEBUG)
+       thread_template.t_page_creation_throttled_hard = 0;
+       thread_template.t_page_creation_throttled_soft = 0;
+#endif /* DEVELOPMENT || DEBUG */
+       thread_template.t_page_creation_throttled = 0;
        thread_template.t_page_creation_count = 0;
        thread_template.t_page_creation_time = 0;
 
        thread_template.t_page_creation_count = 0;
        thread_template.t_page_creation_time = 0;
 
@@ -294,13 +328,19 @@ thread_bootstrap(void)
 
        thread_template.t_ledger = LEDGER_NULL;
        thread_template.t_threadledger = LEDGER_NULL;
 
        thread_template.t_ledger = LEDGER_NULL;
        thread_template.t_threadledger = LEDGER_NULL;
+#ifdef CONFIG_BANK
+       thread_template.t_bankledger = LEDGER_NULL;
+       thread_template.t_deduct_bank_ledger_time = 0;
+#endif
 
        thread_template.requested_policy = default_task_requested_policy;
        thread_template.effective_policy = default_task_effective_policy;
        thread_template.pended_policy    = default_task_pended_policy;
 
 
        thread_template.requested_policy = default_task_requested_policy;
        thread_template.effective_policy = default_task_effective_policy;
        thread_template.pended_policy    = default_task_pended_policy;
 
-       thread_template.iotier_override = THROTTLE_LEVEL_NONE;
+       bzero(&thread_template.overrides, sizeof(thread_template.overrides));
 
 
+       thread_template.iotier_override = THROTTLE_LEVEL_NONE;
+       thread_template.thread_io_stats = NULL;
        thread_template.thread_callout_interrupt_wakeups = thread_template.thread_callout_platform_idle_wakeups = 0;
 
        thread_template.thread_timer_wakeups_bin_1 = thread_template.thread_timer_wakeups_bin_2 = 0;
        thread_template.thread_callout_interrupt_wakeups = thread_template.thread_callout_platform_idle_wakeups = 0;
 
        thread_template.thread_timer_wakeups_bin_1 = thread_template.thread_timer_wakeups_bin_2 = 0;
@@ -308,10 +348,17 @@ thread_bootstrap(void)
 
        thread_template.thread_tag = 0;
 
 
        thread_template.thread_tag = 0;
 
+       thread_template.ith_voucher_name = MACH_PORT_NULL;
+       thread_template.ith_voucher = IPC_VOUCHER_NULL;
+
+       thread_template.work_interval_id = 0;
+
        init_thread = thread_template;
        machine_set_current_thread(&init_thread);
 }
 
        init_thread = thread_template;
        machine_set_current_thread(&init_thread);
 }
 
+extern boolean_t allow_qos_policy_set;
+
 void
 thread_init(void)
 {
 void
 thread_init(void)
 {
@@ -321,6 +368,16 @@ thread_init(void)
                        THREAD_CHUNK * sizeof(struct thread),
                        "threads");
 
                        THREAD_CHUNK * sizeof(struct thread),
                        "threads");
 
+       thread_qos_override_zone = zinit(
+               sizeof(struct thread_qos_override),
+               4 * thread_max * sizeof(struct thread_qos_override),
+               PAGE_SIZE,
+               "thread qos override");
+       zone_change(thread_qos_override_zone, Z_EXPAND, TRUE);
+       zone_change(thread_qos_override_zone, Z_COLLECT, TRUE);
+       zone_change(thread_qos_override_zone, Z_CALLERACCT, FALSE);
+       zone_change(thread_qos_override_zone, Z_NOENCRYPT, TRUE);
+
        lck_grp_attr_setdefault(&thread_lck_grp_attr);
        lck_grp_init(&thread_lck_grp, "thread", &thread_lck_grp_attr);
        lck_attr_setdefault(&thread_lck_attr);
        lck_grp_attr_setdefault(&thread_lck_grp_attr);
        lck_grp_init(&thread_lck_grp, "thread", &thread_lck_grp_attr);
        lck_attr_setdefault(&thread_lck_attr);
@@ -338,6 +395,8 @@ thread_init(void)
                cpumon_ustackshots_trigger_pct = CPUMON_USTACKSHOTS_TRIGGER_DEFAULT_PCT;
        }
 
                cpumon_ustackshots_trigger_pct = CPUMON_USTACKSHOTS_TRIGGER_DEFAULT_PCT;
        }
 
+       PE_parse_boot_argn("-qos-policy-allow", &allow_qos_policy_set, sizeof(allow_qos_policy_set));   
+
        init_thread_ledgers();
 }
 
        init_thread_ledgers();
 }
 
@@ -355,7 +414,6 @@ void
 thread_terminate_self(void)
 {
        thread_t                thread = current_thread();
 thread_terminate_self(void)
 {
        thread_t                thread = current_thread();
-
        task_t                  task;
        spl_t                   s;
        int threadcnt;
        task_t                  task;
        spl_t                   s;
        int threadcnt;
@@ -373,6 +431,8 @@ thread_terminate_self(void)
        s = splsched();
        thread_lock(thread);
 
        s = splsched();
        thread_lock(thread);
 
+       assert_thread_sched_count(thread);
+
        /*
         *      Cancel priority depression, wait for concurrent expirations
         *      on other processors.
        /*
         *      Cancel priority depression, wait for concurrent expirations
         *      on other processors.
@@ -380,6 +440,9 @@ thread_terminate_self(void)
        if (thread->sched_flags & TH_SFLAG_DEPRESSED_MASK) {
                thread->sched_flags &= ~TH_SFLAG_DEPRESSED_MASK;
 
        if (thread->sched_flags & TH_SFLAG_DEPRESSED_MASK) {
                thread->sched_flags &= ~TH_SFLAG_DEPRESSED_MASK;
 
+               /* If our priority was low because of a depressed yield, restore it in case we block below */
+               thread_recompute_sched_pri(thread, FALSE);
+
                if (timer_call_cancel(&thread->depress_timer))
                        thread->depress_timer_active--;
        }
                if (timer_call_cancel(&thread->depress_timer))
                        thread->depress_timer_active--;
        }
@@ -399,20 +462,32 @@ thread_terminate_self(void)
        thread_unlock(thread);
        splx(s);
 
        thread_unlock(thread);
        splx(s);
 
+
+       thread_mtx_lock(thread);
+
        thread_policy_reset(thread);
 
        thread_policy_reset(thread);
 
+       thread_mtx_unlock(thread);
 
        task = thread->task;
 
        task = thread->task;
-       uthread_cleanup(task, thread->uthread, task->bsd_info);
+       uthread_cleanup(task, thread->uthread, task->bsd_info, thread->inspection == 1 ? TRUE : FALSE);
        threadcnt = hw_atomic_sub(&task->active_thread_count, 1);
 
        /*
         * If we are the last thread to terminate and the task is
         * associated with a BSD process, perform BSD process exit.
         */
        threadcnt = hw_atomic_sub(&task->active_thread_count, 1);
 
        /*
         * If we are the last thread to terminate and the task is
         * associated with a BSD process, perform BSD process exit.
         */
-       if (threadcnt == 0 && task->bsd_info != NULL)
+       if (threadcnt == 0 && task->bsd_info != NULL) {
                proc_exit(task->bsd_info);
                proc_exit(task->bsd_info);
-
+               /*
+                * if there is crash info in task
+                * then do the deliver action since this is
+                * last thread for this task.
+                */
+               if (task->corpse_info) {
+                       task_deliver_crash_notification(task);
+               }
+       }
        uthread_cred_free(thread->uthread);
 
        s = splsched();
        uthread_cred_free(thread->uthread);
 
        s = splsched();
@@ -452,7 +527,9 @@ thread_terminate_self(void)
         */
        thread->state |= TH_TERMINATE;
        thread_mark_wait_locked(thread, THREAD_UNINT);
         */
        thread->state |= TH_TERMINATE;
        thread_mark_wait_locked(thread, THREAD_UNINT);
+       assert((thread->sched_flags & TH_SFLAG_PROMOTED) == 0);
        assert(thread->promotions == 0);
        assert(thread->promotions == 0);
+       assert(!(thread->sched_flags & TH_SFLAG_WAITQ_PROMOTED));
        assert(thread->rwlock_count == 0);
        thread_unlock(thread);
        /* splsched */
        assert(thread->rwlock_count == 0);
        thread_unlock(thread);
        /* splsched */
@@ -461,6 +538,14 @@ thread_terminate_self(void)
        /*NOTREACHED*/
 }
 
        /*NOTREACHED*/
 }
 
+/* Drop a thread refcount that definitely isn't the last one. */
+void
+thread_deallocate_safe(thread_t thread)
+{
+       if (__improbable(hw_atomic_sub(&(thread)->ref_count, 1) == 0))
+               panic("bad thread refcount!");
+}
+
 void
 thread_deallocate(
        thread_t                        thread)
 void
 thread_deallocate(
        thread_t                        thread)
@@ -470,19 +555,22 @@ thread_deallocate(
        if (thread == THREAD_NULL)
                return;
 
        if (thread == THREAD_NULL)
                return;
 
-       if (thread_deallocate_internal(thread) > 0)
+       if (__probable(hw_atomic_sub(&(thread)->ref_count, 1) > 0))
                return;
 
        if(!(thread->state & TH_TERMINATE2))
                panic("thread_deallocate: thread not properly terminated\n");
 
                return;
 
        if(!(thread->state & TH_TERMINATE2))
                panic("thread_deallocate: thread not properly terminated\n");
 
+       assert(thread->runq == PROCESSOR_NULL);
+
 #if KPC
        kpc_thread_destroy(thread);
 #endif
 
 #if KPC
        kpc_thread_destroy(thread);
 #endif
 
-
        ipc_thread_terminate(thread);
 
        ipc_thread_terminate(thread);
 
+       proc_thread_qos_deallocate(thread);
+
        task = thread->task;
 
 #ifdef MACH_BSD 
        task = thread->task;
 
 #ifdef MACH_BSD 
@@ -499,6 +587,12 @@ thread_deallocate(
        if (thread->t_threadledger)
                ledger_dereference(thread->t_threadledger);
 
        if (thread->t_threadledger)
                ledger_dereference(thread->t_threadledger);
 
+       if (IPC_VOUCHER_NULL != thread->ith_voucher)
+               ipc_voucher_release(thread->ith_voucher);
+
+       if (thread->thread_io_stats)
+               kfree(thread->thread_io_stats, sizeof(struct io_stat_info));
+
        if (thread->kernel_stack != 0)
                stack_free(thread);
 
        if (thread->kernel_stack != 0)
                stack_free(thread);
 
@@ -528,9 +622,23 @@ thread_terminate_daemon(void)
        simple_lock(&thread_terminate_lock);
 
        while ((thread = (thread_t)dequeue_head(&thread_terminate_queue)) != THREAD_NULL) {
        simple_lock(&thread_terminate_lock);
 
        while ((thread = (thread_t)dequeue_head(&thread_terminate_queue)) != THREAD_NULL) {
+
+               /* 
+                * if marked for crash reporting, skip reaping. 
+                * The corpse delivery thread will clear bit and enqueue 
+                * for reaping when done
+                */
+               if (thread->inspection){
+                       enqueue_tail(&crashed_threads_queue, (queue_entry_t)thread);
+                       continue;
+               }
+
                simple_unlock(&thread_terminate_lock);
                (void)spllo();
 
                simple_unlock(&thread_terminate_lock);
                (void)spllo();
 
+               assert(thread->SHARE_COUNT == 0);
+               assert(thread->BG_COUNT == 0);
+
                task = thread->task;
 
                task_lock(task);
                task = thread->task;
 
                task_lock(task);
@@ -550,6 +658,9 @@ thread_terminate_daemon(void)
 
                task->task_timer_wakeups_bin_1 += thread->thread_timer_wakeups_bin_1;
                task->task_timer_wakeups_bin_2 += thread->thread_timer_wakeups_bin_2;
 
                task->task_timer_wakeups_bin_1 += thread->thread_timer_wakeups_bin_1;
                task->task_timer_wakeups_bin_2 += thread->thread_timer_wakeups_bin_2;
+               task->task_gpu_ns += ml_gpu_stat(thread);
+               
+               thread_update_qos_cpu_time(thread, FALSE);
                queue_remove(&task->threads, thread, thread_t, task_threads);
                task->thread_count--;
 
                queue_remove(&task->threads, thread, thread_t, task_threads);
                task->thread_count--;
 
@@ -593,6 +704,8 @@ void
 thread_terminate_enqueue(
        thread_t                thread)
 {
 thread_terminate_enqueue(
        thread_t                thread)
 {
+       KERNEL_DEBUG_CONSTANT(TRACE_DATA_THREAD_TERMINATE | DBG_FUNC_NONE, thread->thread_id, 0, 0, 0, 0);
+
        simple_lock(&thread_terminate_lock);
        enqueue_tail(&thread_terminate_queue, (queue_entry_t)thread);
        simple_unlock(&thread_terminate_lock);
        simple_lock(&thread_terminate_lock);
        enqueue_tail(&thread_terminate_queue, (queue_entry_t)thread);
        simple_unlock(&thread_terminate_lock);
@@ -600,6 +713,42 @@ thread_terminate_enqueue(
        thread_wakeup((event_t)&thread_terminate_queue);
 }
 
        thread_wakeup((event_t)&thread_terminate_queue);
 }
 
+/*
+ * thread_terminate_crashed_threads:
+ * walk the list of crashed therds and put back set of threads
+ * who are no longer being inspected.
+ */
+void
+thread_terminate_crashed_threads()
+{
+       thread_t th_iter, th_remove;
+       boolean_t should_wake_terminate_queue = FALSE;
+
+       simple_lock(&thread_terminate_lock);
+       /*
+        * loop through the crashed threads queue
+        * to put any threads that are not being inspected anymore
+        */
+       th_iter = (thread_t)queue_first(&crashed_threads_queue);
+       while (!queue_end(&crashed_threads_queue, (queue_entry_t)th_iter)) {
+               th_remove = th_iter;
+               th_iter = (thread_t)queue_next(&th_iter->links);
+
+               /* make sure current_thread is never in crashed queue */
+               assert(th_remove != current_thread());
+               if (th_remove->inspection != TRUE){
+                       remque((queue_entry_t)th_remove);
+                       enqueue_tail(&thread_terminate_queue, (queue_entry_t)th_remove);
+                       should_wake_terminate_queue = TRUE;
+               }
+       }
+
+       simple_unlock(&thread_terminate_lock);
+       if (should_wake_terminate_queue == TRUE) {
+               thread_wakeup((event_t)&thread_terminate_queue);
+       }
+}
+
 /*
  *     thread_stack_daemon:
  *
 /*
  *     thread_stack_daemon:
  *
@@ -621,6 +770,8 @@ thread_stack_daemon(void)
 
                /* allocate stack with interrupts enabled so that we can call into VM */
                stack_alloc(thread);
 
                /* allocate stack with interrupts enabled so that we can call into VM */
                stack_alloc(thread);
+
+               KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_SCHED,MACH_STACK_WAIT) | DBG_FUNC_END, thread_tid(thread), 0, 0, 0, 0);
                
                s = splsched();
                thread_lock(thread);
                
                s = splsched();
                thread_lock(thread);
@@ -649,6 +800,8 @@ void
 thread_stack_enqueue(
        thread_t                thread)
 {
 thread_stack_enqueue(
        thread_t                thread)
 {
+       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_SCHED,MACH_STACK_WAIT) | DBG_FUNC_START, thread_tid(thread), 0, 0, 0, 0);
+
        simple_lock(&thread_stack_lock);
        enqueue_tail(&thread_stack_queue, (queue_entry_t)thread);
        simple_unlock(&thread_stack_lock);
        simple_lock(&thread_stack_lock);
        enqueue_tail(&thread_stack_queue, (queue_entry_t)thread);
        simple_unlock(&thread_stack_lock);
@@ -664,6 +817,7 @@ thread_daemon_init(void)
 
        simple_lock_init(&thread_terminate_lock, 0);
        queue_init(&thread_terminate_queue);
 
        simple_lock_init(&thread_terminate_lock, 0);
        queue_init(&thread_terminate_queue);
+       queue_init(&crashed_threads_queue);
 
        result = kernel_thread_start_priority((thread_continue_t)thread_terminate_daemon, NULL, MINPRI_KERNEL, &thread);
        if (result != KERN_SUCCESS)
 
        result = kernel_thread_start_priority((thread_continue_t)thread_terminate_daemon, NULL, MINPRI_KERNEL, &thread);
        if (result != KERN_SUCCESS)
@@ -681,9 +835,14 @@ thread_daemon_init(void)
        thread_deallocate(thread);
 }
 
        thread_deallocate(thread);
 }
 
+#define TH_OPTION_NONE         0x00
+#define TH_OPTION_NOCRED       0x01
+#define TH_OPTION_NOSUSP       0x02
 /*
  * Create a new thread.
  * Doesn't start the thread running.
 /*
  * Create a new thread.
  * Doesn't start the thread running.
+ *
+ * Task and tasks_threads_lock are returned locked on success.
  */
 static kern_return_t
 thread_create_internal(
  */
 static kern_return_t
 thread_create_internal(
@@ -691,9 +850,6 @@ thread_create_internal(
        integer_t                               priority,
        thread_continue_t               continuation,
        int                                             options,
        integer_t                               priority,
        thread_continue_t               continuation,
        int                                             options,
-#define TH_OPTION_NONE         0x00
-#define TH_OPTION_NOCRED       0x01
-#define TH_OPTION_NOSUSP       0x02
        thread_t                                *out_thread)
 {
        thread_t                                new_thread;
        thread_t                                *out_thread)
 {
        thread_t                                new_thread;
@@ -726,7 +882,7 @@ thread_create_internal(
 
                new_thread->uthread = NULL;
                /* cred free may not be necessary */
 
                new_thread->uthread = NULL;
                /* cred free may not be necessary */
-               uthread_cleanup(parent_task, ut, parent_task->bsd_info);
+               uthread_cleanup(parent_task, ut, parent_task->bsd_info, FALSE);
                uthread_cred_free(ut);
                uthread_zone_free(ut);
 #endif  /* MACH_BSD */
                uthread_cred_free(ut);
                uthread_zone_free(ut);
 #endif  /* MACH_BSD */
@@ -746,6 +902,16 @@ thread_create_internal(
 
        new_thread->continuation = continuation;
 
 
        new_thread->continuation = continuation;
 
+       /* Allocate I/O Statistics structure */
+       new_thread->thread_io_stats = (io_stat_info_t)kalloc(sizeof(struct io_stat_info));
+       assert(new_thread->thread_io_stats != NULL);
+       bzero(new_thread->thread_io_stats, sizeof(struct io_stat_info));
+
+#if CONFIG_IOSCHED
+       /* Clear out the I/O Scheduling info for AppleFSCompression */
+       new_thread->decmp_upl = NULL;
+#endif /* CONFIG_IOSCHED */ 
+
        lck_mtx_lock(&tasks_threads_lock);
        task_lock(parent_task);
 
        lck_mtx_lock(&tasks_threads_lock);
        task_lock(parent_task);
 
@@ -762,7 +928,7 @@ thread_create_internal(
                        void *ut = new_thread->uthread;
 
                        new_thread->uthread = NULL;
                        void *ut = new_thread->uthread;
 
                        new_thread->uthread = NULL;
-                       uthread_cleanup(parent_task, ut, parent_task->bsd_info);
+                       uthread_cleanup(parent_task, ut, parent_task->bsd_info, FALSE);
                        /* cred free may not be necessary */
                        uthread_cred_free(ut);
                        uthread_zone_free(ut);
                        /* cred free may not be necessary */
                        uthread_cred_free(ut);
                        uthread_zone_free(ut);
@@ -770,6 +936,7 @@ thread_create_internal(
 #endif  /* MACH_BSD */
                ipc_thread_disable(new_thread);
                ipc_thread_terminate(new_thread);
 #endif  /* MACH_BSD */
                ipc_thread_disable(new_thread);
                ipc_thread_terminate(new_thread);
+               kfree(new_thread->thread_io_stats, sizeof(struct io_stat_info));
                lck_mtx_destroy(&new_thread->mutex, &thread_lck_grp);
                machine_thread_destroy(new_thread);
                zfree(thread_zone, new_thread);
                lck_mtx_destroy(&new_thread->mutex, &thread_lck_grp);
                machine_thread_destroy(new_thread);
                zfree(thread_zone, new_thread);
@@ -788,38 +955,35 @@ thread_create_internal(
                 */
                set_astledger(new_thread);
        }
                 */
                set_astledger(new_thread);
        }
-       new_thread->t_threadledger = LEDGER_NULL;       /* per thread ledger is not inherited */
+
+       /* Instantiate a thread ledger. Do not fail thread creation if ledger creation fails. */
+       if ((new_thread->t_threadledger = ledger_instantiate(thread_ledger_template,
+                               LEDGER_CREATE_INACTIVE_ENTRIES)) != LEDGER_NULL) {
+
+               ledger_entry_setactive(new_thread->t_threadledger, thread_ledgers.cpu_time);
+       }
+
+       new_thread->cpu_time_last_qos = 0;
+#ifdef CONFIG_BANK
+       new_thread->t_bankledger = LEDGER_NULL;
+       new_thread->t_deduct_bank_ledger_time = 0;
+#endif
+
        new_thread->t_ledger = new_thread->task->ledger;
        if (new_thread->t_ledger)
                ledger_reference(new_thread->t_ledger);
 
        new_thread->t_ledger = new_thread->task->ledger;
        if (new_thread->t_ledger)
                ledger_reference(new_thread->t_ledger);
 
+#if defined(CONFIG_SCHED_MULTIQ)
+       /* Cache the task's sched_group */
+       new_thread->sched_group = parent_task->sched_group;
+#endif /* defined(CONFIG_SCHED_MULTIQ) */
+
        /* Cache the task's map */
        new_thread->map = parent_task->map;
 
        /* Cache the task's map */
        new_thread->map = parent_task->map;
 
-       /* Chain the thread onto the task's list */
-       queue_enter(&parent_task->threads, new_thread, thread_t, task_threads);
-       parent_task->thread_count++;
-       
-       /* So terminating threads don't need to take the task lock to decrement */
-       hw_atomic_add(&parent_task->active_thread_count, 1);
-
-       /* Protected by the tasks_threads_lock */
-       new_thread->thread_id = ++thread_unique_id;
-
-       queue_enter(&threads, new_thread, thread_t, threads);
-       threads_count++;
-
        timer_call_setup(&new_thread->wait_timer, thread_timer_expire, new_thread);
        timer_call_setup(&new_thread->depress_timer, thread_depress_expire, new_thread);
 
        timer_call_setup(&new_thread->wait_timer, thread_timer_expire, new_thread);
        timer_call_setup(&new_thread->depress_timer, thread_depress_expire, new_thread);
 
-#if CONFIG_COUNTERS
-       /*
-        * If parent task has any reservations, they need to be propagated to this
-        * thread.
-        */
-       new_thread->t_chud = (TASK_PMC_FLAG == (parent_task->t_chud & TASK_PMC_FLAG)) ? 
-               THREAD_PMC_FLAG : 0U;
-#endif
 #if KPC
        kpc_thread_create(new_thread);
 #endif
 #if KPC
        kpc_thread_create(new_thread);
 #endif
@@ -829,24 +993,47 @@ thread_create_internal(
        new_thread->requested_policy.terminated = parent_task->effective_policy.terminated;
 
        /* Set the thread's scheduling parameters */
        new_thread->requested_policy.terminated = parent_task->effective_policy.terminated;
 
        /* Set the thread's scheduling parameters */
+#if defined(CONFIG_SCHED_TIMESHARE_CORE)
+       new_thread->sched_stamp = sched_tick;
+       new_thread->pri_shift = sched_pri_shift;
+#endif /* defined(CONFIG_SCHED_TIMESHARE_CORE) */
+
        new_thread->sched_mode = SCHED(initial_thread_sched_mode)(parent_task);
        new_thread->sched_flags = 0;
        new_thread->max_priority = parent_task->max_priority;
        new_thread->task_priority = parent_task->priority;
        new_thread->sched_mode = SCHED(initial_thread_sched_mode)(parent_task);
        new_thread->sched_flags = 0;
        new_thread->max_priority = parent_task->max_priority;
        new_thread->task_priority = parent_task->priority;
-       new_thread->priority = (priority < 0)? parent_task->priority: priority;
-       if (new_thread->priority > new_thread->max_priority)
-               new_thread->priority = new_thread->max_priority;
-       new_thread->importance = new_thread->priority - new_thread->task_priority;
+
+       int new_priority = (priority < 0) ? parent_task->priority: priority;
+       new_priority = (priority < 0)? parent_task->priority: priority;
+       if (new_priority > new_thread->max_priority)
+               new_priority = new_thread->max_priority;
+
+       new_thread->importance = new_priority - new_thread->task_priority;
        new_thread->saved_importance = new_thread->importance;
 
        new_thread->saved_importance = new_thread->importance;
 
-#if defined(CONFIG_SCHED_TRADITIONAL)
-       new_thread->sched_stamp = sched_tick;
-       new_thread->pri_shift = sched_pri_shift;
-#endif
-       SCHED(compute_priority)(new_thread, FALSE);
+       if (parent_task->max_priority <= MAXPRI_THROTTLE) {
+               sched_set_thread_throttled(new_thread, TRUE);
+       }
 
 
-       new_thread->active = TRUE;
+       sched_set_thread_base_priority(new_thread, new_priority);
+
+       thread_policy_create(new_thread);
 
 
+       /* Chain the thread onto the task's list */
+       queue_enter(&parent_task->threads, new_thread, thread_t, task_threads);
+       parent_task->thread_count++;
+
+       /* So terminating threads don't need to take the task lock to decrement */
+       hw_atomic_add(&parent_task->active_thread_count, 1);
+
+       /* Protected by the tasks_threads_lock */
+       new_thread->thread_id = ++thread_unique_id;
+
+       queue_enter(&threads, new_thread, thread_t, threads);
+       threads_count++;
+
+       new_thread->active = TRUE;
+       new_thread->inspection = FALSE;
        *out_thread = new_thread;
 
        {
        *out_thread = new_thread;
 
        {
@@ -875,7 +1062,8 @@ static kern_return_t
 thread_create_internal2(
        task_t                          task,
        thread_t                        *new_thread,
 thread_create_internal2(
        task_t                          task,
        thread_t                        *new_thread,
-       boolean_t                       from_user)
+       boolean_t                       from_user,
+       thread_continue_t               continuation)
 {
        kern_return_t           result;
        thread_t                        thread;
 {
        kern_return_t           result;
        thread_t                        thread;
@@ -883,7 +1071,7 @@ thread_create_internal2(
        if (task == TASK_NULL || task == kernel_task)
                return (KERN_INVALID_ARGUMENT);
 
        if (task == TASK_NULL || task == kernel_task)
                return (KERN_INVALID_ARGUMENT);
 
-       result = thread_create_internal(task, -1, (thread_continue_t)thread_bootstrap_return, TH_OPTION_NONE, &thread);
+       result = thread_create_internal(task, -1, continuation, TH_OPTION_NONE, &thread);
        if (result != KERN_SUCCESS)
                return (result);
 
        if (result != KERN_SUCCESS)
                return (result);
 
@@ -914,7 +1102,7 @@ thread_create(
        task_t                          task,
        thread_t                        *new_thread)
 {
        task_t                          task,
        thread_t                        *new_thread)
 {
-       return thread_create_internal2(task, new_thread, FALSE);
+       return thread_create_internal2(task, new_thread, FALSE, (thread_continue_t)thread_bootstrap_return);
 }
 
 kern_return_t
 }
 
 kern_return_t
@@ -922,7 +1110,16 @@ thread_create_from_user(
        task_t                          task,
        thread_t                        *new_thread)
 {
        task_t                          task,
        thread_t                        *new_thread)
 {
-       return thread_create_internal2(task, new_thread, TRUE);
+       return thread_create_internal2(task, new_thread, TRUE, (thread_continue_t)thread_bootstrap_return);
+}
+
+kern_return_t
+thread_create_with_continuation(
+       task_t                          task,
+       thread_t                        *new_thread,
+       thread_continue_t               continuation)
+{
+       return thread_create_internal2(task, new_thread, FALSE, continuation);
 }
 
 static kern_return_t
 }
 
 static kern_return_t
@@ -944,8 +1141,7 @@ thread_create_running_internal2(
        if (result != KERN_SUCCESS)
                return (result);
 
        if (result != KERN_SUCCESS)
                return (result);
 
-       result = machine_thread_set_state(
-                                               thread, flavor, new_state, new_state_count);
+       result = machine_thread_set_state(thread, flavor, new_state, new_state_count);
        if (result != KERN_SUCCESS) {
                task_unlock(task);
                lck_mtx_unlock(&tasks_threads_lock);
        if (result != KERN_SUCCESS) {
                task_unlock(task);
                lck_mtx_unlock(&tasks_threads_lock);
@@ -1103,6 +1299,80 @@ kernel_thread_start(
        return kernel_thread_start_priority(continuation, parameter, -1, new_thread);
 }
 
        return kernel_thread_start_priority(continuation, parameter, -1, new_thread);
 }
 
+/* Separated into helper function so it can be used by THREAD_BASIC_INFO and THREAD_EXTENDED_INFO */
+/* it is assumed that the thread is locked by the caller */
+static void
+retrieve_thread_basic_info(thread_t thread, thread_basic_info_t basic_info)
+{
+       int     state, flags;
+
+       /* fill in info */
+
+       thread_read_times(thread, &basic_info->user_time,
+                                                               &basic_info->system_time);
+
+       /*
+        *      Update lazy-evaluated scheduler info because someone wants it.
+        */
+       if (SCHED(can_update_priority)(thread))
+               SCHED(update_priority)(thread);
+
+       basic_info->sleep_time = 0;
+
+       /*
+        *      To calculate cpu_usage, first correct for timer rate,
+        *      then for 5/8 ageing.  The correction factor [3/5] is
+        *      (1/(5/8) - 1).
+        */
+       basic_info->cpu_usage = 0;
+#if defined(CONFIG_SCHED_TIMESHARE_CORE)
+       if (sched_tick_interval) {
+               basic_info->cpu_usage = (integer_t)(((uint64_t)thread->cpu_usage
+                                                                       * TH_USAGE_SCALE) /     sched_tick_interval);
+               basic_info->cpu_usage = (basic_info->cpu_usage * 3) / 5;
+       }
+#endif
+
+       if (basic_info->cpu_usage > TH_USAGE_SCALE)
+               basic_info->cpu_usage = TH_USAGE_SCALE;
+
+       basic_info->policy = ((thread->sched_mode == TH_MODE_TIMESHARE)?
+                                                                                       POLICY_TIMESHARE: POLICY_RR);
+
+       flags = 0;
+       if (thread->options & TH_OPT_IDLE_THREAD)
+               flags |= TH_FLAGS_IDLE;
+
+       if (thread->options & TH_OPT_GLOBAL_FORCED_IDLE) {
+               flags |= TH_FLAGS_GLOBAL_FORCED_IDLE;
+       }
+
+       if (!thread->kernel_stack)
+               flags |= TH_FLAGS_SWAPPED;
+
+       state = 0;
+       if (thread->state & TH_TERMINATE)
+               state = TH_STATE_HALTED;
+       else
+       if (thread->state & TH_RUN)
+               state = TH_STATE_RUNNING;
+       else
+       if (thread->state & TH_UNINT)
+               state = TH_STATE_UNINTERRUPTIBLE;
+       else
+       if (thread->state & TH_SUSP)
+               state = TH_STATE_STOPPED;
+       else
+       if (thread->state & TH_WAIT)
+               state = TH_STATE_WAITING;
+
+       basic_info->run_state = state;
+       basic_info->flags = flags;
+
+       basic_info->suspend_count = thread->user_stop_count;
+
+       return;
+}
 
 kern_return_t
 thread_info_internal(
 
 kern_return_t
 thread_info_internal(
@@ -1111,116 +1381,47 @@ thread_info_internal(
        thread_info_t                   thread_info_out,        /* ptr to OUT array */
        mach_msg_type_number_t  *thread_info_count)     /*IN/OUT*/
 {
        thread_info_t                   thread_info_out,        /* ptr to OUT array */
        mach_msg_type_number_t  *thread_info_count)     /*IN/OUT*/
 {
-       int                                             state, flags;
-       spl_t                                   s;
+       spl_t   s;
 
        if (thread == THREAD_NULL)
                return (KERN_INVALID_ARGUMENT);
 
        if (flavor == THREAD_BASIC_INFO) {
 
        if (thread == THREAD_NULL)
                return (KERN_INVALID_ARGUMENT);
 
        if (flavor == THREAD_BASIC_INFO) {
-           register thread_basic_info_t        basic_info;
 
 
-           if (*thread_info_count < THREAD_BASIC_INFO_COUNT)
+               if (*thread_info_count < THREAD_BASIC_INFO_COUNT)
                        return (KERN_INVALID_ARGUMENT);
 
                        return (KERN_INVALID_ARGUMENT);
 
-           basic_info = (thread_basic_info_t) thread_info_out;
-
-           s = splsched();
-           thread_lock(thread);
-
-           /* fill in info */
+               s = splsched();
+               thread_lock(thread);
 
 
-           thread_read_times(thread, &basic_info->user_time,
-                                                                       &basic_info->system_time);
+               retrieve_thread_basic_info(thread, (thread_basic_info_t) thread_info_out);
 
 
-               /*
-                *      Update lazy-evaluated scheduler info because someone wants it.
-                */
-               if (SCHED(can_update_priority)(thread))
-                       SCHED(update_priority)(thread);
+               thread_unlock(thread);
+               splx(s);
 
 
-               basic_info->sleep_time = 0;
+               *thread_info_count = THREAD_BASIC_INFO_COUNT;
 
 
-               /*
-                *      To calculate cpu_usage, first correct for timer rate,
-                *      then for 5/8 ageing.  The correction factor [3/5] is
-                *      (1/(5/8) - 1).
-                */
-               basic_info->cpu_usage = 0;
-#if defined(CONFIG_SCHED_TRADITIONAL)
-               if (sched_tick_interval) {
-                       basic_info->cpu_usage = (integer_t)(((uint64_t)thread->cpu_usage
-                                                                               * TH_USAGE_SCALE) /     sched_tick_interval);
-                       basic_info->cpu_usage = (basic_info->cpu_usage * 3) / 5;
-               }
-#endif
-               
-               if (basic_info->cpu_usage > TH_USAGE_SCALE)
-                       basic_info->cpu_usage = TH_USAGE_SCALE;
-
-               basic_info->policy = ((thread->sched_mode == TH_MODE_TIMESHARE)?
-                                                                                               POLICY_TIMESHARE: POLICY_RR);
-
-           flags = 0;
-               if (thread->options & TH_OPT_IDLE_THREAD)
-                       flags |= TH_FLAGS_IDLE;
-
-           if (!thread->kernel_stack)
-                       flags |= TH_FLAGS_SWAPPED;
-
-           state = 0;
-           if (thread->state & TH_TERMINATE)
-                       state = TH_STATE_HALTED;
-           else
-               if (thread->state & TH_RUN)
-                       state = TH_STATE_RUNNING;
-           else
-               if (thread->state & TH_UNINT)
-                       state = TH_STATE_UNINTERRUPTIBLE;
-           else
-               if (thread->state & TH_SUSP)
-                       state = TH_STATE_STOPPED;
-           else
-               if (thread->state & TH_WAIT)
-                       state = TH_STATE_WAITING;
-
-           basic_info->run_state = state;
-           basic_info->flags = flags;
-
-           basic_info->suspend_count = thread->user_stop_count;
-
-           thread_unlock(thread);
-           splx(s);
-
-           *thread_info_count = THREAD_BASIC_INFO_COUNT;
-
-           return (KERN_SUCCESS);
+               return (KERN_SUCCESS);
        }
        else
        if (flavor == THREAD_IDENTIFIER_INFO) {
        }
        else
        if (flavor == THREAD_IDENTIFIER_INFO) {
-           register thread_identifier_info_t   identifier_info;
+               register thread_identifier_info_t       identifier_info;
 
 
-           if (*thread_info_count < THREAD_IDENTIFIER_INFO_COUNT)
+               if (*thread_info_count < THREAD_IDENTIFIER_INFO_COUNT)
                        return (KERN_INVALID_ARGUMENT);
 
                        return (KERN_INVALID_ARGUMENT);
 
-           identifier_info = (thread_identifier_info_t) thread_info_out;
+               identifier_info = (thread_identifier_info_t) thread_info_out;
 
 
-           s = splsched();
-           thread_lock(thread);
+               s = splsched();
+               thread_lock(thread);
 
 
-           identifier_info->thread_id = thread->thread_id;
-           identifier_info->thread_handle = thread->machine.cthread_self;
-           if(thread->task->bsd_info) {
-               identifier_info->dispatch_qaddr =  identifier_info->thread_handle + get_dispatchqueue_offset_from_proc(thread->task->bsd_info);
-           } else {
-                   thread_unlock(thread);
-                   splx(s);
-                   return KERN_INVALID_ARGUMENT;
-           }
+               identifier_info->thread_id = thread->thread_id;
+               identifier_info->thread_handle = thread->machine.cthread_self;
+               identifier_info->dispatch_qaddr = thread_dispatchqaddr(thread);
 
 
-           thread_unlock(thread);
-           splx(s);
-           return KERN_SUCCESS;
+               thread_unlock(thread);
+               splx(s);
+               return KERN_SUCCESS;
        }
        else
        if (flavor == THREAD_SCHED_TIMESHARE_INFO) {
        }
        else
        if (flavor == THREAD_SCHED_TIMESHARE_INFO) {
@@ -1231,23 +1432,22 @@ thread_info_internal(
 
                ts_info = (policy_timeshare_info_t)thread_info_out;
 
 
                ts_info = (policy_timeshare_info_t)thread_info_out;
 
-           s = splsched();
+               s = splsched();
                thread_lock(thread);
 
                thread_lock(thread);
 
-           if (thread->sched_mode != TH_MODE_TIMESHARE) {
-               thread_unlock(thread);
+               if (thread->sched_mode != TH_MODE_TIMESHARE) {
+                       thread_unlock(thread);
                        splx(s);
                        splx(s);
-
                        return (KERN_INVALID_POLICY);
                        return (KERN_INVALID_POLICY);
-           }
+               }
 
                ts_info->depressed = (thread->sched_flags & TH_SFLAG_DEPRESSED_MASK) != 0;
                if (ts_info->depressed) {
                        ts_info->base_priority = DEPRESSPRI;
 
                ts_info->depressed = (thread->sched_flags & TH_SFLAG_DEPRESSED_MASK) != 0;
                if (ts_info->depressed) {
                        ts_info->base_priority = DEPRESSPRI;
-                       ts_info->depress_priority = thread->priority;
+                       ts_info->depress_priority = thread->base_pri;
                }
                else {
                }
                else {
-                       ts_info->base_priority = thread->priority;
+                       ts_info->base_priority = thread->base_pri;
                        ts_info->depress_priority = -1;
                }
 
                        ts_info->depress_priority = -1;
                }
 
@@ -1255,11 +1455,11 @@ thread_info_internal(
                ts_info->max_priority = thread->max_priority;
 
                thread_unlock(thread);
                ts_info->max_priority = thread->max_priority;
 
                thread_unlock(thread);
-           splx(s);
+               splx(s);
 
                *thread_info_count = POLICY_TIMESHARE_INFO_COUNT;
 
 
                *thread_info_count = POLICY_TIMESHARE_INFO_COUNT;
 
-               return (KERN_SUCCESS);  
+               return (KERN_SUCCESS);
        }
        else
        if (flavor == THREAD_SCHED_FIFO_INFO) {
        }
        else
        if (flavor == THREAD_SCHED_FIFO_INFO) {
@@ -1273,17 +1473,17 @@ thread_info_internal(
                policy_rr_info_t                        rr_info;
                uint32_t quantum_time;
                uint64_t quantum_ns;
                policy_rr_info_t                        rr_info;
                uint32_t quantum_time;
                uint64_t quantum_ns;
-               
+
                if (*thread_info_count < POLICY_RR_INFO_COUNT)
                        return (KERN_INVALID_ARGUMENT);
 
                rr_info = (policy_rr_info_t) thread_info_out;
 
                if (*thread_info_count < POLICY_RR_INFO_COUNT)
                        return (KERN_INVALID_ARGUMENT);
 
                rr_info = (policy_rr_info_t) thread_info_out;
 
-           s = splsched();
+               s = splsched();
                thread_lock(thread);
 
                thread_lock(thread);
 
-           if (thread->sched_mode == TH_MODE_TIMESHARE) {
-               thread_unlock(thread);
+               if (thread->sched_mode == TH_MODE_TIMESHARE) {
+                       thread_unlock(thread);
                        splx(s);
 
                        return (KERN_INVALID_POLICY);
                        splx(s);
 
                        return (KERN_INVALID_POLICY);
@@ -1292,25 +1492,80 @@ thread_info_internal(
                rr_info->depressed = (thread->sched_flags & TH_SFLAG_DEPRESSED_MASK) != 0;
                if (rr_info->depressed) {
                        rr_info->base_priority = DEPRESSPRI;
                rr_info->depressed = (thread->sched_flags & TH_SFLAG_DEPRESSED_MASK) != 0;
                if (rr_info->depressed) {
                        rr_info->base_priority = DEPRESSPRI;
-                       rr_info->depress_priority = thread->priority;
+                       rr_info->depress_priority = thread->base_pri;
                }
                else {
                }
                else {
-                       rr_info->base_priority = thread->priority;
+                       rr_info->base_priority = thread->base_pri;
                        rr_info->depress_priority = -1;
                }
 
                quantum_time = SCHED(initial_quantum_size)(THREAD_NULL);
                absolutetime_to_nanoseconds(quantum_time, &quantum_ns);
                        rr_info->depress_priority = -1;
                }
 
                quantum_time = SCHED(initial_quantum_size)(THREAD_NULL);
                absolutetime_to_nanoseconds(quantum_time, &quantum_ns);
-               
+
                rr_info->max_priority = thread->max_priority;
                rr_info->max_priority = thread->max_priority;
-           rr_info->quantum = (uint32_t)(quantum_ns / 1000 / 1000);
+               rr_info->quantum = (uint32_t)(quantum_ns / 1000 / 1000);
 
                thread_unlock(thread);
 
                thread_unlock(thread);
-           splx(s);
+               splx(s);
 
                *thread_info_count = POLICY_RR_INFO_COUNT;
 
 
                *thread_info_count = POLICY_RR_INFO_COUNT;
 
-               return (KERN_SUCCESS);  
+               return (KERN_SUCCESS);
+       }
+       else
+       if (flavor == THREAD_EXTENDED_INFO) {
+               thread_basic_info_data_t        basic_info;
+               thread_extended_info_t          extended_info = (thread_extended_info_t) thread_info_out;
+
+               if (*thread_info_count < THREAD_EXTENDED_INFO_COUNT) {
+                       return (KERN_INVALID_ARGUMENT);
+               }
+
+               s = splsched();
+               thread_lock(thread);
+
+               /* NOTE: This mimics fill_taskthreadinfo(), which is the function used by proc_pidinfo() for
+                * the PROC_PIDTHREADINFO flavor (which can't be used on corpses)
+                */
+               retrieve_thread_basic_info(thread, &basic_info);
+               extended_info->pth_user_time = ((basic_info.user_time.seconds * (integer_t)NSEC_PER_SEC) + (basic_info.user_time.microseconds * (integer_t)NSEC_PER_USEC));
+               extended_info->pth_system_time = ((basic_info.system_time.seconds * (integer_t)NSEC_PER_SEC) + (basic_info.system_time.microseconds * (integer_t)NSEC_PER_USEC));
+
+               extended_info->pth_cpu_usage = basic_info.cpu_usage;
+               extended_info->pth_policy = basic_info.policy;
+               extended_info->pth_run_state = basic_info.run_state;
+               extended_info->pth_flags = basic_info.flags;
+               extended_info->pth_sleep_time = basic_info.sleep_time;
+               extended_info->pth_curpri = thread->sched_pri;
+               extended_info->pth_priority = thread->base_pri;
+               extended_info->pth_maxpriority = thread->max_priority;
+
+               bsd_getthreadname(thread->uthread,extended_info->pth_name);
+
+               thread_unlock(thread);
+               splx(s);
+
+               *thread_info_count = THREAD_EXTENDED_INFO_COUNT;
+
+               return (KERN_SUCCESS);
+       }
+       else
+       if (flavor == THREAD_DEBUG_INFO_INTERNAL) {
+#if DEVELOPMENT || DEBUG
+               thread_debug_info_internal_t dbg_info;
+               if (*thread_info_count < THREAD_DEBUG_INFO_INTERNAL_COUNT)
+                       return (KERN_NOT_SUPPORTED);
+
+               if (thread_info_out == NULL)
+                       return (KERN_INVALID_ARGUMENT);
+
+               dbg_info = (thread_debug_info_internal_t) thread_info_out;
+               dbg_info->page_creation_count = thread->t_page_creation_count;
+
+               *thread_info_count = THREAD_DEBUG_INFO_INTERNAL_COUNT;
+               return (KERN_SUCCESS);
+#endif /* DEVELOPMENT || DEBUG */
+               return (KERN_NOT_SUPPORTED);
        }
 
        return (KERN_INVALID_ARGUMENT);
        }
 
        return (KERN_INVALID_ARGUMENT);
@@ -1349,6 +1604,25 @@ thread_read_times(
        }
 }
 
        }
 }
 
+uint64_t thread_get_runtime_self(void)
+{
+       boolean_t interrupt_state;
+       uint64_t runtime;
+       thread_t thread = NULL;
+       processor_t processor = NULL;
+
+       thread = current_thread();
+
+       /* Not interrupt safe, as the scheduler may otherwise update timer values underneath us */
+       interrupt_state = ml_set_interrupts_enabled(FALSE);
+       processor = current_processor();
+       timer_switch(PROCESSOR_DATA(processor, thread_timer), mach_absolute_time(), PROCESSOR_DATA(processor, thread_timer));
+       runtime = (timer_grab(&thread->user_timer) + timer_grab(&thread->system_timer));
+       ml_set_interrupts_enabled(interrupt_state);
+
+       return runtime;
+}
+
 kern_return_t
 thread_assign(
        __unused thread_t                       thread,
 kern_return_t
 thread_assign(
        __unused thread_t                       thread,
@@ -1439,6 +1713,25 @@ thread_wire(
 }
 
 
 }
 
 
+boolean_t
+set_vm_privilege(boolean_t privileged)
+{
+       boolean_t       was_vmpriv;
+
+       if (current_thread()->options & TH_OPT_VMPRIV)
+               was_vmpriv = TRUE;
+       else
+               was_vmpriv = FALSE;
+
+       if (privileged != FALSE)
+               current_thread()->options |= TH_OPT_VMPRIV;
+       else
+               current_thread()->options &= ~TH_OPT_VMPRIV;
+
+       return (was_vmpriv);
+}
+
+
 /*
  * XXX assuming current thread only, for now...
  */
 /*
  * XXX assuming current thread only, for now...
  */
@@ -1515,7 +1808,7 @@ THIS_THREAD_IS_CONSUMING_TOO_MUCH_CPU__SENDING_EXC_RESOURCE(void)
        task_t           task                           = current_task();
        thread_t     thread             = current_thread();
        uint64_t     tid                = thread->thread_id;
        task_t           task                           = current_task();
        thread_t     thread             = current_thread();
        uint64_t     tid                = thread->thread_id;
-       char         *procname          = (char *) "unknown";
+       const char       *procname          = "unknown";
        time_value_t thread_total_time  = {0, 0};
        time_value_t thread_system_time;
        time_value_t thread_user_time;
        time_value_t thread_total_time  = {0, 0};
        time_value_t thread_system_time;
        time_value_t thread_user_time;
@@ -1584,11 +1877,16 @@ THIS_THREAD_IS_CONSUMING_TOO_MUCH_CPU__SENDING_EXC_RESOURCE(void)
                return;
        }
 
                return;
        }
 
+       if (audio_active) {
+               printf("process %s[%d] thread %llu caught burning CPU!; EXC_RESOURCE "
+                      "supressed due to audio playback\n", procname, pid, tid);
+               return;
+       }
        printf("process %s[%d] thread %llu caught burning CPU! "
               "It used more than %d%% CPU (Actual recent usage: %d%%) over %d seconds. "
               "thread lifetime cpu usage %d.%06d seconds, (%d.%06d user, %d.%06d system) "
               "ledger info: balance: %lld credit: %lld debit: %lld limit: %llu (%d%%) "
        printf("process %s[%d] thread %llu caught burning CPU! "
               "It used more than %d%% CPU (Actual recent usage: %d%%) over %d seconds. "
               "thread lifetime cpu usage %d.%06d seconds, (%d.%06d user, %d.%06d system) "
               "ledger info: balance: %lld credit: %lld debit: %lld limit: %llu (%d%%) "
-              "period: %llu time since last refill (ns): %llu \n",
+              "period: %llu time since last refill (ns): %llu %s\n",
               procname, pid, tid,
               percentage, usage_percent,  interval_sec,
               thread_total_time.seconds,  thread_total_time.microseconds,
               procname, pid, tid,
               percentage, usage_percent,  interval_sec,
               thread_total_time.seconds,  thread_total_time.microseconds,
@@ -1597,20 +1895,63 @@ THIS_THREAD_IS_CONSUMING_TOO_MUCH_CPU__SENDING_EXC_RESOURCE(void)
               lei.lei_balance,
               lei.lei_credit,             lei.lei_debit,
               lei.lei_limit,              limit_percent,
               lei.lei_balance,
               lei.lei_credit,             lei.lei_debit,
               lei.lei_limit,              limit_percent,
-              lei.lei_refill_period,      lei.lei_last_refill);
+              lei.lei_refill_period,      lei.lei_last_refill,
+              (fatal ? "[fatal violation]" : ""));
 
 
        code[0] = code[1] = 0;
        EXC_RESOURCE_ENCODE_TYPE(code[0], RESOURCE_TYPE_CPU);
 
 
        code[0] = code[1] = 0;
        EXC_RESOURCE_ENCODE_TYPE(code[0], RESOURCE_TYPE_CPU);
-       EXC_RESOURCE_ENCODE_FLAVOR(code[0], FLAVOR_CPU_MONITOR);
+       if (fatal) {
+               EXC_RESOURCE_ENCODE_FLAVOR(code[0], FLAVOR_CPU_MONITOR_FATAL);
+       }else {
+               EXC_RESOURCE_ENCODE_FLAVOR(code[0], FLAVOR_CPU_MONITOR);
+       }
        EXC_RESOURCE_CPUMONITOR_ENCODE_INTERVAL(code[0], interval_sec);
        EXC_RESOURCE_CPUMONITOR_ENCODE_PERCENTAGE(code[0], limit_percent);
        EXC_RESOURCE_CPUMONITOR_ENCODE_PERCENTAGE(code[1], usage_percent);
        exception_triage(EXC_RESOURCE, code, EXCEPTION_CODE_MAX);
 
        if (fatal) {
        EXC_RESOURCE_CPUMONITOR_ENCODE_INTERVAL(code[0], interval_sec);
        EXC_RESOURCE_CPUMONITOR_ENCODE_PERCENTAGE(code[0], limit_percent);
        EXC_RESOURCE_CPUMONITOR_ENCODE_PERCENTAGE(code[1], usage_percent);
        exception_triage(EXC_RESOURCE, code, EXCEPTION_CODE_MAX);
 
        if (fatal) {
+#if CONFIG_JETSAM
+               jetsam_on_ledger_cpulimit_exceeded();
+#else
                task_terminate_internal(task);
                task_terminate_internal(task);
+#endif
+       }
+}
+
+void thread_update_io_stats(thread_t thread, int size, int io_flags)
+{
+       int io_tier;
+
+       if (thread->thread_io_stats == NULL || thread->task->task_io_stats == NULL)
+               return;
+
+       if (io_flags & DKIO_READ) {
+               UPDATE_IO_STATS(thread->thread_io_stats->disk_reads, size);
+               UPDATE_IO_STATS_ATOMIC(thread->task->task_io_stats->disk_reads, size);
+       }
+       
+       if (io_flags & DKIO_META) {
+               UPDATE_IO_STATS(thread->thread_io_stats->metadata, size);
+               UPDATE_IO_STATS_ATOMIC(thread->task->task_io_stats->metadata, size);
+       }
+       
+       if (io_flags & DKIO_PAGING) {
+               UPDATE_IO_STATS(thread->thread_io_stats->paging, size);
+               UPDATE_IO_STATS_ATOMIC(thread->task->task_io_stats->paging, size);
        }
        }
+
+       io_tier = ((io_flags & DKIO_TIER_MASK) >> DKIO_TIER_SHIFT);
+       assert (io_tier < IO_NUM_PRIORITIES);
+
+       UPDATE_IO_STATS(thread->thread_io_stats->io_priority[io_tier], size);
+       UPDATE_IO_STATS_ATOMIC(thread->task->task_io_stats->io_priority[io_tier], size);
+
+       /* Update Total I/O Counts */
+       UPDATE_IO_STATS(thread->thread_io_stats->total_io, size);
+       UPDATE_IO_STATS_ATOMIC(thread->task->task_io_stats->total_io, size);
+
 }
 
 void
 }
 
 void
@@ -1632,6 +1973,7 @@ init_thread_ledgers(void) {
        }
 
        thread_ledgers.cpu_time = idx;
        }
 
        thread_ledgers.cpu_time = idx;
+       
        thread_ledger_template = t;
 }
 
        thread_ledger_template = t;
 }
 
@@ -1711,12 +2053,8 @@ thread_set_cpulimit(int action, uint8_t percentage, uint64_t interval_ns)
                 */
                if (thread->t_threadledger != LEDGER_NULL) {
                        l = thread->t_threadledger;
                 */
                if (thread->t_threadledger != LEDGER_NULL) {
                        l = thread->t_threadledger;
-                       /*
-                        * The only way to get a per-thread ledger is via CPU limits.
-                        */
-                       assert(thread->options & (TH_OPT_PROC_CPULIMIT | TH_OPT_PRVT_CPULIMIT));
-                       thread->t_threadledger = NULL;
-                       ledger_dereference(l);
+                       ledger_set_limit(l, thread_ledgers.cpu_time, LEDGER_LIMIT_INFINITY, 0);
+                       ledger_set_action(l, thread_ledgers.cpu_time, LEDGER_ACTION_IGNORE);
                        thread->options &= ~(TH_OPT_PROC_CPULIMIT | TH_OPT_PRVT_CPULIMIT);
                }
 
                        thread->options &= ~(TH_OPT_PROC_CPULIMIT | TH_OPT_PRVT_CPULIMIT);
                }
 
@@ -1786,123 +2124,6 @@ thread_set_cpulimit(int action, uint8_t percentage, uint64_t interval_ns)
        return (0);
 }
 
        return (0);
 }
 
-int            split_funnel_off = 0;
-lck_grp_t      *funnel_lck_grp = LCK_GRP_NULL;
-lck_grp_attr_t *funnel_lck_grp_attr;
-lck_attr_t     *funnel_lck_attr;
-
-funnel_t *
-funnel_alloc(
-       int type)
-{
-       lck_mtx_t       *m;
-       funnel_t        *fnl;
-
-       if (funnel_lck_grp == LCK_GRP_NULL) {
-               funnel_lck_grp_attr = lck_grp_attr_alloc_init();
-
-               funnel_lck_grp = lck_grp_alloc_init("Funnel",  funnel_lck_grp_attr);
-
-               funnel_lck_attr = lck_attr_alloc_init();
-       }
-       if ((fnl = (funnel_t *)kalloc(sizeof(funnel_t))) != 0){
-               bzero((void *)fnl, sizeof(funnel_t));
-               if ((m = lck_mtx_alloc_init(funnel_lck_grp, funnel_lck_attr)) == (lck_mtx_t *)NULL) {
-                       kfree(fnl, sizeof(funnel_t));
-                       return(THR_FUNNEL_NULL);
-               }
-               fnl->fnl_mutex = m;
-               fnl->fnl_type = type;
-       }
-       return(fnl);
-}
-
-void 
-funnel_free(
-       funnel_t * fnl)
-{
-       lck_mtx_free(fnl->fnl_mutex, funnel_lck_grp);
-       if (fnl->fnl_oldmutex)
-               lck_mtx_free(fnl->fnl_oldmutex, funnel_lck_grp);
-       kfree(fnl, sizeof(funnel_t));
-}
-
-void 
-funnel_lock(
-       funnel_t * fnl)
-{
-       lck_mtx_lock(fnl->fnl_mutex);
-       fnl->fnl_mtxholder = current_thread();
-}
-
-void 
-funnel_unlock(
-       funnel_t * fnl)
-{
-       lck_mtx_unlock(fnl->fnl_mutex);
-       fnl->fnl_mtxholder = NULL;
-       fnl->fnl_mtxrelease = current_thread();
-}
-
-funnel_t *
-thread_funnel_get(
-       void)
-{
-       thread_t th = current_thread();
-
-       if (th->funnel_state & TH_FN_OWNED) {
-               return(th->funnel_lock);
-       }
-       return(THR_FUNNEL_NULL);
-}
-
-boolean_t
-thread_funnel_set(
-        funnel_t *     fnl,
-       boolean_t       funneled)
-{
-       thread_t        cur_thread;
-       boolean_t       funnel_state_prev;
-       boolean_t       intr;
-        
-       cur_thread = current_thread();
-       funnel_state_prev = ((cur_thread->funnel_state & TH_FN_OWNED) == TH_FN_OWNED);
-
-       if (funnel_state_prev != funneled) {
-               intr = ml_set_interrupts_enabled(FALSE);
-
-               if (funneled == TRUE) {
-                       if (cur_thread->funnel_lock)
-                               panic("Funnel lock called when holding one %p", cur_thread->funnel_lock);
-                       KERNEL_DEBUG(0x6032428 | DBG_FUNC_NONE,
-                                                                                       fnl, 1, 0, 0, 0);
-                       funnel_lock(fnl);
-                       KERNEL_DEBUG(0x6032434 | DBG_FUNC_NONE,
-                                                                                       fnl, 1, 0, 0, 0);
-                       cur_thread->funnel_state |= TH_FN_OWNED;
-                       cur_thread->funnel_lock = fnl;
-               } else {
-                       if(cur_thread->funnel_lock->fnl_mutex != fnl->fnl_mutex)
-                               panic("Funnel unlock  when not holding funnel");
-                       cur_thread->funnel_state &= ~TH_FN_OWNED;
-                       KERNEL_DEBUG(0x603242c | DBG_FUNC_NONE,
-                                                               fnl, 1, 0, 0, 0);
-
-                       cur_thread->funnel_lock = THR_FUNNEL_NULL;
-                       funnel_unlock(fnl);
-               }
-               (void)ml_set_interrupts_enabled(intr);
-       } else {
-               /* if we are trying to acquire funnel recursively
-                * check for funnel to be held already
-                */
-               if (funneled && (fnl->fnl_mutex != cur_thread->funnel_lock->fnl_mutex)) {
-                               panic("thread_funnel_set: already holding a different funnel");
-               }
-       }
-       return(funnel_state_prev);
-}
-
 static void
 sched_call_null(
 __unused       int                     type,
 static void
 sched_call_null(
 __unused       int                     type,
@@ -1952,8 +2173,10 @@ thread_dispatchqaddr(
 
        if (thread != THREAD_NULL) {
                thread_handle = thread->machine.cthread_self;
 
        if (thread != THREAD_NULL) {
                thread_handle = thread->machine.cthread_self;
-
-               if (thread->task->bsd_info)
+               
+                if (thread->inspection == TRUE)
+                       dispatchqueue_addr = thread_handle + get_task_dispatchqueue_offset(thread->task);
+                else if (thread->task->bsd_info)
                        dispatchqueue_addr = thread_handle + get_dispatchqueue_offset_from_proc(thread->task->bsd_info);
        }
 
                        dispatchqueue_addr = thread_handle + get_dispatchqueue_offset_from_proc(thread->task->bsd_info);
        }
 
@@ -1984,6 +2207,295 @@ thread_should_halt(
        return (thread_should_halt_fast(th));
 }
 
        return (thread_should_halt_fast(th));
 }
 
+/*
+ * thread_set_voucher_name - reset the voucher port name bound to this thread
+ *
+ * Conditions:  nothing locked
+ *
+ *     If we already converted the previous name to a cached voucher
+ *     reference, then we discard that reference here.  The next lookup
+ *     will cache it again.
+ */
+
+kern_return_t
+thread_set_voucher_name(mach_port_name_t voucher_name)
+{
+       thread_t thread = current_thread();
+       ipc_voucher_t new_voucher = IPC_VOUCHER_NULL;
+       ipc_voucher_t voucher;
+#ifdef CONFIG_BANK
+       ledger_t bankledger = NULL;
+#endif
+
+       if (MACH_PORT_DEAD == voucher_name)
+               return KERN_INVALID_RIGHT;
+
+       /*
+        * agressively convert to voucher reference
+        */
+       if (MACH_PORT_VALID(voucher_name)) {
+               new_voucher = convert_port_name_to_voucher(voucher_name);
+               if (IPC_VOUCHER_NULL == new_voucher)
+                       return KERN_INVALID_ARGUMENT;
+       }
+#ifdef CONFIG_BANK
+       bankledger = bank_get_voucher_ledger(new_voucher);
+#endif
+
+       thread_mtx_lock(thread);
+       voucher = thread->ith_voucher;
+       thread->ith_voucher_name = voucher_name;
+       thread->ith_voucher = new_voucher;
+#ifdef CONFIG_BANK
+       bank_swap_thread_bank_ledger(thread, bankledger);
+#endif
+       thread_mtx_unlock(thread);
+
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,
+                                 MACHDBG_CODE(DBG_MACH_IPC,MACH_THREAD_SET_VOUCHER) | DBG_FUNC_NONE,
+                                 (uintptr_t)thread_tid(thread),
+                                 (uintptr_t)voucher_name,
+                                 VM_KERNEL_ADDRPERM((uintptr_t)new_voucher),
+                                 1, 0);
+
+       if (IPC_VOUCHER_NULL != voucher)
+               ipc_voucher_release(voucher);
+
+       return KERN_SUCCESS;
+}
+
+/* 
+ *  thread_get_mach_voucher - return a voucher reference for the specified thread voucher
+ *
+ *  Conditions:  nothing locked
+ *
+ *  A reference to the voucher may be lazily pending, if someone set the voucher name
+ *  but nobody has done a lookup yet.  In that case, we'll have to do the equivalent
+ *  lookup here.
+ *
+ *  NOTE:      At the moment, there is no distinction between the current and effective
+ *             vouchers because we only set them at the thread level currently.
+ */
+kern_return_t 
+thread_get_mach_voucher(
+       thread_act_t            thread,
+       mach_voucher_selector_t __unused which,
+       ipc_voucher_t           *voucherp)
+{
+       ipc_voucher_t           voucher;
+       mach_port_name_t        voucher_name;
+
+       if (THREAD_NULL == thread)
+               return KERN_INVALID_ARGUMENT;
+
+       thread_mtx_lock(thread);
+       voucher = thread->ith_voucher;
+
+       /* if already cached, just return a ref */
+       if (IPC_VOUCHER_NULL != voucher) {
+               ipc_voucher_reference(voucher);
+               thread_mtx_unlock(thread);
+               *voucherp = voucher;
+               return KERN_SUCCESS;
+       }
+
+       voucher_name = thread->ith_voucher_name;
+
+       /* convert the name to a port, then voucher reference */
+       if (MACH_PORT_VALID(voucher_name)) {
+               ipc_port_t port;
+
+               if (KERN_SUCCESS !=
+                   ipc_object_copyin(thread->task->itk_space, voucher_name,
+                                     MACH_MSG_TYPE_COPY_SEND, (ipc_object_t *)&port)) {
+                       thread->ith_voucher_name = MACH_PORT_NULL;
+                       thread_mtx_unlock(thread);
+                       *voucherp = IPC_VOUCHER_NULL;
+                       return KERN_SUCCESS;
+               }
+
+               /* convert to a voucher ref to return, and cache a ref on thread */
+               voucher = convert_port_to_voucher(port);
+               ipc_voucher_reference(voucher);
+               thread->ith_voucher = voucher;
+               thread_mtx_unlock(thread);
+
+               KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,
+                                         MACHDBG_CODE(DBG_MACH_IPC,MACH_THREAD_SET_VOUCHER) | DBG_FUNC_NONE,
+                                         (uintptr_t)thread_tid(thread),
+                                         (uintptr_t)port,
+                                         VM_KERNEL_ADDRPERM((uintptr_t)voucher),
+                                         2, 0);
+
+
+               ipc_port_release_send(port);
+       } else
+               thread_mtx_unlock(thread);
+
+       *voucherp = voucher;
+       return KERN_SUCCESS;
+}
+
+/* 
+ *  thread_set_mach_voucher - set a voucher reference for the specified thread voucher
+ *
+ *  Conditions: callers holds a reference on the voucher.
+ *             nothing locked.
+ *
+ *  We grab another reference to the voucher and bind it to the thread.  Any lazy
+ *  binding is erased.  The old voucher reference associated with the thread is
+ *  discarded.
+ */
+kern_return_t 
+thread_set_mach_voucher(
+       thread_t                thread,
+       ipc_voucher_t           voucher)
+{
+       ipc_voucher_t old_voucher;
+#ifdef CONFIG_BANK
+       ledger_t bankledger = NULL;
+#endif
+
+       if (THREAD_NULL == thread)
+               return KERN_INVALID_ARGUMENT;
+
+       if (thread != current_thread() || thread->started)
+               return KERN_INVALID_ARGUMENT;
+
+
+       ipc_voucher_reference(voucher);
+#ifdef CONFIG_BANK
+       bankledger = bank_get_voucher_ledger(voucher);
+#endif
+       thread_mtx_lock(thread);
+       old_voucher = thread->ith_voucher;
+       thread->ith_voucher = voucher;
+       thread->ith_voucher_name = MACH_PORT_NULL;
+#ifdef CONFIG_BANK
+       bank_swap_thread_bank_ledger(thread, bankledger);
+#endif
+       thread_mtx_unlock(thread);
+
+       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,
+                                 MACHDBG_CODE(DBG_MACH_IPC,MACH_THREAD_SET_VOUCHER) | DBG_FUNC_NONE,
+                                 (uintptr_t)thread_tid(thread),
+                                 (uintptr_t)MACH_PORT_NULL,
+                                 VM_KERNEL_ADDRPERM((uintptr_t)voucher),
+                                 3, 0);
+
+       ipc_voucher_release(old_voucher);
+
+       return KERN_SUCCESS;
+}
+
+/* 
+ *  thread_swap_mach_voucher - swap a voucher reference for the specified thread voucher
+ *
+ *  Conditions: callers holds a reference on the new and presumed old voucher(s).
+ *             nothing locked.
+ *
+ *  If the old voucher is still the same as passed in, replace it with new voucher
+ *  and discard the old (and the reference passed in).  Otherwise, discard the new
+ *  and return an updated old voucher.
+ */
+kern_return_t
+thread_swap_mach_voucher(
+       thread_t                thread,
+       ipc_voucher_t           new_voucher,
+       ipc_voucher_t           *in_out_old_voucher)
+{
+       mach_port_name_t old_voucher_name;
+       ipc_voucher_t old_voucher;
+#ifdef CONFIG_BANK
+       ledger_t bankledger = NULL;
+#endif
+
+       if (THREAD_NULL == thread)
+               return KERN_INVALID_TASK;
+
+       if (thread != current_thread() || thread->started)
+               return KERN_INVALID_ARGUMENT;
+
+#ifdef CONFIG_BANK
+       bankledger = bank_get_voucher_ledger(new_voucher);
+#endif
+
+       thread_mtx_lock(thread);
+
+       old_voucher = thread->ith_voucher;
+
+       if (IPC_VOUCHER_NULL == old_voucher) {
+               old_voucher_name = thread->ith_voucher_name;
+
+               /* perform lazy binding if needed */
+               if (MACH_PORT_VALID(old_voucher_name)) {
+                       old_voucher = convert_port_name_to_voucher(old_voucher_name);
+                       thread->ith_voucher_name = MACH_PORT_NULL;
+                       thread->ith_voucher = old_voucher;
+
+                       KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,
+                                                 MACHDBG_CODE(DBG_MACH_IPC,MACH_THREAD_SET_VOUCHER) | DBG_FUNC_NONE,
+                                                 (uintptr_t)thread_tid(thread),
+                                                 (uintptr_t)old_voucher_name,
+                                                 VM_KERNEL_ADDRPERM((uintptr_t)old_voucher),
+                                                 4, 0);
+
+               }
+       }
+
+       /* swap in new voucher, if old voucher matches the one supplied */
+       if (old_voucher == *in_out_old_voucher) {
+               ipc_voucher_reference(new_voucher);
+               thread->ith_voucher = new_voucher;
+               thread->ith_voucher_name = MACH_PORT_NULL;
+#ifdef CONFIG_BANK
+               bank_swap_thread_bank_ledger(thread, bankledger);
+#endif
+               thread_mtx_unlock(thread);
+
+               KERNEL_DEBUG_CONSTANT_IST(KDEBUG_TRACE,
+                                         MACHDBG_CODE(DBG_MACH_IPC,MACH_THREAD_SET_VOUCHER) | DBG_FUNC_NONE,
+                                         (uintptr_t)thread_tid(thread),
+                                         (uintptr_t)MACH_PORT_NULL,
+                                         VM_KERNEL_ADDRPERM((uintptr_t)new_voucher),
+                                         5, 0);
+
+               ipc_voucher_release(old_voucher);
+
+               *in_out_old_voucher = IPC_VOUCHER_NULL;
+               return KERN_SUCCESS;
+       }
+
+       /* Otherwise, just return old voucher reference */
+       ipc_voucher_reference(old_voucher);
+       thread_mtx_unlock(thread);
+       *in_out_old_voucher = old_voucher;
+       return KERN_SUCCESS;
+}
+
+/* 
+ *  thread_get_current_voucher_origin_pid - get the pid of the originator of the current voucher.
+ */
+kern_return_t
+thread_get_current_voucher_origin_pid(
+       int32_t      *pid)
+{
+       uint32_t buf_size;
+       kern_return_t kr;
+       thread_t thread = current_thread();
+       
+       buf_size = sizeof(*pid);
+       kr = mach_voucher_attr_command(thread->ith_voucher,
+               MACH_VOUCHER_ATTR_KEY_BANK,
+               BANK_ORIGINATOR_PID,
+               NULL,
+               0,
+               (mach_voucher_attr_content_t)pid,
+               &buf_size);
+
+       return kr;
+}
+
 #if CONFIG_DTRACE
 uint32_t dtrace_get_thread_predcache(thread_t thread)
 {
 #if CONFIG_DTRACE
 uint32_t dtrace_get_thread_predcache(thread_t thread)
 {
@@ -2001,6 +2513,15 @@ int64_t dtrace_get_thread_vtime(thread_t thread)
                return 0;
 }
 
                return 0;
 }
 
+int dtrace_get_thread_last_cpu_id(thread_t thread)
+{
+       if ((thread != THREAD_NULL) && (thread->last_processor != PROCESSOR_NULL)) {
+               return thread->last_processor->cpu_id;
+       } else {
+               return -1;
+       }
+}
+
 int64_t dtrace_get_thread_tracing(thread_t thread)
 {
        if (thread != THREAD_NULL)
 int64_t dtrace_get_thread_tracing(thread_t thread)
 {
        if (thread != THREAD_NULL)