]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/kern/thread.h
xnu-3248.60.10.tar.gz
[apple/xnu.git] / osfmk / kern / thread.h
index 47ffc95ff34c9d222382ad9231e7622778d40c70..44918bbcfd09bc47c488422fb08001f064e6f201 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@
  * 
@@ -99,8 +99,6 @@
 
 #ifdef MACH_KERNEL_PRIVATE
 
-#include <cputypes.h>
-
 #include <mach_assert.h>
 #include <mach_ldebug.h>
 
 
 #include <mach/port.h>
 #include <kern/cpu_number.h>
+#include <kern/smp.h>
 #include <kern/queue.h>
 #include <kern/timer.h>
-#include <kern/lock.h>
+#include <kern/simple_lock.h>
 #include <kern/locks.h>
 #include <kern/sched.h>
 #include <kern/sched_prim.h>
+#include <mach/sfi_class.h>
 #include <kern/thread_call.h>
 #include <kern/timer_call.h>
 #include <kern/task.h>
 #include <kern/exception.h>
 #include <kern/affinity.h>
 
+#include <kern/waitq.h>
+
 #include <ipc/ipc_kmsg.h>
 
 #include <machine/cpu_data.h>
@@ -130,21 +132,24 @@ struct thread {
         *      NOTE:   The runq field in the thread structure has an unusual
         *      locking protocol.  If its value is PROCESSOR_NULL, then it is
         *      locked by the thread_lock, but if its value is something else
-        *      then it is locked by the associated run queue lock.
+        *      then it is locked by the associated run queue lock. It is
+        *      set to PROCESSOR_NULL without holding the thread lock, but the
+        *      transition from PROCESSOR_NULL to non-null must be done
+        *      under the thread lock and the run queue lock.
         *
-        *      When the thread is on a wait queue, these first three fields
-        *      are treated as an unofficial union with a wait_queue_element.
-        *      If you change these, you must change that definition as well
-        *      (kern/wait_queue.h).
+        *      New waitq APIs allow the 'links' and 'runq' fields to be
+        *      anywhere in the thread structure.
         */
        /* Items examined often, modified infrequently */
        queue_chain_t   links;                          /* run/wait queue links */
        processor_t             runq;                           /* run queue assignment */
-       wait_queue_t    wait_queue;                     /* wait queue we are currently on */
        event64_t               wait_event;                     /* wait queue event */
+       struct waitq    *waitq;
        /* Data updated during assert_wait/thread_wakeup */
+#if __SMP__
        decl_simple_lock_data(,sched_lock)      /* scheduling lock (thread_lock()) */
        decl_simple_lock_data(,wake_lock)       /* for thread stop / wait (wake_lock()) */
+#endif
        integer_t               options;                        /* options set by thread itself */
 #define TH_OPT_INTMASK         0x0003          /* interrupt / abort level */
 #define TH_OPT_VMPRIV          0x0004          /* may allocate reserved memory */
@@ -152,23 +157,23 @@ struct thread {
 #define TH_OPT_SYSTEM_CRITICAL 0x0010          /* Thread must always be allowed to run - even under heavy load */
 #define TH_OPT_PROC_CPULIMIT   0x0020          /* Thread has a task-wide CPU limit applied to it */
 #define TH_OPT_PRVT_CPULIMIT   0x0040          /* Thread has a thread-private CPU limit applied to it */
-#define TH_OPT_IDLE_THREAD             0x0080          /* Thread is a per-processor idle thread */
+#define TH_OPT_IDLE_THREAD     0x0080          /* Thread is a per-processor idle thread */
+#define TH_OPT_GLOBAL_FORCED_IDLE      0x0100  /* Thread performs forced idle for thermal control */
+#define TH_OPT_SCHED_VM_GROUP  0x0200          /* Thread belongs to special scheduler VM group */
+#define TH_OPT_HONOR_QLIMIT    0x0400          /* Thread will honor qlimit while sending mach_msg, regardless of MACH_SEND_ALWAYS */
+#define TH_OPT_SEND_IMPORTANCE 0x0800          /* Thread will allow importance donation from kernel rpc */
 
        boolean_t                       wake_active;    /* wake event on stop */
        int                                     at_safe_point;  /* thread_abort_safely allowed */
        ast_t                           reason;                 /* why we blocked */
+       uint32_t                        quantum_remaining;
+       wait_result_t                   wait_result;    /* outcome of wait -
+                                                        * may be examined by this thread
+                                                        * WITHOUT locking */
        thread_continue_t       continuation;   /* continue here next dispatch */
        void                            *parameter;             /* continuation parameter */
-       wait_result_t           wait_result;    /* outcome of wait -
-                                                                                * may be examined by this thread
-                                                                                * WITHOUT locking */
 
        /* Data updated/used in thread_invoke */
-    int                                    funnel_state;
-    struct funnel_lock *funnel_lock;           /* Non-reentrancy funnel */
-#define TH_FN_OWNED                    0x1                             /* we own the funnel */
-#define TH_FN_REFUNNEL         0x2                             /* re-acquire funnel on dispatch */
-
        vm_offset_t             kernel_stack;           /* current kernel stack */
        vm_offset_t                     reserved_stack;         /* reserved kernel stack */
 
@@ -181,20 +186,23 @@ struct thread {
 #define TH_SUSP                        0x02                    /* stopped or requested to stop */
 #define TH_RUN                 0x04                    /* running or on runq */
 #define TH_UNINT               0x08                    /* waiting uninteruptibly */
-#define        TH_TERMINATE    0x10                    /* halted at termination */
-#define        TH_TERMINATE2   0x20                    /* added to termination queue */
+#define TH_TERMINATE           0x10                    /* halted at termination */
+#define TH_TERMINATE2          0x20                    /* added to termination queue */
 
 #define TH_IDLE                        0x80                    /* idling processor */
 
        /* Scheduling information */
        sched_mode_t                    sched_mode;             /* scheduling mode */
        sched_mode_t                    saved_mode;             /* saved mode during forced mode demotion */
+
+       sfi_class_id_t                  sfi_class;              /* SFI class (XXX Updated on CSW/QE/AST) */
+       sfi_class_id_t                  sfi_wait_class; /* Currently in SFI wait for this class, protected by sfi_lock */
        
-       unsigned int                    sched_flags;            /* current flag bits */
-#define TH_SFLAG_FAIRSHARE_TRIPPED     0x0001          /* fairshare scheduling activated */
+       uint32_t                        sched_flags;            /* current flag bits */
+/* TH_SFLAG_FAIRSHARE_TRIPPED (unused) 0x0001 */
 #define TH_SFLAG_FAILSAFE              0x0002          /* fail-safe has tripped */
-#define TH_SFLAG_THROTTLED             0x0004      /* owner task in throttled state */
-#define TH_SFLAG_DEMOTED_MASK      (TH_SFLAG_THROTTLED | TH_SFLAG_FAILSAFE | TH_SFLAG_FAIRSHARE_TRIPPED)
+#define TH_SFLAG_THROTTLED             0x0004          /* thread treated as background for scheduler decay purposes */
+#define TH_SFLAG_DEMOTED_MASK      (TH_SFLAG_THROTTLE_DEMOTED | TH_SFLAG_FAILSAFE)     /* saved_mode contains previous sched_mode */
 
 #define        TH_SFLAG_PROMOTED               0x0008          /* sched pri has been promoted */
 #define TH_SFLAG_ABORT                 0x0010          /* abort interruptible waits */
@@ -206,22 +214,17 @@ struct thread {
 #define TH_SFLAG_PRI_UPDATE            0x0100          /* Updating priority */
 #define TH_SFLAG_EAGERPREEMPT          0x0200          /* Any preemption of this thread should be treated as if AST_URGENT applied */
 #define TH_SFLAG_RW_PROMOTED           0x0400          /* sched pri has been promoted due to blocking with RW lock held */
-#define TH_SFLAG_PROMOTED_MASK         (TH_SFLAG_PROMOTED | TH_SFLAG_RW_PROMOTED)
+#define TH_SFLAG_THROTTLE_DEMOTED      0x0800          /* throttled thread forced to timeshare mode (may be applied in addition to failsafe) */
+#define TH_SFLAG_WAITQ_PROMOTED                0x1000          /* sched pri promoted from waitq wakeup (generally for IPC receive) */
+#define TH_SFLAG_PROMOTED_MASK         (TH_SFLAG_PROMOTED | TH_SFLAG_RW_PROMOTED | TH_SFLAG_WAITQ_PROMOTED)
 
 #define TH_SFLAG_RW_PROMOTED_BIT       (10)    /* 0x400 */
 
-/*
- * A thread can either be completely unthrottled, about to be throttled,
- * throttled (TH_SFLAG_THROTTLED), or about to be unthrottled
- */
-#define        TH_SFLAG_PENDING_THROTTLE_DEMOTION      0x1000  /* Pending sched_mode demotion */
-#define        TH_SFLAG_PENDING_THROTTLE_PROMOTION     0x2000  /* Pending sched_mode promition */
-#define        TH_SFLAG_PENDING_THROTTLE_MASK          (TH_SFLAG_PENDING_THROTTLE_DEMOTION | TH_SFLAG_PENDING_THROTTLE_PROMOTION)
-
-       int16_t                         sched_pri;                      /* scheduled (current) priority */
-       int16_t                         priority;                       /* base priority */
-       int16_t                         max_priority;           /* max base priority */
-       int16_t                         task_priority;          /* copy of task base priority */
+       int16_t                         sched_pri;              /* scheduled (current) priority */
+       int16_t                         base_pri;               /* base priority */
+       int16_t                         max_priority;           /* copy of max base priority */
+       int16_t                         task_priority;          /* copy of task base priority */
+
 #if defined(CONFIG_SCHED_GRRR)
 #if 0
        uint16_t                        grrr_deficit;           /* fixed point (1/1000th quantum) fractional deficit */
@@ -235,7 +238,13 @@ struct thread {
 
        uint32_t                        rwlock_count;   /* Number of lck_rw_t locks held by thread */
 
+#if MACH_ASSERT
+       uint32_t                        SHARE_COUNT, BG_COUNT; /* This thread's contribution to global sched counters (temporary debugging) */
+#endif /* MACH_ASSERT */
+
        integer_t                       importance;                     /* task-relative importance */
+       uint32_t                        was_promoted_on_wakeup;
+
        /* Priority depression expiration */
        integer_t                       depress_timer_active;
        timer_call_data_t       depress_timer;
@@ -248,10 +257,12 @@ struct thread {
                uint64_t                        deadline;
        }                                       realtime;
 
-       uint32_t                        was_promoted_on_wakeup;
-       uint32_t                        current_quantum;        /* duration of current quantum */
        uint64_t                        last_run_time;          /* time when thread was switched away from */
-       uint64_t                        last_quantum_refill_time;       /* time when current_quantum was refilled after expiration */
+       uint64_t                        last_made_runnable_time;        /* time when thread was unblocked or preempted */
+
+#if defined(CONFIG_SCHED_MULTIQ)
+       sched_group_t                   sched_group;
+#endif /* defined(CONFIG_SCHED_MULTIQ) */
 
   /* Data used during setrun/dispatch */
        timer_data_t            system_timer;           /* system mode timer */
@@ -273,17 +284,19 @@ struct thread {
 #endif
        
        /* Statistics and timesharing calculations */
-#if defined(CONFIG_SCHED_TRADITIONAL)
+#if defined(CONFIG_SCHED_TIMESHARE_CORE)
        natural_t                       sched_stamp;    /* last scheduler tick */
        natural_t                       sched_usage;    /* timesharing cpu usage [sched] */
        natural_t                       pri_shift;              /* usage -> priority from pset */
        natural_t                       cpu_usage;              /* instrumented cpu usage [%cpu] */
        natural_t                       cpu_delta;              /* accumulated cpu_usage delta */
-#endif
+#endif /* CONFIG_SCHED_TIMESHARE_CORE */
+
        uint32_t                        c_switch;               /* total context switches */
        uint32_t                        p_switch;               /* total processor switches */
        uint32_t                        ps_switch;              /* total pset switches */
 
+       integer_t mutex_count;  /* total count of locks held */
        /* Timing data structures */
        int                                     precise_user_kernel_time; /* precise user/kernel enabled for this thread */
        timer_data_t            user_timer;                     /* user mode timer */
@@ -293,6 +306,11 @@ struct thread {
        uint64_t                        vtimer_prof_save;
        uint64_t                        vtimer_rlim_save;
 
+#if CONFIG_SCHED_SFI
+       /* Timing for wait state */
+       uint64_t                wait_sfi_begin_time;    /* start time for thread waiting in SFI */
+#endif
+
        /* Timed wait expiration */
        timer_call_data_t       wait_timer;
        integer_t                       wait_timer_active;
@@ -315,7 +333,6 @@ struct thread {
                        mach_vm_address_t       msg_addr;       /* receive buffer pointer */
                        mach_msg_size_t         msize;          /* max size for recvd msg */
                        mach_msg_option_t       option;         /* options for receive */
-                       mach_msg_size_t         slist_size;     /* scatter list size */
                        mach_port_name_t        receiver_name;  /* the receive port name */
                        struct ipc_kmsg         *kmsg;          /* received message */
                        mach_msg_continue_t     continuation;
@@ -341,6 +358,10 @@ struct thread {
                mach_exception_data_type_t              subcode;        /* Exception sub-code */
        } guard_exc_info;
 
+       /* Kernel holds on this thread  */
+       int16_t                                         suspend_count;
+       /* User level suspensions */
+       int16_t                                         user_stop_count;
 
        /* IPC data structures */
 #if IMPORTANCE_INHERITANCE
@@ -357,9 +378,6 @@ struct thread {
        /* Activation */
                queue_chain_t                   task_threads;
 
-               /*** Machine-dependent state ***/
-               struct machine_thread   machine;
-
                /* Task membership */
                struct task                             *task;
                vm_map_t                                map;
@@ -375,16 +393,10 @@ struct thread {
                        active:1,                               /* Thread is active and has not been terminated */
                        started:1,                              /* Thread has been started after creation */
                        static_param:1,                 /* Disallow policy parameter changes */
+                       inspection:1,                           /* TRUE when task is being inspected by crash reporter */
+                       policy_reset:1,                 /* Disallow policy parameter changes on terminating threads */
                        :0;
-
-               /* Return Handers */
-               struct ReturnHandler {
-                       struct ReturnHandler    *next;
-                       void            (*handler)(
-                                                       struct ReturnHandler            *rh,
-                                                       struct thread                           *thread);
-               } *handlers, special_handler;
-
+       
                /* Ports associated with this thread */
                struct ipc_port                 *ith_self;              /* not a right, doesn't hold ref */
                struct ipc_port                 *ith_sself;             /* a send right */
@@ -404,6 +416,11 @@ struct thread {
 
                clock_sec_t t_page_creation_time;
                uint32_t    t_page_creation_count;
+               uint32_t    t_page_creation_throttled;
+#if (DEVELOPMENT || DEBUG)
+               uint64_t    t_page_creation_throttled_hard;
+               uint64_t    t_page_creation_throttled_soft;
+#endif /* DEVELOPMENT || DEBUG */
 
 #define T_CHUD_MARKED           0x01          /* this thread is marked by CHUD */
 #define T_IN_CHUD               0x02          /* this thread is already in a CHUD handler */
@@ -421,8 +438,6 @@ struct thread {
                uint32_t t_chud;        /* CHUD flags, used for Shark */
                uint32_t chud_c_switch; /* last dispatch detection */
 
-               integer_t mutex_count;  /* total count of locks held */
-
 #ifdef KPC
        /* accumulated performance counters for this thread */
        uint64_t *kpc_buf;
@@ -433,6 +448,11 @@ struct thread {
        uint64_t kperf_pet_cnt;
 #endif
 
+#if HYPERVISOR
+       /* hypervisor virtual CPU object associated with this thread */
+       void *hv_thread_target;
+#endif /* HYPERVISOR */
+
                uint64_t thread_id;     /*system wide unique thread-id*/
 
        /* Statistics accumulated per-thread and aggregated per-task */
@@ -440,16 +460,30 @@ struct thread {
        uint32_t                syscalls_mach;
        ledger_t                t_ledger;
        ledger_t                t_threadledger; /* per thread ledger */
+       uint64_t                cpu_time_last_qos;
+#ifdef CONFIG_BANK
+       ledger_t                t_bankledger;              /* ledger to charge someone */
+       uint64_t                t_deduct_bank_ledger_time; /* cpu time to be deducted from bank ledger */
+#endif
 
        /* policy is protected by the task lock */
        struct task_requested_policy     requested_policy;
        struct task_effective_policy     effective_policy;
        struct task_pended_policy        pended_policy;
 
-       int     iotier_override; /* atomic operations to set, cleared on ret to user */
+       /* usynch override is protected by the task lock, eventually will be thread mutex */
+       struct thread_qos_override {
+               struct thread_qos_override      *override_next;
+               uint32_t        override_contended_resource_count;
+               int16_t         override_qos;
+               int16_t         override_resource_type;
+               user_addr_t     override_resource;
+       } *overrides;
 
+       int     iotier_override; /* atomic operations to set, cleared on ret to user */
+       integer_t               saved_importance;               /* saved task-relative importance */
+       io_stat_info_t                  thread_io_stats; /* per-thread I/O statistics */
 
-       integer_t               saved_importance;               /* saved task-relative importance */
 
        uint32_t                        thread_callout_interrupt_wakeups;
        uint32_t                        thread_callout_platform_idle_wakeups;
@@ -460,10 +494,18 @@ struct thread {
                                        callout_woken_from_platform_idle:1,
                                        callout_woke_thread:1,
                                        thread_bitfield_unused:13;
-       /* Kernel holds on this thread  */
-       int16_t                                         suspend_count;
-       /* User level suspensions */
-       int16_t                                         user_stop_count;
+
+       mach_port_name_t                ith_voucher_name;
+       ipc_voucher_t                   ith_voucher;
+#if CONFIG_IOSCHED
+       void                            *decmp_upl;
+#endif /* CONFIG_IOSCHED */
+
+       /* work interval ID (if any) associated with the thread. Uses thread mutex */
+       uint64_t                work_interval_id;
+
+       /*** Machine-dependent state ***/
+       struct machine_thread   machine;
 };
 
 #define ith_state              saved.receive.state
@@ -471,7 +513,6 @@ struct thread {
 #define ith_msg_addr                   saved.receive.msg_addr
 #define ith_msize              saved.receive.msize
 #define        ith_option              saved.receive.option
-#define ith_scatter_list_size  saved.receive.slist_size
 #define ith_receiver_name      saved.receive.receiver_name
 #define ith_continuation       saved.receive.continuation
 #define ith_kmsg               saved.receive.kmsg
@@ -492,9 +533,6 @@ extern void                 thread_daemon_init(void);
 #define        thread_reference_internal(thread)       \
                        (void)hw_atomic_add(&(thread)->ref_count, 1)
 
-#define thread_deallocate_internal(thread)     \
-                       hw_atomic_sub(&(thread)->ref_count, 1)
-
 #define thread_reference(thread)                                       \
 MACRO_BEGIN                                                                                    \
        if ((thread) != THREAD_NULL)                                    \
@@ -504,6 +542,9 @@ MACRO_END
 extern void                    thread_deallocate(
                                                thread_t                thread);
 
+extern void                    thread_deallocate_safe(
+                                               thread_t                thread);
+
 extern void                    thread_terminate_self(void);
 
 extern kern_return_t   thread_terminate_internal(
@@ -515,6 +556,8 @@ extern void                 thread_start_internal(
 extern void                    thread_terminate_enqueue(
                                                thread_t                thread);
 
+extern void                    thread_terminate_crashed_threads(void);
+
 extern void                    thread_stack_enqueue(
                                                thread_t                thread);
 
@@ -524,7 +567,8 @@ extern void                 thread_hold(
 extern void                    thread_release(
                                                thread_t        thread);
 
-
+/* Locking for scheduler state, always acquired with interrupts disabled (splsched()) */
+#if __SMP__
 #define        thread_lock_init(th)    simple_lock_init(&(th)->sched_lock, 0)
 #define thread_lock(th)                        simple_lock(&(th)->sched_lock)
 #define thread_unlock(th)              simple_unlock(&(th)->sched_lock)
@@ -532,6 +576,15 @@ extern void                        thread_release(
 #define wake_lock_init(th)             simple_lock_init(&(th)->wake_lock, 0)
 #define wake_lock(th)                  simple_lock(&(th)->wake_lock)
 #define wake_unlock(th)                        simple_unlock(&(th)->wake_lock)
+#else
+#define thread_lock_init(th)   do { (void)th; } while(0)
+#define thread_lock(th)                        do { (void)th; } while(0)
+#define thread_unlock(th)              do { (void)th; } while(0)
+
+#define wake_lock_init(th)             do { (void)th; } while(0)
+#define wake_lock(th)                  do { (void)th; } while(0)
+#define wake_unlock(th)                        do { (void)th; } while(0)
+#endif
 
 #define thread_should_halt_fast(thread)                (!(thread)->active)
 
@@ -567,6 +620,11 @@ extern void                                thread_task_priority(
                                                        integer_t               priority,
                                                        integer_t               max_priority);
 
+extern kern_return_t                    thread_set_mode_and_absolute_pri(
+                                                        thread_t       thread,
+                                                        integer_t      policy,
+                                                        integer_t      priority);
+
 extern void                            thread_policy_reset(
                                                        thread_t                thread);
 
@@ -604,6 +662,9 @@ extern void                         machine_load_context(
 extern kern_return_t   machine_thread_state_initialize(
                                                        thread_t                                thread);
 
+extern kern_return_t   machine_thread_neon_state_initialize(
+                                                       thread_t                                thread);
+
 extern kern_return_t   machine_thread_set_state(
                                                        thread_t                                thread,
                                                        thread_flavor_t                 flavor,
@@ -644,45 +705,30 @@ extern kern_return_t      machine_thread_inherit_taskwide(
                                                        thread_t                thread,
                                                        task_t                  parent_task);
 
-/*
- * XXX Funnel locks XXX
- */
-
-struct funnel_lock {
-       int                     fnl_type;                       /* funnel type */
-       lck_mtx_t       *fnl_mutex;                     /* underlying mutex for the funnel */
-       void *          fnl_mtxholder;          /* thread (last)holdng mutex */
-       void *          fnl_mtxrelease;         /* thread (last)releasing mutex */
-       lck_mtx_t       *fnl_oldmutex;          /* Mutex before collapsing split funnel */
-};
-
-typedef struct ReturnHandler           ReturnHandler;
+extern kern_return_t   machine_thread_set_tsd_base(
+                                                       thread_t                                thread,
+                                                       mach_vm_offset_t                tsd_base);
 
 #define        thread_mtx_lock(thread)                 lck_mtx_lock(&(thread)->mutex)
 #define        thread_mtx_try(thread)                  lck_mtx_try_lock(&(thread)->mutex)
 #define        thread_mtx_unlock(thread)               lck_mtx_unlock(&(thread)->mutex)
 
-extern void                    act_execute_returnhandlers(void);
-
 extern void                    install_special_handler(
                                                thread_t                thread);
 
 extern void                    special_handler(
-                                               ReturnHandler   *rh,
                                                thread_t                thread);
 
+extern void
+thread_update_qos_cpu_time(
+                       thread_t thread,
+                       boolean_t lock_needed);
+
 void act_machine_sv_free(thread_t, int);
 
 vm_offset_t                    min_valid_stack_address(void);
 vm_offset_t                    max_valid_stack_address(void);
 
-extern void            funnel_lock(
-                                               struct funnel_lock      *lock);
-
-extern void            funnel_unlock(
-                                               struct funnel_lock      *lock);
-
-
 static inline uint16_t thread_set_tag_internal(thread_t        thread, uint16_t tag) {
        return __sync_fetch_and_or(&thread->thread_tag, tag);
 }
@@ -691,6 +737,15 @@ static inline uint16_t     thread_get_tag_internal(thread_t        thread) {
        return thread->thread_tag;
 }
 
+typedef struct {
+       int             qos_pri[THREAD_QOS_LAST];
+       int             qos_iotier[THREAD_QOS_LAST];
+       uint32_t        qos_through_qos[THREAD_QOS_LAST];
+       uint32_t        qos_latency_qos[THREAD_QOS_LAST];
+} qos_policy_params_t;
+
+extern void thread_set_options(uint32_t thopt);
+
 #else  /* MACH_KERNEL_PRIVATE */
 
 __BEGIN_DECLS
@@ -711,10 +766,6 @@ __END_DECLS
 
 __BEGIN_DECLS
 
-
-extern uint64_t                        thread_tid(
-                                               thread_t thread);
-
 extern uint64_t                        thread_dispatchqaddr(
                                                thread_t thread);
 
@@ -722,6 +773,15 @@ __END_DECLS
 
 #endif /* KERNEL_PRIVATE */
 
+#ifdef KERNEL
+__BEGIN_DECLS
+
+extern uint64_t                        thread_tid(thread_t thread);
+
+__END_DECLS
+
+#endif  /* KERNEL */
+
 __BEGIN_DECLS
 
 #ifdef XNU_KERNEL_PRIVATE
@@ -736,6 +796,17 @@ __BEGIN_DECLS
 uint16_t       thread_set_tag(thread_t, uint16_t);
 uint16_t       thread_get_tag(thread_t);
 
+/*
+ * Allocate/assign a single work interval ID for a thread,
+ * and support deallocating it.
+ */
+extern kern_return_t                   thread_policy_create_work_interval(
+       thread_t                thread,
+       uint64_t                *work_interval_id);
+
+extern kern_return_t                   thread_policy_destroy_work_interval(
+       thread_t                thread,
+       uint64_t                work_interval_id);
 
 extern kern_return_t    thread_state_initialize(
                                                        thread_t                                thread);
@@ -752,6 +823,11 @@ extern kern_return_t       thread_getstatus(
                                                        thread_state_t                  tstate,
                                                        mach_msg_type_number_t  *count);
 
+extern kern_return_t   thread_create_with_continuation(
+                                                       task_t task,
+                                                       thread_t *new_thread,
+                                                       thread_continue_t continuation);
+
 extern kern_return_t   thread_create_workq(
                                                        task_t                  task,
                                                        thread_continue_t       thread_return,
@@ -780,27 +856,13 @@ extern struct _thread_ledger_indices thread_ledgers;
 extern int thread_get_cpulimit(int *action, uint8_t *percentage, uint64_t *interval_ns);
 extern int thread_set_cpulimit(int action, uint8_t percentage, uint64_t interval_ns);
 
-typedef struct funnel_lock             funnel_t;
-
-#define THR_FUNNEL_NULL (funnel_t *)0
-
-extern funnel_t                 *funnel_alloc(
-                                               int                     type);
-
-extern void                    funnel_free(
-                                               funnel_t        *lock);
-
-extern funnel_t                *thread_funnel_get(void);
-
-extern boolean_t       thread_funnel_set(
-                                               funnel_t        *lock,
-                                               boolean_t        funneled);
-
 extern void                    thread_read_times(
                                                thread_t                thread,
                                                time_value_t    *user_time,
                                                time_value_t    *system_time);
 
+extern uint64_t                thread_get_runtime_self(void);
+
 extern void                    thread_setuserstack(
                                                thread_t                thread,
                                                mach_vm_offset_t        user_stack);
@@ -813,6 +875,10 @@ extern void                        thread_setentrypoint(
                                                thread_t                thread,
                                                mach_vm_offset_t        entry);
 
+extern kern_return_t   thread_set_tsd_base(
+                                                       thread_t        thread,
+                                                       mach_vm_offset_t tsd_base);
+
 extern kern_return_t   thread_setsinglestep(
                                                thread_t                thread,
                                                int                     on);
@@ -842,6 +908,7 @@ extern kern_return_t        thread_wire_internal(
                                                        boolean_t               wired,
                                                        boolean_t               *prev_state);
 
+
 extern kern_return_t   thread_dup(thread_t);
 
 typedef void   (*sched_call_t)(
@@ -859,12 +926,18 @@ extern void               thread_static_param(
                                        thread_t                thread,
                                        boolean_t               state);
 
+extern boolean_t       thread_is_static_param(
+                                       thread_t                thread);
+
 extern kern_return_t   thread_policy_set_internal(
                                        thread_t                thread,
                                        thread_policy_flavor_t  flavor,
                                        thread_policy_t         policy_info,
                                        mach_msg_type_number_t  count);
 
+extern boolean_t thread_has_qos_policy(thread_t thread);
+
+extern kern_return_t thread_remove_qos_policy(thread_t thread);
 
 extern task_t  get_threadtask(thread_t);
 #define thread_is_64bit(thd)   \
@@ -874,9 +947,16 @@ extern task_t      get_threadtask(thread_t);
 extern void            *get_bsdthread_info(thread_t);
 extern void            set_bsdthread_info(thread_t, void *);
 extern void            *uthread_alloc(task_t, thread_t, int);
-extern void            uthread_cleanup(task_t, void *, void *); 
+extern void            uthread_cleanup_name(void *uthread);
+extern void            uthread_cleanup(task_t, void *, void *, boolean_t);
 extern void            uthread_zone_free(void *); 
-extern void            uthread_cred_free(void *); 
+extern void            uthread_cred_free(void *);
+
+#if PROC_REF_DEBUG
+extern int             uthread_get_proc_refcount(void *);
+extern void            uthread_reset_proc_refcount(void *);
+extern int             proc_ref_tracking_disabled;
+#endif
 
 extern boolean_t       thread_should_halt(
                                                thread_t                thread);
@@ -886,13 +966,14 @@ extern boolean_t  thread_should_abort(
 
 extern int is_64signalregset(void);
 
-void act_set_apc(thread_t);
-void act_set_kperf(thread_t);
+extern void act_set_kperf(thread_t);
+extern void set_astledger(thread_t thread);
 
 extern uint32_t dtrace_get_thread_predcache(thread_t);
 extern int64_t dtrace_get_thread_vtime(thread_t);
 extern int64_t dtrace_get_thread_tracing(thread_t);
 extern boolean_t dtrace_get_thread_reentering(thread_t);
+extern int dtrace_get_thread_last_cpu_id(thread_t);
 extern vm_offset_t dtrace_get_kernel_stack(thread_t);
 extern void dtrace_set_thread_predcache(thread_t, uint32_t);
 extern void dtrace_set_thread_vtime(thread_t, int64_t);
@@ -921,9 +1002,19 @@ void guard_ast(thread_t thread);
 extern void fd_guard_ast(thread_t thread);
 extern void mach_port_guard_ast(thread_t thread);
 extern void thread_guard_violation(thread_t thread, unsigned type);
+extern void thread_update_io_stats(thread_t thread, int size, int io_flags);
+
+extern kern_return_t   thread_set_voucher_name(mach_port_name_t name);
+extern kern_return_t thread_get_current_voucher_origin_pid(int32_t *pid);
+
+extern void set_thread_rwlock_boost(void);
+extern void clear_thread_rwlock_boost(void);
+
+extern void thread_enable_send_importance(thread_t thread, boolean_t enable);
 
 #endif /* XNU_KERNEL_PRIVATE */
 
+
 /*! @function kernel_thread_start
     @abstract Create a kernel thread.
     @discussion This function takes three input parameters, namely reference to the function that the thread should execute, caller specified data and a reference which is used to return the newly created kernel thread. The function returns KERN_SUCCESS on success or an appropriate kernel code type indicating the error. It may be noted that the caller is responsible for explicitly releasing the reference to the created thread when no longer needed. This should be done by calling thread_deallocate(new_thread).
@@ -941,6 +1032,7 @@ extern kern_return_t       kernel_thread_start(
 void thread_set_eager_preempt(thread_t thread);
 void thread_clear_eager_preempt(thread_t thread);
 extern ipc_port_t convert_thread_to_port(thread_t);
+extern boolean_t set_vm_privilege(boolean_t);
 #endif /* KERNEL_PRIVATE */
 
 __END_DECLS