xnu-7195.101.1.tar.gz

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

diff --git a/osfmk/kern/bsd_kern.c b/osfmk/kern/bsd_kern.c
index 69aaa1ceb98ef6afffab242102592095a3a6943e..aafd7130138d36d8a64be3e307bc566068ea4447 100644 (file)
--- a/osfmk/kern/bsd_kern.c
+++ b/osfmk/kern/bsd_kern.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2018 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <mach/mach_types.h>
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <mach/mach_types.h>


@@ -44,28 +44,42 @@
 #include <vm/vm_protos.h> /* last */
 #include <sys/resource.h>
 #include <sys/signal.h>
 #include <vm/vm_protos.h> /* last */
 #include <sys/resource.h>
 #include <sys/signal.h>

+#include <sys/errno.h>
+#include <sys/proc_require.h>
+
+#if MONOTONIC
+#include <kern/monotonic.h>
+#include <machine/monotonic.h>
+#endif /* MONOTONIC */
+
+#include <machine/limits.h>
+#include <sys/codesign.h> /* CS_CDHASH_LEN */

 
 #undef thread_should_halt
 
 /* BSD KERN COMPONENT INTERFACE */
 
 
 #undef thread_should_halt
 
 /* BSD KERN COMPONENT INTERFACE */
 

-task_t bsd_init_task = TASK_NULL;

 extern unsigned int not_in_kdp; /* Skip acquiring locks if we're in kdp */
 extern unsigned int not_in_kdp; /* Skip acquiring locks if we're in kdp */

- 
+

 thread_t get_firstthread(task_t);
 int get_task_userstop(task_t);
 int get_thread_userstop(thread_t);
 boolean_t current_thread_aborted(void);
 thread_t get_firstthread(task_t);
 int get_task_userstop(task_t);
 int get_thread_userstop(thread_t);
 boolean_t current_thread_aborted(void);

-void task_act_iterate_wth_args(task_t, void(*)(thread_t, void *), void *);
-kern_return_t get_signalact(task_t , thread_t *, int);
+void task_act_iterate_wth_args(task_t, void (*)(thread_t, void *), void *);
+kern_return_t get_signalact(task_t, thread_t *, int);

 int fill_task_rusage(task_t task, rusage_info_current *ri);
 int fill_task_io_rusage(task_t task, rusage_info_current *ri);
 int fill_task_qos_rusage(task_t task, rusage_info_current *ri);
 int fill_task_rusage(task_t task, rusage_info_current *ri);
 int fill_task_io_rusage(task_t task, rusage_info_current *ri);
 int fill_task_qos_rusage(task_t task, rusage_info_current *ri);

+void fill_task_monotonic_rusage(task_t task, rusage_info_current *ri);
+uint64_t get_task_logical_writes(task_t task, boolean_t external);

 void fill_task_billed_usage(task_t task, rusage_info_current *ri);
 void task_bsdtask_kill(task_t);
 
 extern uint64_t get_dispatchqueue_serialno_offset_from_proc(void *p);
 void fill_task_billed_usage(task_t task, rusage_info_current *ri);
 void task_bsdtask_kill(task_t);
 
 extern uint64_t get_dispatchqueue_serialno_offset_from_proc(void *p);

+extern uint64_t get_dispatchqueue_label_offset_from_proc(void *p);

 extern uint64_t proc_uniqueid(void *p);
 extern uint64_t proc_uniqueid(void *p);

+extern int proc_pidversion(void *p);
+extern int proc_getcdhash(void *p, char *cdhash);

 
 #if MACH_BSD
 extern void psignal(void *, int);
 
 #if MACH_BSD
 extern void psignal(void *, int);


@@ -74,12 +88,15 @@ extern void psignal(void *, int);
 /*
  *
  */
 /*
  *
  */

-void  *get_bsdtask_info(task_t t)
+void  *
+get_bsdtask_info(task_t t)

 {
 {

-       return(t->bsd_info);
+       proc_require(t->bsd_info, PROC_REQUIRE_ALLOW_NULL | PROC_REQUIRE_ALLOW_KERNPROC);
+       return t->bsd_info;

 }
 
 }
 

-void task_bsdtask_kill(task_t t)
+void
+task_bsdtask_kill(task_t t)

 {
        void * bsd_info = get_bsdtask_info(t);
        if (bsd_info != NULL) {
 {
        void * bsd_info = get_bsdtask_info(t);
        if (bsd_info != NULL) {


@@ -89,34 +106,69 @@ void task_bsdtask_kill(task_t t)
 /*
  *
  */
 /*
  *
  */

-void *get_bsdthreadtask_info(thread_t th)
+void *
+get_bsdthreadtask_info(thread_t th)

 {
 {

-       return(th->task != TASK_NULL ? th->task->bsd_info : NULL);
+       void *bsd_info = NULL;
+
+       if (th->task) {
+               bsd_info = get_bsdtask_info(th->task);
+       }
+       return bsd_info;

 }
 
 /*
  *
  */
 }
 
 /*
  *
  */

-void set_bsdtask_info(task_t t,void * v)
+void
+set_bsdtask_info(task_t t, void * v)

 {
 {

-       t->bsd_info=v;
+       t->bsd_info = v;

 }
 
 /*
  *
  */
 }
 
 /*
  *
  */

-void *get_bsdthread_info(thread_t th)
+void *
+get_bsdthread_info(thread_t th)

 {
 {

-       return(th->uthread);
+       return th->uthread;

 }
 
 }
 

+/*
+ * This is used to remember any FS error from VNOP_PAGEIN code when
+ * invoked under vm_fault(). The value is an errno style value. It can
+ * be retrieved by exception handlers using thread_get_state().
+ */
+void
+set_thread_pagein_error(thread_t th, int error)
+{
+       assert(th == current_thread());
+       if (error == 0 || th->t_pagein_error == 0) {
+               th->t_pagein_error = error;
+       }
+}
+
+#if defined(__x86_64__)
+/*
+ * Returns non-zero if the thread has a non-NULL task
+ * and that task has an LDT.
+ */
+int
+thread_task_has_ldt(thread_t th)
+{
+       return th->task && th->task->i386_ldt != 0;
+}
+#endif /* __x86_64__ */
+

 /*
  * XXX
  */
 /*
  * XXX
  */

-int get_thread_lock_count(thread_t th);                /* forced forward */
-int get_thread_lock_count(thread_t th)
+int get_thread_lock_count(thread_t th);         /* forced forward */
+int
+get_thread_lock_count(thread_t th)

 {
 {

-       return(th->mutex_count);
+       return th->mutex_count;

 }
 
 /*
 }
 
 /*


@@ -125,41 +177,44 @@ int get_thread_lock_count(thread_t th)
  * can't go away, so we make sure it is still active after
  * retrieving the first thread for extra safety.
  */
  * can't go away, so we make sure it is still active after
  * retrieving the first thread for extra safety.
  */

-thread_t get_firstthread(task_t task)
+thread_t
+get_firstthread(task_t task)

 {
 {

-       thread_t        thread = (thread_t)(void *)queue_first(&task->threads);
+       thread_t        thread = (thread_t)(void *)queue_first(&task->threads);

 
 

-       if (queue_end(&task->threads, (queue_entry_t)thread))
+       if (queue_end(&task->threads, (queue_entry_t)thread)) {

                thread = THREAD_NULL;
                thread = THREAD_NULL;

+       }

 
 

-       if (!task->active)
-               return (THREAD_NULL);
+       if (!task->active) {
+               return THREAD_NULL;
+       }

 
 

-       return (thread);
+       return thread;

 }
 
 kern_return_t
 get_signalact(
 }
 
 kern_return_t
 get_signalact(

-       task_t          task,
-       thread_t        *result_out,
-       int                     setast)
+       task_t          task,
+       thread_t        *result_out,
+       int                     setast)

 {
 {

-       kern_return_t   result = KERN_SUCCESS;
-       thread_t                inc, thread = THREAD_NULL;
+       kern_return_t   result = KERN_SUCCESS;
+       thread_t                inc, thread = THREAD_NULL;

 
        task_lock(task);
 
        if (!task->active) {
                task_unlock(task);
 
 
        task_lock(task);
 
        if (!task->active) {
                task_unlock(task);
 

-               return (KERN_FAILURE);
+               return KERN_FAILURE;

        }
 
        for (inc  = (thread_t)(void *)queue_first(&task->threads);
        }
 
        for (inc  = (thread_t)(void *)queue_first(&task->threads);

-                       !queue_end(&task->threads, (queue_entry_t)inc); ) {
+           !queue_end(&task->threads, (queue_entry_t)inc);) {

                thread_mtx_lock(inc);
                if (inc->active &&
                thread_mtx_lock(inc);
                if (inc->active &&

-                               (inc->sched_flags & TH_SFLAG_ABORTED_MASK) != TH_SFLAG_ABORT) {
+                   (inc->sched_flags & TH_SFLAG_ABORTED_MASK) != TH_SFLAG_ABORT) {

                        thread = inc;
                        break;
                }
                        thread = inc;
                        break;
                }


@@ -168,48 +223,50 @@ get_signalact(
                inc = (thread_t)(void *)queue_next(&inc->task_threads);
        }
 
                inc = (thread_t)(void *)queue_next(&inc->task_threads);
        }
 

-       if (result_out) 
+       if (result_out) {

                *result_out = thread;
                *result_out = thread;

+       }

 
        if (thread) {
 
        if (thread) {

-               if (setast)
+               if (setast) {

                        act_set_astbsd(thread);
                        act_set_astbsd(thread);

+               }

 
                thread_mtx_unlock(thread);
 
                thread_mtx_unlock(thread);

-       }
-       else
+       } else {

                result = KERN_FAILURE;
                result = KERN_FAILURE;

+       }

 
        task_unlock(task);
 
 
        task_unlock(task);
 

-       return (result);
+       return result;

 }
 
 
 kern_return_t
 check_actforsig(
 }
 
 
 kern_return_t
 check_actforsig(

-       task_t                  task,
-       thread_t                thread,
-       int                             setast)
+       task_t                  task,
+       thread_t                thread,
+       int                             setast)

 {
 {

-       kern_return_t   result = KERN_FAILURE;
-       thread_t                inc;
+       kern_return_t   result = KERN_FAILURE;
+       thread_t                inc;

 
        task_lock(task);
 
        if (!task->active) {
                task_unlock(task);
 
 
        task_lock(task);
 
        if (!task->active) {
                task_unlock(task);
 

-               return (KERN_FAILURE);
+               return KERN_FAILURE;

        }
 
        for (inc  = (thread_t)(void *)queue_first(&task->threads);
        }
 
        for (inc  = (thread_t)(void *)queue_first(&task->threads);

-                       !queue_end(&task->threads, (queue_entry_t)inc); ) {
+           !queue_end(&task->threads, (queue_entry_t)inc);) {

                if (inc == thread) {
                        thread_mtx_lock(inc);
 
                if (inc == thread) {
                        thread_mtx_lock(inc);
 

-                       if (inc->active  && 
-                                       (inc->sched_flags & TH_SFLAG_ABORTED_MASK) != TH_SFLAG_ABORT) {
+                       if (inc->active &&
+                           (inc->sched_flags & TH_SFLAG_ABORTED_MASK) != TH_SFLAG_ABORT) {

                                result = KERN_SUCCESS;
                                break;
                        }
                                result = KERN_SUCCESS;
                                break;
                        }


@@ -222,20 +279,22 @@ check_actforsig(
        }
 
        if (result == KERN_SUCCESS) {
        }
 
        if (result == KERN_SUCCESS) {

-               if (setast)
+               if (setast) {

                        act_set_astbsd(thread);
                        act_set_astbsd(thread);

+               }

 
                thread_mtx_unlock(thread);
        }
 
        task_unlock(task);
 
 
                thread_mtx_unlock(thread);
        }
 
        task_unlock(task);
 

-       return (result);
+       return result;

 }
 
 }
 

-ledger_t  get_task_ledger(task_t t)
+ledger_t
+get_task_ledger(task_t t)

 {
 {

-       return(t->ledger);
+       return t->ledger;

 }
 
 /*
 }
 
 /*


@@ -244,17 +303,20 @@ ledger_t  get_task_ledger(task_t t)
  * the map could be switched for the task (and freed) before
  * we go to return it here.
  */
  * the map could be switched for the task (and freed) before
  * we go to return it here.
  */

-vm_map_t  get_task_map(task_t t)
+vm_map_t
+get_task_map(task_t t)

 {
 {

-       return(t->map);
+       return t->map;

 }
 
 }
 

-vm_map_t  get_task_map_reference(task_t t)
+vm_map_t
+get_task_map_reference(task_t t)

 {
        vm_map_t m;
 
 {
        vm_map_t m;
 

-       if (t == NULL)
+       if (t == NULL) {

                return VM_MAP_NULL;
                return VM_MAP_NULL;

+       }

 
        task_lock(t);
        if (!t->active) {
 
        task_lock(t);
        if (!t->active) {


@@ -262,7 +324,7 @@ vm_map_t  get_task_map_reference(task_t t)
                return VM_MAP_NULL;
        }
        m = t->map;
                return VM_MAP_NULL;
        }
        m = t->map;

-       vm_map_reference_swap(m);
+       vm_map_reference(m);

        task_unlock(t);
        return m;
 }
        task_unlock(t);
        return m;
 }


@@ -270,53 +332,42 @@ vm_map_t  get_task_map_reference(task_t t)
 /*
  *
  */
 /*
  *
  */

-ipc_space_t  get_task_ipcspace(task_t t)
+ipc_space_t
+get_task_ipcspace(task_t t)

 {
 {

-       return(t->itk_space);
+       return t->itk_space;

 }
 
 }
 

-int get_task_numactivethreads(task_t task)
-{
-       thread_t        inc;
-       int num_active_thr=0;
-       task_lock(task);
-
-       for (inc  = (thread_t)(void *)queue_first(&task->threads);
-                       !queue_end(&task->threads, (queue_entry_t)inc); inc = (thread_t)(void *)queue_next(&inc->task_threads)) 
-       {
-               if(inc->active)
-                       num_active_thr++;
-       }
-       task_unlock(task);
-       return num_active_thr;
-}
-
-int  get_task_numacts(task_t t)
+int
+get_task_numacts(task_t t)

 {
 {

-       return(t->thread_count);
+       return t->thread_count;

 }
 
 /* does this machine need  64bit register set for signal handler */
 }
 
 /* does this machine need  64bit register set for signal handler */

-int is_64signalregset(void)
+int
+is_64signalregset(void)

 {
 {

-       if (task_has_64BitData(current_task())) {
-               return(1);
+       if (task_has_64Bit_data(current_task())) {
+               return 1;

        }
 
        }
 

-       return(0);
+       return 0;

 }
 
 /*
  * Swap in a new map for the task/thread pair; the old map reference is
 }
 
 /*
  * Swap in a new map for the task/thread pair; the old map reference is

- * returned.
+ * returned. Also does a pmap switch if thread provided is current thread.

  */
 vm_map_t
  */
 vm_map_t

-swap_task_map(task_t task, thread_t thread, vm_map_t map, boolean_t doswitch)
+swap_task_map(task_t task, thread_t thread, vm_map_t map)

 {
        vm_map_t old_map;
 {
        vm_map_t old_map;

+       boolean_t doswitch = (thread == current_thread()) ? TRUE : FALSE;

 
 

-       if (task != thread->task)
+       if (task != thread->task) {

                panic("swap_task_map");
                panic("swap_task_map");

+       }

 
        task_lock(task);
        mp_disable_preemption();
 
        task_lock(task);
        mp_disable_preemption();


@@ -326,15 +377,11 @@ swap_task_map(task_t task, thread_t thread, vm_map_t map, boolean_t doswitch)
        vm_commit_pagezero_status(map);
 
        if (doswitch) {
        vm_commit_pagezero_status(map);
 
        if (doswitch) {

-               pmap_switch(map->pmap);
+               PMAP_SWITCH_USER(thread, map, cpu_number());

        }
        mp_enable_preemption();
        task_unlock(task);
 
        }
        mp_enable_preemption();
        task_unlock(task);
 

-#if (defined(__i386__) || defined(__x86_64__)) && NCOPY_WINDOWS > 0
-       inval_copy_windows(thread);
-#endif
-

        return old_map;
 }
 
        return old_map;
 }
 


@@ -345,57 +392,75 @@ swap_task_map(task_t task, thread_t thread, vm_map_t map, boolean_t doswitch)
  * the map could be switched for the task (and freed) before
  * we go to return it here.
  */
  * the map could be switched for the task (and freed) before
  * we go to return it here.
  */

-pmap_t  get_task_pmap(task_t t)
+pmap_t
+get_task_pmap(task_t t)

 {
 {

-       return(t->map->pmap);
+       return t->map->pmap;

 }
 
 /*
  *
  */
 }
 
 /*
  *
  */

-uint64_t get_task_resident_size(task_t task) 
+uint64_t
+get_task_resident_size(task_t task)

 {
        vm_map_t map;
 {
        vm_map_t map;

-       
+

        map = (task == kernel_task) ? kernel_map: task->map;
        map = (task == kernel_task) ? kernel_map: task->map;

-       return((uint64_t)pmap_resident_count(map->pmap) * PAGE_SIZE_64);
+       return (uint64_t)pmap_resident_count(map->pmap) * PAGE_SIZE_64;

 }
 
 }
 

-uint64_t get_task_compressed(task_t task) 
+uint64_t
+get_task_compressed(task_t task)

 {
        vm_map_t map;
 {
        vm_map_t map;

-       
+

        map = (task == kernel_task) ? kernel_map: task->map;
        map = (task == kernel_task) ? kernel_map: task->map;

-       return((uint64_t)pmap_compressed(map->pmap) * PAGE_SIZE_64);
+       return (uint64_t)pmap_compressed(map->pmap) * PAGE_SIZE_64;

 }
 
 }
 

-uint64_t get_task_resident_max(task_t task) 
+uint64_t
+get_task_resident_max(task_t task)

 {
        vm_map_t map;
 {
        vm_map_t map;

-       
+

        map = (task == kernel_task) ? kernel_map: task->map;
        map = (task == kernel_task) ? kernel_map: task->map;

-       return((uint64_t)pmap_resident_max(map->pmap) * PAGE_SIZE_64);
+       return (uint64_t)pmap_resident_max(map->pmap) * PAGE_SIZE_64;
+}
+
+/*
+ * Get the balance for a given field in the task ledger.
+ * Returns 0 if the entry is invalid.
+ */
+static uint64_t
+get_task_ledger_balance(task_t task, int entry)
+{
+       ledger_amount_t balance = 0;
+
+       ledger_get_balance(task->ledger, entry, &balance);
+       return balance;

 }
 
 }
 

-uint64_t get_task_purgeable_size(task_t task) 
+uint64_t
+get_task_purgeable_size(task_t task)

 {
        kern_return_t ret;
 {
        kern_return_t ret;

-       ledger_amount_t credit, debit;
+       ledger_amount_t balance = 0;

        uint64_t volatile_size = 0;
 
        uint64_t volatile_size = 0;
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.purgeable_volatile, &credit, &debit);
+       ret = ledger_get_balance(task->ledger, task_ledgers.purgeable_volatile, &balance);

        if (ret != KERN_SUCCESS) {
                return 0;
        }
 
        if (ret != KERN_SUCCESS) {
                return 0;
        }
 

-       volatile_size += (credit - debit);
+       volatile_size += balance;

 
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.purgeable_volatile_compressed, &credit, &debit);
+       ret = ledger_get_balance(task->ledger, task_ledgers.purgeable_volatile_compressed, &balance);

        if (ret != KERN_SUCCESS) {
                return 0;
        }
 
        if (ret != KERN_SUCCESS) {
                return 0;
        }
 

-       volatile_size += (credit - debit);
+       volatile_size += balance;

 
        return volatile_size;
 }
 
        return volatile_size;
 }


@@ -403,28 +468,43 @@ uint64_t get_task_purgeable_size(task_t task)
 /*
  *
  */
 /*
  *
  */

-uint64_t get_task_phys_footprint(task_t task) 
-{      
+uint64_t
+get_task_phys_footprint(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.phys_footprint);
+}
+
+#if CONFIG_LEDGER_INTERVAL_MAX
+/*
+ *
+ */
+uint64_t
+get_task_phys_footprint_interval_max(task_t task, int reset)
+{

        kern_return_t ret;
        kern_return_t ret;

-       ledger_amount_t credit, debit;
-       
-       ret = ledger_get_entries(task->ledger, task_ledgers.phys_footprint, &credit, &debit);
+       ledger_amount_t max;
+
+       ret = ledger_get_interval_max(task->ledger, task_ledgers.phys_footprint, &max, reset);
+

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return max;

        }
 
        return 0;
 }
        }
 
        return 0;
 }

+#endif /* CONFIG_LEDGER_INTERVAL_MAX */

 
 /*
  *
  */
 
 /*
  *
  */

-uint64_t get_task_phys_footprint_max(task_t task) 
-{      
+uint64_t
+get_task_phys_footprint_lifetime_max(task_t task)
+{

        kern_return_t ret;
        ledger_amount_t max;
        kern_return_t ret;
        ledger_amount_t max;

-       
-       ret = ledger_get_maximum(task->ledger, task_ledgers.phys_footprint, &max);
+
+       ret = ledger_get_lifetime_max(task->ledger, task_ledgers.phys_footprint, &max);
+

        if (KERN_SUCCESS == ret) {
                return max;
        }
        if (KERN_SUCCESS == ret) {
                return max;
        }


@@ -435,7 +515,8 @@ uint64_t get_task_phys_footprint_max(task_t task)
 /*
  *
  */
 /*
  *
  */

-uint64_t get_task_phys_footprint_limit(task_t task)
+uint64_t
+get_task_phys_footprint_limit(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t max;
 {
        kern_return_t ret;
        ledger_amount_t max;


@@ -448,129 +529,218 @@ uint64_t get_task_phys_footprint_limit(task_t task)
        return 0;
 }
 
        return 0;
 }
 

-uint64_t get_task_internal(task_t task)
+uint64_t
+get_task_internal(task_t task)

 {
 {

-       kern_return_t ret;
-       ledger_amount_t credit, debit;
+       return get_task_ledger_balance(task, task_ledgers.internal);
+}

 
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.internal, &credit, &debit);
-       if (KERN_SUCCESS == ret) {
-               return (credit - debit);
-       }
+uint64_t
+get_task_internal_compressed(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.internal_compressed);
+}

 
 

-       return 0;
+uint64_t
+get_task_purgeable_nonvolatile(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.purgeable_nonvolatile);
+}
+
+uint64_t
+get_task_purgeable_nonvolatile_compressed(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.purgeable_nonvolatile_compressed);
+}
+
+uint64_t
+get_task_alternate_accounting(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.alternate_accounting);
+}
+
+uint64_t
+get_task_alternate_accounting_compressed(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.alternate_accounting_compressed);
+}
+
+uint64_t
+get_task_page_table(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.page_table);
+}
+
+#if CONFIG_FREEZE
+uint64_t
+get_task_frozen_to_swap(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.frozen_to_swap);

 }
 }

+#endif /* CONFIG_FREEZE */

 
 

-uint64_t get_task_internal_compressed(task_t task)
+uint64_t
+get_task_iokit_mapped(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.iokit_mapped);
+}
+
+uint64_t
+get_task_network_nonvolatile(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.network_nonvolatile);
+}
+
+uint64_t
+get_task_network_nonvolatile_compressed(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.network_nonvolatile_compressed);
+}
+
+uint64_t
+get_task_wired_mem(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.wired_mem);
+}
+
+uint64_t
+get_task_tagged_footprint(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 
 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.internal_compressed, &credit, &debit);
+       ret = ledger_get_entries(task->ledger, task_ledgers.tagged_footprint, &credit, &debit);

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return credit - debit;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

-uint64_t get_task_purgeable_nonvolatile(task_t task)
+uint64_t
+get_task_tagged_footprint_compressed(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 
 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.purgeable_nonvolatile, &credit, &debit);
+       ret = ledger_get_entries(task->ledger, task_ledgers.tagged_footprint_compressed, &credit, &debit);

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return credit - debit;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

-uint64_t get_task_purgeable_nonvolatile_compressed(task_t task)
+uint64_t
+get_task_media_footprint(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 
 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.purgeable_nonvolatile_compressed, &credit, &debit);
+       ret = ledger_get_entries(task->ledger, task_ledgers.media_footprint, &credit, &debit);

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return credit - debit;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

-uint64_t get_task_alternate_accounting(task_t task)
+uint64_t
+get_task_media_footprint_compressed(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 
 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.alternate_accounting, &credit, &debit);
+       ret = ledger_get_entries(task->ledger, task_ledgers.media_footprint_compressed, &credit, &debit);

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return credit - debit;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

-uint64_t get_task_alternate_accounting_compressed(task_t task)
+uint64_t
+get_task_graphics_footprint(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 
 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.alternate_accounting_compressed, &credit, &debit);
+       ret = ledger_get_entries(task->ledger, task_ledgers.graphics_footprint, &credit, &debit);

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return credit - debit;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

-uint64_t get_task_page_table(task_t task)
+
+uint64_t
+get_task_graphics_footprint_compressed(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 
 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.page_table, &credit, &debit);
+       ret = ledger_get_entries(task->ledger, task_ledgers.graphics_footprint_compressed, &credit, &debit);

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return credit - debit;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

-uint64_t get_task_iokit_mapped(task_t task)
+uint64_t
+get_task_neural_footprint(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 
 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 

-       ret = ledger_get_entries(task->ledger, task_ledgers.iokit_mapped, &credit, &debit);
+       ret = ledger_get_entries(task->ledger, task_ledgers.neural_footprint, &credit, &debit);

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return credit - debit;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

-uint64_t get_task_cpu_time(task_t task)
+uint64_t
+get_task_neural_footprint_compressed(task_t task)

 {
        kern_return_t ret;
        ledger_amount_t credit, debit;
 {
        kern_return_t ret;
        ledger_amount_t credit, debit;

-       
-       ret = ledger_get_entries(task->ledger, task_ledgers.cpu_time, &credit, &debit);
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.neural_footprint_compressed, &credit, &debit);

        if (KERN_SUCCESS == ret) {
        if (KERN_SUCCESS == ret) {

-               return (credit - debit);
+               return credit - debit;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

+uint64_t
+get_task_cpu_time(task_t task)
+{
+       return get_task_ledger_balance(task, task_ledgers.cpu_time);
+}
+
+uint32_t
+get_task_loadTag(task_t task)
+{
+       return os_atomic_load(&task->loadTag, relaxed);
+}
+
+uint32_t
+set_task_loadTag(task_t task, uint32_t loadTag)
+{
+       return os_atomic_xchg(&task->loadTag, loadTag, relaxed);
+}
+

 /*
  *
  */
 /*
  *
  */

-task_t get_threadtask(thread_t th)
+task_t
+get_threadtask(thread_t th)

 {
 {

-       return(th->task);
+       return th->task;

 }
 
 /*
 }
 
 /*


@@ -578,9 +748,9 @@ task_t      get_threadtask(thread_t th)
  */
 vm_map_offset_t
 get_map_min(
  */
 vm_map_offset_t
 get_map_min(

-       vm_map_t        map)
+       vm_map_t        map)

 {
 {

-       return(vm_map_min(map));
+       return vm_map_min(map);

 }
 
 /*
 }
 
 /*


@@ -588,80 +758,90 @@ get_map_min(
  */
 vm_map_offset_t
 get_map_max(
  */
 vm_map_offset_t
 get_map_max(

-       vm_map_t        map)
+       vm_map_t        map)

 {
 {

-       return(vm_map_max(map));
+       return vm_map_max(map);

 }
 vm_map_size_t
 get_vmmap_size(
 }
 vm_map_size_t
 get_vmmap_size(

-       vm_map_t        map)
+       vm_map_t        map)

 {
 {

-       return(map->size);
+       return vm_map_adjusted_size(map);
+}
+int
+get_task_page_size(
+       task_t task)
+{
+       return vm_map_page_size(task->map);

 }
 
 #if CONFIG_COREDUMP
 
 static int
 get_vmsubmap_entries(
 }
 
 #if CONFIG_COREDUMP
 
 static int
 get_vmsubmap_entries(

-       vm_map_t        map,
-       vm_object_offset_t      start,
-       vm_object_offset_t      end)
+       vm_map_t        map,
+       vm_object_offset_t      start,
+       vm_object_offset_t      end)

 {
 {

-       int     total_entries = 0;
-       vm_map_entry_t  entry;
+       int     total_entries = 0;
+       vm_map_entry_t  entry;

 
 

-       if (not_in_kdp)
-         vm_map_lock(map);
+       if (not_in_kdp) {
+               vm_map_lock(map);
+       }

        entry = vm_map_first_entry(map);
        entry = vm_map_first_entry(map);

-       while((entry != vm_map_to_entry(map)) && (entry->vme_start < start)) {
+       while ((entry != vm_map_to_entry(map)) && (entry->vme_start < start)) {

                entry = entry->vme_next;
        }
 
                entry = entry->vme_next;
        }
 

-       while((entry != vm_map_to_entry(map)) && (entry->vme_start < end)) {
-               if(entry->is_sub_map) {
-                       total_entries +=        
-                               get_vmsubmap_entries(VME_SUBMAP(entry), 
-                                                    VME_OFFSET(entry), 
-                                                    (VME_OFFSET(entry) + 
-                                                     entry->vme_end -
-                                                     entry->vme_start));
+       while ((entry != vm_map_to_entry(map)) && (entry->vme_start < end)) {
+               if (entry->is_sub_map) {
+                       total_entries +=
+                           get_vmsubmap_entries(VME_SUBMAP(entry),
+                           VME_OFFSET(entry),
+                           (VME_OFFSET(entry) +
+                           entry->vme_end -
+                           entry->vme_start));

                } else {
                        total_entries += 1;
                }
                entry = entry->vme_next;
        }
                } else {
                        total_entries += 1;
                }
                entry = entry->vme_next;
        }

-       if (not_in_kdp)
-         vm_map_unlock(map);
-       return(total_entries);
+       if (not_in_kdp) {
+               vm_map_unlock(map);
+       }
+       return total_entries;

 }
 
 int
 get_vmmap_entries(
 }
 
 int
 get_vmmap_entries(

-       vm_map_t        map)
+       vm_map_t        map)

 {
 {

-       int     total_entries = 0;
-       vm_map_entry_t  entry;
+       int     total_entries = 0;
+       vm_map_entry_t  entry;

 
 

-       if (not_in_kdp)
-         vm_map_lock(map);
+       if (not_in_kdp) {
+               vm_map_lock(map);
+       }

        entry = vm_map_first_entry(map);
 
        entry = vm_map_first_entry(map);
 

-       while(entry != vm_map_to_entry(map)) {
-               if(entry->is_sub_map) {
-                       total_entries +=        
-                               get_vmsubmap_entries(VME_SUBMAP(entry), 
-                                                    VME_OFFSET(entry),
-                                                    (VME_OFFSET(entry) + 
-                                                     entry->vme_end -
-                                                     entry->vme_start));
+       while (entry != vm_map_to_entry(map)) {
+               if (entry->is_sub_map) {
+                       total_entries +=
+                           get_vmsubmap_entries(VME_SUBMAP(entry),
+                           VME_OFFSET(entry),
+                           (VME_OFFSET(entry) +
+                           entry->vme_end -
+                           entry->vme_start));

                } else {
                        total_entries += 1;
                }
                entry = entry->vme_next;
        }
                } else {
                        total_entries += 1;
                }
                entry = entry->vme_next;
        }

-       if (not_in_kdp)
-         vm_map_unlock(map);
-       return(total_entries);
+       if (not_in_kdp) {
+               vm_map_unlock(map);
+       }
+       return total_entries;

 }
 #endif /* CONFIG_COREDUMP */
 
 }
 #endif /* CONFIG_COREDUMP */
 


@@ -675,7 +855,7 @@ int
 get_task_userstop(
        task_t task)
 {
 get_task_userstop(
        task_t task)
 {

-       return(task->user_stop_count);
+       return task->user_stop_count;

 }
 
 /*
 }
 
 /*


@@ -685,7 +865,7 @@ int
 get_thread_userstop(
        thread_t th)
 {
 get_thread_userstop(
        thread_t th)
 {

-       return(th->user_stop_count);
+       return th->user_stop_count;

 }
 
 /*
 }
 
 /*


@@ -695,17 +875,17 @@ boolean_t
 get_task_pidsuspended(
        task_t task)
 {
 get_task_pidsuspended(
        task_t task)
 {

-    return (task->pidsuspended);
+       return task->pidsuspended;

 }
 
 /*
  *
  */
 }
 
 /*
  *
  */

-boolean_t 
+boolean_t

 get_task_frozen(
        task_t task)
 {
 get_task_frozen(
        task_t task)
 {

-    return (task->frozen);   
+       return task->frozen;

 }
 
 /*
 }
 
 /*


@@ -715,7 +895,7 @@ boolean_t
 thread_should_abort(
        thread_t th)
 {
 thread_should_abort(
        thread_t th)
 {

-       return ((th->sched_flags & TH_SFLAG_ABORTED_MASK) == TH_SFLAG_ABORT);
+       return (th->sched_flags & TH_SFLAG_ABORTED_MASK) == TH_SFLAG_ABORT;

 }
 
 /*
 }
 
 /*


@@ -727,20 +907,22 @@ thread_should_abort(
  * qualifies.
  */
 boolean_t
  * qualifies.
  */
 boolean_t

-current_thread_aborted (
-               void)
+current_thread_aborted(
+       void)

 {
        thread_t th = current_thread();
        spl_t s;
 
        if ((th->sched_flags & TH_SFLAG_ABORTED_MASK) == TH_SFLAG_ABORT &&
 {
        thread_t th = current_thread();
        spl_t s;
 
        if ((th->sched_flags & TH_SFLAG_ABORTED_MASK) == TH_SFLAG_ABORT &&

-                       (th->options & TH_OPT_INTMASK) != THREAD_UNINT)
-               return (TRUE);
+           (th->options & TH_OPT_INTMASK) != THREAD_UNINT) {
+               return TRUE;
+       }

        if (th->sched_flags & TH_SFLAG_ABORTSAFELY) {
                s = splsched();
                thread_lock(th);
        if (th->sched_flags & TH_SFLAG_ABORTSAFELY) {
                s = splsched();
                thread_lock(th);

-               if (th->sched_flags & TH_SFLAG_ABORTSAFELY)
+               if (th->sched_flags & TH_SFLAG_ABORTSAFELY) {

                        th->sched_flags &= ~TH_SFLAG_ABORTED_MASK;
                        th->sched_flags &= ~TH_SFLAG_ABORTED_MASK;

+               }

                thread_unlock(th);
                splx(s);
        }
                thread_unlock(th);
                splx(s);
        }


@@ -752,16 +934,16 @@ current_thread_aborted (
  */
 void
 task_act_iterate_wth_args(
  */
 void
 task_act_iterate_wth_args(

-       task_t                  task,
-       void                    (*func_callback)(thread_t, void *),
-       void                    *func_arg)
+       task_t                  task,
+       void                    (*func_callback)(thread_t, void *),
+       void                    *func_arg)

 {
 {

-       thread_t        inc;
+       thread_t        inc;

 
        task_lock(task);
 
        for (inc  = (thread_t)(void *)queue_first(&task->threads);
 
        task_lock(task);
 
        for (inc  = (thread_t)(void *)queue_first(&task->threads);

-                       !queue_end(&task->threads, (queue_entry_t)inc); ) {
+           !queue_end(&task->threads, (queue_entry_t)inc);) {

                (void) (*func_callback)(inc, func_arg);
                inc = (thread_t)(void *)queue_next(&inc->task_threads);
        }
                (void) (*func_callback)(inc, func_arg);
                inc = (thread_t)(void *)queue_next(&inc->task_threads);
        }


@@ -786,13 +968,13 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
 
        map = (task == kernel_task)? kernel_map: task->map;
 
 
        map = (task == kernel_task)? kernel_map: task->map;
 

-       ptinfo->pti_virtual_size  = map->size;
+       ptinfo->pti_virtual_size  = vm_map_adjusted_size(map);

        ptinfo->pti_resident_size =
        ptinfo->pti_resident_size =

-               (mach_vm_size_t)(pmap_resident_count(map->pmap))
-               * PAGE_SIZE_64;
+           (mach_vm_size_t)(pmap_resident_count(map->pmap))
+           * PAGE_SIZE_64;

 
        ptinfo->pti_policy = ((task != kernel_task)?
 
        ptinfo->pti_policy = ((task != kernel_task)?

-                                          POLICY_TIMESHARE: POLICY_RR);
+           POLICY_TIMESHARE: POLICY_RR);

 
        tinfo.threads_user = tinfo.threads_system = 0;
        tinfo.total_user = task->total_user_time;
 
        tinfo.threads_user = tinfo.threads_system = 0;
        tinfo.total_user = task->total_user_time;


@@ -802,14 +984,16 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
                uint64_t    tval;
                spl_t x;
 
                uint64_t    tval;
                spl_t x;
 

-               if (thread->options & TH_OPT_IDLE_THREAD)
+               if (thread->options & TH_OPT_IDLE_THREAD) {

                        continue;
                        continue;

+               }

 
                x = splsched();
                thread_lock(thread);
 
 
                x = splsched();
                thread_lock(thread);
 

-               if ((thread->state & TH_RUN) == TH_RUN)
+               if ((thread->state & TH_RUN) == TH_RUN) {

                        numrunning++;
                        numrunning++;

+               }

                cswitch += thread->c_switch;
                tval = timer_grab(&thread->user_timer);
                tinfo.threads_user += tval;
                cswitch += thread->c_switch;
                tval = timer_grab(&thread->user_timer);
                tinfo.threads_user += tval;


@@ -837,8 +1021,8 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
        ptinfo->pti_total_user = tinfo.total_user;
        ptinfo->pti_threads_system = tinfo.threads_system;
        ptinfo->pti_threads_user = tinfo.threads_user;
        ptinfo->pti_total_user = tinfo.total_user;
        ptinfo->pti_threads_system = tinfo.threads_system;
        ptinfo->pti_threads_user = tinfo.threads_user;

-       
-       ptinfo->pti_faults = task->faults;
+
+       ptinfo->pti_faults = (int32_t) MIN(counter_load(&task->faults), INT32_MAX);

        ptinfo->pti_pageins = task->pageins;
        ptinfo->pti_cow_faults = task->cow_faults;
        ptinfo->pti_messages_sent = task->messages_sent;
        ptinfo->pti_pageins = task->pageins;
        ptinfo->pti_cow_faults = task->cow_faults;
        ptinfo->pti_messages_sent = task->messages_sent;


@@ -853,11 +1037,11 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
        task_unlock(task);
 }
 
        task_unlock(task);
 }
 

-int 
-fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_threadinfo_internal * ptinfo, void * vpp, int *vidp)
+int
+fill_taskthreadinfo(task_t task, uint64_t thaddr, bool thuniqueid, struct proc_threadinfo_internal * ptinfo, void * vpp, int *vidp)

 {
        thread_t  thact;
 {
        thread_t  thact;

-       int err=0;
+       int err = 0;

        mach_msg_type_number_t count;
        thread_basic_info_data_t basic_info;
        kern_return_t kret;
        mach_msg_type_number_t count;
        thread_basic_info_data_t basic_info;
        kern_return_t kret;


@@ -866,18 +1050,16 @@ fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_th
        task_lock(task);
 
        for (thact  = (thread_t)(void *)queue_first(&task->threads);
        task_lock(task);
 
        for (thact  = (thread_t)(void *)queue_first(&task->threads);

-                       !queue_end(&task->threads, (queue_entry_t)thact); ) {
-               addr = (thuniqueid==0)?thact->machine.cthread_self: thact->thread_id;
-               if (addr == thaddr)
-               {
-               
+           !queue_end(&task->threads, (queue_entry_t)thact);) {
+               addr = (thuniqueid) ? thact->thread_id : thact->machine.cthread_self;
+               if (addr == thaddr) {

                        count = THREAD_BASIC_INFO_COUNT;
                        if ((kret = thread_info_internal(thact, THREAD_BASIC_INFO, (thread_info_t)&basic_info, &count)) != KERN_SUCCESS) {
                                err = 1;
                        count = THREAD_BASIC_INFO_COUNT;
                        if ((kret = thread_info_internal(thact, THREAD_BASIC_INFO, (thread_info_t)&basic_info, &count)) != KERN_SUCCESS) {
                                err = 1;

-                               goto out;       
+                               goto out;

                        }
                        }

-                       ptinfo->pth_user_time = ((basic_info.user_time.seconds * (integer_t)NSEC_PER_SEC) + (basic_info.user_time.microseconds * (integer_t)NSEC_PER_USEC));
-                       ptinfo->pth_system_time = ((basic_info.system_time.seconds * (integer_t)NSEC_PER_SEC) + (basic_info.system_time.microseconds * (integer_t)NSEC_PER_USEC));
+                       ptinfo->pth_user_time = (((uint64_t)basic_info.user_time.seconds * NSEC_PER_SEC) + ((uint64_t)basic_info.user_time.microseconds * NSEC_PER_USEC));
+                       ptinfo->pth_system_time = (((uint64_t)basic_info.system_time.seconds * NSEC_PER_SEC) + ((uint64_t)basic_info.system_time.microseconds * NSEC_PER_USEC));

 
                        ptinfo->pth_cpu_usage = basic_info.cpu_usage;
                        ptinfo->pth_policy = basic_info.policy;
 
                        ptinfo->pth_cpu_usage = basic_info.cpu_usage;
                        ptinfo->pth_policy = basic_info.policy;


@@ -887,12 +1069,13 @@ fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_th
                        ptinfo->pth_curpri = thact->sched_pri;
                        ptinfo->pth_priority = thact->base_pri;
                        ptinfo->pth_maxpriority = thact->max_priority;
                        ptinfo->pth_curpri = thact->sched_pri;
                        ptinfo->pth_priority = thact->base_pri;
                        ptinfo->pth_maxpriority = thact->max_priority;

-                       
-                       if ((vpp != NULL) && (thact->uthread != NULL)) 
+
+                       if ((vpp != NULL) && (thact->uthread != NULL)) {

                                bsd_threadcdir(thact->uthread, vpp, vidp);
                                bsd_threadcdir(thact->uthread, vpp, vidp);

-                       bsd_getthreadname(thact->uthread,ptinfo->pth_name);
+                       }
+                       bsd_getthreadname(thact->uthread, ptinfo->pth_name);

                        err = 0;
                        err = 0;

-                       goto out; 
+                       goto out;

                }
                thact = (thread_t)(void *)queue_next(&thact->task_threads);
        }
                }
                thact = (thread_t)(void *)queue_next(&thact->task_threads);
        }


@@ -900,13 +1083,13 @@ fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_th
 
 out:
        task_unlock(task);
 
 out:
        task_unlock(task);

-       return(err);
+       return err;

 }
 
 int
 }
 
 int

-fill_taskthreadlist(task_t task, void * buffer, int thcount)
+fill_taskthreadlist(task_t task, void * buffer, int thcount, bool thuniqueid)

 {
 {

-       int numthr=0;
+       int numthr = 0;

        thread_t thact;
        uint64_t * uptr;
        uint64_t  thaddr;
        thread_t thact;
        uint64_t * uptr;
        uint64_t  thaddr;


@@ -916,29 +1099,29 @@ fill_taskthreadlist(task_t task, void * buffer, int thcount)
        task_lock(task);
 
        for (thact  = (thread_t)(void *)queue_first(&task->threads);
        task_lock(task);
 
        for (thact  = (thread_t)(void *)queue_first(&task->threads);

-                       !queue_end(&task->threads, (queue_entry_t)thact); ) {
-               thaddr = thact->machine.cthread_self;
+           !queue_end(&task->threads, (queue_entry_t)thact);) {
+               thaddr = (thuniqueid) ? thact->thread_id : thact->machine.cthread_self;

                *uptr++ = thaddr;
                numthr++;
                *uptr++ = thaddr;
                numthr++;

-               if (numthr >= thcount)
+               if (numthr >= thcount) {

                        goto out;
                        goto out;

+               }

                thact = (thread_t)(void *)queue_next(&thact->task_threads);
        }
 
 out:
        task_unlock(task);
        return (int)(numthr * sizeof(uint64_t));
                thact = (thread_t)(void *)queue_next(&thact->task_threads);
        }
 
 out:
        task_unlock(task);
        return (int)(numthr * sizeof(uint64_t));

-       

 }
 
 int
 get_numthreads(task_t task)
 {
 }
 
 int
 get_numthreads(task_t task)
 {

-       return(task->thread_count);
+       return task->thread_count;

 }
 
 /*
 }
 
 /*

- * Gather the various pieces of info about the designated task, 
+ * Gather the various pieces of info about the designated task,

  * and collect it all into a single rusage_info.
  */
 int
  * and collect it all into a single rusage_info.
  */
 int


@@ -946,38 +1129,34 @@ fill_task_rusage(task_t task, rusage_info_current *ri)
 {
        struct task_power_info powerinfo;
 
 {
        struct task_power_info powerinfo;
 

+       uint64_t runnable_time = 0;
+

        assert(task != TASK_NULL);
        task_lock(task);
 
        assert(task != TASK_NULL);
        task_lock(task);
 

-       task_power_info_locked(task, &powerinfo, NULL, NULL);
+       task_power_info_locked(task, &powerinfo, NULL, NULL, &runnable_time);

        ri->ri_pkg_idle_wkups = powerinfo.task_platform_idle_wakeups;
        ri->ri_interrupt_wkups = powerinfo.task_interrupt_wakeups;
        ri->ri_user_time = powerinfo.total_user;
        ri->ri_system_time = powerinfo.total_system;
        ri->ri_pkg_idle_wkups = powerinfo.task_platform_idle_wakeups;
        ri->ri_interrupt_wkups = powerinfo.task_interrupt_wakeups;
        ri->ri_user_time = powerinfo.total_user;
        ri->ri_system_time = powerinfo.total_system;

+       ri->ri_runnable_time = runnable_time;

 
 

-       ledger_get_balance(task->ledger, task_ledgers.phys_footprint,
-                          (ledger_amount_t *)&ri->ri_phys_footprint);
+       ri->ri_phys_footprint = get_task_phys_footprint(task);

        ledger_get_balance(task->ledger, task_ledgers.phys_mem,
        ledger_get_balance(task->ledger, task_ledgers.phys_mem,

-                          (ledger_amount_t *)&ri->ri_resident_size);
-       ledger_get_balance(task->ledger, task_ledgers.wired_mem,
-                          (ledger_amount_t *)&ri->ri_wired_size);
+           (ledger_amount_t *)&ri->ri_resident_size);
+       ri->ri_wired_size = get_task_wired_mem(task);

 
        ri->ri_pageins = task->pageins;
 
        task_unlock(task);
 
        ri->ri_pageins = task->pageins;
 
        task_unlock(task);

-       return (0);
+       return 0;

 }
 
 void
 fill_task_billed_usage(task_t task __unused, rusage_info_current *ri)
 {
 }
 
 void
 fill_task_billed_usage(task_t task __unused, rusage_info_current *ri)
 {

-#if CONFIG_BANK
-       ri->ri_billed_system_time = bank_billed_time_safe(task);
-       ri->ri_serviced_system_time = bank_serviced_time_safe(task);
-#else
-       ri->ri_billed_system_time = 0;
-       ri->ri_serviced_system_time = 0;
-#endif
+       bank_billed_balance_safe(task, &ri->ri_billed_system_time, &ri->ri_billed_energy);
+       bank_serviced_balance_safe(task, &ri->ri_serviced_system_time, &ri->ri_serviced_energy);

 }
 
 int
 }
 
 int


@@ -995,7 +1174,7 @@ fill_task_io_rusage(task_t task, rusage_info_current *ri)
                ri->ri_diskio_byteswritten = 0;
        }
        task_unlock(task);
                ri->ri_diskio_byteswritten = 0;
        }
        task_unlock(task);

-       return (0);
+       return 0;

 }
 
 int
 }
 
 int


@@ -1006,23 +1185,65 @@ fill_task_qos_rusage(task_t task, rusage_info_current *ri)
        assert(task != TASK_NULL);
        task_lock(task);
 
        assert(task != TASK_NULL);
        task_lock(task);
 

-       /* Rollup Qos time of all the threads to task */
+       /* Rollup QoS time of all the threads to task */

        queue_iterate(&task->threads, thread, thread_t, task_threads) {
        queue_iterate(&task->threads, thread, thread_t, task_threads) {

-               if (thread->options & TH_OPT_IDLE_THREAD)
+               if (thread->options & TH_OPT_IDLE_THREAD) {

                        continue;
                        continue;

+               }

 
                thread_update_qos_cpu_time(thread);
        }
 
                thread_update_qos_cpu_time(thread);
        }

-       ri->ri_cpu_time_qos_default = task->cpu_time_qos_stats.cpu_time_qos_default;
-       ri->ri_cpu_time_qos_maintenance = task->cpu_time_qos_stats.cpu_time_qos_maintenance;
-       ri->ri_cpu_time_qos_background = task->cpu_time_qos_stats.cpu_time_qos_background;
-       ri->ri_cpu_time_qos_utility = task->cpu_time_qos_stats.cpu_time_qos_utility;
-       ri->ri_cpu_time_qos_legacy = task->cpu_time_qos_stats.cpu_time_qos_legacy;
-       ri->ri_cpu_time_qos_user_initiated = task->cpu_time_qos_stats.cpu_time_qos_user_initiated;
-       ri->ri_cpu_time_qos_user_interactive = task->cpu_time_qos_stats.cpu_time_qos_user_interactive;
+       ri->ri_cpu_time_qos_default = task->cpu_time_eqos_stats.cpu_time_qos_default;
+       ri->ri_cpu_time_qos_maintenance = task->cpu_time_eqos_stats.cpu_time_qos_maintenance;
+       ri->ri_cpu_time_qos_background = task->cpu_time_eqos_stats.cpu_time_qos_background;
+       ri->ri_cpu_time_qos_utility = task->cpu_time_eqos_stats.cpu_time_qos_utility;
+       ri->ri_cpu_time_qos_legacy = task->cpu_time_eqos_stats.cpu_time_qos_legacy;
+       ri->ri_cpu_time_qos_user_initiated = task->cpu_time_eqos_stats.cpu_time_qos_user_initiated;
+       ri->ri_cpu_time_qos_user_interactive = task->cpu_time_eqos_stats.cpu_time_qos_user_interactive;

 
        task_unlock(task);
 
        task_unlock(task);

-       return (0);
+       return 0;
+}
+
+void
+fill_task_monotonic_rusage(task_t task, rusage_info_current *ri)
+{
+#if MONOTONIC
+       if (!mt_core_supported) {
+               return;
+       }
+
+       assert(task != TASK_NULL);
+
+       uint64_t counts[MT_CORE_NFIXED] = { 0 };
+       mt_fixed_task_counts(task, counts);
+#ifdef MT_CORE_INSTRS
+       ri->ri_instructions = counts[MT_CORE_INSTRS];
+#endif /* defined(MT_CORE_INSTRS) */
+       ri->ri_cycles = counts[MT_CORE_CYCLES];
+#else /* MONOTONIC */
+#pragma unused(task, ri)
+#endif /* !MONOTONIC */
+}
+
+uint64_t
+get_task_logical_writes(task_t task, boolean_t external)
+{
+       assert(task != TASK_NULL);
+       struct ledger_entry_info lei;
+
+       task_lock(task);
+
+       if (external == FALSE) {
+               ledger_get_entry_info(task->ledger, task_ledgers.logical_writes, &lei);
+       } else {
+               ledger_get_entry_info(task->ledger, task_ledgers.logical_writes_to_external, &lei);
+       }
+
+       ledger_get_entry_info(task->ledger, task_ledgers.logical_writes, &lei);
+
+       task_unlock(task);
+       return lei.lei_balance;

 }
 
 uint64_t
 }
 
 uint64_t


@@ -1037,6 +1258,18 @@ get_task_dispatchqueue_serialno_offset(task_t task)
        return dq_serialno_offset;
 }
 
        return dq_serialno_offset;
 }
 

+uint64_t
+get_task_dispatchqueue_label_offset(task_t task)
+{
+       uint64_t dq_label_offset = 0;
+
+       if (task->bsd_info) {
+               dq_label_offset = get_dispatchqueue_label_offset_from_proc(task->bsd_info);
+       }
+
+       return dq_label_offset;
+}
+

 uint64_t
 get_task_uniqueid(task_t task)
 {
 uint64_t
 get_task_uniqueid(task_t task)
 {


@@ -1047,16 +1280,54 @@ get_task_uniqueid(task_t task)
        }
 }
 
        }
 }
 

+int
+get_task_version(task_t task)
+{
+       if (task->bsd_info) {
+               return proc_pidversion(task->bsd_info);
+       } else {
+               return INT_MAX;
+       }
+}
+

 #if CONFIG_MACF
 struct label *
 get_task_crash_label(task_t task)
 {
        return task->crash_label;
 }
 #if CONFIG_MACF
 struct label *
 get_task_crash_label(task_t task)
 {
        return task->crash_label;
 }

+#endif

 
 

-void
-set_task_crash_label(task_t task, struct label *label)
+int
+fill_taskipctableinfo(task_t task, uint32_t *table_size, uint32_t *table_free)

 {
 {

-       task->crash_label = label;
+       ipc_space_t space = task->itk_space;
+       if (space == NULL) {
+               return -1;
+       }
+
+       is_read_lock(space);
+       if (!is_active(space)) {
+               is_read_unlock(space);
+               return -1;
+       }
+
+       *table_size = space->is_table_size;
+       *table_free = space->is_table_free;
+
+       is_read_unlock(space);
+
+       return 0;
+}
+
+int
+get_task_cdhash(task_t task, char cdhash[static CS_CDHASH_LEN])
+{
+       int result = 0;
+
+       task_lock(task);
+       result = task->bsd_info ? proc_getcdhash(task->bsd_info, cdhash) : ESRCH;
+       task_unlock(task);
+
+       return result;

 }
 }

-#endif