]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/kern_memorystatus.c
xnu-7195.81.3.tar.gz
[apple/xnu.git] / bsd / kern / kern_memorystatus.c
index 5c3410624cf99db7f39d92748d3646caab3403f9..69e5f6d69ab161b390aeb7818cfaf18a3059db75 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -38,8 +38,7 @@
 #include <kern/policy_internal.h>
 #include <kern/thread_group.h>
 
-#include <IOKit/IOBSD.h>
-
+#include <corpses/task_corpse.h>
 #include <libkern/libkern.h>
 #include <mach/coalition.h>
 #include <mach/mach_time.h>
 #include <sys/wait.h>
 #include <sys/tree.h>
 #include <sys/priv.h>
+#include <vm/pmap.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_protos.h>
+#include <mach/machine/sdt.h>
+#include <libkern/section_keywords.h>
+#include <stdatomic.h>
+
+#include <IOKit/IOBSD.h>
 
 #if CONFIG_FREEZE
 #include <vm/vm_map.h>
 #endif /* CONFIG_FREEZE */
 
 #include <sys/kern_memorystatus.h>
-
-#include <mach/machine/sdt.h>
-#include <libkern/section_keywords.h>
-#include <stdatomic.h>
+#include <sys/kern_memorystatus_freeze.h>
+#include <sys/kern_memorystatus_notify.h>
 
 /* For logging clarity */
 static const char *memorystatus_kill_cause_name[] = {
@@ -100,6 +103,8 @@ memorystatus_priority_band_name(int32_t priority)
                return "AUDIO_AND_ACCESSORY";
        case JETSAM_PRIORITY_CONDUCTOR:
                return "CONDUCTOR";
+       case JETSAM_PRIORITY_DRIVER_APPLE:
+               return "DRIVER_APPLE";
        case JETSAM_PRIORITY_HOME:
                return "HOME";
        case JETSAM_PRIORITY_EXECUTIVE:
@@ -149,18 +154,6 @@ extern void get_zone_map_size(uint64_t *current_size, uint64_t *capacity);
  */
 extern void get_largest_zone_info(char *zone_name, size_t zone_name_len, uint64_t *zone_size);
 
-/* These are very verbose printfs(), enable with
- * MEMORYSTATUS_DEBUG_LOG
- */
-#if MEMORYSTATUS_DEBUG_LOG
-#define MEMORYSTATUS_DEBUG(cond, format, ...)      \
-do {                                              \
-       if (cond) { printf(format, ##__VA_ARGS__); } \
-} while(0)
-#else
-#define MEMORYSTATUS_DEBUG(cond, format, ...)
-#endif
-
 /*
  * Active / Inactive limit support
  * proc list must be locked
@@ -221,120 +214,183 @@ MACRO_END
 
 unsigned long delta_percentage = 5;
 unsigned long critical_threshold_percentage = 5;
+// On embedded devices with more than 3GB of memory we lower the critical percentage.
+uint64_t config_jetsam_large_memory_cutoff = 3UL * (1UL << 30);
+unsigned long critical_threshold_percentage_larger_devices = 4;
+unsigned long delta_percentage_larger_devices = 4;
 unsigned long idle_offset_percentage = 5;
 unsigned long pressure_threshold_percentage = 15;
-unsigned long freeze_threshold_percentage = 50;
 unsigned long policy_more_free_offset_percentage = 5;
+unsigned long sysproc_aging_aggr_threshold_percentage = 7;
 
-/* General memorystatus stuff */
-
-struct klist memorystatus_klist;
-static lck_mtx_t memorystatus_klist_mutex;
+/*
+ * default jetsam snapshot support
+ */
+memorystatus_jetsam_snapshot_t *memorystatus_jetsam_snapshot;
+memorystatus_jetsam_snapshot_t *memorystatus_jetsam_snapshot_copy;
 
-static void memorystatus_klist_lock(void);
-static void memorystatus_klist_unlock(void);
+#if CONFIG_FREEZE
+memorystatus_jetsam_snapshot_t *memorystatus_jetsam_snapshot_freezer;
+/*
+ * The size of the freezer snapshot is given by memorystatus_jetsam_snapshot_max / JETSAM_SNAPSHOT_FREEZER_MAX_FACTOR
+ * The freezer snapshot can be much smaller than the default snapshot
+ * because it only includes apps that have been killed and dasd consumes it every 30 minutes.
+ * Since the snapshots are always wired we don't want to overallocate too much.
+ */
+#define JETSAM_SNAPSHOT_FREEZER_MAX_FACTOR 20
+unsigned int memorystatus_jetsam_snapshot_freezer_max;
+unsigned int memorystatus_jetsam_snapshot_freezer_size;
+TUNABLE(bool, memorystatus_jetsam_use_freezer_snapshot, "kern.jetsam_user_freezer_snapshot", true);
+#endif /* CONFIG_FREEZE */
 
-static uint64_t memorystatus_sysprocs_idle_delay_time = 0;
-static uint64_t memorystatus_apps_idle_delay_time = 0;
+unsigned int memorystatus_jetsam_snapshot_count = 0;
+unsigned int memorystatus_jetsam_snapshot_copy_count = 0;
+unsigned int memorystatus_jetsam_snapshot_max = 0;
+unsigned int memorystatus_jetsam_snapshot_size = 0;
+uint64_t memorystatus_jetsam_snapshot_last_timestamp = 0;
+uint64_t memorystatus_jetsam_snapshot_timeout = 0;
 
+#if DEVELOPMENT || DEBUG
 /*
- * Memorystatus kevents
+ * On development and debug kernels, we allow one pid to take ownership
+ * of the memorystatus snapshot (via memorystatus_control).
+ * If there's an owner, then only they may consume the snapshot.
+ * This is used when testing the snapshot interface to avoid racing with other
+ * processes on the system that consume snapshots.
  */
+static pid_t memorystatus_snapshot_owner = 0;
+SYSCTL_INT(_kern, OID_AUTO, memorystatus_snapshot_owner, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_snapshot_owner, 0, "");
+#endif /* DEVELOPMENT || DEBUG */
+static void memorystatus_init_jetsam_snapshot_header(memorystatus_jetsam_snapshot_t *snapshot);
 
-static int filt_memorystatusattach(struct knote *kn, struct kevent_internal_s *kev);
-static void filt_memorystatusdetach(struct knote *kn);
-static int filt_memorystatus(struct knote *kn, long hint);
-static int filt_memorystatustouch(struct knote *kn, struct kevent_internal_s *kev);
-static int filt_memorystatusprocess(struct knote *kn, struct filt_process_s *data, struct kevent_internal_s *kev);
-
-SECURITY_READ_ONLY_EARLY(struct filterops) memorystatus_filtops = {
-       .f_attach = filt_memorystatusattach,
-       .f_detach = filt_memorystatusdetach,
-       .f_event = filt_memorystatus,
-       .f_touch = filt_memorystatustouch,
-       .f_process = filt_memorystatusprocess,
-};
+/* General memorystatus stuff */
 
-enum {
-       kMemorystatusNoPressure = 0x1,
-       kMemorystatusPressure = 0x2,
-       kMemorystatusLowSwap = 0x4,
-       kMemorystatusProcLimitWarn = 0x8,
-       kMemorystatusProcLimitCritical = 0x10
-};
+uint64_t memorystatus_sysprocs_idle_delay_time = 0;
+uint64_t memorystatus_apps_idle_delay_time = 0;
+/* Some devices give entitled apps a higher memory limit */
+#if __arm64__
+int32_t memorystatus_entitled_max_task_footprint_mb = 0;
+
+#if DEVELOPMENT || DEBUG
+SYSCTL_INT(_kern, OID_AUTO, entitled_max_task_pmem, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_entitled_max_task_footprint_mb, 0, "");
+#endif /* DEVELOPMENT || DEBUG */
+#endif /* __arm64__ */
+
+static lck_grp_attr_t *memorystatus_jetsam_fg_band_lock_grp_attr;
+static lck_grp_t *memorystatus_jetsam_fg_band_lock_grp;
+lck_mtx_t memorystatus_jetsam_fg_band_lock;
 
 /* Idle guard handling */
 
 static int32_t memorystatus_scheduled_idle_demotions_sysprocs = 0;
 static int32_t memorystatus_scheduled_idle_demotions_apps = 0;
 
-static thread_call_t memorystatus_idle_demotion_call;
-
 static void memorystatus_perform_idle_demotion(__unused void *spare1, __unused void *spare2);
 static void memorystatus_schedule_idle_demotion_locked(proc_t p, boolean_t set_state);
-static void memorystatus_invalidate_idle_demotion_locked(proc_t p, boolean_t clean_state);
 static void memorystatus_reschedule_idle_demotion_locked(void);
-
-static void memorystatus_update_priority_locked(proc_t p, int priority, boolean_t head_insert, boolean_t skip_demotion_check);
-
 int memorystatus_update_priority_for_appnap(proc_t p, boolean_t is_appnap);
-
 vm_pressure_level_t convert_internal_pressure_level_to_dispatch_level(vm_pressure_level_t);
-
 boolean_t is_knote_registered_modify_task_pressure_bits(struct knote*, int, task_t, vm_pressure_level_t, vm_pressure_level_t);
 void memorystatus_klist_reset_all_for_level(vm_pressure_level_t pressure_level_to_clear);
 void memorystatus_send_low_swap_note(void);
+int memorystatus_get_proccnt_upto_priority(int32_t max_bucket_index);
+boolean_t memorystatus_kill_elevated_process(uint32_t cause, os_reason_t jetsam_reason, unsigned int band, int aggr_count,
+    uint32_t *errors, uint64_t *memory_reclaimed);
+uint64_t memorystatus_available_memory_internal(proc_t p);
 
 unsigned int memorystatus_level = 0;
-
 static int memorystatus_list_count = 0;
-
-
-#define MEMSTAT_BUCKET_COUNT (JETSAM_PRIORITY_MAX + 1)
-
-typedef struct memstat_bucket {
-       TAILQ_HEAD(, proc) list;
-       int count;
-} memstat_bucket_t;
-
 memstat_bucket_t memstat_bucket[MEMSTAT_BUCKET_COUNT];
-
-int memorystatus_get_proccnt_upto_priority(int32_t max_bucket_index);
-
+static thread_call_t memorystatus_idle_demotion_call;
 uint64_t memstat_idle_demotion_deadline = 0;
-
 int system_procs_aging_band = JETSAM_PRIORITY_AGING_BAND1;
 int applications_aging_band = JETSAM_PRIORITY_IDLE;
 
 #define isProcessInAgingBands(p)        ((isSysProc(p) && system_procs_aging_band && (p->p_memstat_effectivepriority == system_procs_aging_band)) || (isApp(p) && applications_aging_band && (p->p_memstat_effectivepriority == applications_aging_band)))
 
-/*
- * Checking the p_memstat_state almost always requires the proc_list_lock
- * because the jetsam thread could be on the other core changing the state.
- *
- * App -- almost always managed by a system process. Always have dirty tracking OFF. Can include extensions too.
- * System Processes -- not managed by anybody. Always have dirty tracking ON. Can include extensions (here) too.
- */
-#define isApp(p)                        ((p->p_memstat_state & P_MEMSTAT_MANAGED) || ! (p->p_memstat_dirty & P_DIRTY_TRACK))
-#define isSysProc(p)                    ( ! (p->p_memstat_state & P_MEMSTAT_MANAGED) || (p->p_memstat_dirty & P_DIRTY_TRACK))
-
 #define kJetsamAgingPolicyNone                          (0)
 #define kJetsamAgingPolicyLegacy                        (1)
 #define kJetsamAgingPolicySysProcsReclaimedFirst        (2)
 #define kJetsamAgingPolicyAppsReclaimedFirst            (3)
 #define kJetsamAgingPolicyMax                           kJetsamAgingPolicyAppsReclaimedFirst
 
-unsigned int jetsam_aging_policy = kJetsamAgingPolicyLegacy;
+unsigned int jetsam_aging_policy = kJetsamAgingPolicySysProcsReclaimedFirst;
 
 extern int corpse_for_fatal_memkill;
-extern unsigned long total_corpses_count(void) __attribute__((pure));
-extern void task_purge_all_corpses(void);
 extern uint64_t vm_purgeable_purge_task_owned(task_t task);
 boolean_t memorystatus_allowed_vm_map_fork(task_t);
 #if DEVELOPMENT || DEBUG
 void memorystatus_abort_vm_map_fork(task_t);
 #endif
 
+/*
+ * Idle delay timeout factors for daemons based on relaunch behavior. Only used in
+ * kJetsamAgingPolicySysProcsReclaimedFirst aging policy.
+ */
+#define kJetsamSysProcsIdleDelayTimeLowRatio    (5)
+#define kJetsamSysProcsIdleDelayTimeMedRatio    (2)
+#define kJetsamSysProcsIdleDelayTimeHighRatio   (1)
+static_assert(kJetsamSysProcsIdleDelayTimeLowRatio <= DEFERRED_IDLE_EXIT_TIME_SECS, "sysproc idle delay time for low relaunch daemons would be 0");
+
+/*
+ * For the kJetsamAgingPolicySysProcsReclaimedFirst aging policy, treat apps as well
+ * behaved daemons for aging purposes.
+ */
+#define kJetsamAppsIdleDelayTimeRatio   (kJetsamSysProcsIdleDelayTimeLowRatio)
+
+static uint64_t
+memorystatus_sysprocs_idle_time(proc_t p)
+{
+       /*
+        * The kJetsamAgingPolicySysProcsReclaimedFirst aging policy uses the relaunch behavior to
+        * determine the exact idle deferred time provided to the daemons. For all other aging
+        * policies, simply return the default aging idle time.
+        */
+       if (jetsam_aging_policy != kJetsamAgingPolicySysProcsReclaimedFirst) {
+               return memorystatus_sysprocs_idle_delay_time;
+       }
+
+       uint64_t idle_delay_time = 0;
+       /*
+        * For system processes, base the idle delay time on the
+        * jetsam relaunch behavior specified by launchd. The idea
+        * is to provide extra protection to the daemons which would
+        * relaunch immediately after jetsam.
+        */
+       switch (p->p_memstat_relaunch_flags) {
+       case P_MEMSTAT_RELAUNCH_UNKNOWN:
+       case P_MEMSTAT_RELAUNCH_LOW:
+               idle_delay_time = memorystatus_sysprocs_idle_delay_time / kJetsamSysProcsIdleDelayTimeLowRatio;
+               break;
+       case P_MEMSTAT_RELAUNCH_MED:
+               idle_delay_time = memorystatus_sysprocs_idle_delay_time / kJetsamSysProcsIdleDelayTimeMedRatio;
+               break;
+       case P_MEMSTAT_RELAUNCH_HIGH:
+               idle_delay_time = memorystatus_sysprocs_idle_delay_time / kJetsamSysProcsIdleDelayTimeHighRatio;
+               break;
+       default:
+               panic("Unknown relaunch flags on process!");
+               break;
+       }
+       return idle_delay_time;
+}
+
+static uint64_t
+memorystatus_apps_idle_time(__unused proc_t p)
+{
+       /*
+        * For kJetsamAgingPolicySysProcsReclaimedFirst, the Apps are considered as low
+        * relaunch candidates. So only provide limited protection to them. In the other
+        * aging policies, return the default aging idle time.
+        */
+       if (jetsam_aging_policy != kJetsamAgingPolicySysProcsReclaimedFirst) {
+               return memorystatus_apps_idle_delay_time;
+       }
+
+       return memorystatus_apps_idle_delay_time / kJetsamAppsIdleDelayTimeRatio;
+}
+
+
 #if 0
 
 /* Keeping around for future use if we need a utility that can do this OR an app that needs a dynamic adjustment. */
@@ -462,7 +518,7 @@ sysctl_jetsam_set_sysprocs_idle_delay_time SYSCTL_HANDLER_ARGS
        uint64_t old_time_in_ns = 0;
 
        absolutetime_to_nanoseconds(memorystatus_sysprocs_idle_delay_time, &old_time_in_ns);
-       old_time_in_secs = old_time_in_ns / NSEC_PER_SEC;
+       old_time_in_secs = (int) (old_time_in_ns / NSEC_PER_SEC);
 
        error = sysctl_io_number(req, old_time_in_secs, sizeof(int), &val, NULL);
        if (error || !req->newptr) {
@@ -492,7 +548,7 @@ sysctl_jetsam_set_apps_idle_delay_time SYSCTL_HANDLER_ARGS
        uint64_t old_time_in_ns = 0;
 
        absolutetime_to_nanoseconds(memorystatus_apps_idle_delay_time, &old_time_in_ns);
-       old_time_in_secs = old_time_in_ns / NSEC_PER_SEC;
+       old_time_in_secs = (int) (old_time_in_ns / NSEC_PER_SEC);
 
        error = sysctl_io_number(req, old_time_in_secs, sizeof(int), &val, NULL);
        if (error || !req->newptr) {
@@ -518,11 +574,169 @@ static unsigned int memorystatus_dirty_count = 0;
 
 SYSCTL_INT(_kern, OID_AUTO, max_task_pmem, CTLFLAG_RD | CTLFLAG_LOCKED | CTLFLAG_MASKED, &max_task_footprint_mb, 0, "");
 
-#if CONFIG_EMBEDDED
+static int memorystatus_highwater_enabled = 1;  /* Update the cached memlimit data. */
+static boolean_t proc_jetsam_state_is_active_locked(proc_t);
+
+#if __arm64__
+int legacy_footprint_bonus_mb = 50; /* This value was chosen after looking at the top 30 apps
+                                     * that needed the additional room in their footprint when
+                                     * the 'correct' accounting methods were applied to them.
+                                     */
 
-SYSCTL_INT(_kern, OID_AUTO, memorystatus_level, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_level, 0, "");
+#if DEVELOPMENT || DEBUG
+SYSCTL_INT(_kern, OID_AUTO, legacy_footprint_bonus_mb, CTLFLAG_RW | CTLFLAG_LOCKED, &legacy_footprint_bonus_mb, 0, "");
+#endif /* DEVELOPMENT || DEBUG */
+/*
+ * Raise the inactive and active memory limits to new values.
+ * Will only raise the limits and will do nothing if either of the current
+ * limits are 0.
+ * Caller must hold the proc_list_lock
+ */
+static void
+memorystatus_raise_memlimit(proc_t p, int new_memlimit_active, int new_memlimit_inactive)
+{
+       int memlimit_mb_active = 0, memlimit_mb_inactive = 0;
+       boolean_t memlimit_active_is_fatal = FALSE, memlimit_inactive_is_fatal = FALSE, use_active_limit = FALSE;
+
+       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
+
+       if (p->p_memstat_memlimit_active > 0) {
+               memlimit_mb_active = p->p_memstat_memlimit_active;
+       } else if (p->p_memstat_memlimit_active == -1) {
+               memlimit_mb_active = max_task_footprint_mb;
+       } else {
+               /*
+                * Nothing to do for '0' which is
+                * a special value only used internally
+                * to test 'no limits'.
+                */
+               return;
+       }
+
+       if (p->p_memstat_memlimit_inactive > 0) {
+               memlimit_mb_inactive = p->p_memstat_memlimit_inactive;
+       } else if (p->p_memstat_memlimit_inactive == -1) {
+               memlimit_mb_inactive = max_task_footprint_mb;
+       } else {
+               /*
+                * Nothing to do for '0' which is
+                * a special value only used internally
+                * to test 'no limits'.
+                */
+               return;
+       }
+
+       memlimit_mb_active = MAX(new_memlimit_active, memlimit_mb_active);
+       memlimit_mb_inactive = MAX(new_memlimit_inactive, memlimit_mb_inactive);
+
+       memlimit_active_is_fatal = (p->p_memstat_state & P_MEMSTAT_MEMLIMIT_ACTIVE_FATAL);
+       memlimit_inactive_is_fatal = (p->p_memstat_state & P_MEMSTAT_MEMLIMIT_INACTIVE_FATAL);
+
+       SET_ACTIVE_LIMITS_LOCKED(p, memlimit_mb_active, memlimit_active_is_fatal);
+       SET_INACTIVE_LIMITS_LOCKED(p, memlimit_mb_inactive, memlimit_inactive_is_fatal);
+
+       if (proc_jetsam_state_is_active_locked(p) == TRUE) {
+               use_active_limit = TRUE;
+               CACHE_ACTIVE_LIMITS_LOCKED(p, memlimit_active_is_fatal);
+       } else {
+               CACHE_INACTIVE_LIMITS_LOCKED(p, memlimit_inactive_is_fatal);
+       }
+
+       if (memorystatus_highwater_enabled) {
+               task_set_phys_footprint_limit_internal(p->task,
+                   (p->p_memstat_memlimit > 0) ? p->p_memstat_memlimit : -1,
+                   NULL,                                    /*return old value */
+                   use_active_limit,                                    /*active limit?*/
+                   (use_active_limit ? memlimit_active_is_fatal : memlimit_inactive_is_fatal));
+       }
+}
+
+void
+memorystatus_act_on_legacy_footprint_entitlement(proc_t p, boolean_t footprint_increase)
+{
+       int memlimit_mb_active = 0, memlimit_mb_inactive = 0;
+
+       if (p == NULL) {
+               return;
+       }
+
+       proc_list_lock();
+
+       if (p->p_memstat_memlimit_active > 0) {
+               memlimit_mb_active = p->p_memstat_memlimit_active;
+       } else if (p->p_memstat_memlimit_active == -1) {
+               memlimit_mb_active = max_task_footprint_mb;
+       } else {
+               /*
+                * Nothing to do for '0' which is
+                * a special value only used internally
+                * to test 'no limits'.
+                */
+               proc_list_unlock();
+               return;
+       }
+
+       if (p->p_memstat_memlimit_inactive > 0) {
+               memlimit_mb_inactive = p->p_memstat_memlimit_inactive;
+       } else if (p->p_memstat_memlimit_inactive == -1) {
+               memlimit_mb_inactive = max_task_footprint_mb;
+       } else {
+               /*
+                * Nothing to do for '0' which is
+                * a special value only used internally
+                * to test 'no limits'.
+                */
+               proc_list_unlock();
+               return;
+       }
+
+       if (footprint_increase) {
+               memlimit_mb_active += legacy_footprint_bonus_mb;
+               memlimit_mb_inactive += legacy_footprint_bonus_mb;
+       } else {
+               memlimit_mb_active -= legacy_footprint_bonus_mb;
+               if (memlimit_mb_active == max_task_footprint_mb) {
+                       memlimit_mb_active = -1; /* reverting back to default system limit */
+               }
+
+               memlimit_mb_inactive -= legacy_footprint_bonus_mb;
+               if (memlimit_mb_inactive == max_task_footprint_mb) {
+                       memlimit_mb_inactive = -1; /* reverting back to default system limit */
+               }
+       }
+       memorystatus_raise_memlimit(p, memlimit_mb_active, memlimit_mb_inactive);
+
+       proc_list_unlock();
+}
+
+void
+memorystatus_act_on_ios13extended_footprint_entitlement(proc_t p)
+{
+       if (max_mem < 1500ULL * 1024 * 1024 ||
+           max_mem > 2ULL * 1024 * 1024 * 1024) {
+               /* ios13extended_footprint is only for 2GB devices */
+               return;
+       }
+       /* limit to "almost 2GB" */
+       proc_list_lock();
+       memorystatus_raise_memlimit(p, 1800, 1800);
+       proc_list_unlock();
+}
+
+void
+memorystatus_act_on_entitled_task_limit(proc_t p)
+{
+       if (memorystatus_entitled_max_task_footprint_mb == 0) {
+               // Entitlement is not supported on this device.
+               return;
+       }
+       proc_list_lock();
+       memorystatus_raise_memlimit(p, memorystatus_entitled_max_task_footprint_mb, memorystatus_entitled_max_task_footprint_mb);
+       proc_list_unlock();
+}
+#endif /* __arm64__ */
 
-#endif /* CONFIG_EMBEDDED */
+SYSCTL_INT(_kern, OID_AUTO, memorystatus_level, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_level, 0, "");
 
 int
 memorystatus_get_level(__unused struct proc *p, struct memorystatus_get_level_args *args, __unused int *ret)
@@ -538,16 +752,10 @@ memorystatus_get_level(__unused struct proc *p, struct memorystatus_get_level_ar
        return 0;
 }
 
-static proc_t memorystatus_get_first_proc_locked(unsigned int *bucket_index, boolean_t search);
-static proc_t memorystatus_get_next_proc_locked(unsigned int *bucket_index, proc_t p, boolean_t search);
-
 static void memorystatus_thread(void *param __unused, wait_result_t wr __unused);
 
 /* Memory Limits */
 
-static int memorystatus_highwater_enabled = 1;  /* Update the cached memlimit data. */
-
-static boolean_t proc_jetsam_state_is_active_locked(proc_t);
 static boolean_t memorystatus_kill_specific_process(pid_t victim_pid, uint32_t cause, os_reason_t jetsam_reason);
 static boolean_t memorystatus_kill_process_sync(pid_t victim_pid, uint32_t cause, os_reason_t jetsam_reason);
 
@@ -560,6 +768,9 @@ static int memorystatus_cmd_get_memlimit_properties(pid_t pid, user_addr_t buffe
 
 static int memorystatus_cmd_get_memlimit_excess_np(pid_t pid, uint32_t flags, user_addr_t buffer, size_t buffer_size, __unused int32_t *retval);
 
+static void memorystatus_get_memlimit_properties_internal(proc_t p, memorystatus_memlimit_properties_t *p_entry);
+static int memorystatus_set_memlimit_properties_internal(proc_t p, memorystatus_memlimit_properties_t *p_entry);
+
 int proc_get_memstat_priority(proc_t, boolean_t);
 
 static boolean_t memorystatus_idle_snapshot = 0;
@@ -601,20 +812,6 @@ SYSCTL_UINT(_kern, OID_AUTO, memorystatus_jld_eval_aggressive_priority_band_max,
 
 static uint32_t kill_under_pressure_cause = 0;
 
-/*
- * default jetsam snapshot support
- */
-static memorystatus_jetsam_snapshot_t *memorystatus_jetsam_snapshot;
-static memorystatus_jetsam_snapshot_t *memorystatus_jetsam_snapshot_copy;
-#define memorystatus_jetsam_snapshot_list memorystatus_jetsam_snapshot->entries
-static unsigned int memorystatus_jetsam_snapshot_count = 0;
-static unsigned int memorystatus_jetsam_snapshot_copy_count = 0;
-static unsigned int memorystatus_jetsam_snapshot_max = 0;
-static unsigned int memorystatus_jetsam_snapshot_size = 0;
-static uint64_t memorystatus_jetsam_snapshot_last_timestamp = 0;
-static uint64_t memorystatus_jetsam_snapshot_timeout = 0;
-#define JETSAM_SNAPSHOT_TIMEOUT_SECS 30
-
 /*
  * snapshot support for memstats collected at boot.
  */
@@ -625,22 +822,21 @@ static boolean_t memorystatus_init_jetsam_snapshot_entry_locked(proc_t p, memory
 static void memorystatus_update_jetsam_snapshot_entry_locked(proc_t p, uint32_t kill_cause, uint64_t killtime);
 
 static void memorystatus_clear_errors(void);
-static void memorystatus_get_task_page_counts(task_t task, uint32_t *footprint, uint32_t *max_footprint_lifetime, uint32_t *purgeable_pages);
 static void memorystatus_get_task_phys_footprint_page_counts(task_t task,
     uint64_t *internal_pages, uint64_t *internal_compressed_pages,
     uint64_t *purgeable_nonvolatile_pages, uint64_t *purgeable_nonvolatile_compressed_pages,
     uint64_t *alternate_accounting_pages, uint64_t *alternate_accounting_compressed_pages,
-    uint64_t *iokit_mapped_pages, uint64_t *page_table_pages);
+    uint64_t *iokit_mapped_pages, uint64_t *page_table_pages, uint64_t *frozen_to_swap_pages);
 
 static void memorystatus_get_task_memory_region_count(task_t task, uint64_t *count);
 
 static uint32_t memorystatus_build_state(proc_t p);
 //static boolean_t memorystatus_issue_pressure_kevent(boolean_t pressured);
 
-static boolean_t memorystatus_kill_top_process(boolean_t any, boolean_t sort_flag, uint32_t cause, os_reason_t jetsam_reason, int32_t *priority, uint32_t *errors);
-static boolean_t memorystatus_kill_top_process_aggressive(uint32_t cause, int aggr_count, int32_t priority_max, uint32_t *errors);
-static boolean_t memorystatus_kill_elevated_process(uint32_t cause, os_reason_t jetsam_reason, unsigned int band, int aggr_count, uint32_t *errors);
-static boolean_t memorystatus_kill_hiwat_proc(uint32_t *errors, boolean_t *purged);
+static boolean_t memorystatus_kill_top_process(boolean_t any, boolean_t sort_flag, uint32_t cause, os_reason_t jetsam_reason, int32_t *priority,
+    uint32_t *errors, uint64_t *memory_reclaimed);
+static boolean_t memorystatus_kill_processes_aggressive(uint32_t cause, int aggr_count, int32_t priority_max, uint32_t *errors, uint64_t *memory_reclaimed);
+static boolean_t memorystatus_kill_hiwat_proc(uint32_t *errors, boolean_t *purged, uint64_t *memory_reclaimed);
 
 static boolean_t memorystatus_kill_process_async(pid_t victim_pid, uint32_t cause);
 
@@ -663,16 +859,27 @@ extern unsigned int    vm_page_inactive_count;
 extern unsigned int    vm_page_throttled_count;
 extern unsigned int    vm_page_purgeable_count;
 extern unsigned int    vm_page_wire_count;
+extern unsigned int    vm_page_speculative_count;
+
+#if CONFIG_JETSAM
+#define MEMORYSTATUS_LOG_AVAILABLE_PAGES memorystatus_available_pages
+#else /* CONFIG_JETSAM */
+#define MEMORYSTATUS_LOG_AVAILABLE_PAGES (vm_page_active_count + vm_page_inactive_count + vm_page_free_count + vm_page_speculative_count)
+#endif /* CONFIG_JETSAM */
 #if CONFIG_SECLUDED_MEMORY
 extern unsigned int     vm_page_secluded_count;
+extern unsigned int     vm_page_secluded_count_over_target;
 #endif /* CONFIG_SECLUDED_MEMORY */
 
+/* Aggressive jetsam pages threshold for sysproc aging policy */
+unsigned int memorystatus_sysproc_aging_aggr_pages = 0;
+
 #if CONFIG_JETSAM
 unsigned int memorystatus_available_pages = (unsigned int)-1;
 unsigned int memorystatus_available_pages_pressure = 0;
 unsigned int memorystatus_available_pages_critical = 0;
-static unsigned int memorystatus_available_pages_critical_base = 0;
-static unsigned int memorystatus_available_pages_critical_idle_offset = 0;
+unsigned int memorystatus_available_pages_critical_base = 0;
+unsigned int memorystatus_available_pages_critical_idle_offset = 0;
 
 #if DEVELOPMENT || DEBUG
 SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_available_pages, 0, "");
@@ -688,6 +895,15 @@ static unsigned int memorystatus_thread_wasted_wakeup = 0;
 /* Callback into vm_compressor.c to signal that thrashing has been mitigated. */
 extern void vm_thrashing_jetsam_done(void);
 static int memorystatus_cmd_set_jetsam_memory_limit(pid_t pid, int32_t high_water_mark, __unused int32_t *retval, boolean_t is_fatal_limit);
+#if DEVELOPMENT || DEBUG
+static inline uint32_t
+roundToNearestMB(uint32_t in)
+{
+       return (in + ((1 << 20) - 1)) >> 20;
+}
+
+static int memorystatus_cmd_increase_jetsam_task_limit(pid_t pid, uint32_t byte_increase);
+#endif
 
 int32_t max_kill_priority = JETSAM_PRIORITY_MAX;
 
@@ -700,140 +916,16 @@ uint64_t memorystatus_available_pages_critical = (uint64_t)-1;
 int32_t max_kill_priority = JETSAM_PRIORITY_IDLE;
 #endif /* CONFIG_JETSAM */
 
-unsigned int memorystatus_frozen_count = 0;
-unsigned int memorystatus_frozen_processes_max = 0;
-unsigned int memorystatus_frozen_shared_mb = 0;
-unsigned int memorystatus_frozen_shared_mb_max = 0;
-unsigned int memorystatus_freeze_shared_mb_per_process_max = 0; /* Max. MB allowed per process to be freezer-eligible. */
-unsigned int memorystatus_freeze_private_shared_pages_ratio = 2; /* Ratio of private:shared pages for a process to be freezer-eligible. */
-unsigned int memorystatus_suspended_count = 0;
-unsigned int memorystatus_thaw_count = 0;
-unsigned int memorystatus_refreeze_eligible_count = 0; /* # of processes currently thawed i.e. have state on disk & in-memory */
-
-#if VM_PRESSURE_EVENTS
-
-boolean_t memorystatus_warn_process(pid_t pid, __unused boolean_t is_active, __unused boolean_t is_fatal, boolean_t exceeded);
-
-vm_pressure_level_t memorystatus_vm_pressure_level = kVMPressureNormal;
-
-/*
- * We use this flag to signal if we have any HWM offenders
- * on the system. This way we can reduce the number of wakeups
- * of the memorystatus_thread when the system is between the
- * "pressure" and "critical" threshold.
- *
- * The (re-)setting of this variable is done without any locks
- * or synchronization simply because it is not possible (currently)
- * to keep track of HWM offenders that drop down below their memory
- * limit and/or exit. So, we choose to burn a couple of wasted wakeups
- * by allowing the unguarded modification of this variable.
- */
-boolean_t memorystatus_hwm_candidates = 0;
-
-static int memorystatus_send_note(int event_code, void *data, size_t data_length);
-
-/*
- * This value is the threshold that a process must meet to be considered for scavenging.
- */
-#if CONFIG_EMBEDDED
-#define VM_PRESSURE_MINIMUM_RSIZE               6       /* MB */
-#else /* CONFIG_EMBEDDED */
-#define VM_PRESSURE_MINIMUM_RSIZE               10      /* MB */
-#endif /* CONFIG_EMBEDDED */
-
-uint32_t vm_pressure_task_footprint_min = VM_PRESSURE_MINIMUM_RSIZE;
-
-#if DEVELOPMENT || DEBUG
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_vm_pressure_task_footprint_min, CTLFLAG_RW | CTLFLAG_LOCKED, &vm_pressure_task_footprint_min, 0, "");
-#endif /* DEVELOPMENT || DEBUG */
-
-#endif /* VM_PRESSURE_EVENTS */
-
-
 #if DEVELOPMENT || DEBUG
 
 lck_grp_attr_t *disconnect_page_mappings_lck_grp_attr;
 lck_grp_t *disconnect_page_mappings_lck_grp;
 static lck_mtx_t disconnect_page_mappings_mutex;
 
-extern boolean_t kill_on_no_paging_space;
+extern bool kill_on_no_paging_space;
 #endif /* DEVELOPMENT || DEBUG */
 
 
-/*
- * Table that expresses the probability of a process
- * being used in the next hour.
- */
-typedef struct memorystatus_internal_probabilities {
-       char proc_name[MAXCOMLEN + 1];
-       int use_probability;
-} memorystatus_internal_probabilities_t;
-
-static memorystatus_internal_probabilities_t *memorystatus_global_probabilities_table = NULL;
-static size_t memorystatus_global_probabilities_size = 0;
-
-/* Freeze */
-
-#if CONFIG_FREEZE
-boolean_t memorystatus_freeze_enabled = FALSE;
-int memorystatus_freeze_wakeup = 0;
-int memorystatus_freeze_jetsam_band = 0; /* the jetsam band which will contain P_MEMSTAT_FROZEN processes */
-
-lck_grp_attr_t *freezer_lck_grp_attr;
-lck_grp_t *freezer_lck_grp;
-static lck_mtx_t freezer_mutex;
-
-static inline boolean_t memorystatus_can_freeze_processes(void);
-static boolean_t memorystatus_can_freeze(boolean_t *memorystatus_freeze_swap_low);
-static boolean_t memorystatus_is_process_eligible_for_freeze(proc_t p);
-static void memorystatus_freeze_thread(void *param __unused, wait_result_t wr __unused);
-static boolean_t memorystatus_freeze_thread_should_run(void);
-
-void memorystatus_disable_freeze(void);
-
-/* Thresholds */
-static unsigned int memorystatus_freeze_threshold = 0;
-
-static unsigned int memorystatus_freeze_pages_min = 0;
-static unsigned int memorystatus_freeze_pages_max = 0;
-
-static unsigned int memorystatus_freeze_suspended_threshold = FREEZE_SUSPENDED_THRESHOLD_DEFAULT;
-
-static unsigned int memorystatus_freeze_daily_mb_max = FREEZE_DAILY_MB_MAX_DEFAULT;
-static uint64_t  memorystatus_freeze_budget_pages_remaining = 0; //remaining # of pages that can be frozen to disk
-static boolean_t memorystatus_freeze_degradation = FALSE; //protected by the freezer mutex. Signals we are in a degraded freeze mode.
-
-static unsigned int memorystatus_max_frozen_demotions_daily = 0;
-static unsigned int memorystatus_thaw_count_demotion_threshold = 0;
-
-/* Stats */
-static uint64_t memorystatus_freeze_pageouts = 0;
-
-/* Throttling */
-#define DEGRADED_WINDOW_MINS    (30)
-#define NORMAL_WINDOW_MINS      (24 * 60)
-
-static throttle_interval_t throttle_intervals[] = {
-       { DEGRADED_WINDOW_MINS, 1, 0, 0, { 0, 0 }},
-       { NORMAL_WINDOW_MINS, 1, 0, 0, { 0, 0 }},
-};
-throttle_interval_t *degraded_throttle_window = &throttle_intervals[0];
-throttle_interval_t *normal_throttle_window = &throttle_intervals[1];
-
-extern uint64_t vm_swap_get_free_space(void);
-extern boolean_t vm_swap_max_budget(uint64_t *);
-
-static void memorystatus_freeze_update_throttle(uint64_t *budget_pages_allowed);
-
-static uint64_t memorystatus_freezer_thread_next_run_ts = 0;
-
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_count, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_frozen_count, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_thaw_count, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_thaw_count, 0, "");
-SYSCTL_QUAD(_kern, OID_AUTO, memorystatus_freeze_pageouts, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_freeze_pageouts, "");
-SYSCTL_QUAD(_kern, OID_AUTO, memorystatus_freeze_budget_pages_remaining, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_freeze_budget_pages_remaining, "");
-
-#endif /* CONFIG_FREEZE */
-
 /* Debug */
 
 extern struct knote *vm_find_knote_from_pid(pid_t, struct klist *);
@@ -870,16 +962,17 @@ memorystatus_debug_dump_bucket_locked(unsigned int bucket_index)
         */
 
        printf("memorystatus_debug_dump ***START*(PAGE_SIZE_64=%llu)**\n", PAGE_SIZE_64);
-       printf("bucket [pid]       [pages / MB]     [state]      [EP / RP]   dirty     deadline [L-limit / C-limit / A-limit / IA-limit] name\n");
+       printf("bucket [pid]       [pages / MB]     [state]      [EP / RP / AP]   dirty     deadline [L-limit / C-limit / A-limit / IA-limit] name\n");
        p = memorystatus_get_first_proc_locked(&b, traverse_all_buckets);
        while (p) {
                bytes = get_task_phys_footprint(p->task);
                task_get_phys_footprint_limit(p->task, &ledger_limit);
-               printf("%2d     [%5d]     [%5lld /%3lldMB]   0x%-8x   [%2d / %2d]   0x%-3x   %10lld    [%3d / %3d%s / %3d%s / %3d%s]   %s\n",
+               printf("%2d     [%5d]     [%5lld /%3lldMB]   0x%-8x   [%2d / %2d / %2d]   0x%-3x   %10lld    [%3d / %3d%s / %3d%s / %3d%s]   %s\n",
                    b, p->p_pid,
                    (bytes / PAGE_SIZE_64),             /* task's footprint converted from bytes to pages     */
                    (bytes / (1024ULL * 1024ULL)),      /* task's footprint converted from bytes to MB */
-                   p->p_memstat_state, p->p_memstat_effectivepriority, p->p_memstat_requestedpriority, p->p_memstat_dirty, p->p_memstat_idledeadline,
+                   p->p_memstat_state, p->p_memstat_effectivepriority, p->p_memstat_requestedpriority, p->p_memstat_assertionpriority,
+                   p->p_memstat_dirty, p->p_memstat_idledeadline,
                    ledger_limit,
                    p->p_memstat_memlimit,
                    (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT ? "F " : "NF"),
@@ -999,7525 +1092,5383 @@ sysctl_memorystatus_highwater_enable SYSCTL_HANDLER_ARGS
 
 SYSCTL_PROC(_kern, OID_AUTO, memorystatus_highwater_enabled, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_highwater_enabled, 0, sysctl_memorystatus_highwater_enable, "I", "");
 
-#if VM_PRESSURE_EVENTS
+SYSCTL_INT(_kern, OID_AUTO, memorystatus_idle_snapshot, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_idle_snapshot, 0, "");
 
-/*
- * This routine is used for targeted notifications regardless of system memory pressure
- * and regardless of whether or not the process has already been notified.
- * It bypasses and has no effect on the only-one-notification per soft-limit policy.
- *
- * "memnote" is the current user.
- */
+#if CONFIG_JETSAM
+SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages_critical, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_available_pages_critical, 0, "");
+SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages_critical_base, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_available_pages_critical_base, 0, "");
+SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages_critical_idle_offset, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_available_pages_critical_idle_offset, 0, "");
+SYSCTL_UINT(_kern, OID_AUTO, memorystatus_policy_more_free_offset_pages, CTLFLAG_RW, &memorystatus_policy_more_free_offset_pages, 0, "");
 
-static int
-sysctl_memorystatus_vm_pressure_send SYSCTL_HANDLER_ARGS
-{
-#pragma unused(arg1, arg2)
+static unsigned int memorystatus_jetsam_panic_debug = 0;
 
-       int error = 0, pid = 0;
-       struct knote *kn = NULL;
-       boolean_t found_knote = FALSE;
-       int fflags = 0;         /* filter flags for EVFILT_MEMORYSTATUS */
-       uint64_t value = 0;
+#if VM_PRESSURE_EVENTS
 
-       error = sysctl_handle_quad(oidp, &value, 0, req);
-       if (error || !req->newptr) {
-               return error;
-       }
+SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages_pressure, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_available_pages_pressure, 0, "");
 
-       /*
-        * Find the pid in the low 32 bits of value passed in.
-        */
-       pid = (int)(value & 0xFFFFFFFF);
+#endif /* VM_PRESSURE_EVENTS */
 
-       /*
-        * Find notification in the high 32 bits of the value passed in.
-        */
-       fflags = (int)((value >> 32) & 0xFFFFFFFF);
+#endif /* CONFIG_JETSAM */
 
-       /*
-        * For backwards compatibility, when no notification is
-        * passed in, default to the NOTE_MEMORYSTATUS_PRESSURE_WARN
-        */
-       if (fflags == 0) {
-               fflags = NOTE_MEMORYSTATUS_PRESSURE_WARN;
-               // printf("memorystatus_vm_pressure_send: using default notification [0x%x]\n", fflags);
-       }
+#endif /* DEVELOPMENT || DEBUG */
 
-       /*
-        * See event.h ... fflags for EVFILT_MEMORYSTATUS
-        */
-       if (!((fflags == NOTE_MEMORYSTATUS_PRESSURE_NORMAL) ||
-           (fflags == NOTE_MEMORYSTATUS_PRESSURE_WARN) ||
-           (fflags == NOTE_MEMORYSTATUS_PRESSURE_CRITICAL) ||
-           (fflags == NOTE_MEMORYSTATUS_LOW_SWAP) ||
-           (fflags == NOTE_MEMORYSTATUS_PROC_LIMIT_WARN) ||
-           (fflags == NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL) ||
-           (((fflags & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 &&
-           ((fflags & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0))))) {
-               printf("memorystatus_vm_pressure_send: notification [0x%x] not supported \n", fflags);
-               error = 1;
+extern kern_return_t kernel_thread_start_priority(thread_continue_t continuation,
+    void *parameter,
+    integer_t priority,
+    thread_t *new_thread);
+
+#if DEVELOPMENT || DEBUG
+
+static int
+sysctl_memorystatus_disconnect_page_mappings SYSCTL_HANDLER_ARGS
+{
+#pragma unused(arg1, arg2)
+       int     error = 0, pid = 0;
+       proc_t  p;
+
+       error = sysctl_handle_int(oidp, &pid, 0, req);
+       if (error || !req->newptr) {
                return error;
        }
 
-       /*
-        * Forcibly send pid a memorystatus notification.
-        */
+       lck_mtx_lock(&disconnect_page_mappings_mutex);
+
+       if (pid == -1) {
+               vm_pageout_disconnect_all_pages();
+       } else {
+               p = proc_find(pid);
 
-       memorystatus_klist_lock();
+               if (p != NULL) {
+                       error = task_disconnect_page_mappings(p->task);
 
-       SLIST_FOREACH(kn, &memorystatus_klist, kn_selnext) {
-               proc_t knote_proc = knote_get_kq(kn)->kq_p;
-               pid_t knote_pid = knote_proc->p_pid;
+                       proc_rele(p);
 
-               if (knote_pid == pid) {
-                       /*
-                        * Forcibly send this pid a memorystatus notification.
-                        */
-                       kn->kn_fflags = fflags;
-                       found_knote = TRUE;
+                       if (error) {
+                               error = EIO;
+                       }
+               } else {
+                       error = EINVAL;
                }
        }
-
-       if (found_knote) {
-               KNOTE(&memorystatus_klist, 0);
-               printf("memorystatus_vm_pressure_send: (value 0x%llx) notification [0x%x] sent to process [%d] \n", value, fflags, pid);
-               error = 0;
-       } else {
-               printf("memorystatus_vm_pressure_send: (value 0x%llx) notification [0x%x] not sent to process [%d] (none registered?)\n", value, fflags, pid);
-               error = 1;
-       }
-
-       memorystatus_klist_unlock();
+       lck_mtx_unlock(&disconnect_page_mappings_mutex);
 
        return error;
 }
 
-SYSCTL_PROC(_kern, OID_AUTO, memorystatus_vm_pressure_send, CTLTYPE_QUAD | CTLFLAG_WR | CTLFLAG_LOCKED | CTLFLAG_MASKED,
-    0, 0, &sysctl_memorystatus_vm_pressure_send, "Q", "");
-
-#endif /* VM_PRESSURE_EVENTS */
-
-SYSCTL_INT(_kern, OID_AUTO, memorystatus_idle_snapshot, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_idle_snapshot, 0, "");
-
-#if CONFIG_JETSAM
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages_critical, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_available_pages_critical, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages_critical_base, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_available_pages_critical_base, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages_critical_idle_offset, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_available_pages_critical_idle_offset, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_policy_more_free_offset_pages, CTLFLAG_RW, &memorystatus_policy_more_free_offset_pages, 0, "");
-
-static unsigned int memorystatus_jetsam_panic_debug = 0;
-static unsigned int memorystatus_jetsam_policy_offset_pages_diagnostic = 0;
+SYSCTL_PROC(_kern, OID_AUTO, memorystatus_disconnect_page_mappings, CTLTYPE_INT | CTLFLAG_WR | CTLFLAG_LOCKED | CTLFLAG_MASKED,
+    0, 0, &sysctl_memorystatus_disconnect_page_mappings, "I", "");
 
-/* Diagnostic code */
+#endif /* DEVELOPMENT || DEBUG */
 
-enum {
-       kJetsamDiagnosticModeNone =              0,
-       kJetsamDiagnosticModeAll  =              1,
-       kJetsamDiagnosticModeStopAtFirstActive = 2,
-       kJetsamDiagnosticModeCount
-} jetsam_diagnostic_mode = kJetsamDiagnosticModeNone;
+/*
+ * Sorts the given bucket.
+ *
+ * Input:
+ *     bucket_index - jetsam priority band to be sorted.
+ *     sort_order - JETSAM_SORT_xxx from kern_memorystatus.h
+ *             Currently sort_order is only meaningful when handling
+ *             coalitions.
+ *
+ * proc_list_lock must be held by the caller.
+ */
+static void
+memorystatus_sort_bucket_locked(unsigned int bucket_index, int sort_order)
+{
+       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
+       if (memstat_bucket[bucket_index].count == 0) {
+               return;
+       }
 
-static int jetsam_diagnostic_suspended_one_active_proc = 0;
+       switch (bucket_index) {
+       case JETSAM_PRIORITY_FOREGROUND:
+               if (memorystatus_sort_by_largest_coalition_locked(bucket_index, sort_order) == 0) {
+                       /*
+                        * Fall back to per process sorting when zero coalitions are found.
+                        */
+                       memorystatus_sort_by_largest_process_locked(bucket_index);
+               }
+               break;
+       default:
+               memorystatus_sort_by_largest_process_locked(bucket_index);
+               break;
+       }
+}
 
+/*
+ * Picks the sorting routine for a given jetsam priority band.
+ *
+ * Input:
+ *     bucket_index - jetsam priority band to be sorted.
+ *     sort_order - JETSAM_SORT_xxx from kern_memorystatus.h
+ *             Currently sort_order is only meaningful when handling
+ *             coalitions.
+ *
+ * Return:
+ *     0     on success
+ *      non-0 on failure
+ */
 static int
-sysctl_jetsam_diagnostic_mode SYSCTL_HANDLER_ARGS
+memorystatus_sort_bucket(unsigned int bucket_index, int sort_order)
 {
-#pragma unused(arg1, arg2)
-
-       const char *diagnosticStrings[] = {
-               "jetsam: diagnostic mode: resetting critical level.",
-               "jetsam: diagnostic mode: will examine all processes",
-               "jetsam: diagnostic mode: will stop at first active process"
-       };
+       int coal_sort_order;
 
-       int error, val = jetsam_diagnostic_mode;
-       boolean_t changed = FALSE;
+       /*
+        * Verify the jetsam priority
+        */
+       if (bucket_index >= MEMSTAT_BUCKET_COUNT) {
+               return EINVAL;
+       }
 
-       error = sysctl_handle_int(oidp, &val, 0, req);
-       if (error || !req->newptr) {
-               return error;
+#if DEVELOPMENT || DEBUG
+       if (sort_order == JETSAM_SORT_DEFAULT) {
+               coal_sort_order = COALITION_SORT_DEFAULT;
+       } else {
+               coal_sort_order = sort_order;           /* only used for testing scenarios */
        }
-       if ((val < 0) || (val >= kJetsamDiagnosticModeCount)) {
-               printf("jetsam: diagnostic mode: invalid value - %d\n", val);
+#else
+       /* Verify default */
+       if (sort_order == JETSAM_SORT_DEFAULT) {
+               coal_sort_order = COALITION_SORT_DEFAULT;
+       } else {
                return EINVAL;
        }
+#endif
 
        proc_list_lock();
+       memorystatus_sort_bucket_locked(bucket_index, coal_sort_order);
+       proc_list_unlock();
 
-       if ((unsigned int) val != jetsam_diagnostic_mode) {
-               jetsam_diagnostic_mode = val;
+       return 0;
+}
 
-               memorystatus_jetsam_policy &= ~kPolicyDiagnoseActive;
+/*
+ * Sort processes by size for a single jetsam bucket.
+ */
 
-               switch (jetsam_diagnostic_mode) {
-               case kJetsamDiagnosticModeNone:
-                       /* Already cleared */
-                       break;
-               case kJetsamDiagnosticModeAll:
-                       memorystatus_jetsam_policy |= kPolicyDiagnoseAll;
-                       break;
-               case kJetsamDiagnosticModeStopAtFirstActive:
-                       memorystatus_jetsam_policy |= kPolicyDiagnoseFirst;
-                       break;
-               default:
-                       /* Already validated */
-                       break;
-               }
+static void
+memorystatus_sort_by_largest_process_locked(unsigned int bucket_index)
+{
+       proc_t p = NULL, insert_after_proc = NULL, max_proc = NULL;
+       proc_t next_p = NULL, prev_max_proc = NULL;
+       uint32_t pages = 0, max_pages = 0;
+       memstat_bucket_t *current_bucket;
 
-               memorystatus_update_levels_locked(FALSE);
-               changed = TRUE;
+       if (bucket_index >= MEMSTAT_BUCKET_COUNT) {
+               return;
        }
 
-       proc_list_unlock();
+       current_bucket = &memstat_bucket[bucket_index];
 
-       if (changed) {
-               printf("%s\n", diagnosticStrings[val]);
-       }
+       p = TAILQ_FIRST(&current_bucket->list);
 
-       return 0;
-}
+       while (p) {
+               memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
+               max_pages = pages;
+               max_proc = p;
+               prev_max_proc = p;
 
-SYSCTL_PROC(_debug, OID_AUTO, jetsam_diagnostic_mode, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED | CTLFLAG_ANYBODY,
-    &jetsam_diagnostic_mode, 0, sysctl_jetsam_diagnostic_mode, "I", "Jetsam Diagnostic Mode");
+               while ((next_p = TAILQ_NEXT(p, p_memstat_list)) != NULL) {
+                       /* traversing list until we find next largest process */
+                       p = next_p;
+                       memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
+                       if (pages > max_pages) {
+                               max_pages = pages;
+                               max_proc = p;
+                       }
+               }
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_jetsam_policy_offset_pages_diagnostic, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_jetsam_policy_offset_pages_diagnostic, 0, "");
+               if (prev_max_proc != max_proc) {
+                       /* found a larger process, place it in the list */
+                       TAILQ_REMOVE(&current_bucket->list, max_proc, p_memstat_list);
+                       if (insert_after_proc == NULL) {
+                               TAILQ_INSERT_HEAD(&current_bucket->list, max_proc, p_memstat_list);
+                       } else {
+                               TAILQ_INSERT_AFTER(&current_bucket->list, insert_after_proc, max_proc, p_memstat_list);
+                       }
+                       prev_max_proc = max_proc;
+               }
 
-#if VM_PRESSURE_EVENTS
+               insert_after_proc = max_proc;
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_available_pages_pressure, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_available_pages_pressure, 0, "");
+               p = TAILQ_NEXT(max_proc, p_memstat_list);
+       }
+}
 
-#endif /* VM_PRESSURE_EVENTS */
+proc_t
+memorystatus_get_first_proc_locked(unsigned int *bucket_index, boolean_t search)
+{
+       memstat_bucket_t *current_bucket;
+       proc_t next_p;
 
-#endif /* CONFIG_JETSAM */
+       if ((*bucket_index) >= MEMSTAT_BUCKET_COUNT) {
+               return NULL;
+       }
 
-#if CONFIG_FREEZE
+       current_bucket = &memstat_bucket[*bucket_index];
+       next_p = TAILQ_FIRST(&current_bucket->list);
+       if (!next_p && search) {
+               while (!next_p && (++(*bucket_index) < MEMSTAT_BUCKET_COUNT)) {
+                       current_bucket = &memstat_bucket[*bucket_index];
+                       next_p = TAILQ_FIRST(&current_bucket->list);
+               }
+       }
+
+       return next_p;
+}
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_jetsam_band, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_jetsam_band, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_daily_mb_max, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_daily_mb_max, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_degraded_mode, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_freeze_degradation, 0, "");
+proc_t
+memorystatus_get_next_proc_locked(unsigned int *bucket_index, proc_t p, boolean_t search)
+{
+       memstat_bucket_t *current_bucket;
+       proc_t next_p;
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_threshold, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_threshold, 0, "");
+       if (!p || ((*bucket_index) >= MEMSTAT_BUCKET_COUNT)) {
+               return NULL;
+       }
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_pages_min, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_pages_min, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_pages_max, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_pages_max, 0, "");
+       next_p = TAILQ_NEXT(p, p_memstat_list);
+       while (!next_p && search && (++(*bucket_index) < MEMSTAT_BUCKET_COUNT)) {
+               current_bucket = &memstat_bucket[*bucket_index];
+               next_p = TAILQ_FIRST(&current_bucket->list);
+       }
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_refreeze_eligible_count, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_refreeze_eligible_count, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_processes_max, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_frozen_processes_max, 0, "");
+       return next_p;
+}
 
 /*
- * Max. shared-anonymous memory in MB that can be held by frozen processes in the high jetsam band.
- * "0" means no limit.
- * Default is 10% of system-wide task limit.
+ * Structure to hold state for a jetsam thread.
+ * Typically there should be a single jetsam thread
+ * unless parallel jetsam is enabled.
  */
+struct jetsam_thread_state {
+       uint8_t       inited; /* boolean - if the thread is initialized */
+       uint8_t       limit_to_low_bands; /* boolean */
+       int           memorystatus_wakeup; /* wake channel */
+       int           index; /* jetsam thread index */
+       thread_t      thread; /* jetsam thread pointer */
+} *jetsam_threads;
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_shared_mb_max, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_frozen_shared_mb_max, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_shared_mb, CTLFLAG_RD | CTLFLAG_LOCKED, &memorystatus_frozen_shared_mb, 0, "");
+/* Maximum number of jetsam threads allowed */
+#define JETSAM_THREADS_LIMIT   3
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_shared_mb_per_process_max, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_shared_mb_per_process_max, 0, "");
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_private_shared_pages_ratio, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_private_shared_pages_ratio, 0, "");
+/* Number of active jetsam threads */
+_Atomic int active_jetsam_threads = 1;
 
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_min_processes, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_suspended_threshold, 0, "");
+/* Number of maximum jetsam threads configured */
+int max_jetsam_threads = JETSAM_THREADS_LIMIT;
 
 /*
- * max. # of frozen process demotions we will allow in our daily cycle.
- */
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_max_freeze_demotions_daily, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_max_frozen_demotions_daily, 0, "");
-/*
- * min # of thaws needed by a process to protect it from getting demoted into the IDLE band.
+ * Global switch for enabling fast jetsam. Fast jetsam is
+ * hooked up via the system_override() system call. It has the
+ * following effects:
+ * - Raise the jetsam threshold ("clear-the-deck")
+ * - Enabled parallel jetsam on eligible devices
  */
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_thaw_count_demotion_threshold, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_thaw_count_demotion_threshold, 0, "");
-
-boolean_t memorystatus_freeze_throttle_enabled = TRUE;
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_throttle_enabled, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_throttle_enabled, 0, "");
+#if __AMP__
+int fast_jetsam_enabled = 1;
+#else /* __AMP__ */
+int fast_jetsam_enabled = 0;
+#endif /* __AMP__ */
 
-/*
- * When set to true, this keeps frozen processes in the compressor pool in memory, instead of swapping them out to disk.
- * Exposed via the sysctl kern.memorystatus_freeze_to_memory.
- */
-boolean_t memorystatus_freeze_to_memory = FALSE;
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_freeze_to_memory, CTLFLAG_RW | CTLFLAG_LOCKED, &memorystatus_freeze_to_memory, 0, "");
+#if CONFIG_DIRTYSTATUS_TRACKING
+int dirtystatus_tracking_enabled = 0;
+SYSCTL_INT(_kern, OID_AUTO, dirtystatus_tracking_enabled, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &dirtystatus_tracking_enabled, 0, "");
+#endif
 
-#define VM_PAGES_FOR_ALL_PROCS  (2)
-/*
- * Manual trigger of freeze and thaw for dev / debug kernels only.
- */
-static int
-sysctl_memorystatus_freeze SYSCTL_HANDLER_ARGS
+/* Routine to find the jetsam state structure for the current jetsam thread */
+static inline struct jetsam_thread_state *
+jetsam_current_thread(void)
 {
-#pragma unused(arg1, arg2)
-       int error, pid = 0;
-       proc_t p;
-       int freezer_error_code = 0;
-
-       if (memorystatus_freeze_enabled == FALSE) {
-               printf("sysctl_freeze: Freeze is DISABLED\n");
-               return ENOTSUP;
+       for (int thr_id = 0; thr_id < max_jetsam_threads; thr_id++) {
+               if (jetsam_threads[thr_id].thread == current_thread()) {
+                       return &(jetsam_threads[thr_id]);
+               }
        }
+       return NULL;
+}
 
-       error = sysctl_handle_int(oidp, &pid, 0, req);
-       if (error || !req->newptr) {
-               return error;
-       }
 
-       if (pid == VM_PAGES_FOR_ALL_PROCS) {
-               vm_pageout_anonymous_pages();
+__private_extern__ void
+memorystatus_init(void)
+{
+       kern_return_t result;
+       int i;
 
-               return 0;
-       }
+#if CONFIG_FREEZE
+       memorystatus_freeze_jetsam_band = JETSAM_PRIORITY_UI_SUPPORT;
+       memorystatus_frozen_processes_max = FREEZE_PROCESSES_MAX;
+       memorystatus_frozen_shared_mb_max = ((MAX_FROZEN_SHARED_MB_PERCENT * max_task_footprint_mb) / 100); /* 10% of the system wide task limit */
+       memorystatus_freeze_shared_mb_per_process_max = (memorystatus_frozen_shared_mb_max / 4);
+       memorystatus_freeze_pages_min = FREEZE_PAGES_MIN;
+       memorystatus_freeze_pages_max = FREEZE_PAGES_MAX;
+       memorystatus_max_frozen_demotions_daily = MAX_FROZEN_PROCESS_DEMOTIONS;
+       memorystatus_thaw_count_demotion_threshold = MIN_THAW_DEMOTION_THRESHOLD;
+#endif
 
-       lck_mtx_lock(&freezer_mutex);
+#if DEVELOPMENT || DEBUG
+       disconnect_page_mappings_lck_grp_attr = lck_grp_attr_alloc_init();
+       disconnect_page_mappings_lck_grp = lck_grp_alloc_init("disconnect_page_mappings", disconnect_page_mappings_lck_grp_attr);
 
-       p = proc_find(pid);
-       if (p != NULL) {
-               uint32_t purgeable, wired, clean, dirty, shared;
-               uint32_t max_pages = 0, state = 0;
+       lck_mtx_init(&disconnect_page_mappings_mutex, disconnect_page_mappings_lck_grp, NULL);
 
-               if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
-                       /*
-                        * Freezer backed by the compressor and swap file(s)
-                        * will hold compressed data.
-                        *
-                        * Set the sysctl kern.memorystatus_freeze_to_memory to true to keep compressed data from
-                        * being swapped out to disk. Note that this disables freezer swap support globally,
-                        * not just for the process being frozen.
-                        *
-                        *
-                        * We don't care about the global freezer budget or the process's (min/max) budget here.
-                        * The freeze sysctl is meant to force-freeze a process.
-                        *
-                        * We also don't update any global or process stats on this path, so that the jetsam/ freeze
-                        * logic remains unaffected. The tasks we're performing here are: freeze the process, set the
-                        * P_MEMSTAT_FROZEN bit, and elevate the process to a higher band (if the freezer is active).
-                        */
-                       max_pages = memorystatus_freeze_pages_max;
-               } else {
-                       /*
-                        * We only have the compressor without any swap.
-                        */
-                       max_pages = UINT32_MAX - 1;
-               }
+       if (kill_on_no_paging_space) {
+               max_kill_priority = JETSAM_PRIORITY_MAX;
+       }
+#endif
 
-               proc_list_lock();
-               state = p->p_memstat_state;
-               proc_list_unlock();
+       memorystatus_jetsam_fg_band_lock_grp_attr = lck_grp_attr_alloc_init();
+       memorystatus_jetsam_fg_band_lock_grp =
+           lck_grp_alloc_init("memorystatus_jetsam_fg_band", memorystatus_jetsam_fg_band_lock_grp_attr);
+       lck_mtx_init(&memorystatus_jetsam_fg_band_lock, memorystatus_jetsam_fg_band_lock_grp, NULL);
 
-               /*
-                * The jetsam path also verifies that the process is a suspended App. We don't care about that here.
-                * We simply ensure that jetsam is not already working on the process and that the process has not
-                * explicitly disabled freezing.
-                */
-               if (state & (P_MEMSTAT_TERMINATED | P_MEMSTAT_LOCKED | P_MEMSTAT_FREEZE_DISABLED)) {
-                       printf("sysctl_freeze: p_memstat_state check failed, process is%s%s%s\n",
-                           (state & P_MEMSTAT_TERMINATED) ? " terminated" : "",
-                           (state & P_MEMSTAT_LOCKED) ? " locked" : "",
-                           (state & P_MEMSTAT_FREEZE_DISABLED) ? " unfreezable" : "");
+       /* Init buckets */
+       for (i = 0; i < MEMSTAT_BUCKET_COUNT; i++) {
+               TAILQ_INIT(&memstat_bucket[i].list);
+               memstat_bucket[i].count = 0;
+               memstat_bucket[i].relaunch_high_count = 0;
+       }
+       memorystatus_idle_demotion_call = thread_call_allocate((thread_call_func_t)memorystatus_perform_idle_demotion, NULL);
 
-                       proc_rele(p);
-                       lck_mtx_unlock(&freezer_mutex);
-                       return EPERM;
-               }
+       nanoseconds_to_absolutetime((uint64_t)DEFERRED_IDLE_EXIT_TIME_SECS * NSEC_PER_SEC, &memorystatus_sysprocs_idle_delay_time);
+       nanoseconds_to_absolutetime((uint64_t)DEFERRED_IDLE_EXIT_TIME_SECS * NSEC_PER_SEC, &memorystatus_apps_idle_delay_time);
 
-               error = task_freeze(p->task, &purgeable, &wired, &clean, &dirty, max_pages, &shared, &freezer_error_code, FALSE /* eval only */);
+#if CONFIG_JETSAM
+       /* Apply overrides */
+       if (!PE_parse_boot_argn("kern.jetsam_delta", &delta_percentage, sizeof(delta_percentage))) {
+               PE_get_default("kern.jetsam_delta", &delta_percentage, sizeof(delta_percentage));
+       }
+       if (delta_percentage == 0) {
+               delta_percentage = 5;
+       }
+       if (max_mem > config_jetsam_large_memory_cutoff) {
+               critical_threshold_percentage = critical_threshold_percentage_larger_devices;
+               delta_percentage = delta_percentage_larger_devices;
+       }
+       assert(delta_percentage < 100);
+       if (!PE_parse_boot_argn("kern.jetsam_critical_threshold", &critical_threshold_percentage, sizeof(critical_threshold_percentage))) {
+               PE_get_default("kern.jetsam_critical_threshold", &critical_threshold_percentage, sizeof(critical_threshold_percentage));
+       }
+       assert(critical_threshold_percentage < 100);
+       PE_get_default("kern.jetsam_idle_offset", &idle_offset_percentage, sizeof(idle_offset_percentage));
+       assert(idle_offset_percentage < 100);
+       PE_get_default("kern.jetsam_pressure_threshold", &pressure_threshold_percentage, sizeof(pressure_threshold_percentage));
+       assert(pressure_threshold_percentage < 100);
+       PE_get_default("kern.jetsam_freeze_threshold", &freeze_threshold_percentage, sizeof(freeze_threshold_percentage));
+       assert(freeze_threshold_percentage < 100);
 
-               if (error) {
-                       char reason[128];
-                       if (freezer_error_code == FREEZER_ERROR_EXCESS_SHARED_MEMORY) {
-                               strlcpy(reason, "too much shared memory", 128);
-                       }
 
-                       if (freezer_error_code == FREEZER_ERROR_LOW_PRIVATE_SHARED_RATIO) {
-                               strlcpy(reason, "low private-shared pages ratio", 128);
-                       }
+       if (!PE_parse_boot_argn("jetsam_aging_policy", &jetsam_aging_policy,
+           sizeof(jetsam_aging_policy))) {
+               if (!PE_get_default("kern.jetsam_aging_policy", &jetsam_aging_policy,
+                   sizeof(jetsam_aging_policy))) {
+                       jetsam_aging_policy = kJetsamAgingPolicySysProcsReclaimedFirst;
+               }
+       }
 
-                       if (freezer_error_code == FREEZER_ERROR_NO_COMPRESSOR_SPACE) {
-                               strlcpy(reason, "no compressor space", 128);
-                       }
+       if (jetsam_aging_policy > kJetsamAgingPolicyMax) {
+               jetsam_aging_policy = kJetsamAgingPolicySysProcsReclaimedFirst;
+       }
 
-                       if (freezer_error_code == FREEZER_ERROR_NO_SWAP_SPACE) {
-                               strlcpy(reason, "no swap space", 128);
-                       }
+       switch (jetsam_aging_policy) {
+       case kJetsamAgingPolicyNone:
+               system_procs_aging_band = JETSAM_PRIORITY_IDLE;
+               applications_aging_band = JETSAM_PRIORITY_IDLE;
+               break;
 
-                       printf("sysctl_freeze: task_freeze failed: %s\n", reason);
+       case kJetsamAgingPolicyLegacy:
+               /*
+                * Legacy behavior where some daemons get a 10s protection once
+                * AND only before the first clean->dirty->clean transition before
+                * going into IDLE band.
+                */
+               system_procs_aging_band = JETSAM_PRIORITY_AGING_BAND1;
+               applications_aging_band = JETSAM_PRIORITY_IDLE;
+               break;
 
-                       if (error == KERN_NO_SPACE) {
-                               /* Make it easy to distinguish between failures due to low compressor/ swap space and other failures. */
-                               error = ENOSPC;
-                       } else {
-                               error = EIO;
-                       }
-               } else {
-                       proc_list_lock();
-                       if ((p->p_memstat_state & P_MEMSTAT_FROZEN) == 0) {
-                               p->p_memstat_state |= P_MEMSTAT_FROZEN;
-                               memorystatus_frozen_count++;
-                       }
-                       p->p_memstat_frozen_count++;
+       case kJetsamAgingPolicySysProcsReclaimedFirst:
+               system_procs_aging_band = JETSAM_PRIORITY_AGING_BAND1;
+               applications_aging_band = JETSAM_PRIORITY_AGING_BAND2;
+               break;
 
+       case kJetsamAgingPolicyAppsReclaimedFirst:
+               system_procs_aging_band = JETSAM_PRIORITY_AGING_BAND2;
+               applications_aging_band = JETSAM_PRIORITY_AGING_BAND1;
+               break;
 
-                       proc_list_unlock();
+       default:
+               break;
+       }
 
-                       if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
-                               /*
-                                * We elevate only if we are going to swap out the data.
-                                */
-                               error = memorystatus_update_inactive_jetsam_priority_band(pid, MEMORYSTATUS_CMD_ELEVATED_INACTIVEJETSAMPRIORITY_ENABLE,
-                                   memorystatus_freeze_jetsam_band, TRUE);
+       /*
+        * The aging bands cannot overlap with the JETSAM_PRIORITY_ELEVATED_INACTIVE
+        * band and must be below it in priority. This is so that we don't have to make
+        * our 'aging' code worry about a mix of processes, some of which need to age
+        * and some others that need to stay elevated in the jetsam bands.
+        */
+       assert(JETSAM_PRIORITY_ELEVATED_INACTIVE > system_procs_aging_band);
+       assert(JETSAM_PRIORITY_ELEVATED_INACTIVE > applications_aging_band);
 
-                               if (error) {
-                                       printf("sysctl_freeze: Elevating frozen process to higher jetsam band failed with %d\n", error);
-                               }
-                       }
-               }
+       /* Take snapshots for idle-exit kills by default? First check the boot-arg... */
+       if (!PE_parse_boot_argn("jetsam_idle_snapshot", &memorystatus_idle_snapshot, sizeof(memorystatus_idle_snapshot))) {
+               /* ...no boot-arg, so check the device tree */
+               PE_get_default("kern.jetsam_idle_snapshot", &memorystatus_idle_snapshot, sizeof(memorystatus_idle_snapshot));
+       }
 
-               proc_rele(p);
+       memorystatus_delta = (unsigned int) (delta_percentage * atop_64(max_mem) / 100);
+       memorystatus_available_pages_critical_idle_offset = (unsigned int) (idle_offset_percentage * atop_64(max_mem) / 100);
+       memorystatus_available_pages_critical_base = (unsigned int) ((critical_threshold_percentage / delta_percentage) * memorystatus_delta);
+       memorystatus_policy_more_free_offset_pages = (unsigned int) ((policy_more_free_offset_percentage / delta_percentage) * memorystatus_delta);
+       memorystatus_sysproc_aging_aggr_pages = (unsigned int) (sysproc_aging_aggr_threshold_percentage * atop_64(max_mem) / 100);
 
-               lck_mtx_unlock(&freezer_mutex);
-               return error;
+       /* Jetsam Loop Detection */
+       if (max_mem <= (512 * 1024 * 1024)) {
+               /* 512 MB devices */
+               memorystatus_jld_eval_period_msecs = 8000;      /* 8000 msecs == 8 second window */
        } else {
-               printf("sysctl_freeze: Invalid process\n");
+               /* 1GB and larger devices */
+               memorystatus_jld_eval_period_msecs = 6000;      /* 6000 msecs == 6 second window */
        }
 
+       memorystatus_jld_enabled = TRUE;
 
-       lck_mtx_unlock(&freezer_mutex);
-       return EINVAL;
-}
-
-SYSCTL_PROC(_kern, OID_AUTO, memorystatus_freeze, CTLTYPE_INT | CTLFLAG_WR | CTLFLAG_LOCKED | CTLFLAG_MASKED,
-    0, 0, &sysctl_memorystatus_freeze, "I", "");
-
-static int
-sysctl_memorystatus_available_pages_thaw SYSCTL_HANDLER_ARGS
-{
-#pragma unused(arg1, arg2)
+       /* No contention at this point */
+       memorystatus_update_levels_locked(FALSE);
 
-       int error, pid = 0;
-       proc_t p;
+#endif /* CONFIG_JETSAM */
 
-       if (memorystatus_freeze_enabled == FALSE) {
-               return ENOTSUP;
+#if __arm64__
+       if (!PE_parse_boot_argn("entitled_max_task_pmem", &memorystatus_entitled_max_task_footprint_mb,
+           sizeof(memorystatus_entitled_max_task_footprint_mb))) {
+               if (!PE_get_default("kern.entitled_max_task_pmem", &memorystatus_entitled_max_task_footprint_mb,
+                   sizeof(memorystatus_entitled_max_task_footprint_mb))) {
+                       // entitled_max_task_pmem is not supported on this system.
+                       memorystatus_entitled_max_task_footprint_mb = 0;
+               }
        }
-
-       error = sysctl_handle_int(oidp, &pid, 0, req);
-       if (error || !req->newptr) {
-               return error;
+       if (memorystatus_entitled_max_task_footprint_mb > max_mem / (1UL << 20) || memorystatus_entitled_max_task_footprint_mb < 0) {
+               os_log_with_startup_serial(OS_LOG_DEFAULT, "Invalid value (%d) for entitled_max_task_pmem. Setting to 0",
+                   memorystatus_entitled_max_task_footprint_mb);
        }
+#endif /* __arm64__ */
 
-       if (pid == VM_PAGES_FOR_ALL_PROCS) {
-               do_fastwake_warmup_all();
-               return 0;
-       } else {
-               p = proc_find(pid);
-               if (p != NULL) {
-                       error = task_thaw(p->task);
+       memorystatus_jetsam_snapshot_max = maxproc;
 
-                       if (error) {
-                               error = EIO;
-                       } else {
-                               /*
-                                * task_thaw() succeeded.
-                                *
-                                * We increment memorystatus_frozen_count on the sysctl freeze path.
-                                * And so we need the P_MEMSTAT_FROZEN to decrement the frozen count
-                                * when this process exits.
-                                *
-                                * proc_list_lock();
-                                * p->p_memstat_state &= ~P_MEMSTAT_FROZEN;
-                                * proc_list_unlock();
-                                */
-                       }
-                       proc_rele(p);
-                       return error;
-               }
-       }
+       memorystatus_jetsam_snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) +
+           (sizeof(memorystatus_jetsam_snapshot_entry_t) * memorystatus_jetsam_snapshot_max);
 
-       return EINVAL;
-}
+       memorystatus_jetsam_snapshot = kalloc_flags(memorystatus_jetsam_snapshot_size, Z_WAITOK | Z_ZERO);
+       if (!memorystatus_jetsam_snapshot) {
+               panic("Could not allocate memorystatus_jetsam_snapshot");
+       }
 
-SYSCTL_PROC(_kern, OID_AUTO, memorystatus_thaw, CTLTYPE_INT | CTLFLAG_WR | CTLFLAG_LOCKED | CTLFLAG_MASKED,
-    0, 0, &sysctl_memorystatus_available_pages_thaw, "I", "");
+       memorystatus_jetsam_snapshot_copy = kalloc_flags(memorystatus_jetsam_snapshot_size, Z_WAITOK | Z_ZERO);
+       if (!memorystatus_jetsam_snapshot_copy) {
+               panic("Could not allocate memorystatus_jetsam_snapshot_copy");
+       }
 
-typedef struct _global_freezable_status {
-       boolean_t       freeze_pages_threshold_crossed;
-       boolean_t       freeze_eligible_procs_available;
-       boolean_t       freeze_scheduled_in_future;
-}global_freezable_status_t;
+#if CONFIG_FREEZE
+       memorystatus_jetsam_snapshot_freezer_max = memorystatus_jetsam_snapshot_max / JETSAM_SNAPSHOT_FREEZER_MAX_FACTOR;
+       memorystatus_jetsam_snapshot_freezer_size = sizeof(memorystatus_jetsam_snapshot_t) +
+           (sizeof(memorystatus_jetsam_snapshot_entry_t) * memorystatus_jetsam_snapshot_freezer_max);
 
-typedef struct _proc_freezable_status {
-       boolean_t       freeze_has_memstat_state;
-       boolean_t       freeze_has_pages_min;
-       int             freeze_has_probability;
-       boolean_t       freeze_attempted;
-       uint32_t        p_memstat_state;
-       uint32_t        p_pages;
-       int             p_freeze_error_code;
-       int             p_pid;
-       char            p_name[MAXCOMLEN + 1];
-}proc_freezable_status_t;
+       memorystatus_jetsam_snapshot_freezer = kalloc_flags(memorystatus_jetsam_snapshot_freezer_size, Z_WAITOK | Z_ZERO);
+       if (!memorystatus_jetsam_snapshot_freezer) {
+               panic("Could not allocate memorystatus_jetsam_snapshot_freezer");
+       }
+#endif /* CONFIG_FREEZE */
 
-#define MAX_FREEZABLE_PROCESSES 100
+       nanoseconds_to_absolutetime((uint64_t)JETSAM_SNAPSHOT_TIMEOUT_SECS * NSEC_PER_SEC, &memorystatus_jetsam_snapshot_timeout);
 
-static int
-memorystatus_freezer_get_status(user_addr_t buffer, size_t buffer_size, int32_t *retval)
-{
-       uint32_t                        proc_count = 0, i = 0;
-       global_freezable_status_t       *list_head;
-       proc_freezable_status_t         *list_entry;
-       size_t                          list_size = 0;
-       proc_t                          p;
-       memstat_bucket_t                *bucket;
-       uint32_t                        state = 0, pages = 0, entry_count = 0;
-       boolean_t                       try_freeze = TRUE;
-       int                             error = 0, probability_of_use = 0;
+       memset(&memorystatus_at_boot_snapshot, 0, sizeof(memorystatus_jetsam_snapshot_t));
 
+#if CONFIG_FREEZE
+       memorystatus_freeze_threshold = (unsigned int) ((freeze_threshold_percentage / delta_percentage) * memorystatus_delta);
+#endif
 
-       if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE == FALSE) {
-               return ENOTSUP;
+       /* Check the boot-arg to see if fast jetsam is allowed */
+       if (!PE_parse_boot_argn("fast_jetsam_enabled", &fast_jetsam_enabled, sizeof(fast_jetsam_enabled))) {
+               fast_jetsam_enabled = 0;
        }
 
-       list_size = sizeof(global_freezable_status_t) + (sizeof(proc_freezable_status_t) * MAX_FREEZABLE_PROCESSES);
-
-       if (buffer_size < list_size) {
-               return EINVAL;
+       /* Check the boot-arg to configure the maximum number of jetsam threads */
+       if (!PE_parse_boot_argn("max_jetsam_threads", &max_jetsam_threads, sizeof(max_jetsam_threads))) {
+               max_jetsam_threads = JETSAM_THREADS_LIMIT;
        }
 
-       list_head = (global_freezable_status_t*)kalloc(list_size);
-       if (list_head == NULL) {
-               return ENOMEM;
+       /* Restrict the maximum number of jetsam threads to JETSAM_THREADS_LIMIT */
+       if (max_jetsam_threads > JETSAM_THREADS_LIMIT) {
+               max_jetsam_threads = JETSAM_THREADS_LIMIT;
        }
 
-       memset(list_head, 0, list_size);
+       /* For low CPU systems disable fast jetsam mechanism */
+       if (vm_pageout_state.vm_restricted_to_single_processor == TRUE) {
+               max_jetsam_threads = 1;
+               fast_jetsam_enabled = 0;
+       }
 
-       list_size = sizeof(global_freezable_status_t);
+       /* Initialize the jetsam_threads state array */
+       jetsam_threads = zalloc_permanent(sizeof(struct jetsam_thread_state) *
+           max_jetsam_threads, ZALIGN(struct jetsam_thread_state));
 
-       proc_list_lock();
+       /* Initialize all the jetsam threads */
+       for (i = 0; i < max_jetsam_threads; i++) {
+               jetsam_threads[i].inited = FALSE;
+               jetsam_threads[i].index = i;
+               result = kernel_thread_start_priority(memorystatus_thread, NULL, 95 /* MAXPRI_KERNEL */, &jetsam_threads[i].thread);
+               if (result != KERN_SUCCESS) {
+                       panic("Could not create memorystatus_thread %d", i);
+               }
+               thread_deallocate(jetsam_threads[i].thread);
+       }
+}
 
-       uint64_t curr_time = mach_absolute_time();
+/* Centralised for the purposes of allowing panic-on-jetsam */
+extern void
+vm_run_compactor(void);
 
-       list_head->freeze_pages_threshold_crossed = (memorystatus_available_pages < memorystatus_freeze_threshold);
-       list_head->freeze_eligible_procs_available = ((memorystatus_suspended_count - memorystatus_frozen_count) > memorystatus_freeze_suspended_threshold);
-       list_head->freeze_scheduled_in_future = (curr_time < memorystatus_freezer_thread_next_run_ts);
+/*
+ * The jetsam no frills kill call
+ *      Return: 0 on success
+ *             error code on failure (EINVAL...)
+ */
+static int
+jetsam_do_kill(proc_t p, int jetsam_flags, os_reason_t jetsam_reason)
+{
+       int error = 0;
+       error = exit_with_reason(p, W_EXITCODE(0, SIGKILL), (int *)NULL, FALSE, FALSE, jetsam_flags, jetsam_reason);
+       return error;
+}
 
-       list_entry = (proc_freezable_status_t*) ((uintptr_t)list_head + sizeof(global_freezable_status_t));
+/*
+ * Wrapper for processes exiting with memorystatus details
+ */
+static boolean_t
+memorystatus_do_kill(proc_t p, uint32_t cause, os_reason_t jetsam_reason, uint64_t *footprint_of_killed_proc)
+{
+       int error = 0;
+       __unused pid_t victim_pid = p->p_pid;
+       uint64_t footprint = get_task_phys_footprint(p->task);
+#if (KDEBUG_LEVEL >= KDEBUG_LEVEL_STANDARD)
+       int32_t memstat_effectivepriority = p->p_memstat_effectivepriority;
+#endif /* (KDEBUG_LEVEL >= KDEBUG_LEVEL_STANDARD) */
 
-       bucket = &memstat_bucket[JETSAM_PRIORITY_IDLE];
+       KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DO_KILL)) | DBG_FUNC_START,
+           victim_pid, cause, vm_page_free_count, footprint, 0);
+       DTRACE_MEMORYSTATUS4(memorystatus_do_kill, proc_t, p, os_reason_t, jetsam_reason, uint32_t, cause, uint64_t, footprint);
+#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
+       if (memorystatus_jetsam_panic_debug & (1 << cause)) {
+               panic("memorystatus_do_kill(): jetsam debug panic (cause: %d)", cause);
+       }
+#else
+#pragma unused(cause)
+#endif
 
-       entry_count = (memorystatus_global_probabilities_size / sizeof(memorystatus_internal_probabilities_t));
+       if (p->p_memstat_effectivepriority >= JETSAM_PRIORITY_FOREGROUND) {
+               printf("memorystatus: killing process %d [%s] in high band %s (%d) - memorystatus_available_pages: %llu\n", p->p_pid,
+                   (*p->p_name ? p->p_name : "unknown"),
+                   memorystatus_priority_band_name(p->p_memstat_effectivepriority), p->p_memstat_effectivepriority,
+                   (uint64_t)MEMORYSTATUS_LOG_AVAILABLE_PAGES);
+       }
 
-       p = memorystatus_get_first_proc_locked(&i, FALSE);
-       proc_count++;
-
-       while ((proc_count <= MAX_FREEZABLE_PROCESSES) &&
-           (p) &&
-           (list_size < buffer_size)) {
-               if (isApp(p) == FALSE) {
-                       p = memorystatus_get_next_proc_locked(&i, p, FALSE);
-                       proc_count++;
-                       continue;
-               }
+       /*
+        * The jetsam_reason (os_reason_t) has enough information about the kill cause.
+        * We don't really need jetsam_flags anymore, so it's okay that not all possible kill causes have been mapped.
+        */
+       int jetsam_flags = P_LTERM_JETSAM;
+       switch (cause) {
+       case kMemorystatusKilledHiwat:                                          jetsam_flags |= P_JETSAM_HIWAT; break;
+       case kMemorystatusKilledVnodes:                                         jetsam_flags |= P_JETSAM_VNODE; break;
+       case kMemorystatusKilledVMPageShortage:                         jetsam_flags |= P_JETSAM_VMPAGESHORTAGE; break;
+       case kMemorystatusKilledVMCompressorThrashing:
+       case kMemorystatusKilledVMCompressorSpaceShortage:      jetsam_flags |= P_JETSAM_VMTHRASHING; break;
+       case kMemorystatusKilledFCThrashing:                            jetsam_flags |= P_JETSAM_FCTHRASHING; break;
+       case kMemorystatusKilledPerProcessLimit:                        jetsam_flags |= P_JETSAM_PID; break;
+       case kMemorystatusKilledIdleExit:                                       jetsam_flags |= P_JETSAM_IDLEEXIT; break;
+       }
+       error = jetsam_do_kill(p, jetsam_flags, jetsam_reason);
+       *footprint_of_killed_proc = ((error == 0) ? footprint : 0);
 
-               strlcpy(list_entry->p_name, p->p_name, MAXCOMLEN + 1);
+       KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DO_KILL)) | DBG_FUNC_END,
+           victim_pid, memstat_effectivepriority, vm_page_free_count, error, 0);
 
-               list_entry->p_pid = p->p_pid;
+       KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_COMPACTOR_RUN)) | DBG_FUNC_START,
+           victim_pid, cause, vm_page_free_count, *footprint_of_killed_proc, 0);
 
-               state = p->p_memstat_state;
+       vm_run_compactor();
 
-               if ((state & (P_MEMSTAT_TERMINATED | P_MEMSTAT_LOCKED | P_MEMSTAT_FREEZE_DISABLED | P_MEMSTAT_FREEZE_IGNORE)) ||
-                   !(state & P_MEMSTAT_SUSPENDED)) {
-                       try_freeze = list_entry->freeze_has_memstat_state = FALSE;
-               } else {
-                       try_freeze = list_entry->freeze_has_memstat_state = TRUE;
-               }
+       KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_COMPACTOR_RUN)) | DBG_FUNC_END,
+           victim_pid, cause, vm_page_free_count, 0, 0);
 
-               list_entry->p_memstat_state = state;
+       return error == 0;
+}
 
-               memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
-               if (pages < memorystatus_freeze_pages_min) {
-                       try_freeze = list_entry->freeze_has_pages_min = FALSE;
-               } else {
-                       list_entry->freeze_has_pages_min = TRUE;
-                       if (try_freeze != FALSE) {
-                               try_freeze = TRUE;
-                       }
-               }
+/*
+ * Node manipulation
+ */
 
-               list_entry->p_pages = pages;
+static void
+memorystatus_check_levels_locked(void)
+{
+#if CONFIG_JETSAM
+       /* Update levels */
+       memorystatus_update_levels_locked(TRUE);
+#else /* CONFIG_JETSAM */
+       /*
+        * Nothing to do here currently since we update
+        * memorystatus_available_pages in vm_pressure_response.
+        */
+#endif /* CONFIG_JETSAM */
+}
 
-               if (entry_count) {
-                       uint32_t j = 0;
-                       for (j = 0; j < entry_count; j++) {
-                               if (strncmp(memorystatus_global_probabilities_table[j].proc_name,
-                                   p->p_name,
-                                   MAXCOMLEN + 1) == 0) {
-                                       probability_of_use = memorystatus_global_probabilities_table[j].use_probability;
-                                       break;
-                               }
-                       }
+/*
+ * Pin a process to a particular jetsam band when it is in the background i.e. not doing active work.
+ * For an application: that means no longer in the FG band
+ * For a daemon: that means no longer in its 'requested' jetsam priority band
+ */
 
-                       list_entry->freeze_has_probability = probability_of_use;
+int
+memorystatus_update_inactive_jetsam_priority_band(pid_t pid, uint32_t op_flags, int jetsam_prio, boolean_t effective_now)
+{
+       int error = 0;
+       boolean_t enable = FALSE;
+       proc_t  p = NULL;
 
-                       if (probability_of_use && try_freeze != FALSE) {
-                               try_freeze = TRUE;
-                       } else {
-                               try_freeze = FALSE;
-                       }
+       if (op_flags == MEMORYSTATUS_CMD_ELEVATED_INACTIVEJETSAMPRIORITY_ENABLE) {
+               enable = TRUE;
+       } else if (op_flags == MEMORYSTATUS_CMD_ELEVATED_INACTIVEJETSAMPRIORITY_DISABLE) {
+               enable = FALSE;
+       } else {
+               return EINVAL;
+       }
+
+       p = proc_find(pid);
+       if (p != NULL) {
+               if ((enable && ((p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) == P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND)) ||
+                   (!enable && ((p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) == 0))) {
+                       /*
+                        * No change in state.
+                        */
                } else {
-                       if (try_freeze != FALSE) {
-                               try_freeze = TRUE;
-                       }
-                       list_entry->freeze_has_probability = -1;
-               }
+                       proc_list_lock();
 
-               if (try_freeze) {
-                       uint32_t purgeable, wired, clean, dirty, shared;
-                       uint32_t max_pages = 0;
-                       int freezer_error_code = 0;
+                       if (enable) {
+                               p->p_memstat_state |= P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND;
+                               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
 
-                       error = task_freeze(p->task, &purgeable, &wired, &clean, &dirty, max_pages, &shared, &freezer_error_code, TRUE /* eval only */);
+                               if (effective_now) {
+                                       if (p->p_memstat_effectivepriority < jetsam_prio) {
+                                               if (memorystatus_highwater_enabled) {
+                                                       /*
+                                                        * Process is about to transition from
+                                                        * inactive --> active
+                                                        * assign active state
+                                                        */
+                                                       boolean_t is_fatal;
+                                                       boolean_t use_active = TRUE;
+                                                       CACHE_ACTIVE_LIMITS_LOCKED(p, is_fatal);
+                                                       task_set_phys_footprint_limit_internal(p->task, (p->p_memstat_memlimit > 0) ? p->p_memstat_memlimit : -1, NULL, use_active, is_fatal);
+                                               }
+                                               memorystatus_update_priority_locked(p, jetsam_prio, FALSE, FALSE);
+                                       }
+                               } else {
+                                       if (isProcessInAgingBands(p)) {
+                                               memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, FALSE, TRUE);
+                                       }
+                               }
+                       } else {
+                               p->p_memstat_state &= ~P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND;
+                               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
 
-                       if (error) {
-                               list_entry->p_freeze_error_code = freezer_error_code;
+                               if (effective_now) {
+                                       if (p->p_memstat_effectivepriority == jetsam_prio) {
+                                               memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, FALSE, TRUE);
+                                       }
+                               } else {
+                                       if (isProcessInAgingBands(p)) {
+                                               memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, FALSE, TRUE);
+                                       }
+                               }
                        }
 
-                       list_entry->freeze_attempted = TRUE;
+                       proc_list_unlock();
                }
-
-               list_entry++;
-
-               list_size += sizeof(proc_freezable_status_t);
-
-               p = memorystatus_get_next_proc_locked(&i, p, FALSE);
-               proc_count++;
-       }
-
-       proc_list_unlock();
-
-       buffer_size = list_size;
-
-       error = copyout(list_head, buffer, buffer_size);
-       if (error == 0) {
-               *retval = buffer_size;
+               proc_rele(p);
+               error = 0;
        } else {
-               *retval = 0;
+               error = ESRCH;
        }
 
-       list_size = sizeof(global_freezable_status_t) + (sizeof(proc_freezable_status_t) * MAX_FREEZABLE_PROCESSES);
-       kfree(list_head, list_size);
-
-       MEMORYSTATUS_DEBUG(1, "memorystatus_freezer_get_status: returning %d (%lu - size)\n", error, (unsigned long)*list_size);
-
        return error;
 }
 
-static int
-memorystatus_freezer_control(int32_t flags, user_addr_t buffer, size_t buffer_size, int32_t *retval)
+static void
+memorystatus_perform_idle_demotion(__unused void *spare1, __unused void *spare2)
 {
-       int err = ENOTSUP;
+       proc_t p;
+       uint64_t current_time = 0, idle_delay_time = 0;
+       int demote_prio_band = 0;
+       memstat_bucket_t *demotion_bucket;
 
-       if (flags == FREEZER_CONTROL_GET_STATUS) {
-               err = memorystatus_freezer_get_status(buffer, buffer_size, retval);
-       }
+       MEMORYSTATUS_DEBUG(1, "memorystatus_perform_idle_demotion()\n");
 
-       return err;
-}
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_IDLE_DEMOTE) | DBG_FUNC_START, 0, 0, 0, 0, 0);
 
-#endif /* CONFIG_FREEZE */
+       current_time = mach_absolute_time();
 
-#endif /* DEVELOPMENT || DEBUG */
+       proc_list_lock();
 
-extern kern_return_t kernel_thread_start_priority(thread_continue_t continuation,
-    void *parameter,
-    integer_t priority,
-    thread_t *new_thread);
+       demote_prio_band = JETSAM_PRIORITY_IDLE + 1;
 
-#if DEVELOPMENT || DEBUG
+       for (; demote_prio_band < JETSAM_PRIORITY_MAX; demote_prio_band++) {
+               if (demote_prio_band != system_procs_aging_band && demote_prio_band != applications_aging_band) {
+                       continue;
+               }
 
-static int
-sysctl_memorystatus_disconnect_page_mappings SYSCTL_HANDLER_ARGS
-{
-#pragma unused(arg1, arg2)
-       int     error = 0, pid = 0;
-       proc_t  p;
+               demotion_bucket = &memstat_bucket[demote_prio_band];
+               p = TAILQ_FIRST(&demotion_bucket->list);
 
-       error = sysctl_handle_int(oidp, &pid, 0, req);
-       if (error || !req->newptr) {
-               return error;
-       }
+               while (p) {
+                       MEMORYSTATUS_DEBUG(1, "memorystatus_perform_idle_demotion() found %d\n", p->p_pid);
 
-       lck_mtx_lock(&disconnect_page_mappings_mutex);
+                       assert(p->p_memstat_idledeadline);
 
-       if (pid == -1) {
-               vm_pageout_disconnect_all_pages();
-       } else {
-               p = proc_find(pid);
+                       assert(p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS);
 
-               if (p != NULL) {
-                       error = task_disconnect_page_mappings(p->task);
+                       if (current_time >= p->p_memstat_idledeadline) {
+                               if ((isSysProc(p) &&
+                                   ((p->p_memstat_dirty & (P_DIRTY_IDLE_EXIT_ENABLED | P_DIRTY_IS_DIRTY)) != P_DIRTY_IDLE_EXIT_ENABLED)) || /* system proc marked dirty*/
+                                   task_has_assertions((struct task *)(p->task))) {     /* has outstanding assertions which might indicate outstanding work too */
+                                       idle_delay_time = (isSysProc(p)) ? memorystatus_sysprocs_idle_time(p) : memorystatus_apps_idle_time(p);
 
-                       proc_rele(p);
+                                       p->p_memstat_idledeadline += idle_delay_time;
+                                       p = TAILQ_NEXT(p, p_memstat_list);
+                               } else {
+                                       proc_t next_proc = NULL;
 
-                       if (error) {
-                               error = EIO;
+                                       next_proc = TAILQ_NEXT(p, p_memstat_list);
+                                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+
+                                       memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, false, true);
+
+                                       p = next_proc;
+                                       continue;
+                               }
+                       } else {
+                               // No further candidates
+                               break;
                        }
-               } else {
-                       error = EINVAL;
                }
        }
-       lck_mtx_unlock(&disconnect_page_mappings_mutex);
-
-       return error;
-}
 
-SYSCTL_PROC(_kern, OID_AUTO, memorystatus_disconnect_page_mappings, CTLTYPE_INT | CTLFLAG_WR | CTLFLAG_LOCKED | CTLFLAG_MASKED,
-    0, 0, &sysctl_memorystatus_disconnect_page_mappings, "I", "");
+       memorystatus_reschedule_idle_demotion_locked();
 
-#endif /* DEVELOPMENT || DEBUG */
+       proc_list_unlock();
 
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_IDLE_DEMOTE) | DBG_FUNC_END, 0, 0, 0, 0, 0);
+}
 
-/*
- * Picks the sorting routine for a given jetsam priority band.
- *
- * Input:
- *     bucket_index - jetsam priority band to be sorted.
- *     sort_order - JETSAM_SORT_xxx from kern_memorystatus.h
- *             Currently sort_order is only meaningful when handling
- *             coalitions.
- *
- * Return:
- *     0     on success
- *      non-0 on failure
- */
-static int
-memorystatus_sort_bucket(unsigned int bucket_index, int sort_order)
+static void
+memorystatus_schedule_idle_demotion_locked(proc_t p, boolean_t set_state)
 {
-       int coal_sort_order;
+       boolean_t present_in_sysprocs_aging_bucket = FALSE;
+       boolean_t present_in_apps_aging_bucket = FALSE;
+       uint64_t  idle_delay_time = 0;
 
-       /*
-        * Verify the jetsam priority
-        */
-       if (bucket_index >= MEMSTAT_BUCKET_COUNT) {
-               return EINVAL;
+       if (jetsam_aging_policy == kJetsamAgingPolicyNone) {
+               return;
        }
 
-#if DEVELOPMENT || DEBUG
-       if (sort_order == JETSAM_SORT_DEFAULT) {
-               coal_sort_order = COALITION_SORT_DEFAULT;
-       } else {
-               coal_sort_order = sort_order;           /* only used for testing scenarios */
-       }
-#else
-       /* Verify default */
-       if (sort_order == JETSAM_SORT_DEFAULT) {
-               coal_sort_order = COALITION_SORT_DEFAULT;
-       } else {
-               return EINVAL;
+       if ((p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) ||
+           (p->p_memstat_state & P_MEMSTAT_PRIORITY_ASSERTION)) {
+               /*
+                * This process isn't going to be making the trip to the lower bands.
+                */
+               return;
        }
-#endif
-
-       proc_list_lock();
 
-       if (memstat_bucket[bucket_index].count == 0) {
-               proc_list_unlock();
-               return 0;
-       }
+       if (isProcessInAgingBands(p)) {
+               if (jetsam_aging_policy != kJetsamAgingPolicyLegacy) {
+                       assert((p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) != P_DIRTY_AGING_IN_PROGRESS);
+               }
 
-       switch (bucket_index) {
-       case JETSAM_PRIORITY_FOREGROUND:
-               if (memorystatus_sort_by_largest_coalition_locked(bucket_index, coal_sort_order) == 0) {
-                       /*
-                        * Fall back to per process sorting when zero coalitions are found.
-                        */
-                       memorystatus_sort_by_largest_process_locked(bucket_index);
+               if (isSysProc(p) && system_procs_aging_band) {
+                       present_in_sysprocs_aging_bucket = TRUE;
+               } else if (isApp(p) && applications_aging_band) {
+                       present_in_apps_aging_bucket = TRUE;
                }
-               break;
-       default:
-               memorystatus_sort_by_largest_process_locked(bucket_index);
-               break;
        }
-       proc_list_unlock();
-
-       return 0;
-}
 
-/*
- * Sort processes by size for a single jetsam bucket.
- */
+       assert(!present_in_sysprocs_aging_bucket);
+       assert(!present_in_apps_aging_bucket);
 
-static void
-memorystatus_sort_by_largest_process_locked(unsigned int bucket_index)
-{
-       proc_t p = NULL, insert_after_proc = NULL, max_proc = NULL;
-       proc_t next_p = NULL, prev_max_proc = NULL;
-       uint32_t pages = 0, max_pages = 0;
-       memstat_bucket_t *current_bucket;
+       MEMORYSTATUS_DEBUG(1, "memorystatus_schedule_idle_demotion_locked: scheduling demotion to idle band for pid %d (dirty:0x%x, set_state %d, demotions %d).\n",
+           p->p_pid, p->p_memstat_dirty, set_state, (memorystatus_scheduled_idle_demotions_sysprocs + memorystatus_scheduled_idle_demotions_apps));
 
-       if (bucket_index >= MEMSTAT_BUCKET_COUNT) {
-               return;
+       if (isSysProc(p)) {
+               assert((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED);
        }
 
-       current_bucket = &memstat_bucket[bucket_index];
-
-       p = TAILQ_FIRST(&current_bucket->list);
-
-       while (p) {
-               memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
-               max_pages = pages;
-               max_proc = p;
-               prev_max_proc = p;
-
-               while ((next_p = TAILQ_NEXT(p, p_memstat_list)) != NULL) {
-                       /* traversing list until we find next largest process */
-                       p = next_p;
-                       memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
-                       if (pages > max_pages) {
-                               max_pages = pages;
-                               max_proc = p;
-                       }
-               }
-
-               if (prev_max_proc != max_proc) {
-                       /* found a larger process, place it in the list */
-                       TAILQ_REMOVE(&current_bucket->list, max_proc, p_memstat_list);
-                       if (insert_after_proc == NULL) {
-                               TAILQ_INSERT_HEAD(&current_bucket->list, max_proc, p_memstat_list);
-                       } else {
-                               TAILQ_INSERT_AFTER(&current_bucket->list, insert_after_proc, max_proc, p_memstat_list);
-                       }
-                       prev_max_proc = max_proc;
-               }
+       idle_delay_time = (isSysProc(p)) ? memorystatus_sysprocs_idle_time(p) : memorystatus_apps_idle_time(p);
+       if (set_state) {
+               p->p_memstat_dirty |= P_DIRTY_AGING_IN_PROGRESS;
+               p->p_memstat_idledeadline = mach_absolute_time() + idle_delay_time;
+       }
 
-               insert_after_proc = max_proc;
+       assert(p->p_memstat_idledeadline);
 
-               p = TAILQ_NEXT(max_proc, p_memstat_list);
+       if (isSysProc(p) && present_in_sysprocs_aging_bucket == FALSE) {
+               memorystatus_scheduled_idle_demotions_sysprocs++;
+       } else if (isApp(p) && present_in_apps_aging_bucket == FALSE) {
+               memorystatus_scheduled_idle_demotions_apps++;
        }
 }
 
-static proc_t
-memorystatus_get_first_proc_locked(unsigned int *bucket_index, boolean_t search)
+void
+memorystatus_invalidate_idle_demotion_locked(proc_t p, boolean_t clear_state)
 {
-       memstat_bucket_t *current_bucket;
-       proc_t next_p;
+       boolean_t present_in_sysprocs_aging_bucket = FALSE;
+       boolean_t present_in_apps_aging_bucket = FALSE;
 
-       if ((*bucket_index) >= MEMSTAT_BUCKET_COUNT) {
-               return NULL;
+       if (!system_procs_aging_band && !applications_aging_band) {
+               return;
        }
 
-       current_bucket = &memstat_bucket[*bucket_index];
-       next_p = TAILQ_FIRST(&current_bucket->list);
-       if (!next_p && search) {
-               while (!next_p && (++(*bucket_index) < MEMSTAT_BUCKET_COUNT)) {
-                       current_bucket = &memstat_bucket[*bucket_index];
-                       next_p = TAILQ_FIRST(&current_bucket->list);
+       if ((p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) == 0) {
+               return;
+       }
+
+       if (isProcessInAgingBands(p)) {
+               if (jetsam_aging_policy != kJetsamAgingPolicyLegacy) {
+                       assert((p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) == P_DIRTY_AGING_IN_PROGRESS);
+               }
+
+               if (isSysProc(p) && system_procs_aging_band) {
+                       assert(p->p_memstat_effectivepriority == system_procs_aging_band);
+                       assert(p->p_memstat_idledeadline);
+                       present_in_sysprocs_aging_bucket = TRUE;
+               } else if (isApp(p) && applications_aging_band) {
+                       assert(p->p_memstat_effectivepriority == applications_aging_band);
+                       assert(p->p_memstat_idledeadline);
+                       present_in_apps_aging_bucket = TRUE;
                }
        }
 
-       return next_p;
-}
+       MEMORYSTATUS_DEBUG(1, "memorystatus_invalidate_idle_demotion(): invalidating demotion to idle band for pid %d (clear_state %d, demotions %d).\n",
+           p->p_pid, clear_state, (memorystatus_scheduled_idle_demotions_sysprocs + memorystatus_scheduled_idle_demotions_apps));
 
-static proc_t
-memorystatus_get_next_proc_locked(unsigned int *bucket_index, proc_t p, boolean_t search)
-{
-       memstat_bucket_t *current_bucket;
-       proc_t next_p;
 
-       if (!p || ((*bucket_index) >= MEMSTAT_BUCKET_COUNT)) {
-               return NULL;
+       if (clear_state) {
+               p->p_memstat_idledeadline = 0;
+               p->p_memstat_dirty &= ~P_DIRTY_AGING_IN_PROGRESS;
        }
 
-       next_p = TAILQ_NEXT(p, p_memstat_list);
-       while (!next_p && search && (++(*bucket_index) < MEMSTAT_BUCKET_COUNT)) {
-               current_bucket = &memstat_bucket[*bucket_index];
-               next_p = TAILQ_FIRST(&current_bucket->list);
+       if (isSysProc(p) && present_in_sysprocs_aging_bucket == TRUE) {
+               memorystatus_scheduled_idle_demotions_sysprocs--;
+               assert(memorystatus_scheduled_idle_demotions_sysprocs >= 0);
+       } else if (isApp(p) && present_in_apps_aging_bucket == TRUE) {
+               memorystatus_scheduled_idle_demotions_apps--;
+               assert(memorystatus_scheduled_idle_demotions_apps >= 0);
        }
 
-       return next_p;
+       assert((memorystatus_scheduled_idle_demotions_sysprocs + memorystatus_scheduled_idle_demotions_apps) >= 0);
 }
 
-/*
- * Structure to hold state for a jetsam thread.
- * Typically there should be a single jetsam thread
- * unless parallel jetsam is enabled.
- */
-struct jetsam_thread_state {
-       boolean_t       inited; /* if the thread is initialized */
-       int             memorystatus_wakeup; /* wake channel */
-       int             index; /* jetsam thread index */
-       thread_t        thread; /* jetsam thread pointer */
-} *jetsam_threads;
+static void
+memorystatus_reschedule_idle_demotion_locked(void)
+{
+       if (0 == (memorystatus_scheduled_idle_demotions_sysprocs + memorystatus_scheduled_idle_demotions_apps)) {
+               if (memstat_idle_demotion_deadline) {
+                       /* Transitioned 1->0, so cancel next call */
+                       thread_call_cancel(memorystatus_idle_demotion_call);
+                       memstat_idle_demotion_deadline = 0;
+               }
+       } else {
+               memstat_bucket_t *demotion_bucket;
+               proc_t p = NULL, p1 = NULL, p2 = NULL;
 
-/* Maximum number of jetsam threads allowed */
-#define JETSAM_THREADS_LIMIT   3
+               if (system_procs_aging_band) {
+                       demotion_bucket = &memstat_bucket[system_procs_aging_band];
+                       p1 = TAILQ_FIRST(&demotion_bucket->list);
 
-/* Number of active jetsam threads */
-_Atomic int active_jetsam_threads = 1;
+                       p = p1;
+               }
 
-/* Number of maximum jetsam threads configured */
-int max_jetsam_threads = JETSAM_THREADS_LIMIT;
+               if (applications_aging_band) {
+                       demotion_bucket = &memstat_bucket[applications_aging_band];
+                       p2 = TAILQ_FIRST(&demotion_bucket->list);
 
-/*
- * Global switch for enabling fast jetsam. Fast jetsam is
- * hooked up via the system_override() system call. It has the
- * following effects:
- * - Raise the jetsam threshold ("clear-the-deck")
- * - Enabled parallel jetsam on eligible devices
- */
-int fast_jetsam_enabled = 0;
+                       if (p1 && p2) {
+                               p = (p1->p_memstat_idledeadline > p2->p_memstat_idledeadline) ? p2 : p1;
+                       } else {
+                               p = (p1 == NULL) ? p2 : p1;
+                       }
+               }
 
-/* Routine to find the jetsam state structure for the current jetsam thread */
-static inline struct jetsam_thread_state *
-jetsam_current_thread(void)
-{
-       for (int thr_id = 0; thr_id < max_jetsam_threads; thr_id++) {
-               if (jetsam_threads[thr_id].thread == current_thread()) {
-                       return &(jetsam_threads[thr_id]);
+               assert(p);
+
+               if (p != NULL) {
+                       assert(p && p->p_memstat_idledeadline);
+                       if (memstat_idle_demotion_deadline != p->p_memstat_idledeadline) {
+                               thread_call_enter_delayed(memorystatus_idle_demotion_call, p->p_memstat_idledeadline);
+                               memstat_idle_demotion_deadline = p->p_memstat_idledeadline;
+                       }
                }
        }
-       panic("jetsam_current_thread() is being called from a non-jetsam thread\n");
-       /* Contol should not reach here */
-       return NULL;
 }
 
+/*
+ * List manipulation
+ */
 
-__private_extern__ void
-memorystatus_init(void)
+int
+memorystatus_add(proc_t p, boolean_t locked)
 {
-       kern_return_t result;
-       int i;
+       memstat_bucket_t *bucket;
 
-#if CONFIG_FREEZE
-       memorystatus_freeze_jetsam_band = JETSAM_PRIORITY_UI_SUPPORT;
-       memorystatus_frozen_processes_max = FREEZE_PROCESSES_MAX;
-       memorystatus_frozen_shared_mb_max = ((MAX_FROZEN_SHARED_MB_PERCENT * max_task_footprint_mb) / 100); /* 10% of the system wide task limit */
-       memorystatus_freeze_shared_mb_per_process_max = (memorystatus_frozen_shared_mb_max / 4);
-       memorystatus_freeze_pages_min = FREEZE_PAGES_MIN;
-       memorystatus_freeze_pages_max = FREEZE_PAGES_MAX;
-       memorystatus_max_frozen_demotions_daily = MAX_FROZEN_PROCESS_DEMOTIONS;
-       memorystatus_thaw_count_demotion_threshold = MIN_THAW_DEMOTION_THRESHOLD;
-#endif
+       MEMORYSTATUS_DEBUG(1, "memorystatus_list_add(): adding pid %d with priority %d.\n", p->p_pid, p->p_memstat_effectivepriority);
 
-#if DEVELOPMENT || DEBUG
-       disconnect_page_mappings_lck_grp_attr = lck_grp_attr_alloc_init();
-       disconnect_page_mappings_lck_grp = lck_grp_alloc_init("disconnect_page_mappings", disconnect_page_mappings_lck_grp_attr);
+       if (!locked) {
+               proc_list_lock();
+       }
 
-       lck_mtx_init(&disconnect_page_mappings_mutex, disconnect_page_mappings_lck_grp, NULL);
+       DTRACE_MEMORYSTATUS2(memorystatus_add, proc_t, p, int32_t, p->p_memstat_effectivepriority);
 
-       if (kill_on_no_paging_space == TRUE) {
-               max_kill_priority = JETSAM_PRIORITY_MAX;
+       /* Processes marked internal do not have priority tracked */
+       if (p->p_memstat_state & P_MEMSTAT_INTERNAL) {
+               goto exit;
        }
-#endif
 
-
-       /* Init buckets */
-       for (i = 0; i < MEMSTAT_BUCKET_COUNT; i++) {
-               TAILQ_INIT(&memstat_bucket[i].list);
-               memstat_bucket[i].count = 0;
+       /*
+        * Opt out system processes from being frozen by default.
+        * For coalition-based freezing, we only want to freeze sysprocs that have specifically opted in.
+        */
+       if (isSysProc(p)) {
+               p->p_memstat_state |= P_MEMSTAT_FREEZE_DISABLED;
        }
-       memorystatus_idle_demotion_call = thread_call_allocate((thread_call_func_t)memorystatus_perform_idle_demotion, NULL);
+#if CONFIG_FREEZE
+       memorystatus_freeze_init_proc(p);
+#endif
 
-#if CONFIG_JETSAM
-       nanoseconds_to_absolutetime((uint64_t)DEFERRED_IDLE_EXIT_TIME_SECS * NSEC_PER_SEC, &memorystatus_sysprocs_idle_delay_time);
-       nanoseconds_to_absolutetime((uint64_t)DEFERRED_IDLE_EXIT_TIME_SECS * NSEC_PER_SEC, &memorystatus_apps_idle_delay_time);
-
-       /* Apply overrides */
-       PE_get_default("kern.jetsam_delta", &delta_percentage, sizeof(delta_percentage));
-       if (delta_percentage == 0) {
-               delta_percentage = 5;
-       }
-       assert(delta_percentage < 100);
-       PE_get_default("kern.jetsam_critical_threshold", &critical_threshold_percentage, sizeof(critical_threshold_percentage));
-       assert(critical_threshold_percentage < 100);
-       PE_get_default("kern.jetsam_idle_offset", &idle_offset_percentage, sizeof(idle_offset_percentage));
-       assert(idle_offset_percentage < 100);
-       PE_get_default("kern.jetsam_pressure_threshold", &pressure_threshold_percentage, sizeof(pressure_threshold_percentage));
-       assert(pressure_threshold_percentage < 100);
-       PE_get_default("kern.jetsam_freeze_threshold", &freeze_threshold_percentage, sizeof(freeze_threshold_percentage));
-       assert(freeze_threshold_percentage < 100);
-
-       if (!PE_parse_boot_argn("jetsam_aging_policy", &jetsam_aging_policy,
-           sizeof(jetsam_aging_policy))) {
-               if (!PE_get_default("kern.jetsam_aging_policy", &jetsam_aging_policy,
-                   sizeof(jetsam_aging_policy))) {
-                       jetsam_aging_policy = kJetsamAgingPolicyLegacy;
-               }
-       }
-
-       if (jetsam_aging_policy > kJetsamAgingPolicyMax) {
-               jetsam_aging_policy = kJetsamAgingPolicyLegacy;
-       }
-
-       switch (jetsam_aging_policy) {
-       case kJetsamAgingPolicyNone:
-               system_procs_aging_band = JETSAM_PRIORITY_IDLE;
-               applications_aging_band = JETSAM_PRIORITY_IDLE;
-               break;
+       bucket = &memstat_bucket[p->p_memstat_effectivepriority];
 
-       case kJetsamAgingPolicyLegacy:
+       if (isSysProc(p) && system_procs_aging_band && (p->p_memstat_effectivepriority == system_procs_aging_band)) {
+               assert(bucket->count == memorystatus_scheduled_idle_demotions_sysprocs - 1);
+       } else if (isApp(p) && applications_aging_band && (p->p_memstat_effectivepriority == applications_aging_band)) {
+               assert(bucket->count == memorystatus_scheduled_idle_demotions_apps - 1);
+       } else if (p->p_memstat_effectivepriority == JETSAM_PRIORITY_IDLE) {
                /*
-                * Legacy behavior where some daemons get a 10s protection once
-                * AND only before the first clean->dirty->clean transition before
-                * going into IDLE band.
+                * Entering the idle band.
+                * Record idle start time.
                 */
-               system_procs_aging_band = JETSAM_PRIORITY_AGING_BAND1;
-               applications_aging_band = JETSAM_PRIORITY_IDLE;
-               break;
-
-       case kJetsamAgingPolicySysProcsReclaimedFirst:
-               system_procs_aging_band = JETSAM_PRIORITY_AGING_BAND1;
-               applications_aging_band = JETSAM_PRIORITY_AGING_BAND2;
-               break;
-
-       case kJetsamAgingPolicyAppsReclaimedFirst:
-               system_procs_aging_band = JETSAM_PRIORITY_AGING_BAND2;
-               applications_aging_band = JETSAM_PRIORITY_AGING_BAND1;
-               break;
-
-       default:
-               break;
+               p->p_memstat_idle_start = mach_absolute_time();
        }
 
-       /*
-        * The aging bands cannot overlap with the JETSAM_PRIORITY_ELEVATED_INACTIVE
-        * band and must be below it in priority. This is so that we don't have to make
-        * our 'aging' code worry about a mix of processes, some of which need to age
-        * and some others that need to stay elevated in the jetsam bands.
-        */
-       assert(JETSAM_PRIORITY_ELEVATED_INACTIVE > system_procs_aging_band);
-       assert(JETSAM_PRIORITY_ELEVATED_INACTIVE > applications_aging_band);
-
-       /* Take snapshots for idle-exit kills by default? First check the boot-arg... */
-       if (!PE_parse_boot_argn("jetsam_idle_snapshot", &memorystatus_idle_snapshot, sizeof(memorystatus_idle_snapshot))) {
-               /* ...no boot-arg, so check the device tree */
-               PE_get_default("kern.jetsam_idle_snapshot", &memorystatus_idle_snapshot, sizeof(memorystatus_idle_snapshot));
+       TAILQ_INSERT_TAIL(&bucket->list, p, p_memstat_list);
+       bucket->count++;
+       if (p->p_memstat_relaunch_flags & (P_MEMSTAT_RELAUNCH_HIGH)) {
+               bucket->relaunch_high_count++;
        }
 
-       memorystatus_delta = delta_percentage * atop_64(max_mem) / 100;
-       memorystatus_available_pages_critical_idle_offset = idle_offset_percentage * atop_64(max_mem) / 100;
-       memorystatus_available_pages_critical_base = (critical_threshold_percentage / delta_percentage) * memorystatus_delta;
-       memorystatus_policy_more_free_offset_pages = (policy_more_free_offset_percentage / delta_percentage) * memorystatus_delta;
+       memorystatus_list_count++;
 
-       /* Jetsam Loop Detection */
-       if (max_mem <= (512 * 1024 * 1024)) {
-               /* 512 MB devices */
-               memorystatus_jld_eval_period_msecs = 8000;      /* 8000 msecs == 8 second window */
-       } else {
-               /* 1GB and larger devices */
-               memorystatus_jld_eval_period_msecs = 6000;      /* 6000 msecs == 6 second window */
+       memorystatus_check_levels_locked();
+
+exit:
+       if (!locked) {
+               proc_list_unlock();
        }
 
-       memorystatus_jld_enabled = TRUE;
+       return 0;
+}
 
-       /* No contention at this point */
-       memorystatus_update_levels_locked(FALSE);
+/*
+ * Description:
+ *     Moves a process from one jetsam bucket to another.
+ *     which changes the LRU position of the process.
+ *
+ *     Monitors transition between buckets and if necessary
+ *     will update cached memory limits accordingly.
+ *
+ *     skip_demotion_check:
+ *     - if the 'jetsam aging policy' is NOT 'legacy':
+ *             When this flag is TRUE, it means we are going
+ *             to age the ripe processes out of the aging bands and into the
+ *             IDLE band and apply their inactive memory limits.
+ *
+ *     - if the 'jetsam aging policy' is 'legacy':
+ *             When this flag is TRUE, it might mean the above aging mechanism
+ *             OR
+ *             It might be that we have a process that has used up its 'idle deferral'
+ *             stay that is given to it once per lifetime. And in this case, the process
+ *             won't be going through any aging codepaths. But we still need to apply
+ *             the right inactive limits and so we explicitly set this to TRUE if the
+ *             new priority for the process is the IDLE band.
+ */
+void
+memorystatus_update_priority_locked(proc_t p, int priority, boolean_t head_insert, boolean_t skip_demotion_check)
+{
+       memstat_bucket_t *old_bucket, *new_bucket;
 
-#endif /* CONFIG_JETSAM */
+       assert(priority < MEMSTAT_BUCKET_COUNT);
 
-       memorystatus_jetsam_snapshot_max = maxproc;
+       /* Ensure that exit isn't underway, leaving the proc retained but removed from its bucket */
+       if ((p->p_listflag & P_LIST_EXITED) != 0) {
+               return;
+       }
 
-       memorystatus_jetsam_snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) +
-           (sizeof(memorystatus_jetsam_snapshot_entry_t) * memorystatus_jetsam_snapshot_max);
+       MEMORYSTATUS_DEBUG(1, "memorystatus_update_priority_locked(): setting %s(%d) to priority %d, inserting at %s\n",
+           (*p->p_name ? p->p_name : "unknown"), p->p_pid, priority, head_insert ? "head" : "tail");
 
-       memorystatus_jetsam_snapshot =
-           (memorystatus_jetsam_snapshot_t*)kalloc(memorystatus_jetsam_snapshot_size);
-       if (!memorystatus_jetsam_snapshot) {
-               panic("Could not allocate memorystatus_jetsam_snapshot");
-       }
+       DTRACE_MEMORYSTATUS3(memorystatus_update_priority, proc_t, p, int32_t, p->p_memstat_effectivepriority, int, priority);
 
-       memorystatus_jetsam_snapshot_copy =
-           (memorystatus_jetsam_snapshot_t*)kalloc(memorystatus_jetsam_snapshot_size);
-       if (!memorystatus_jetsam_snapshot_copy) {
-               panic("Could not allocate memorystatus_jetsam_snapshot_copy");
-       }
+       old_bucket = &memstat_bucket[p->p_memstat_effectivepriority];
 
-       nanoseconds_to_absolutetime((uint64_t)JETSAM_SNAPSHOT_TIMEOUT_SECS * NSEC_PER_SEC, &memorystatus_jetsam_snapshot_timeout);
+       if (skip_demotion_check == FALSE) {
+               if (isSysProc(p)) {
+                       /*
+                        * For system processes, the memorystatus_dirty_* routines take care of adding/removing
+                        * the processes from the aging bands and balancing the demotion counts.
+                        * We can, however, override that if the process has an 'elevated inactive jetsam band' attribute.
+                        */
 
-       memset(&memorystatus_at_boot_snapshot, 0, sizeof(memorystatus_jetsam_snapshot_t));
+                       if (p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) {
+                               /*
+                                * 2 types of processes can use the non-standard elevated inactive band:
+                                * - Frozen processes that always land in memorystatus_freeze_jetsam_band
+                                * OR
+                                * - processes that specifically opt-in to the elevated inactive support e.g. docked processes.
+                                */
+#if CONFIG_FREEZE
+                               if (p->p_memstat_state & P_MEMSTAT_FROZEN) {
+                                       if (priority <= memorystatus_freeze_jetsam_band) {
+                                               priority = memorystatus_freeze_jetsam_band;
+                                       }
+                               } else
+#endif /* CONFIG_FREEZE */
+                               {
+                                       if (priority <= JETSAM_PRIORITY_ELEVATED_INACTIVE) {
+                                               priority = JETSAM_PRIORITY_ELEVATED_INACTIVE;
+                                       }
+                               }
+                               assert(!(p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS));
+                       }
+               } else if (isApp(p)) {
+                       /*
+                        * Check to see if the application is being lowered in jetsam priority. If so, and:
+                        * - it has an 'elevated inactive jetsam band' attribute, then put it in the appropriate band.
+                        * - it is a normal application, then let it age in the aging band if that policy is in effect.
+                        */
 
+                       if (p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) {
 #if CONFIG_FREEZE
-       memorystatus_freeze_threshold = (freeze_threshold_percentage / delta_percentage) * memorystatus_delta;
-#endif
+                               if (p->p_memstat_state & P_MEMSTAT_FROZEN) {
+                                       if (priority <= memorystatus_freeze_jetsam_band) {
+                                               priority = memorystatus_freeze_jetsam_band;
+                                       }
+                               } else
+#endif /* CONFIG_FREEZE */
+                               {
+                                       if (priority <= JETSAM_PRIORITY_ELEVATED_INACTIVE) {
+                                               priority = JETSAM_PRIORITY_ELEVATED_INACTIVE;
+                                       }
+                               }
+                       } else {
+                               if (applications_aging_band) {
+                                       if (p->p_memstat_effectivepriority == applications_aging_band) {
+                                               assert(old_bucket->count == (memorystatus_scheduled_idle_demotions_apps + 1));
+                                       }
 
-       /* Check the boot-arg to see if fast jetsam is allowed */
-       if (!PE_parse_boot_argn("fast_jetsam_enabled", &fast_jetsam_enabled, sizeof(fast_jetsam_enabled))) {
-               fast_jetsam_enabled = 0;
+                                       if ((jetsam_aging_policy != kJetsamAgingPolicyLegacy) && (priority <= applications_aging_band)) {
+                                               assert(!(p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS));
+                                               priority = applications_aging_band;
+                                               memorystatus_schedule_idle_demotion_locked(p, TRUE);
+                                       }
+                               }
+                       }
+               }
        }
 
-       /* Check the boot-arg to configure the maximum number of jetsam threads */
-       if (!PE_parse_boot_argn("max_jetsam_threads", &max_jetsam_threads, sizeof(max_jetsam_threads))) {
-               max_jetsam_threads = JETSAM_THREADS_LIMIT;
+       if ((system_procs_aging_band && (priority == system_procs_aging_band)) || (applications_aging_band && (priority == applications_aging_band))) {
+               assert(p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS);
        }
 
-       /* Restrict the maximum number of jetsam threads to JETSAM_THREADS_LIMIT */
-       if (max_jetsam_threads > JETSAM_THREADS_LIMIT) {
-               max_jetsam_threads = JETSAM_THREADS_LIMIT;
+#if DEVELOPMENT || DEBUG
+       if (priority == JETSAM_PRIORITY_IDLE && /* if the process is on its way into the IDLE band */
+           skip_demotion_check == FALSE &&     /* and it isn't via the path that will set the INACTIVE memlimits */
+           (p->p_memstat_dirty & P_DIRTY_TRACK) && /* and it has 'DIRTY' tracking enabled */
+           ((p->p_memstat_memlimit != p->p_memstat_memlimit_inactive) || /* and we notice that the current limit isn't the right value (inactive) */
+           ((p->p_memstat_state & P_MEMSTAT_MEMLIMIT_INACTIVE_FATAL) ? (!(p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT)) : (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT)))) { /* OR type (fatal vs non-fatal) */
+               printf("memorystatus_update_priority_locked: on %s with 0x%x, prio: %d and %d\n", p->p_name, p->p_memstat_state, priority, p->p_memstat_memlimit); /* then we must catch this */
        }
+#endif /* DEVELOPMENT || DEBUG */
 
-       /* For low CPU systems disable fast jetsam mechanism */
-       if (vm_pageout_state.vm_restricted_to_single_processor == TRUE) {
-               max_jetsam_threads = 1;
-               fast_jetsam_enabled = 0;
+       TAILQ_REMOVE(&old_bucket->list, p, p_memstat_list);
+       old_bucket->count--;
+       if (p->p_memstat_relaunch_flags & (P_MEMSTAT_RELAUNCH_HIGH)) {
+               old_bucket->relaunch_high_count--;
        }
 
-       /* Initialize the jetsam_threads state array */
-       jetsam_threads = kalloc(sizeof(struct jetsam_thread_state) * max_jetsam_threads);
-
-       /* Initialize all the jetsam threads */
-       for (i = 0; i < max_jetsam_threads; i++) {
-               result = kernel_thread_start_priority(memorystatus_thread, NULL, 95 /* MAXPRI_KERNEL */, &jetsam_threads[i].thread);
-               if (result == KERN_SUCCESS) {
-                       jetsam_threads[i].inited = FALSE;
-                       jetsam_threads[i].index = i;
-                       thread_deallocate(jetsam_threads[i].thread);
-               } else {
-                       panic("Could not create memorystatus_thread %d", i);
-               }
+       new_bucket = &memstat_bucket[priority];
+       if (head_insert) {
+               TAILQ_INSERT_HEAD(&new_bucket->list, p, p_memstat_list);
+       } else {
+               TAILQ_INSERT_TAIL(&new_bucket->list, p, p_memstat_list);
+       }
+       new_bucket->count++;
+       if (p->p_memstat_relaunch_flags & (P_MEMSTAT_RELAUNCH_HIGH)) {
+               new_bucket->relaunch_high_count++;
        }
-}
 
-/* Centralised for the purposes of allowing panic-on-jetsam */
-extern void
-vm_run_compactor(void);
+       if (memorystatus_highwater_enabled) {
+               boolean_t is_fatal;
+               boolean_t use_active;
 
-/*
- * The jetsam no frills kill call
- *      Return: 0 on success
- *             error code on failure (EINVAL...)
- */
-static int
-jetsam_do_kill(proc_t p, int jetsam_flags, os_reason_t jetsam_reason)
-{
-       int error = 0;
-       error = exit_with_reason(p, W_EXITCODE(0, SIGKILL), (int *)NULL, FALSE, FALSE, jetsam_flags, jetsam_reason);
-       return error;
-}
+               /*
+                * If cached limit data is updated, then the limits
+                * will be enforced by writing to the ledgers.
+                */
+               boolean_t ledger_update_needed = TRUE;
 
-/*
- * Wrapper for processes exiting with memorystatus details
- */
-static boolean_t
-memorystatus_do_kill(proc_t p, uint32_t cause, os_reason_t jetsam_reason)
-{
-       int error = 0;
-       __unused pid_t victim_pid = p->p_pid;
+               /*
+                * Here, we must update the cached memory limit if the task
+                * is transitioning between:
+                *      active <--> inactive
+                *      FG     <-->       BG
+                * but:
+                *      dirty  <-->    clean   is ignored
+                *
+                * We bypass non-idle processes that have opted into dirty tracking because
+                * a move between buckets does not imply a transition between the
+                * dirty <--> clean state.
+                */
 
-       KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DO_KILL)) | DBG_FUNC_START,
-           victim_pid, cause, vm_page_free_count, 0, 0);
+               if (p->p_memstat_dirty & P_DIRTY_TRACK) {
+                       if (skip_demotion_check == TRUE && priority == JETSAM_PRIORITY_IDLE) {
+                               CACHE_INACTIVE_LIMITS_LOCKED(p, is_fatal);
+                               use_active = FALSE;
+                       } else {
+                               ledger_update_needed = FALSE;
+                       }
+               } else if ((priority >= JETSAM_PRIORITY_FOREGROUND) && (p->p_memstat_effectivepriority < JETSAM_PRIORITY_FOREGROUND)) {
+                       /*
+                        *      inactive --> active
+                        *      BG       -->     FG
+                        *      assign active state
+                        */
+                       CACHE_ACTIVE_LIMITS_LOCKED(p, is_fatal);
+                       use_active = TRUE;
+               } else if ((priority < JETSAM_PRIORITY_FOREGROUND) && (p->p_memstat_effectivepriority >= JETSAM_PRIORITY_FOREGROUND)) {
+                       /*
+                        *      active --> inactive
+                        *      FG     -->       BG
+                        *      assign inactive state
+                        */
+                       CACHE_INACTIVE_LIMITS_LOCKED(p, is_fatal);
+                       use_active = FALSE;
+               } else {
+                       /*
+                        * The transition between jetsam priority buckets apparently did
+                        * not affect active/inactive state.
+                        * This is not unusual... especially during startup when
+                        * processes are getting established in their respective bands.
+                        */
+                       ledger_update_needed = FALSE;
+               }
 
-       DTRACE_MEMORYSTATUS3(memorystatus_do_kill, proc_t, p, os_reason_t, jetsam_reason, uint32_t, cause);
-#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
-       if (memorystatus_jetsam_panic_debug & (1 << cause)) {
-               panic("memorystatus_do_kill(): jetsam debug panic (cause: %d)", cause);
-       }
-#else
-#pragma unused(cause)
-#endif
+               /*
+                * Enforce the new limits by writing to the ledger
+                */
+               if (ledger_update_needed) {
+                       task_set_phys_footprint_limit_internal(p->task, (p->p_memstat_memlimit > 0) ? p->p_memstat_memlimit : -1, NULL, use_active, is_fatal);
 
-       if (p->p_memstat_effectivepriority >= JETSAM_PRIORITY_FOREGROUND) {
-               printf("memorystatus: killing process %d [%s] in high band %s (%d) - memorystatus_available_pages: %llu\n", p->p_pid,
-                   (*p->p_name ? p->p_name : "unknown"),
-                   memorystatus_priority_band_name(p->p_memstat_effectivepriority), p->p_memstat_effectivepriority,
-                   (uint64_t)memorystatus_available_pages);
+                       MEMORYSTATUS_DEBUG(3, "memorystatus_update_priority_locked: new limit on pid %d (%dMB %s) priority old --> new (%d --> %d) dirty?=0x%x %s\n",
+                           p->p_pid, (p->p_memstat_memlimit > 0 ? p->p_memstat_memlimit : -1),
+                           (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT ? "F " : "NF"), p->p_memstat_effectivepriority, priority, p->p_memstat_dirty,
+                           (p->p_memstat_dirty ? ((p->p_memstat_dirty & P_DIRTY) ? "isdirty" : "isclean") : ""));
+               }
        }
 
        /*
-        * The jetsam_reason (os_reason_t) has enough information about the kill cause.
-        * We don't really need jetsam_flags anymore, so it's okay that not all possible kill causes have been mapped.
+        * Record idle start or idle delta.
         */
-       int jetsam_flags = P_LTERM_JETSAM;
-       switch (cause) {
-       case kMemorystatusKilledHiwat:                                          jetsam_flags |= P_JETSAM_HIWAT; break;
-       case kMemorystatusKilledVnodes:                                         jetsam_flags |= P_JETSAM_VNODE; break;
-       case kMemorystatusKilledVMPageShortage:                         jetsam_flags |= P_JETSAM_VMPAGESHORTAGE; break;
-       case kMemorystatusKilledVMCompressorThrashing:
-       case kMemorystatusKilledVMCompressorSpaceShortage:      jetsam_flags |= P_JETSAM_VMTHRASHING; break;
-       case kMemorystatusKilledFCThrashing:                            jetsam_flags |= P_JETSAM_FCTHRASHING; break;
-       case kMemorystatusKilledPerProcessLimit:                        jetsam_flags |= P_JETSAM_PID; break;
-       case kMemorystatusKilledIdleExit:                                       jetsam_flags |= P_JETSAM_IDLEEXIT; break;
+       if (p->p_memstat_effectivepriority == priority) {
+               /*
+                * This process is not transitioning between
+                * jetsam priority buckets.  Do nothing.
+                */
+       } else if (p->p_memstat_effectivepriority == JETSAM_PRIORITY_IDLE) {
+               uint64_t now;
+               /*
+                * Transitioning out of the idle priority bucket.
+                * Record idle delta.
+                */
+               assert(p->p_memstat_idle_start != 0);
+               now = mach_absolute_time();
+               if (now > p->p_memstat_idle_start) {
+                       p->p_memstat_idle_delta = now - p->p_memstat_idle_start;
+               }
+
+               /*
+                * About to become active and so memory footprint could change.
+                * So mark it eligible for freeze-considerations next time around.
+                */
+               if (p->p_memstat_state & P_MEMSTAT_FREEZE_IGNORE) {
+                       p->p_memstat_state &= ~P_MEMSTAT_FREEZE_IGNORE;
+               }
+       } else if (priority == JETSAM_PRIORITY_IDLE) {
+               /*
+                * Transitioning into the idle priority bucket.
+                * Record idle start.
+                */
+               p->p_memstat_idle_start = mach_absolute_time();
        }
-       error = jetsam_do_kill(p, jetsam_flags, jetsam_reason);
 
-       KERNEL_DEBUG_CONSTANT((BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DO_KILL)) | DBG_FUNC_END,
-           victim_pid, cause, vm_page_free_count, error, 0);
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_CHANGE_PRIORITY), p->p_pid, priority, p->p_memstat_effectivepriority, 0, 0);
 
-       vm_run_compactor();
+       p->p_memstat_effectivepriority = priority;
 
-       return error == 0;
-}
+#if CONFIG_SECLUDED_MEMORY
+       if (secluded_for_apps &&
+           task_could_use_secluded_mem(p->task)) {
+               task_set_can_use_secluded_mem(
+                       p->task,
+                       (priority >= JETSAM_PRIORITY_FOREGROUND));
+       }
+#endif /* CONFIG_SECLUDED_MEMORY */
 
-/*
- * Node manipulation
- */
+       memorystatus_check_levels_locked();
+}
 
-static void
-memorystatus_check_levels_locked(void)
+int
+memorystatus_relaunch_flags_update(proc_t p, int relaunch_flags)
 {
-#if CONFIG_JETSAM
-       /* Update levels */
-       memorystatus_update_levels_locked(TRUE);
-#else /* CONFIG_JETSAM */
-       /*
-        * Nothing to do here currently since we update
-        * memorystatus_available_pages in vm_pressure_response.
-        */
-#endif /* CONFIG_JETSAM */
+       p->p_memstat_relaunch_flags = relaunch_flags;
+       KDBG(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_RELAUNCH_FLAGS), p->p_pid, relaunch_flags, 0, 0, 0);
+       return 0;
 }
 
 /*
- * Pin a process to a particular jetsam band when it is in the background i.e. not doing active work.
- * For an application: that means no longer in the FG band
- * For a daemon: that means no longer in its 'requested' jetsam priority band
+ *
+ * Description: Update the jetsam priority and memory limit attributes for a given process.
+ *
+ * Parameters:
+ *     p       init this process's jetsam information.
+ *     priority          The jetsam priority band
+ *     user_data         user specific data, unused by the kernel
+ *     is_assertion      When true, a priority update is driven by an assertion.
+ *     effective         guards against race if process's update already occurred
+ *     update_memlimit   When true we know this is the init step via the posix_spawn path.
+ *
+ *     memlimit_active   Value in megabytes; The monitored footprint level while the
+ *                       process is active.  Exceeding it may result in termination
+ *                       based on it's associated fatal flag.
+ *
+ *     memlimit_active_is_fatal  When a process is active and exceeds its memory footprint,
+ *                               this describes whether or not it should be immediately fatal.
+ *
+ *     memlimit_inactive Value in megabytes; The monitored footprint level while the
+ *                       process is inactive.  Exceeding it may result in termination
+ *                       based on it's associated fatal flag.
+ *
+ *     memlimit_inactive_is_fatal  When a process is inactive and exceeds its memory footprint,
+ *                                 this describes whether or not it should be immediatly fatal.
+ *
+ * Returns:     0      Success
+ *             non-0   Failure
  */
 
 int
-memorystatus_update_inactive_jetsam_priority_band(pid_t pid, uint32_t op_flags, int jetsam_prio, boolean_t effective_now)
+memorystatus_update(proc_t p, int priority, uint64_t user_data, boolean_t is_assertion, boolean_t effective, boolean_t update_memlimit,
+    int32_t memlimit_active, boolean_t memlimit_active_is_fatal,
+    int32_t memlimit_inactive, boolean_t memlimit_inactive_is_fatal)
 {
-       int error = 0;
-       boolean_t enable = FALSE;
-       proc_t  p = NULL;
+       int ret;
+       boolean_t head_insert = false;
 
-       if (op_flags == MEMORYSTATUS_CMD_ELEVATED_INACTIVEJETSAMPRIORITY_ENABLE) {
-               enable = TRUE;
-       } else if (op_flags == MEMORYSTATUS_CMD_ELEVATED_INACTIVEJETSAMPRIORITY_DISABLE) {
-               enable = FALSE;
-       } else {
-               return EINVAL;
+       MEMORYSTATUS_DEBUG(1, "memorystatus_update: changing (%s) pid %d: priority %d, user_data 0x%llx\n", (*p->p_name ? p->p_name : "unknown"), p->p_pid, priority, user_data);
+
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_UPDATE) | DBG_FUNC_START, p->p_pid, priority, user_data, effective, 0);
+
+       if (priority == -1) {
+               /* Use as shorthand for default priority */
+               priority = JETSAM_PRIORITY_DEFAULT;
+       } else if ((priority == system_procs_aging_band) || (priority == applications_aging_band)) {
+               /* Both the aging bands are reserved for internal use; if requested, adjust to JETSAM_PRIORITY_IDLE. */
+               priority = JETSAM_PRIORITY_IDLE;
+       } else if (priority == JETSAM_PRIORITY_IDLE_HEAD) {
+               /* JETSAM_PRIORITY_IDLE_HEAD inserts at the head of the idle queue */
+               priority = JETSAM_PRIORITY_IDLE;
+               head_insert = TRUE;
+       } else if ((priority < 0) || (priority >= MEMSTAT_BUCKET_COUNT)) {
+               /* Sanity check */
+               ret = EINVAL;
+               goto out;
        }
 
-       p = proc_find(pid);
-       if (p != NULL) {
-               if ((enable && ((p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) == P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND)) ||
-                   (!enable && ((p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) == 0))) {
+       proc_list_lock();
+
+       assert(!(p->p_memstat_state & P_MEMSTAT_INTERNAL));
+
+       if (effective && (p->p_memstat_state & P_MEMSTAT_PRIORITYUPDATED)) {
+               ret = EALREADY;
+               proc_list_unlock();
+               MEMORYSTATUS_DEBUG(1, "memorystatus_update: effective change specified for pid %d, but change already occurred.\n", p->p_pid);
+               goto out;
+       }
+
+       if ((p->p_memstat_state & P_MEMSTAT_TERMINATED) || ((p->p_listflag & P_LIST_EXITED) != 0)) {
+               /*
+                * This could happen when a process calling posix_spawn() is exiting on the jetsam thread.
+                */
+               ret = EBUSY;
+               proc_list_unlock();
+               goto out;
+       }
+
+       p->p_memstat_state |= P_MEMSTAT_PRIORITYUPDATED;
+       p->p_memstat_userdata = user_data;
+
+       if (is_assertion) {
+               if (priority == JETSAM_PRIORITY_IDLE) {
                        /*
-                        * No change in state.
+                        * Assertions relinquish control when the process is heading to IDLE.
                         */
-               } else {
-                       proc_list_lock();
+                       if (p->p_memstat_state & P_MEMSTAT_PRIORITY_ASSERTION) {
+                               /*
+                                * Mark the process as no longer being managed by assertions.
+                                */
+                               p->p_memstat_state &= ~P_MEMSTAT_PRIORITY_ASSERTION;
+                       } else {
+                               /*
+                                * Ignore an idle priority transition if the process is not
+                                * already managed by assertions.  We won't treat this as
+                                * an error, but we will log the unexpected behavior and bail.
+                                */
+                               os_log(OS_LOG_DEFAULT, "memorystatus: Ignore assertion driven idle priority. Process not previously controlled %s:%d\n",
+                                   (*p->p_name ? p->p_name : "unknown"), p->p_pid);
 
-                       if (enable) {
-                               p->p_memstat_state |= P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND;
-                               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+                               ret = 0;
+                               proc_list_unlock();
+                               goto out;
+                       }
+               } else {
+                       /*
+                        * Process is now being managed by assertions,
+                        */
+                       p->p_memstat_state |= P_MEMSTAT_PRIORITY_ASSERTION;
+               }
 
-                               if (effective_now) {
-                                       if (p->p_memstat_effectivepriority < jetsam_prio) {
-                                               if (memorystatus_highwater_enabled) {
-                                                       /*
-                                                        * Process is about to transition from
-                                                        * inactive --> active
-                                                        * assign active state
-                                                        */
-                                                       boolean_t is_fatal;
-                                                       boolean_t use_active = TRUE;
-                                                       CACHE_ACTIVE_LIMITS_LOCKED(p, is_fatal);
-                                                       task_set_phys_footprint_limit_internal(p->task, (p->p_memstat_memlimit > 0) ? p->p_memstat_memlimit : -1, NULL, use_active, is_fatal);
-                                               }
-                                               memorystatus_update_priority_locked(p, jetsam_prio, FALSE, FALSE);
-                                       }
-                               } else {
-                                       if (isProcessInAgingBands(p)) {
-                                               memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, FALSE, TRUE);
-                                       }
-                               }
+               /* Always update the assertion priority in this path */
+
+               p->p_memstat_assertionpriority = priority;
+
+               int memstat_dirty_flags = memorystatus_dirty_get(p, TRUE);  /* proc_list_lock is held */
+
+               if (memstat_dirty_flags != 0) {
+                       /*
+                        * Calculate maximum priority only when dirty tracking processes are involved.
+                        */
+                       int maxpriority;
+                       if (memstat_dirty_flags & PROC_DIRTY_IS_DIRTY) {
+                               maxpriority = MAX(p->p_memstat_assertionpriority, p->p_memstat_requestedpriority);
                        } else {
-                               p->p_memstat_state &= ~P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND;
-                               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+                               /* clean */
 
-                               if (effective_now) {
-                                       if (p->p_memstat_effectivepriority == jetsam_prio) {
-                                               memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, FALSE, TRUE);
+                               if (memstat_dirty_flags & PROC_DIRTY_ALLOWS_IDLE_EXIT) {
+                                       /*
+                                        * The aging policy must be evaluated and applied here because runnningboardd
+                                        * has relinquished its hold on the jetsam priority by attempting to move a
+                                        * clean process to the idle band.
+                                        */
+
+                                       int newpriority = JETSAM_PRIORITY_IDLE;
+                                       if ((p->p_memstat_dirty & (P_DIRTY_IDLE_EXIT_ENABLED | P_DIRTY_IS_DIRTY)) == P_DIRTY_IDLE_EXIT_ENABLED) {
+                                               newpriority = (p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) ? system_procs_aging_band : JETSAM_PRIORITY_IDLE;
                                        }
-                               } else {
-                                       if (isProcessInAgingBands(p)) {
-                                               memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, FALSE, TRUE);
+
+                                       maxpriority = MAX(p->p_memstat_assertionpriority, newpriority );
+
+                                       if (newpriority == system_procs_aging_band) {
+                                               memorystatus_schedule_idle_demotion_locked(p, FALSE);
                                        }
+                               } else {
+                                       /*
+                                        * Preserves requestedpriority when the process does not support pressured exit.
+                                        */
+                                       maxpriority = MAX(p->p_memstat_assertionpriority, p->p_memstat_requestedpriority);
                                }
                        }
-
-                       proc_list_unlock();
+                       priority = maxpriority;
                }
-               proc_rele(p);
-               error = 0;
        } else {
-               error = ESRCH;
+               p->p_memstat_requestedpriority = priority;
        }
 
-       return error;
-}
+       if (update_memlimit) {
+               boolean_t is_fatal;
+               boolean_t use_active;
 
-static void
-memorystatus_perform_idle_demotion(__unused void *spare1, __unused void *spare2)
-{
-       proc_t p;
-       uint64_t current_time = 0, idle_delay_time = 0;
-       int demote_prio_band = 0;
-       memstat_bucket_t *demotion_bucket;
+               /*
+                * Posix_spawn'd processes come through this path to instantiate ledger limits.
+                * Forked processes do not come through this path, so no ledger limits exist.
+                * (That's why forked processes can consume unlimited memory.)
+                */
 
-       MEMORYSTATUS_DEBUG(1, "memorystatus_perform_idle_demotion()\n");
+               MEMORYSTATUS_DEBUG(3, "memorystatus_update(enter): pid %d, priority %d, dirty=0x%x, Active(%dMB %s), Inactive(%dMB, %s)\n",
+                   p->p_pid, priority, p->p_memstat_dirty,
+                   memlimit_active, (memlimit_active_is_fatal ? "F " : "NF"),
+                   memlimit_inactive, (memlimit_inactive_is_fatal ? "F " : "NF"));
 
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_IDLE_DEMOTE) | DBG_FUNC_START, 0, 0, 0, 0, 0);
+               if (memlimit_active <= 0) {
+                       /*
+                        * This process will have a system_wide task limit when active.
+                        * System_wide task limit is always fatal.
+                        * It's quite common to see non-fatal flag passed in here.
+                        * It's not an error, we just ignore it.
+                        */
 
-       current_time = mach_absolute_time();
+                       /*
+                        * For backward compatibility with some unexplained launchd behavior,
+                        * we allow a zero sized limit.  But we still enforce system_wide limit
+                        * when written to the ledgers.
+                        */
 
-       proc_list_lock();
+                       if (memlimit_active < 0) {
+                               memlimit_active = -1;  /* enforces system_wide task limit */
+                       }
+                       memlimit_active_is_fatal = TRUE;
+               }
 
-       demote_prio_band = JETSAM_PRIORITY_IDLE + 1;
+               if (memlimit_inactive <= 0) {
+                       /*
+                        * This process will have a system_wide task limit when inactive.
+                        * System_wide task limit is always fatal.
+                        */
 
-       for (; demote_prio_band < JETSAM_PRIORITY_MAX; demote_prio_band++) {
-               if (demote_prio_band != system_procs_aging_band && demote_prio_band != applications_aging_band) {
-                       continue;
+                       memlimit_inactive = -1;
+                       memlimit_inactive_is_fatal = TRUE;
                }
 
-               demotion_bucket = &memstat_bucket[demote_prio_band];
-               p = TAILQ_FIRST(&demotion_bucket->list);
-
-               while (p) {
-                       MEMORYSTATUS_DEBUG(1, "memorystatus_perform_idle_demotion() found %d\n", p->p_pid);
+               /*
+                * Initialize the active limit variants for this process.
+                */
+               SET_ACTIVE_LIMITS_LOCKED(p, memlimit_active, memlimit_active_is_fatal);
 
-                       assert(p->p_memstat_idledeadline);
+               /*
+                * Initialize the inactive limit variants for this process.
+                */
+               SET_INACTIVE_LIMITS_LOCKED(p, memlimit_inactive, memlimit_inactive_is_fatal);
 
-                       assert(p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS);
+               /*
+                * Initialize the cached limits for target process.
+                * When the target process is dirty tracked, it's typically
+                * in a clean state.  Non dirty tracked processes are
+                * typically active (Foreground or above).
+                * But just in case, we don't make assumptions...
+                */
 
-                       if (current_time >= p->p_memstat_idledeadline) {
-                               if ((isSysProc(p) &&
-                                   ((p->p_memstat_dirty & (P_DIRTY_IDLE_EXIT_ENABLED | P_DIRTY_IS_DIRTY)) != P_DIRTY_IDLE_EXIT_ENABLED)) || /* system proc marked dirty*/
-                                   task_has_assertions((struct task *)(p->task))) {     /* has outstanding assertions which might indicate outstanding work too */
-                                       idle_delay_time = (isSysProc(p)) ? memorystatus_sysprocs_idle_delay_time : memorystatus_apps_idle_delay_time;
+               if (proc_jetsam_state_is_active_locked(p) == TRUE) {
+                       CACHE_ACTIVE_LIMITS_LOCKED(p, is_fatal);
+                       use_active = TRUE;
+               } else {
+                       CACHE_INACTIVE_LIMITS_LOCKED(p, is_fatal);
+                       use_active = FALSE;
+               }
 
-                                       p->p_memstat_idledeadline += idle_delay_time;
-                                       p = TAILQ_NEXT(p, p_memstat_list);
-                               } else {
-                                       proc_t next_proc = NULL;
+               /*
+                * Enforce the cached limit by writing to the ledger.
+                */
+               if (memorystatus_highwater_enabled) {
+                       /* apply now */
+                       task_set_phys_footprint_limit_internal(p->task, ((p->p_memstat_memlimit > 0) ? p->p_memstat_memlimit : -1), NULL, use_active, is_fatal);
 
-                                       next_proc = TAILQ_NEXT(p, p_memstat_list);
-                                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+                       MEMORYSTATUS_DEBUG(3, "memorystatus_update: init: limit on pid %d (%dMB %s) targeting priority(%d) dirty?=0x%x %s\n",
+                           p->p_pid, (p->p_memstat_memlimit > 0 ? p->p_memstat_memlimit : -1),
+                           (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT ? "F " : "NF"), priority, p->p_memstat_dirty,
+                           (p->p_memstat_dirty ? ((p->p_memstat_dirty & P_DIRTY) ? "isdirty" : "isclean") : ""));
+               }
+       }
 
-                                       memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, false, true);
+       /*
+        * We can't add to the aging bands buckets here.
+        * But, we could be removing it from those buckets.
+        * Check and take appropriate steps if so.
+        */
 
-                                       p = next_proc;
-                                       continue;
-                               }
-                       } else {
-                               // No further candidates
-                               break;
-                       }
+       if (isProcessInAgingBands(p)) {
+               if ((jetsam_aging_policy != kJetsamAgingPolicyLegacy) && isApp(p) && (priority > applications_aging_band)) {
+                       /*
+                        * Runningboardd is pulling up an application that is in the aging band.
+                        * We reset the app's state here so that it'll get a fresh stay in the
+                        * aging band on the way back.
+                        *
+                        * We always handled the app 'aging' in the memorystatus_update_priority_locked()
+                        * function. Daemons used to be handled via the dirty 'set/clear/track' path.
+                        * But with extensions (daemon-app hybrid), runningboardd is now going through
+                        * this routine for daemons too and things have gotten a bit tangled. This should
+                        * be simplified/untangled at some point and might require some assistance from
+                        * runningboardd.
+                        */
+                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+               } else {
+                       memorystatus_invalidate_idle_demotion_locked(p, FALSE);
+               }
+               memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, FALSE, TRUE);
+       } else {
+               if (jetsam_aging_policy == kJetsamAgingPolicyLegacy && priority == JETSAM_PRIORITY_IDLE) {
+                       /*
+                        * Daemons with 'inactive' limits will go through the dirty tracking codepath.
+                        * This path deals with apps that may have 'inactive' limits e.g. WebContent processes.
+                        * If this is the legacy aging policy we explicitly need to apply those limits. If it
+                        * is any other aging policy, then we don't need to worry because all processes
+                        * will go through the aging bands and then the demotion thread will take care to
+                        * move them into the IDLE band and apply the required limits.
+                        */
+                       memorystatus_update_priority_locked(p, priority, head_insert, TRUE);
                }
        }
 
-       memorystatus_reschedule_idle_demotion_locked();
+       memorystatus_update_priority_locked(p, priority, head_insert, FALSE);
 
        proc_list_unlock();
+       ret = 0;
 
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_IDLE_DEMOTE) | DBG_FUNC_END, 0, 0, 0, 0, 0);
+out:
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_UPDATE) | DBG_FUNC_END, ret, 0, 0, 0, 0);
+
+       return ret;
 }
 
-static void
-memorystatus_schedule_idle_demotion_locked(proc_t p, boolean_t set_state)
+int
+memorystatus_remove(proc_t p)
 {
-       boolean_t present_in_sysprocs_aging_bucket = FALSE;
-       boolean_t present_in_apps_aging_bucket = FALSE;
-       uint64_t  idle_delay_time = 0;
+       int ret;
+       memstat_bucket_t *bucket;
+       boolean_t       reschedule = FALSE;
 
-       if (jetsam_aging_policy == kJetsamAgingPolicyNone) {
-               return;
+       MEMORYSTATUS_DEBUG(1, "memorystatus_list_remove: removing pid %d\n", p->p_pid);
+
+       /*
+        * Check if this proc is locked (because we're performing a freeze).
+        * If so, we fail and instruct the caller to try again later.
+        */
+       if (p->p_memstat_state & P_MEMSTAT_LOCKED) {
+               return EAGAIN;
        }
 
-       if (p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) {
-               /*
-                * This process isn't going to be making the trip to the lower bands.
-                */
-               return;
+       assert(!(p->p_memstat_state & P_MEMSTAT_INTERNAL));
+
+       bucket = &memstat_bucket[p->p_memstat_effectivepriority];
+
+       if (isSysProc(p) && system_procs_aging_band && (p->p_memstat_effectivepriority == system_procs_aging_band)) {
+               assert(bucket->count == memorystatus_scheduled_idle_demotions_sysprocs);
+               reschedule = TRUE;
+       } else if (isApp(p) && applications_aging_band && (p->p_memstat_effectivepriority == applications_aging_band)) {
+               assert(bucket->count == memorystatus_scheduled_idle_demotions_apps);
+               reschedule = TRUE;
        }
 
-       if (isProcessInAgingBands(p)) {
-               if (jetsam_aging_policy != kJetsamAgingPolicyLegacy) {
-                       assert((p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) != P_DIRTY_AGING_IN_PROGRESS);
-               }
+       /*
+        * Record idle delta
+        */
 
-               if (isSysProc(p) && system_procs_aging_band) {
-                       present_in_sysprocs_aging_bucket = TRUE;
-               } else if (isApp(p) && applications_aging_band) {
-                       present_in_apps_aging_bucket = TRUE;
+       if (p->p_memstat_effectivepriority == JETSAM_PRIORITY_IDLE) {
+               uint64_t now = mach_absolute_time();
+               if (now > p->p_memstat_idle_start) {
+                       p->p_memstat_idle_delta = now - p->p_memstat_idle_start;
                }
        }
 
-       assert(!present_in_sysprocs_aging_bucket);
-       assert(!present_in_apps_aging_bucket);
+       TAILQ_REMOVE(&bucket->list, p, p_memstat_list);
+       bucket->count--;
+       if (p->p_memstat_relaunch_flags & (P_MEMSTAT_RELAUNCH_HIGH)) {
+               bucket->relaunch_high_count--;
+       }
 
-       MEMORYSTATUS_DEBUG(1, "memorystatus_schedule_idle_demotion_locked: scheduling demotion to idle band for pid %d (dirty:0x%x, set_state %d, demotions %d).\n",
-           p->p_pid, p->p_memstat_dirty, set_state, (memorystatus_scheduled_idle_demotions_sysprocs + memorystatus_scheduled_idle_demotions_apps));
+       memorystatus_list_count--;
 
-       if (isSysProc(p)) {
-               assert((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED);
+       /* If awaiting demotion to the idle band, clean up */
+       if (reschedule) {
+               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+               memorystatus_reschedule_idle_demotion_locked();
        }
 
-       idle_delay_time = (isSysProc(p)) ? memorystatus_sysprocs_idle_delay_time : memorystatus_apps_idle_delay_time;
-
-       if (set_state) {
-               p->p_memstat_dirty |= P_DIRTY_AGING_IN_PROGRESS;
-               p->p_memstat_idledeadline = mach_absolute_time() + idle_delay_time;
-       }
+       memorystatus_check_levels_locked();
 
-       assert(p->p_memstat_idledeadline);
+#if CONFIG_FREEZE
+       if (p->p_memstat_state & (P_MEMSTAT_FROZEN)) {
+               if (p->p_memstat_state & P_MEMSTAT_REFREEZE_ELIGIBLE) {
+                       p->p_memstat_state &= ~P_MEMSTAT_REFREEZE_ELIGIBLE;
+                       memorystatus_refreeze_eligible_count--;
+               }
 
-       if (isSysProc(p) && present_in_sysprocs_aging_bucket == FALSE) {
-               memorystatus_scheduled_idle_demotions_sysprocs++;
-       } else if (isApp(p) && present_in_apps_aging_bucket == FALSE) {
-               memorystatus_scheduled_idle_demotions_apps++;
+               memorystatus_frozen_count--;
+               memorystatus_frozen_shared_mb -= p->p_memstat_freeze_sharedanon_pages;
+               p->p_memstat_freeze_sharedanon_pages = 0;
        }
-}
 
-static void
-memorystatus_invalidate_idle_demotion_locked(proc_t p, boolean_t clear_state)
-{
-       boolean_t present_in_sysprocs_aging_bucket = FALSE;
-       boolean_t present_in_apps_aging_bucket = FALSE;
+       if (p->p_memstat_state & P_MEMSTAT_SUSPENDED) {
+               memorystatus_suspended_count--;
+       }
+#endif
 
-       if (!system_procs_aging_band && !applications_aging_band) {
-               return;
+#if DEVELOPMENT || DEBUG
+       if (p->p_pid == memorystatus_snapshot_owner) {
+               memorystatus_snapshot_owner = 0;
        }
+#endif /* DEVELOPMENT || DEBUG */
 
-       if ((p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) == 0) {
-               return;
+       if (p) {
+               ret = 0;
+       } else {
+               ret = ESRCH;
        }
 
-       if (isProcessInAgingBands(p)) {
-               if (jetsam_aging_policy != kJetsamAgingPolicyLegacy) {
-                       assert((p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) == P_DIRTY_AGING_IN_PROGRESS);
-               }
+       return ret;
+}
 
-               if (isSysProc(p) && system_procs_aging_band) {
-                       assert(p->p_memstat_effectivepriority == system_procs_aging_band);
-                       assert(p->p_memstat_idledeadline);
-                       present_in_sysprocs_aging_bucket = TRUE;
-               } else if (isApp(p) && applications_aging_band) {
-                       assert(p->p_memstat_effectivepriority == applications_aging_band);
-                       assert(p->p_memstat_idledeadline);
-                       present_in_apps_aging_bucket = TRUE;
-               }
+/*
+ * Validate dirty tracking flags with process state.
+ *
+ * Return:
+ *     0     on success
+ *      non-0 on failure
+ *
+ * The proc_list_lock is held by the caller.
+ */
+
+static int
+memorystatus_validate_track_flags(struct proc *target_p, uint32_t pcontrol)
+{
+       /* See that the process isn't marked for termination */
+       if (target_p->p_memstat_dirty & P_DIRTY_TERMINATED) {
+               return EBUSY;
        }
 
-       MEMORYSTATUS_DEBUG(1, "memorystatus_invalidate_idle_demotion(): invalidating demotion to idle band for pid %d (clear_state %d, demotions %d).\n",
-           p->p_pid, clear_state, (memorystatus_scheduled_idle_demotions_sysprocs + memorystatus_scheduled_idle_demotions_apps));
+       /* Idle exit requires that process be tracked */
+       if ((pcontrol & PROC_DIRTY_ALLOW_IDLE_EXIT) &&
+           !(pcontrol & PROC_DIRTY_TRACK)) {
+               return EINVAL;
+       }
 
+       /* 'Launch in progress' tracking requires that process have enabled dirty tracking too. */
+       if ((pcontrol & PROC_DIRTY_LAUNCH_IN_PROGRESS) &&
+           !(pcontrol & PROC_DIRTY_TRACK)) {
+               return EINVAL;
+       }
 
-       if (clear_state) {
-               p->p_memstat_idledeadline = 0;
-               p->p_memstat_dirty &= ~P_DIRTY_AGING_IN_PROGRESS;
+       /* Only one type of DEFER behavior is allowed.*/
+       if ((pcontrol & PROC_DIRTY_DEFER) &&
+           (pcontrol & PROC_DIRTY_DEFER_ALWAYS)) {
+               return EINVAL;
        }
 
-       if (isSysProc(p) && present_in_sysprocs_aging_bucket == TRUE) {
-               memorystatus_scheduled_idle_demotions_sysprocs--;
-               assert(memorystatus_scheduled_idle_demotions_sysprocs >= 0);
-       } else if (isApp(p) && present_in_apps_aging_bucket == TRUE) {
-               memorystatus_scheduled_idle_demotions_apps--;
-               assert(memorystatus_scheduled_idle_demotions_apps >= 0);
+       /* Deferral is only relevant if idle exit is specified */
+       if (((pcontrol & PROC_DIRTY_DEFER) ||
+           (pcontrol & PROC_DIRTY_DEFER_ALWAYS)) &&
+           !(pcontrol & PROC_DIRTY_ALLOWS_IDLE_EXIT)) {
+               return EINVAL;
        }
 
-       assert((memorystatus_scheduled_idle_demotions_sysprocs + memorystatus_scheduled_idle_demotions_apps) >= 0);
+       return 0;
 }
 
 static void
-memorystatus_reschedule_idle_demotion_locked(void)
+memorystatus_update_idle_priority_locked(proc_t p)
 {
-       if (0 == (memorystatus_scheduled_idle_demotions_sysprocs + memorystatus_scheduled_idle_demotions_apps)) {
-               if (memstat_idle_demotion_deadline) {
-                       /* Transitioned 1->0, so cancel next call */
-                       thread_call_cancel(memorystatus_idle_demotion_call);
-                       memstat_idle_demotion_deadline = 0;
-               }
-       } else {
-               memstat_bucket_t *demotion_bucket;
-               proc_t p = NULL, p1 = NULL, p2 = NULL;
+       int32_t priority;
 
-               if (system_procs_aging_band) {
-                       demotion_bucket = &memstat_bucket[system_procs_aging_band];
-                       p1 = TAILQ_FIRST(&demotion_bucket->list);
+       MEMORYSTATUS_DEBUG(1, "memorystatus_update_idle_priority_locked(): pid %d dirty 0x%X\n", p->p_pid, p->p_memstat_dirty);
 
-                       p = p1;
-               }
+       assert(isSysProc(p));
 
-               if (applications_aging_band) {
-                       demotion_bucket = &memstat_bucket[applications_aging_band];
-                       p2 = TAILQ_FIRST(&demotion_bucket->list);
+       if ((p->p_memstat_dirty & (P_DIRTY_IDLE_EXIT_ENABLED | P_DIRTY_IS_DIRTY)) == P_DIRTY_IDLE_EXIT_ENABLED) {
+               priority = (p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) ? system_procs_aging_band : JETSAM_PRIORITY_IDLE;
+       } else {
+               priority = p->p_memstat_requestedpriority;
+       }
 
-                       if (p1 && p2) {
-                               p = (p1->p_memstat_idledeadline > p2->p_memstat_idledeadline) ? p2 : p1;
-                       } else {
-                               p = (p1 == NULL) ? p2 : p1;
-                       }
+       if (p->p_memstat_state & P_MEMSTAT_PRIORITY_ASSERTION) {
+               /*
+                * This process has a jetsam priority managed by an assertion.
+                * Policy is to choose the max priority.
+                */
+               if (p->p_memstat_assertionpriority > priority) {
+                       os_log(OS_LOG_DEFAULT, "memorystatus: assertion priority %d overrides priority %d for %s:%d\n",
+                           p->p_memstat_assertionpriority, priority,
+                           (*p->p_name ? p->p_name : "unknown"), p->p_pid);
+                       priority = p->p_memstat_assertionpriority;
                }
+       }
 
-               assert(p);
+       if (priority != p->p_memstat_effectivepriority) {
+               if ((jetsam_aging_policy == kJetsamAgingPolicyLegacy) &&
+                   (priority == JETSAM_PRIORITY_IDLE)) {
+                       /*
+                        * This process is on its way into the IDLE band. The system is
+                        * using 'legacy' jetsam aging policy. That means, this process
+                        * has already used up its idle-deferral aging time that is given
+                        * once per its lifetime. So we need to set the INACTIVE limits
+                        * explicitly because it won't be going through the demotion paths
+                        * that take care to apply the limits appropriately.
+                        */
 
-               if (p != NULL) {
-                       assert(p && p->p_memstat_idledeadline);
-                       if (memstat_idle_demotion_deadline != p->p_memstat_idledeadline) {
-                               thread_call_enter_delayed(memorystatus_idle_demotion_call, p->p_memstat_idledeadline);
-                               memstat_idle_demotion_deadline = p->p_memstat_idledeadline;
+                       if (p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) {
+                               /*
+                                * This process has the 'elevated inactive jetsam band' attribute.
+                                * So, there will be no trip to IDLE after all.
+                                * Instead, we pin the process in the elevated band,
+                                * where its ACTIVE limits will apply.
+                                */
+
+                               priority = JETSAM_PRIORITY_ELEVATED_INACTIVE;
                        }
+
+                       memorystatus_update_priority_locked(p, priority, false, true);
+               } else {
+                       memorystatus_update_priority_locked(p, priority, false, false);
                }
        }
 }
 
 /*
- * List manipulation
+ * Processes can opt to have their state tracked by the kernel, indicating  when they are busy (dirty) or idle
+ * (clean). They may also indicate that they support termination when idle, with the result that they are promoted
+ * to their desired, higher, jetsam priority when dirty (and are therefore killed later), and demoted to the low
+ * priority idle band when clean (and killed earlier, protecting higher priority procesess).
+ *
+ * If the deferral flag is set, then newly tracked processes will be protected for an initial period (as determined by
+ * memorystatus_sysprocs_idle_delay_time); if they go clean during this time, then they will be moved to a deferred-idle band
+ * with a slightly higher priority, guarding against immediate termination under memory pressure and being unable to
+ * make forward progress. Finally, when the guard expires, they will be moved to the standard, lowest-priority, idle
+ * band. The deferral can be cleared early by clearing the appropriate flag.
+ *
+ * The deferral timer is active only for the duration that the process is marked as guarded and clean; if the process
+ * is marked dirty, the timer will be cancelled. Upon being subsequently marked clean, the deferment will either be
+ * re-enabled or the guard state cleared, depending on whether the guard deadline has passed.
  */
 
 int
-memorystatus_add(proc_t p, boolean_t locked)
+memorystatus_dirty_track(proc_t p, uint32_t pcontrol)
 {
-       memstat_bucket_t *bucket;
+       unsigned int old_dirty;
+       boolean_t reschedule = FALSE;
+       boolean_t already_deferred = FALSE;
+       boolean_t defer_now = FALSE;
+       int ret = 0;
 
-       MEMORYSTATUS_DEBUG(1, "memorystatus_list_add(): adding pid %d with priority %d.\n", p->p_pid, p->p_memstat_effectivepriority);
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DIRTY_TRACK),
+           p->p_pid, p->p_memstat_dirty, pcontrol, 0, 0);
 
-       if (!locked) {
-               proc_list_lock();
-       }
+       proc_list_lock();
 
-       DTRACE_MEMORYSTATUS2(memorystatus_add, proc_t, p, int32_t, p->p_memstat_effectivepriority);
+       if ((p->p_listflag & P_LIST_EXITED) != 0) {
+               /*
+                * Process is on its way out.
+                */
+               ret = EBUSY;
+               goto exit;
+       }
 
-       /* Processes marked internal do not have priority tracked */
        if (p->p_memstat_state & P_MEMSTAT_INTERNAL) {
+               ret = EPERM;
                goto exit;
        }
 
-       bucket = &memstat_bucket[p->p_memstat_effectivepriority];
-
-       if (isSysProc(p) && system_procs_aging_band && (p->p_memstat_effectivepriority == system_procs_aging_band)) {
-               assert(bucket->count == memorystatus_scheduled_idle_demotions_sysprocs - 1);
-       } else if (isApp(p) && applications_aging_band && (p->p_memstat_effectivepriority == applications_aging_band)) {
-               assert(bucket->count == memorystatus_scheduled_idle_demotions_apps - 1);
-       } else if (p->p_memstat_effectivepriority == JETSAM_PRIORITY_IDLE) {
-               /*
-                * Entering the idle band.
-                * Record idle start time.
-                */
-               p->p_memstat_idle_start = mach_absolute_time();
+       if ((ret = memorystatus_validate_track_flags(p, pcontrol)) != 0) {
+               /* error  */
+               goto exit;
        }
 
-       TAILQ_INSERT_TAIL(&bucket->list, p, p_memstat_list);
-       bucket->count++;
+       old_dirty = p->p_memstat_dirty;
 
-       memorystatus_list_count++;
+       /* These bits are cumulative, as per <rdar://problem/11159924> */
+       if (pcontrol & PROC_DIRTY_TRACK) {
+               p->p_memstat_dirty |= P_DIRTY_TRACK;
+       }
 
-       memorystatus_check_levels_locked();
+       if (pcontrol & PROC_DIRTY_ALLOW_IDLE_EXIT) {
+               p->p_memstat_dirty |= P_DIRTY_ALLOW_IDLE_EXIT;
+       }
 
-exit:
-       if (!locked) {
-               proc_list_unlock();
+       if (pcontrol & PROC_DIRTY_LAUNCH_IN_PROGRESS) {
+               p->p_memstat_dirty |= P_DIRTY_LAUNCH_IN_PROGRESS;
        }
 
-       return 0;
-}
+       if (old_dirty & P_DIRTY_AGING_IN_PROGRESS) {
+               already_deferred = TRUE;
+       }
 
-/*
- * Description:
- *     Moves a process from one jetsam bucket to another.
- *     which changes the LRU position of the process.
- *
- *     Monitors transition between buckets and if necessary
- *     will update cached memory limits accordingly.
- *
- *     skip_demotion_check:
- *     - if the 'jetsam aging policy' is NOT 'legacy':
- *             When this flag is TRUE, it means we are going
- *             to age the ripe processes out of the aging bands and into the
- *             IDLE band and apply their inactive memory limits.
- *
- *     - if the 'jetsam aging policy' is 'legacy':
- *             When this flag is TRUE, it might mean the above aging mechanism
- *             OR
- *             It might be that we have a process that has used up its 'idle deferral'
- *             stay that is given to it once per lifetime. And in this case, the process
- *             won't be going through any aging codepaths. But we still need to apply
- *             the right inactive limits and so we explicitly set this to TRUE if the
- *             new priority for the process is the IDLE band.
- */
-void
-memorystatus_update_priority_locked(proc_t p, int priority, boolean_t head_insert, boolean_t skip_demotion_check)
-{
-       memstat_bucket_t *old_bucket, *new_bucket;
 
-       assert(priority < MEMSTAT_BUCKET_COUNT);
-
-       /* Ensure that exit isn't underway, leaving the proc retained but removed from its bucket */
-       if ((p->p_listflag & P_LIST_EXITED) != 0) {
-               return;
-       }
-
-       MEMORYSTATUS_DEBUG(1, "memorystatus_update_priority_locked(): setting %s(%d) to priority %d, inserting at %s\n",
-           (*p->p_name ? p->p_name : "unknown"), p->p_pid, priority, head_insert ? "head" : "tail");
+       /* This can be set and cleared exactly once. */
+       if (pcontrol & (PROC_DIRTY_DEFER | PROC_DIRTY_DEFER_ALWAYS)) {
+               if ((pcontrol & (PROC_DIRTY_DEFER)) &&
+                   !(old_dirty & P_DIRTY_DEFER)) {
+                       p->p_memstat_dirty |= P_DIRTY_DEFER;
+               }
 
-       DTRACE_MEMORYSTATUS3(memorystatus_update_priority, proc_t, p, int32_t, p->p_memstat_effectivepriority, int, priority);
+               if ((pcontrol & (PROC_DIRTY_DEFER_ALWAYS)) &&
+                   !(old_dirty & P_DIRTY_DEFER_ALWAYS)) {
+                       p->p_memstat_dirty |= P_DIRTY_DEFER_ALWAYS;
+               }
 
-#if DEVELOPMENT || DEBUG
-       if (priority == JETSAM_PRIORITY_IDLE && /* if the process is on its way into the IDLE band */
-           skip_demotion_check == FALSE &&     /* and it isn't via the path that will set the INACTIVE memlimits */
-           (p->p_memstat_dirty & P_DIRTY_TRACK) && /* and it has 'DIRTY' tracking enabled */
-           ((p->p_memstat_memlimit != p->p_memstat_memlimit_inactive) || /* and we notice that the current limit isn't the right value (inactive) */
-           ((p->p_memstat_state & P_MEMSTAT_MEMLIMIT_INACTIVE_FATAL) ? (!(p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT)) : (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT)))) { /* OR type (fatal vs non-fatal) */
-               panic("memorystatus_update_priority_locked: on %s with 0x%x, prio: %d and %d\n", p->p_name, p->p_memstat_state, priority, p->p_memstat_memlimit); /* then we must catch this */
+               defer_now = TRUE;
        }
-#endif /* DEVELOPMENT || DEBUG */
 
-       old_bucket = &memstat_bucket[p->p_memstat_effectivepriority];
-
-       if (skip_demotion_check == FALSE) {
-               if (isSysProc(p)) {
-                       /*
-                        * For system processes, the memorystatus_dirty_* routines take care of adding/removing
-                        * the processes from the aging bands and balancing the demotion counts.
-                        * We can, however, override that if the process has an 'elevated inactive jetsam band' attribute.
-                        */
+       MEMORYSTATUS_DEBUG(1, "memorystatus_on_track_dirty(): set idle-exit %s / defer %s / dirty %s for pid %d\n",
+           ((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED) ? "Y" : "N",
+           defer_now ? "Y" : "N",
+           p->p_memstat_dirty & P_DIRTY ? "Y" : "N",
+           p->p_pid);
 
-                       if (p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) {
+       /* Kick off or invalidate the idle exit deferment if there's a state transition. */
+       if (!(p->p_memstat_dirty & P_DIRTY_IS_DIRTY)) {
+               if ((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED) {
+                       if (defer_now && !already_deferred) {
                                /*
-                                * 2 types of processes can use the non-standard elevated inactive band:
-                                * - Frozen processes that always land in memorystatus_freeze_jetsam_band
-                                * OR
-                                * - processes that specifically opt-in to the elevated inactive support e.g. docked processes.
+                                * Request to defer a clean process that's idle-exit enabled
+                                * and not already in the jetsam deferred band. Most likely a
+                                * new launch.
+                                */
+                               memorystatus_schedule_idle_demotion_locked(p, TRUE);
+                               reschedule = TRUE;
+                       } else if (!defer_now) {
+                               /*
+                                * The process isn't asking for the 'aging' facility.
+                                * Could be that it is:
                                 */
-#if CONFIG_FREEZE
-                               if (p->p_memstat_state & P_MEMSTAT_FROZEN) {
-                                       if (priority <= memorystatus_freeze_jetsam_band) {
-                                               priority = memorystatus_freeze_jetsam_band;
-                                       }
-                               } else
-#endif /* CONFIG_FREEZE */
-                               {
-                                       if (priority <= JETSAM_PRIORITY_ELEVATED_INACTIVE) {
-                                               priority = JETSAM_PRIORITY_ELEVATED_INACTIVE;
-                                       }
-                               }
-                               assert(!(p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS));
-                       }
-               } else if (isApp(p)) {
-                       /*
-                        * Check to see if the application is being lowered in jetsam priority. If so, and:
-                        * - it has an 'elevated inactive jetsam band' attribute, then put it in the appropriate band.
-                        * - it is a normal application, then let it age in the aging band if that policy is in effect.
-                        */
 
-                       if (p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) {
-#if CONFIG_FREEZE
-                               if (p->p_memstat_state & P_MEMSTAT_FROZEN) {
-                                       if (priority <= memorystatus_freeze_jetsam_band) {
-                                               priority = memorystatus_freeze_jetsam_band;
-                                       }
-                               } else
-#endif /* CONFIG_FREEZE */
-                               {
-                                       if (priority <= JETSAM_PRIORITY_ELEVATED_INACTIVE) {
-                                               priority = JETSAM_PRIORITY_ELEVATED_INACTIVE;
-                                       }
-                               }
-                       } else {
-                               if (applications_aging_band) {
-                                       if (p->p_memstat_effectivepriority == applications_aging_band) {
-                                               assert(old_bucket->count == (memorystatus_scheduled_idle_demotions_apps + 1));
-                                       }
+                               if (already_deferred) {
+                                       /*
+                                        * already in the aging bands. Traditionally,
+                                        * some processes have tried to use this to
+                                        * opt out of the 'aging' facility.
+                                        */
 
-                                       if ((jetsam_aging_policy != kJetsamAgingPolicyLegacy) && (priority <= applications_aging_band)) {
-                                               assert(!(p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS));
-                                               priority = applications_aging_band;
-                                               memorystatus_schedule_idle_demotion_locked(p, TRUE);
-                                       }
+                                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+                               } else {
+                                       /*
+                                        * agnostic to the 'aging' facility. In that case,
+                                        * we'll go ahead and opt it in because this is likely
+                                        * a new launch (clean process, dirty tracking enabled)
+                                        */
+
+                                       memorystatus_schedule_idle_demotion_locked(p, TRUE);
                                }
+
+                               reschedule = TRUE;
                        }
                }
-       }
+       } else {
+               /*
+                * We are trying to operate on a dirty process. Dirty processes have to
+                * be removed from the deferred band. The question is do we reset the
+                * deferred state or not?
+                *
+                * This could be a legal request like:
+                * - this process had opted into the 'aging' band
+                * - but it's now dirty and requests to opt out.
+                * In this case, we remove the process from the band and reset its
+                * state too. It'll opt back in properly when needed.
+                *
+                * OR, this request could be a user-space bug. E.g.:
+                * - this process had opted into the 'aging' band when clean
+                * - and, then issues another request to again put it into the band except
+                *   this time the process is dirty.
+                * The process going dirty, as a transition in memorystatus_dirty_set(), will pull the process out of
+                * the deferred band with its state intact. So our request below is no-op.
+                * But we do it here anyways for coverage.
+                *
+                * memorystatus_update_idle_priority_locked()
+                * single-mindedly treats a dirty process as "cannot be in the aging band".
+                */
 
-       if ((system_procs_aging_band && (priority == system_procs_aging_band)) || (applications_aging_band && (priority == applications_aging_band))) {
-               assert(p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS);
+               if (!defer_now && already_deferred) {
+                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+                       reschedule = TRUE;
+               } else {
+                       boolean_t reset_state = (jetsam_aging_policy != kJetsamAgingPolicyLegacy) ? TRUE : FALSE;
+
+                       memorystatus_invalidate_idle_demotion_locked(p, reset_state);
+                       reschedule = TRUE;
+               }
        }
 
-       TAILQ_REMOVE(&old_bucket->list, p, p_memstat_list);
-       old_bucket->count--;
+       memorystatus_update_idle_priority_locked(p);
 
-       new_bucket = &memstat_bucket[priority];
-       if (head_insert) {
-               TAILQ_INSERT_HEAD(&new_bucket->list, p, p_memstat_list);
-       } else {
-               TAILQ_INSERT_TAIL(&new_bucket->list, p, p_memstat_list);
+       if (reschedule) {
+               memorystatus_reschedule_idle_demotion_locked();
        }
-       new_bucket->count++;
 
-       if (memorystatus_highwater_enabled) {
-               boolean_t is_fatal;
-               boolean_t use_active;
+       ret = 0;
+
+exit:
+       proc_list_unlock();
+
+       return ret;
+}
+
+int
+memorystatus_dirty_set(proc_t p, boolean_t self, uint32_t pcontrol)
+{
+       int ret;
+       boolean_t kill = false;
+       boolean_t reschedule = FALSE;
+       boolean_t was_dirty = FALSE;
+       boolean_t now_dirty = FALSE;
+#if CONFIG_DIRTYSTATUS_TRACKING
+       boolean_t notify_change = FALSE;
+       dirty_status_change_event_t change_event;
+#endif
+
+       MEMORYSTATUS_DEBUG(1, "memorystatus_dirty_set(): %d %d 0x%x 0x%x\n", self, p->p_pid, pcontrol, p->p_memstat_dirty);
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DIRTY_SET), p->p_pid, self, pcontrol, 0, 0);
+
+       proc_list_lock();
 
+       if ((p->p_listflag & P_LIST_EXITED) != 0) {
                /*
-                * If cached limit data is updated, then the limits
-                * will be enforced by writing to the ledgers.
+                * Process is on its way out.
                 */
-               boolean_t ledger_update_needed = TRUE;
+               ret = EBUSY;
+               goto exit;
+       }
+
+       if (p->p_memstat_state & P_MEMSTAT_INTERNAL) {
+               ret = EPERM;
+               goto exit;
+       }
+
+       if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
+               was_dirty = TRUE;
+       }
 
+       if (!(p->p_memstat_dirty & P_DIRTY_TRACK)) {
+               /* Dirty tracking not enabled */
+               ret = EINVAL;
+       } else if (pcontrol && (p->p_memstat_dirty & P_DIRTY_TERMINATED)) {
                /*
-                * Here, we must update the cached memory limit if the task
-                * is transitioning between:
-                *      active <--> inactive
-                *      FG     <-->       BG
-                * but:
-                *      dirty  <-->    clean   is ignored
-                *
-                * We bypass non-idle processes that have opted into dirty tracking because
-                * a move between buckets does not imply a transition between the
-                * dirty <--> clean state.
-                */
-
-               if (p->p_memstat_dirty & P_DIRTY_TRACK) {
-                       if (skip_demotion_check == TRUE && priority == JETSAM_PRIORITY_IDLE) {
-                               CACHE_INACTIVE_LIMITS_LOCKED(p, is_fatal);
-                               use_active = FALSE;
-                       } else {
-                               ledger_update_needed = FALSE;
-                       }
-               } else if ((priority >= JETSAM_PRIORITY_FOREGROUND) && (p->p_memstat_effectivepriority < JETSAM_PRIORITY_FOREGROUND)) {
-                       /*
-                        *      inactive --> active
-                        *      BG       -->     FG
-                        *      assign active state
-                        */
-                       CACHE_ACTIVE_LIMITS_LOCKED(p, is_fatal);
-                       use_active = TRUE;
-               } else if ((priority < JETSAM_PRIORITY_FOREGROUND) && (p->p_memstat_effectivepriority >= JETSAM_PRIORITY_FOREGROUND)) {
-                       /*
-                        *      active --> inactive
-                        *      FG     -->       BG
-                        *      assign inactive state
-                        */
-                       CACHE_INACTIVE_LIMITS_LOCKED(p, is_fatal);
-                       use_active = FALSE;
-               } else {
-                       /*
-                        * The transition between jetsam priority buckets apparently did
-                        * not affect active/inactive state.
-                        * This is not unusual... especially during startup when
-                        * processes are getting established in their respective bands.
-                        */
-                       ledger_update_needed = FALSE;
-               }
-
-               /*
-                * Enforce the new limits by writing to the ledger
-                */
-               if (ledger_update_needed) {
-                       task_set_phys_footprint_limit_internal(p->task, (p->p_memstat_memlimit > 0) ? p->p_memstat_memlimit : -1, NULL, use_active, is_fatal);
-
-                       MEMORYSTATUS_DEBUG(3, "memorystatus_update_priority_locked: new limit on pid %d (%dMB %s) priority old --> new (%d --> %d) dirty?=0x%x %s\n",
-                           p->p_pid, (p->p_memstat_memlimit > 0 ? p->p_memstat_memlimit : -1),
-                           (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT ? "F " : "NF"), p->p_memstat_effectivepriority, priority, p->p_memstat_dirty,
-                           (p->p_memstat_dirty ? ((p->p_memstat_dirty & P_DIRTY) ? "isdirty" : "isclean") : ""));
-               }
-       }
-
-       /*
-        * Record idle start or idle delta.
-        */
-       if (p->p_memstat_effectivepriority == priority) {
-               /*
-                * This process is not transitioning between
-                * jetsam priority buckets.  Do nothing.
-                */
-       } else if (p->p_memstat_effectivepriority == JETSAM_PRIORITY_IDLE) {
-               uint64_t now;
-               /*
-                * Transitioning out of the idle priority bucket.
-                * Record idle delta.
-                */
-               assert(p->p_memstat_idle_start != 0);
-               now = mach_absolute_time();
-               if (now > p->p_memstat_idle_start) {
-                       p->p_memstat_idle_delta = now - p->p_memstat_idle_start;
-               }
-
-               /*
-                * About to become active and so memory footprint could change.
-                * So mark it eligible for freeze-considerations next time around.
-                */
-               if (p->p_memstat_state & P_MEMSTAT_FREEZE_IGNORE) {
-                       p->p_memstat_state &= ~P_MEMSTAT_FREEZE_IGNORE;
-               }
-       } else if (priority == JETSAM_PRIORITY_IDLE) {
-               /*
-                * Transitioning into the idle priority bucket.
-                * Record idle start.
-                */
-               p->p_memstat_idle_start = mach_absolute_time();
-       }
-
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_CHANGE_PRIORITY), p->p_pid, priority, p->p_memstat_effectivepriority, 0, 0);
-
-       p->p_memstat_effectivepriority = priority;
-
-#if CONFIG_SECLUDED_MEMORY
-       if (secluded_for_apps &&
-           task_could_use_secluded_mem(p->task)) {
-               task_set_can_use_secluded_mem(
-                       p->task,
-                       (priority >= JETSAM_PRIORITY_FOREGROUND));
-       }
-#endif /* CONFIG_SECLUDED_MEMORY */
-
-       memorystatus_check_levels_locked();
-}
-
-/*
- *
- * Description: Update the jetsam priority and memory limit attributes for a given process.
- *
- * Parameters:
- *     p       init this process's jetsam information.
- *     priority          The jetsam priority band
- *     user_data         user specific data, unused by the kernel
- *     effective         guards against race if process's update already occurred
- *     update_memlimit   When true we know this is the init step via the posix_spawn path.
- *
- *     memlimit_active   Value in megabytes; The monitored footprint level while the
- *                       process is active.  Exceeding it may result in termination
- *                       based on it's associated fatal flag.
- *
- *     memlimit_active_is_fatal  When a process is active and exceeds its memory footprint,
- *                               this describes whether or not it should be immediately fatal.
- *
- *     memlimit_inactive Value in megabytes; The monitored footprint level while the
- *                       process is inactive.  Exceeding it may result in termination
- *                       based on it's associated fatal flag.
- *
- *     memlimit_inactive_is_fatal  When a process is inactive and exceeds its memory footprint,
- *                                 this describes whether or not it should be immediatly fatal.
- *
- * Returns:     0      Success
- *             non-0   Failure
- */
-
-int
-memorystatus_update(proc_t p, int priority, uint64_t user_data, boolean_t effective, boolean_t update_memlimit,
-    int32_t memlimit_active, boolean_t memlimit_active_is_fatal,
-    int32_t memlimit_inactive, boolean_t memlimit_inactive_is_fatal)
-{
-       int ret;
-       boolean_t head_insert = false;
-
-       MEMORYSTATUS_DEBUG(1, "memorystatus_update: changing (%s) pid %d: priority %d, user_data 0x%llx\n", (*p->p_name ? p->p_name : "unknown"), p->p_pid, priority, user_data);
-
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_UPDATE) | DBG_FUNC_START, p->p_pid, priority, user_data, effective, 0);
-
-       if (priority == -1) {
-               /* Use as shorthand for default priority */
-               priority = JETSAM_PRIORITY_DEFAULT;
-       } else if ((priority == system_procs_aging_band) || (priority == applications_aging_band)) {
-               /* Both the aging bands are reserved for internal use; if requested, adjust to JETSAM_PRIORITY_IDLE. */
-               priority = JETSAM_PRIORITY_IDLE;
-       } else if (priority == JETSAM_PRIORITY_IDLE_HEAD) {
-               /* JETSAM_PRIORITY_IDLE_HEAD inserts at the head of the idle queue */
-               priority = JETSAM_PRIORITY_IDLE;
-               head_insert = TRUE;
-       } else if ((priority < 0) || (priority >= MEMSTAT_BUCKET_COUNT)) {
-               /* Sanity check */
-               ret = EINVAL;
-               goto out;
-       }
-
-       proc_list_lock();
-
-       assert(!(p->p_memstat_state & P_MEMSTAT_INTERNAL));
-
-       if (effective && (p->p_memstat_state & P_MEMSTAT_PRIORITYUPDATED)) {
-               ret = EALREADY;
-               proc_list_unlock();
-               MEMORYSTATUS_DEBUG(1, "memorystatus_update: effective change specified for pid %d, but change already occurred.\n", p->p_pid);
-               goto out;
-       }
-
-       if ((p->p_memstat_state & P_MEMSTAT_TERMINATED) || ((p->p_listflag & P_LIST_EXITED) != 0)) {
-               /*
-                * This could happen when a process calling posix_spawn() is exiting on the jetsam thread.
+                * Process is set to be terminated and we're attempting to mark it dirty.
+                * Set for termination and marking as clean is OK - see <rdar://problem/10594349>.
                 */
                ret = EBUSY;
-               proc_list_unlock();
-               goto out;
-       }
-
-       p->p_memstat_state |= P_MEMSTAT_PRIORITYUPDATED;
-       p->p_memstat_userdata = user_data;
-       p->p_memstat_requestedpriority = priority;
-
-       if (update_memlimit) {
-               boolean_t is_fatal;
-               boolean_t use_active;
-
-               /*
-                * Posix_spawn'd processes come through this path to instantiate ledger limits.
-                * Forked processes do not come through this path, so no ledger limits exist.
-                * (That's why forked processes can consume unlimited memory.)
-                */
-
-               MEMORYSTATUS_DEBUG(3, "memorystatus_update(enter): pid %d, priority %d, dirty=0x%x, Active(%dMB %s), Inactive(%dMB, %s)\n",
-                   p->p_pid, priority, p->p_memstat_dirty,
-                   memlimit_active, (memlimit_active_is_fatal ? "F " : "NF"),
-                   memlimit_inactive, (memlimit_inactive_is_fatal ? "F " : "NF"));
-
-               if (memlimit_active <= 0) {
-                       /*
-                        * This process will have a system_wide task limit when active.
-                        * System_wide task limit is always fatal.
-                        * It's quite common to see non-fatal flag passed in here.
-                        * It's not an error, we just ignore it.
-                        */
-
-                       /*
-                        * For backward compatibility with some unexplained launchd behavior,
-                        * we allow a zero sized limit.  But we still enforce system_wide limit
-                        * when written to the ledgers.
-                        */
-
-                       if (memlimit_active < 0) {
-                               memlimit_active = -1;  /* enforces system_wide task limit */
-                       }
-                       memlimit_active_is_fatal = TRUE;
-               }
-
-               if (memlimit_inactive <= 0) {
-                       /*
-                        * This process will have a system_wide task limit when inactive.
-                        * System_wide task limit is always fatal.
-                        */
-
-                       memlimit_inactive = -1;
-                       memlimit_inactive_is_fatal = TRUE;
-               }
-
-               /*
-                * Initialize the active limit variants for this process.
-                */
-               SET_ACTIVE_LIMITS_LOCKED(p, memlimit_active, memlimit_active_is_fatal);
-
-               /*
-                * Initialize the inactive limit variants for this process.
-                */
-               SET_INACTIVE_LIMITS_LOCKED(p, memlimit_inactive, memlimit_inactive_is_fatal);
-
-               /*
-                * Initialize the cached limits for target process.
-                * When the target process is dirty tracked, it's typically
-                * in a clean state.  Non dirty tracked processes are
-                * typically active (Foreground or above).
-                * But just in case, we don't make assumptions...
-                */
-
-               if (proc_jetsam_state_is_active_locked(p) == TRUE) {
-                       CACHE_ACTIVE_LIMITS_LOCKED(p, is_fatal);
-                       use_active = TRUE;
-               } else {
-                       CACHE_INACTIVE_LIMITS_LOCKED(p, is_fatal);
-                       use_active = FALSE;
-               }
-
-               /*
-                * Enforce the cached limit by writing to the ledger.
-                */
-               if (memorystatus_highwater_enabled) {
-                       /* apply now */
-                       task_set_phys_footprint_limit_internal(p->task, ((p->p_memstat_memlimit > 0) ? p->p_memstat_memlimit : -1), NULL, use_active, is_fatal);
-
-                       MEMORYSTATUS_DEBUG(3, "memorystatus_update: init: limit on pid %d (%dMB %s) targeting priority(%d) dirty?=0x%x %s\n",
-                           p->p_pid, (p->p_memstat_memlimit > 0 ? p->p_memstat_memlimit : -1),
-                           (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT ? "F " : "NF"), priority, p->p_memstat_dirty,
-                           (p->p_memstat_dirty ? ((p->p_memstat_dirty & P_DIRTY) ? "isdirty" : "isclean") : ""));
-               }
-       }
-
-       /*
-        * We can't add to the aging bands buckets here.
-        * But, we could be removing it from those buckets.
-        * Check and take appropriate steps if so.
-        */
-
-       if (isProcessInAgingBands(p)) {
-               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
-               memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, FALSE, TRUE);
-       } else {
-               if (jetsam_aging_policy == kJetsamAgingPolicyLegacy && priority == JETSAM_PRIORITY_IDLE) {
-                       /*
-                        * Daemons with 'inactive' limits will go through the dirty tracking codepath.
-                        * This path deals with apps that may have 'inactive' limits e.g. WebContent processes.
-                        * If this is the legacy aging policy we explicitly need to apply those limits. If it
-                        * is any other aging policy, then we don't need to worry because all processes
-                        * will go through the aging bands and then the demotion thread will take care to
-                        * move them into the IDLE band and apply the required limits.
-                        */
-                       memorystatus_update_priority_locked(p, priority, head_insert, TRUE);
-               }
-       }
-
-       memorystatus_update_priority_locked(p, priority, head_insert, FALSE);
-
-       proc_list_unlock();
-       ret = 0;
-
-out:
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_UPDATE) | DBG_FUNC_END, ret, 0, 0, 0, 0);
-
-       return ret;
-}
-
-int
-memorystatus_remove(proc_t p, boolean_t locked)
-{
-       int ret;
-       memstat_bucket_t *bucket;
-       boolean_t       reschedule = FALSE;
-
-       MEMORYSTATUS_DEBUG(1, "memorystatus_list_remove: removing pid %d\n", p->p_pid);
-
-       if (!locked) {
-               proc_list_lock();
-       }
-
-       assert(!(p->p_memstat_state & P_MEMSTAT_INTERNAL));
-
-       bucket = &memstat_bucket[p->p_memstat_effectivepriority];
-
-       if (isSysProc(p) && system_procs_aging_band && (p->p_memstat_effectivepriority == system_procs_aging_band)) {
-               assert(bucket->count == memorystatus_scheduled_idle_demotions_sysprocs);
-               reschedule = TRUE;
-       } else if (isApp(p) && applications_aging_band && (p->p_memstat_effectivepriority == applications_aging_band)) {
-               assert(bucket->count == memorystatus_scheduled_idle_demotions_apps);
-               reschedule = TRUE;
-       }
-
-       /*
-        * Record idle delta
-        */
-
-       if (p->p_memstat_effectivepriority == JETSAM_PRIORITY_IDLE) {
-               uint64_t now = mach_absolute_time();
-               if (now > p->p_memstat_idle_start) {
-                       p->p_memstat_idle_delta = now - p->p_memstat_idle_start;
-               }
-       }
-
-       TAILQ_REMOVE(&bucket->list, p, p_memstat_list);
-       bucket->count--;
-
-       memorystatus_list_count--;
-
-       /* If awaiting demotion to the idle band, clean up */
-       if (reschedule) {
-               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
-               memorystatus_reschedule_idle_demotion_locked();
-       }
-
-       memorystatus_check_levels_locked();
-
-#if CONFIG_FREEZE
-       if (p->p_memstat_state & (P_MEMSTAT_FROZEN)) {
-               if (p->p_memstat_state & P_MEMSTAT_REFREEZE_ELIGIBLE) {
-                       p->p_memstat_state &= ~P_MEMSTAT_REFREEZE_ELIGIBLE;
-                       memorystatus_refreeze_eligible_count--;
-               }
-
-               memorystatus_frozen_count--;
-               memorystatus_frozen_shared_mb -= p->p_memstat_freeze_sharedanon_pages;
-               p->p_memstat_freeze_sharedanon_pages = 0;
-       }
-
-       if (p->p_memstat_state & P_MEMSTAT_SUSPENDED) {
-               memorystatus_suspended_count--;
-       }
-#endif
-
-       if (!locked) {
-               proc_list_unlock();
-       }
-
-       if (p) {
-               ret = 0;
-       } else {
-               ret = ESRCH;
-       }
-
-       return ret;
-}
-
-/*
- * Validate dirty tracking flags with process state.
- *
- * Return:
- *     0     on success
- *      non-0 on failure
- *
- * The proc_list_lock is held by the caller.
- */
-
-static int
-memorystatus_validate_track_flags(struct proc *target_p, uint32_t pcontrol)
-{
-       /* See that the process isn't marked for termination */
-       if (target_p->p_memstat_dirty & P_DIRTY_TERMINATED) {
-               return EBUSY;
-       }
-
-       /* Idle exit requires that process be tracked */
-       if ((pcontrol & PROC_DIRTY_ALLOW_IDLE_EXIT) &&
-           !(pcontrol & PROC_DIRTY_TRACK)) {
-               return EINVAL;
-       }
-
-       /* 'Launch in progress' tracking requires that process have enabled dirty tracking too. */
-       if ((pcontrol & PROC_DIRTY_LAUNCH_IN_PROGRESS) &&
-           !(pcontrol & PROC_DIRTY_TRACK)) {
-               return EINVAL;
-       }
-
-       /* Only one type of DEFER behavior is allowed.*/
-       if ((pcontrol & PROC_DIRTY_DEFER) &&
-           (pcontrol & PROC_DIRTY_DEFER_ALWAYS)) {
-               return EINVAL;
-       }
-
-       /* Deferral is only relevant if idle exit is specified */
-       if (((pcontrol & PROC_DIRTY_DEFER) ||
-           (pcontrol & PROC_DIRTY_DEFER_ALWAYS)) &&
-           !(pcontrol & PROC_DIRTY_ALLOWS_IDLE_EXIT)) {
-               return EINVAL;
-       }
-
-       return 0;
-}
-
-static void
-memorystatus_update_idle_priority_locked(proc_t p)
-{
-       int32_t priority;
-
-       MEMORYSTATUS_DEBUG(1, "memorystatus_update_idle_priority_locked(): pid %d dirty 0x%X\n", p->p_pid, p->p_memstat_dirty);
-
-       assert(isSysProc(p));
-
-       if ((p->p_memstat_dirty & (P_DIRTY_IDLE_EXIT_ENABLED | P_DIRTY_IS_DIRTY)) == P_DIRTY_IDLE_EXIT_ENABLED) {
-               priority = (p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) ? system_procs_aging_band : JETSAM_PRIORITY_IDLE;
-       } else {
-               priority = p->p_memstat_requestedpriority;
-       }
-
-       if (priority != p->p_memstat_effectivepriority) {
-               if ((jetsam_aging_policy == kJetsamAgingPolicyLegacy) &&
-                   (priority == JETSAM_PRIORITY_IDLE)) {
-                       /*
-                        * This process is on its way into the IDLE band. The system is
-                        * using 'legacy' jetsam aging policy. That means, this process
-                        * has already used up its idle-deferral aging time that is given
-                        * once per its lifetime. So we need to set the INACTIVE limits
-                        * explicitly because it won't be going through the demotion paths
-                        * that take care to apply the limits appropriately.
-                        */
-
-                       if (p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) {
-                               /*
-                                * This process has the 'elevated inactive jetsam band' attribute.
-                                * So, there will be no trip to IDLE after all.
-                                * Instead, we pin the process in the elevated band,
-                                * where its ACTIVE limits will apply.
-                                */
-
-                               priority = JETSAM_PRIORITY_ELEVATED_INACTIVE;
-                       }
-
-                       memorystatus_update_priority_locked(p, priority, false, true);
-               } else {
-                       memorystatus_update_priority_locked(p, priority, false, false);
-               }
-       }
-}
-
-/*
- * Processes can opt to have their state tracked by the kernel, indicating  when they are busy (dirty) or idle
- * (clean). They may also indicate that they support termination when idle, with the result that they are promoted
- * to their desired, higher, jetsam priority when dirty (and are therefore killed later), and demoted to the low
- * priority idle band when clean (and killed earlier, protecting higher priority procesess).
- *
- * If the deferral flag is set, then newly tracked processes will be protected for an initial period (as determined by
- * memorystatus_sysprocs_idle_delay_time); if they go clean during this time, then they will be moved to a deferred-idle band
- * with a slightly higher priority, guarding against immediate termination under memory pressure and being unable to
- * make forward progress. Finally, when the guard expires, they will be moved to the standard, lowest-priority, idle
- * band. The deferral can be cleared early by clearing the appropriate flag.
- *
- * The deferral timer is active only for the duration that the process is marked as guarded and clean; if the process
- * is marked dirty, the timer will be cancelled. Upon being subsequently marked clean, the deferment will either be
- * re-enabled or the guard state cleared, depending on whether the guard deadline has passed.
- */
-
-int
-memorystatus_dirty_track(proc_t p, uint32_t pcontrol)
-{
-       unsigned int old_dirty;
-       boolean_t reschedule = FALSE;
-       boolean_t already_deferred = FALSE;
-       boolean_t defer_now = FALSE;
-       int ret = 0;
-
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DIRTY_TRACK),
-           p->p_pid, p->p_memstat_dirty, pcontrol, 0, 0);
-
-       proc_list_lock();
-
-       if ((p->p_listflag & P_LIST_EXITED) != 0) {
-               /*
-                * Process is on its way out.
-                */
-               ret = EBUSY;
-               goto exit;
-       }
-
-       if (p->p_memstat_state & P_MEMSTAT_INTERNAL) {
-               ret = EPERM;
-               goto exit;
-       }
-
-       if ((ret = memorystatus_validate_track_flags(p, pcontrol)) != 0) {
-               /* error  */
-               goto exit;
-       }
-
-       old_dirty = p->p_memstat_dirty;
-
-       /* These bits are cumulative, as per <rdar://problem/11159924> */
-       if (pcontrol & PROC_DIRTY_TRACK) {
-               p->p_memstat_dirty |= P_DIRTY_TRACK;
-       }
-
-       if (pcontrol & PROC_DIRTY_ALLOW_IDLE_EXIT) {
-               p->p_memstat_dirty |= P_DIRTY_ALLOW_IDLE_EXIT;
-       }
-
-       if (pcontrol & PROC_DIRTY_LAUNCH_IN_PROGRESS) {
-               p->p_memstat_dirty |= P_DIRTY_LAUNCH_IN_PROGRESS;
-       }
-
-       if (old_dirty & P_DIRTY_AGING_IN_PROGRESS) {
-               already_deferred = TRUE;
-       }
-
-
-       /* This can be set and cleared exactly once. */
-       if (pcontrol & (PROC_DIRTY_DEFER | PROC_DIRTY_DEFER_ALWAYS)) {
-               if ((pcontrol & (PROC_DIRTY_DEFER)) &&
-                   !(old_dirty & P_DIRTY_DEFER)) {
-                       p->p_memstat_dirty |= P_DIRTY_DEFER;
-               }
-
-               if ((pcontrol & (PROC_DIRTY_DEFER_ALWAYS)) &&
-                   !(old_dirty & P_DIRTY_DEFER_ALWAYS)) {
-                       p->p_memstat_dirty |= P_DIRTY_DEFER_ALWAYS;
-               }
-
-               defer_now = TRUE;
-       }
-
-       MEMORYSTATUS_DEBUG(1, "memorystatus_on_track_dirty(): set idle-exit %s / defer %s / dirty %s for pid %d\n",
-           ((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED) ? "Y" : "N",
-           defer_now ? "Y" : "N",
-           p->p_memstat_dirty & P_DIRTY ? "Y" : "N",
-           p->p_pid);
-
-       /* Kick off or invalidate the idle exit deferment if there's a state transition. */
-       if (!(p->p_memstat_dirty & P_DIRTY_IS_DIRTY)) {
-               if ((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED) {
-                       if (defer_now && !already_deferred) {
-                               /*
-                                * Request to defer a clean process that's idle-exit enabled
-                                * and not already in the jetsam deferred band. Most likely a
-                                * new launch.
-                                */
-                               memorystatus_schedule_idle_demotion_locked(p, TRUE);
-                               reschedule = TRUE;
-                       } else if (!defer_now) {
-                               /*
-                                * The process isn't asking for the 'aging' facility.
-                                * Could be that it is:
-                                */
-
-                               if (already_deferred) {
-                                       /*
-                                        * already in the aging bands. Traditionally,
-                                        * some processes have tried to use this to
-                                        * opt out of the 'aging' facility.
-                                        */
-
-                                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
-                               } else {
-                                       /*
-                                        * agnostic to the 'aging' facility. In that case,
-                                        * we'll go ahead and opt it in because this is likely
-                                        * a new launch (clean process, dirty tracking enabled)
-                                        */
-
-                                       memorystatus_schedule_idle_demotion_locked(p, TRUE);
-                               }
-
-                               reschedule = TRUE;
-                       }
-               }
-       } else {
-               /*
-                * We are trying to operate on a dirty process. Dirty processes have to
-                * be removed from the deferred band. The question is do we reset the
-                * deferred state or not?
-                *
-                * This could be a legal request like:
-                * - this process had opted into the 'aging' band
-                * - but it's now dirty and requests to opt out.
-                * In this case, we remove the process from the band and reset its
-                * state too. It'll opt back in properly when needed.
-                *
-                * OR, this request could be a user-space bug. E.g.:
-                * - this process had opted into the 'aging' band when clean
-                * - and, then issues another request to again put it into the band except
-                *   this time the process is dirty.
-                * The process going dirty, as a transition in memorystatus_dirty_set(), will pull the process out of
-                * the deferred band with its state intact. So our request below is no-op.
-                * But we do it here anyways for coverage.
-                *
-                * memorystatus_update_idle_priority_locked()
-                * single-mindedly treats a dirty process as "cannot be in the aging band".
-                */
-
-               if (!defer_now && already_deferred) {
-                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
-                       reschedule = TRUE;
-               } else {
-                       boolean_t reset_state = (jetsam_aging_policy != kJetsamAgingPolicyLegacy) ? TRUE : FALSE;
-
-                       memorystatus_invalidate_idle_demotion_locked(p, reset_state);
-                       reschedule = TRUE;
-               }
-       }
-
-       memorystatus_update_idle_priority_locked(p);
-
-       if (reschedule) {
-               memorystatus_reschedule_idle_demotion_locked();
-       }
-
-       ret = 0;
-
-exit:
-       proc_list_unlock();
-
-       return ret;
-}
-
-int
-memorystatus_dirty_set(proc_t p, boolean_t self, uint32_t pcontrol)
-{
-       int ret;
-       boolean_t kill = false;
-       boolean_t reschedule = FALSE;
-       boolean_t was_dirty = FALSE;
-       boolean_t now_dirty = FALSE;
-
-       MEMORYSTATUS_DEBUG(1, "memorystatus_dirty_set(): %d %d 0x%x 0x%x\n", self, p->p_pid, pcontrol, p->p_memstat_dirty);
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DIRTY_SET), p->p_pid, self, pcontrol, 0, 0);
-
-       proc_list_lock();
-
-       if ((p->p_listflag & P_LIST_EXITED) != 0) {
-               /*
-                * Process is on its way out.
-                */
-               ret = EBUSY;
-               goto exit;
-       }
-
-       if (p->p_memstat_state & P_MEMSTAT_INTERNAL) {
-               ret = EPERM;
-               goto exit;
-       }
-
-       if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
-               was_dirty = TRUE;
-       }
-
-       if (!(p->p_memstat_dirty & P_DIRTY_TRACK)) {
-               /* Dirty tracking not enabled */
-               ret = EINVAL;
-       } else if (pcontrol && (p->p_memstat_dirty & P_DIRTY_TERMINATED)) {
-               /*
-                * Process is set to be terminated and we're attempting to mark it dirty.
-                * Set for termination and marking as clean is OK - see <rdar://problem/10594349>.
-                */
-               ret = EBUSY;
-       } else {
-               int flag = (self == TRUE) ? P_DIRTY : P_DIRTY_SHUTDOWN;
-               if (pcontrol && !(p->p_memstat_dirty & flag)) {
-                       /* Mark the process as having been dirtied at some point */
-                       p->p_memstat_dirty |= (flag | P_DIRTY_MARKED);
-                       memorystatus_dirty_count++;
-                       ret = 0;
-               } else if ((pcontrol == 0) && (p->p_memstat_dirty & flag)) {
-                       if ((flag == P_DIRTY_SHUTDOWN) && (!(p->p_memstat_dirty & P_DIRTY))) {
-                               /* Clearing the dirty shutdown flag, and the process is otherwise clean - kill */
-                               p->p_memstat_dirty |= P_DIRTY_TERMINATED;
-                               kill = true;
-                       } else if ((flag == P_DIRTY) && (p->p_memstat_dirty & P_DIRTY_TERMINATED)) {
-                               /* Kill previously terminated processes if set clean */
-                               kill = true;
-                       }
-                       p->p_memstat_dirty &= ~flag;
-                       memorystatus_dirty_count--;
-                       ret = 0;
-               } else {
-                       /* Already set */
-                       ret = EALREADY;
-               }
-       }
-
-       if (ret != 0) {
-               goto exit;
-       }
-
-       if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
-               now_dirty = TRUE;
-       }
-
-       if ((was_dirty == TRUE && now_dirty == FALSE) ||
-           (was_dirty == FALSE && now_dirty == TRUE)) {
-               /* Manage idle exit deferral, if applied */
-               if ((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED) {
-                       /*
-                        * Legacy mode: P_DIRTY_AGING_IN_PROGRESS means the process is in the aging band OR it might be heading back
-                        * there once it's clean again. For the legacy case, this only applies if it has some protection window left.
-                        * P_DIRTY_DEFER: one-time protection window given at launch
-                        * P_DIRTY_DEFER_ALWAYS: protection window given for every dirty->clean transition. Like non-legacy mode.
-                        *
-                        * Non-Legacy mode: P_DIRTY_AGING_IN_PROGRESS means the process is in the aging band. It will always stop over
-                        * in that band on it's way to IDLE.
-                        */
-
-                       if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
-                               /*
-                                * New dirty process i.e. "was_dirty == FALSE && now_dirty == TRUE"
-                                *
-                                * The process will move from its aging band to its higher requested
-                                * jetsam band.
-                                */
-                               boolean_t reset_state = (jetsam_aging_policy != kJetsamAgingPolicyLegacy) ? TRUE : FALSE;
-
-                               memorystatus_invalidate_idle_demotion_locked(p, reset_state);
-                               reschedule = TRUE;
-                       } else {
-                               /*
-                                * Process is back from "dirty" to "clean".
-                                */
-
-                               if (jetsam_aging_policy == kJetsamAgingPolicyLegacy) {
-                                       if (((p->p_memstat_dirty & P_DIRTY_DEFER_ALWAYS) == FALSE) &&
-                                           (mach_absolute_time() >= p->p_memstat_idledeadline)) {
-                                               /*
-                                                * The process' hasn't enrolled in the "always defer after dirty"
-                                                * mode and its deadline has expired. It currently
-                                                * does not reside in any of the aging buckets.
-                                                *
-                                                * It's on its way to the JETSAM_PRIORITY_IDLE
-                                                * bucket via memorystatus_update_idle_priority_locked()
-                                                * below.
-                                                *
-                                                * So all we need to do is reset all the state on the
-                                                * process that's related to the aging bucket i.e.
-                                                * the AGING_IN_PROGRESS flag and the timer deadline.
-                                                */
-
-                                               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
-                                               reschedule = TRUE;
-                                       } else {
-                                               /*
-                                                * Process enrolled in "always stop in deferral band after dirty" OR
-                                                * it still has some protection window left and so
-                                                * we just re-arm the timer without modifying any
-                                                * state on the process iff it still wants into that band.
-                                                */
-
-                                               if (p->p_memstat_dirty & P_DIRTY_DEFER_ALWAYS) {
-                                                       memorystatus_schedule_idle_demotion_locked(p, TRUE);
-                                                       reschedule = TRUE;
-                                               } else if (p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) {
-                                                       memorystatus_schedule_idle_demotion_locked(p, FALSE);
-                                                       reschedule = TRUE;
-                                               }
-                                       }
-                               } else {
-                                       memorystatus_schedule_idle_demotion_locked(p, TRUE);
-                                       reschedule = TRUE;
-                               }
-                       }
-               }
-
-               memorystatus_update_idle_priority_locked(p);
-
-               if (memorystatus_highwater_enabled) {
-                       boolean_t ledger_update_needed = TRUE;
-                       boolean_t use_active;
-                       boolean_t is_fatal;
-                       /*
-                        * We are in this path because this process transitioned between
-                        * dirty <--> clean state.  Update the cached memory limits.
-                        */
-
-                       if (proc_jetsam_state_is_active_locked(p) == TRUE) {
-                               /*
-                                * process is pinned in elevated band
-                                * or
-                                * process is dirty
-                                */
-                               CACHE_ACTIVE_LIMITS_LOCKED(p, is_fatal);
-                               use_active = TRUE;
-                               ledger_update_needed = TRUE;
-                       } else {
-                               /*
-                                * process is clean...but if it has opted into pressured-exit
-                                * we don't apply the INACTIVE limit till the process has aged
-                                * out and is entering the IDLE band.
-                                * See memorystatus_update_priority_locked() for that.
-                                */
-
-                               if (p->p_memstat_dirty & P_DIRTY_ALLOW_IDLE_EXIT) {
-                                       ledger_update_needed = FALSE;
-                               } else {
-                                       CACHE_INACTIVE_LIMITS_LOCKED(p, is_fatal);
-                                       use_active = FALSE;
-                                       ledger_update_needed = TRUE;
-                               }
-                       }
-
-                       /*
-                        * Enforce the new limits by writing to the ledger.
-                        *
-                        * This is a hot path and holding the proc_list_lock while writing to the ledgers,
-                        * (where the task lock is taken) is bad.  So, we temporarily drop the proc_list_lock.
-                        * We aren't traversing the jetsam bucket list here, so we should be safe.
-                        * See rdar://21394491.
-                        */
-
-                       if (ledger_update_needed && proc_ref_locked(p) == p) {
-                               int ledger_limit;
-                               if (p->p_memstat_memlimit > 0) {
-                                       ledger_limit = p->p_memstat_memlimit;
-                               } else {
-                                       ledger_limit = -1;
-                               }
-                               proc_list_unlock();
-                               task_set_phys_footprint_limit_internal(p->task, ledger_limit, NULL, use_active, is_fatal);
-                               proc_list_lock();
-                               proc_rele_locked(p);
-
-                               MEMORYSTATUS_DEBUG(3, "memorystatus_dirty_set: new limit on pid %d (%dMB %s) priority(%d) dirty?=0x%x %s\n",
-                                   p->p_pid, (p->p_memstat_memlimit > 0 ? p->p_memstat_memlimit : -1),
-                                   (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT ? "F " : "NF"), p->p_memstat_effectivepriority, p->p_memstat_dirty,
-                                   (p->p_memstat_dirty ? ((p->p_memstat_dirty & P_DIRTY) ? "isdirty" : "isclean") : ""));
-                       }
-               }
-
-               /* If the deferral state changed, reschedule the demotion timer */
-               if (reschedule) {
-                       memorystatus_reschedule_idle_demotion_locked();
-               }
-       }
-
-       if (kill) {
-               if (proc_ref_locked(p) == p) {
-                       proc_list_unlock();
-                       psignal(p, SIGKILL);
-                       proc_list_lock();
-                       proc_rele_locked(p);
-               }
-       }
-
-exit:
-       proc_list_unlock();
-
-       return ret;
-}
-
-int
-memorystatus_dirty_clear(proc_t p, uint32_t pcontrol)
-{
-       int ret = 0;
-
-       MEMORYSTATUS_DEBUG(1, "memorystatus_dirty_clear(): %d 0x%x 0x%x\n", p->p_pid, pcontrol, p->p_memstat_dirty);
-
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DIRTY_CLEAR), p->p_pid, pcontrol, 0, 0, 0);
-
-       proc_list_lock();
-
-       if ((p->p_listflag & P_LIST_EXITED) != 0) {
-               /*
-                * Process is on its way out.
-                */
-               ret = EBUSY;
-               goto exit;
-       }
-
-       if (p->p_memstat_state & P_MEMSTAT_INTERNAL) {
-               ret = EPERM;
-               goto exit;
-       }
-
-       if (!(p->p_memstat_dirty & P_DIRTY_TRACK)) {
-               /* Dirty tracking not enabled */
-               ret = EINVAL;
-               goto exit;
-       }
-
-       if (!pcontrol || (pcontrol & (PROC_DIRTY_LAUNCH_IN_PROGRESS | PROC_DIRTY_DEFER | PROC_DIRTY_DEFER_ALWAYS)) == 0) {
-               ret = EINVAL;
-               goto exit;
-       }
-
-       if (pcontrol & PROC_DIRTY_LAUNCH_IN_PROGRESS) {
-               p->p_memstat_dirty &= ~P_DIRTY_LAUNCH_IN_PROGRESS;
-       }
-
-       /* This can be set and cleared exactly once. */
-       if (pcontrol & (PROC_DIRTY_DEFER | PROC_DIRTY_DEFER_ALWAYS)) {
-               if (p->p_memstat_dirty & P_DIRTY_DEFER) {
-                       p->p_memstat_dirty &= ~(P_DIRTY_DEFER);
-               }
-
-               if (p->p_memstat_dirty & P_DIRTY_DEFER_ALWAYS) {
-                       p->p_memstat_dirty &= ~(P_DIRTY_DEFER_ALWAYS);
-               }
-
-               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
-               memorystatus_update_idle_priority_locked(p);
-               memorystatus_reschedule_idle_demotion_locked();
-       }
-
-       ret = 0;
-exit:
-       proc_list_unlock();
-
-       return ret;
-}
-
-int
-memorystatus_dirty_get(proc_t p)
-{
-       int ret = 0;
-
-       proc_list_lock();
-
-       if (p->p_memstat_dirty & P_DIRTY_TRACK) {
-               ret |= PROC_DIRTY_TRACKED;
-               if (p->p_memstat_dirty & P_DIRTY_ALLOW_IDLE_EXIT) {
-                       ret |= PROC_DIRTY_ALLOWS_IDLE_EXIT;
-               }
-               if (p->p_memstat_dirty & P_DIRTY) {
-                       ret |= PROC_DIRTY_IS_DIRTY;
-               }
-               if (p->p_memstat_dirty & P_DIRTY_LAUNCH_IN_PROGRESS) {
-                       ret |= PROC_DIRTY_LAUNCH_IS_IN_PROGRESS;
-               }
-       }
-
-       proc_list_unlock();
-
-       return ret;
-}
-
-int
-memorystatus_on_terminate(proc_t p)
-{
-       int sig;
-
-       proc_list_lock();
-
-       p->p_memstat_dirty |= P_DIRTY_TERMINATED;
-
-       if ((p->p_memstat_dirty & (P_DIRTY_TRACK | P_DIRTY_IS_DIRTY)) == P_DIRTY_TRACK) {
-               /* Clean; mark as terminated and issue SIGKILL */
-               sig = SIGKILL;
-       } else {
-               /* Dirty, terminated, or state tracking is unsupported; issue SIGTERM to allow cleanup */
-               sig = SIGTERM;
-       }
-
-       proc_list_unlock();
-
-       return sig;
-}
-
-void
-memorystatus_on_suspend(proc_t p)
-{
-#if CONFIG_FREEZE
-       uint32_t pages;
-       memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
-#endif
-       proc_list_lock();
-#if CONFIG_FREEZE
-       memorystatus_suspended_count++;
-#endif
-       p->p_memstat_state |= P_MEMSTAT_SUSPENDED;
-       proc_list_unlock();
-}
-
-void
-memorystatus_on_resume(proc_t p)
-{
-#if CONFIG_FREEZE
-       boolean_t frozen;
-       pid_t pid;
-#endif
-
-       proc_list_lock();
-
-#if CONFIG_FREEZE
-       frozen = (p->p_memstat_state & P_MEMSTAT_FROZEN);
-       if (frozen) {
-               /*
-                * Now that we don't _thaw_ a process completely,
-                * resuming it (and having some on-demand swapins)
-                * shouldn't preclude it from being counted as frozen.
-                *
-                * memorystatus_frozen_count--;
-                *
-                * We preserve the P_MEMSTAT_FROZEN state since the process
-                * could have state on disk AND so will deserve some protection
-                * in the jetsam bands.
-                */
-               if ((p->p_memstat_state & P_MEMSTAT_REFREEZE_ELIGIBLE) == 0) {
-                       p->p_memstat_state |= P_MEMSTAT_REFREEZE_ELIGIBLE;
-                       memorystatus_refreeze_eligible_count++;
-               }
-               p->p_memstat_thaw_count++;
-
-               memorystatus_thaw_count++;
-       }
-
-       memorystatus_suspended_count--;
-
-       pid = p->p_pid;
-#endif
-
-       /*
-        * P_MEMSTAT_FROZEN will remain unchanged. This used to be:
-        * p->p_memstat_state &= ~(P_MEMSTAT_SUSPENDED | P_MEMSTAT_FROZEN);
-        */
-       p->p_memstat_state &= ~P_MEMSTAT_SUSPENDED;
-
-       proc_list_unlock();
-
-#if CONFIG_FREEZE
-       if (frozen) {
-               memorystatus_freeze_entry_t data = { pid, FALSE, 0 };
-               memorystatus_send_note(kMemorystatusFreezeNote, &data, sizeof(data));
-       }
-#endif
-}
-
-void
-memorystatus_on_inactivity(proc_t p)
-{
-#pragma unused(p)
-#if CONFIG_FREEZE
-       /* Wake the freeze thread */
-       thread_wakeup((event_t)&memorystatus_freeze_wakeup);
-#endif
-}
-
-/*
- * The proc_list_lock is held by the caller.
- */
-static uint32_t
-memorystatus_build_state(proc_t p)
-{
-       uint32_t snapshot_state = 0;
-
-       /* General */
-       if (p->p_memstat_state & P_MEMSTAT_SUSPENDED) {
-               snapshot_state |= kMemorystatusSuspended;
-       }
-       if (p->p_memstat_state & P_MEMSTAT_FROZEN) {
-               snapshot_state |= kMemorystatusFrozen;
-       }
-       if (p->p_memstat_state & P_MEMSTAT_REFREEZE_ELIGIBLE) {
-               snapshot_state |= kMemorystatusWasThawed;
-       }
-
-       /* Tracking */
-       if (p->p_memstat_dirty & P_DIRTY_TRACK) {
-               snapshot_state |= kMemorystatusTracked;
-       }
-       if ((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED) {
-               snapshot_state |= kMemorystatusSupportsIdleExit;
-       }
-       if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
-               snapshot_state |= kMemorystatusDirty;
-       }
-
-       return snapshot_state;
-}
-
-static boolean_t
-kill_idle_exit_proc(void)
-{
-       proc_t p, victim_p = PROC_NULL;
-       uint64_t current_time;
-       boolean_t killed = FALSE;
-       unsigned int i = 0;
-       os_reason_t jetsam_reason = OS_REASON_NULL;
-
-       /* Pick next idle exit victim. */
-       current_time = mach_absolute_time();
-
-       jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_IDLE_EXIT);
-       if (jetsam_reason == OS_REASON_NULL) {
-               printf("kill_idle_exit_proc: failed to allocate jetsam reason\n");
-       }
-
-       proc_list_lock();
-
-       p = memorystatus_get_first_proc_locked(&i, FALSE);
-       while (p) {
-               /* No need to look beyond the idle band */
-               if (p->p_memstat_effectivepriority != JETSAM_PRIORITY_IDLE) {
-                       break;
-               }
-
-               if ((p->p_memstat_dirty & (P_DIRTY_ALLOW_IDLE_EXIT | P_DIRTY_IS_DIRTY | P_DIRTY_TERMINATED)) == (P_DIRTY_ALLOW_IDLE_EXIT)) {
-                       if (current_time >= p->p_memstat_idledeadline) {
-                               p->p_memstat_dirty |= P_DIRTY_TERMINATED;
-                               victim_p = proc_ref_locked(p);
-                               break;
-                       }
-               }
-
-               p = memorystatus_get_next_proc_locked(&i, p, FALSE);
-       }
-
-       proc_list_unlock();
-
-       if (victim_p) {
-               printf("memorystatus: killing_idle_process pid %d [%s]\n", victim_p->p_pid, (*victim_p->p_name ? victim_p->p_name : "unknown"));
-               killed = memorystatus_do_kill(victim_p, kMemorystatusKilledIdleExit, jetsam_reason);
-               proc_rele(victim_p);
-       } else {
-               os_reason_free(jetsam_reason);
-       }
-
-       return killed;
-}
-
-static void
-memorystatus_thread_wake(void)
-{
-       int thr_id = 0;
-       int active_thr = atomic_load(&active_jetsam_threads);
-
-       /* Wakeup all the jetsam threads */
-       for (thr_id = 0; thr_id < active_thr; thr_id++) {
-               thread_wakeup((event_t)&jetsam_threads[thr_id].memorystatus_wakeup);
-       }
-}
-
-#if CONFIG_JETSAM
-
-static void
-memorystatus_thread_pool_max()
-{
-       /* Increase the jetsam thread pool to max_jetsam_threads */
-       int max_threads = max_jetsam_threads;
-       printf("Expanding memorystatus pool to %d!\n", max_threads);
-       atomic_store(&active_jetsam_threads, max_threads);
-}
-
-static void
-memorystatus_thread_pool_default()
-{
-       /* Restore the jetsam thread pool to a single thread */
-       printf("Reverting memorystatus pool back to 1\n");
-       atomic_store(&active_jetsam_threads, 1);
-}
-
-#endif /* CONFIG_JETSAM */
-
-extern void vm_pressure_response(void);
-
-static int
-memorystatus_thread_block(uint32_t interval_ms, thread_continue_t continuation)
-{
-       struct jetsam_thread_state *jetsam_thread = jetsam_current_thread();
-
-       if (interval_ms) {
-               assert_wait_timeout(&jetsam_thread->memorystatus_wakeup, THREAD_UNINT, interval_ms, NSEC_PER_MSEC);
-       } else {
-               assert_wait(&jetsam_thread->memorystatus_wakeup, THREAD_UNINT);
-       }
-
-       return thread_block(continuation);
-}
-
-static boolean_t
-memorystatus_avail_pages_below_pressure(void)
-{
-#if CONFIG_EMBEDDED
-/*
- * Instead of CONFIG_EMBEDDED for these *avail_pages* routines, we should
- * key off of the system having dynamic swap support. With full swap support,
- * the system shouldn't really need to worry about various page thresholds.
- */
-       return memorystatus_available_pages <= memorystatus_available_pages_pressure;
-#else /* CONFIG_EMBEDDED */
-       return FALSE;
-#endif /* CONFIG_EMBEDDED */
-}
-
-static boolean_t
-memorystatus_avail_pages_below_critical(void)
-{
-#if CONFIG_EMBEDDED
-       return memorystatus_available_pages <= memorystatus_available_pages_critical;
-#else /* CONFIG_EMBEDDED */
-       return FALSE;
-#endif /* CONFIG_EMBEDDED */
-}
-
-static boolean_t
-memorystatus_post_snapshot(int32_t priority, uint32_t cause)
-{
-#if CONFIG_EMBEDDED
-#pragma unused(cause)
-       /*
-        * Don't generate logs for steady-state idle-exit kills,
-        * unless it is overridden for debug or by the device
-        * tree.
-        */
-
-       return (priority != JETSAM_PRIORITY_IDLE) || memorystatus_idle_snapshot;
-
-#else /* CONFIG_EMBEDDED */
-       /*
-        * Don't generate logs for steady-state idle-exit kills,
-        * unless
-        * - it is overridden for debug or by the device
-        * tree.
-        * OR
-        * - the kill causes are important i.e. not kMemorystatusKilledIdleExit
-        */
-
-       boolean_t snapshot_eligible_kill_cause = (is_reason_thrashing(cause) || is_reason_zone_map_exhaustion(cause));
-       return (priority != JETSAM_PRIORITY_IDLE) || memorystatus_idle_snapshot || snapshot_eligible_kill_cause;
-#endif /* CONFIG_EMBEDDED */
-}
-
-static boolean_t
-memorystatus_action_needed(void)
-{
-#if CONFIG_EMBEDDED
-       return is_reason_thrashing(kill_under_pressure_cause) ||
-              is_reason_zone_map_exhaustion(kill_under_pressure_cause) ||
-              memorystatus_available_pages <= memorystatus_available_pages_pressure;
-#else /* CONFIG_EMBEDDED */
-       return is_reason_thrashing(kill_under_pressure_cause) ||
-              is_reason_zone_map_exhaustion(kill_under_pressure_cause);
-#endif /* CONFIG_EMBEDDED */
-}
-
-#if CONFIG_FREEZE
-extern void             vm_swap_consider_defragmenting(int);
-
-/*
- * This routine will _jetsam_ all frozen processes
- * and reclaim the swap space immediately.
- *
- * So freeze has to be DISABLED when we call this routine.
- */
-
-void
-memorystatus_disable_freeze(void)
-{
-       memstat_bucket_t *bucket;
-       int bucket_count = 0, retries = 0;
-       boolean_t retval = FALSE, killed = FALSE;
-       uint32_t errors = 0, errors_over_prev_iteration = 0;
-       os_reason_t jetsam_reason = 0;
-       unsigned int band = 0;
-       proc_t p = PROC_NULL, next_p = PROC_NULL;
-
-       assert(memorystatus_freeze_enabled == FALSE);
-
-       jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_DISK_SPACE_SHORTAGE);
-       if (jetsam_reason == OS_REASON_NULL) {
-               printf("memorystatus_disable_freeze: failed to allocate jetsam reason\n");
-       }
-
-       /*
-        * Let's relocate all frozen processes into band 8. Demoted frozen processes
-        * are sitting in band 0 currently and it's possible to have a frozen process
-        * in the FG band being actively used. We don't reset its frozen state when
-        * it is resumed because it has state on disk.
-        *
-        * We choose to do this relocation rather than implement a new 'kill frozen'
-        * process function for these reasons:
-        * - duplication of code: too many kill functions exist and we need to rework them better.
-        * - disk-space-shortage kills are rare
-        * - not having the 'real' jetsam band at time of the this frozen kill won't preclude us
-        *   from answering any imp. questions re. jetsam policy/effectiveness.
-        *
-        * This is essentially what memorystatus_update_inactive_jetsam_priority_band() does while
-        * avoiding the application of memory limits.
-        */
-
-again:
-       proc_list_lock();
-
-       band = JETSAM_PRIORITY_IDLE;
-       p = PROC_NULL;
-       next_p = PROC_NULL;
-
-       next_p = memorystatus_get_first_proc_locked(&band, TRUE);
-       while (next_p) {
-               p = next_p;
-               next_p = memorystatus_get_next_proc_locked(&band, p, TRUE);
-
-               if (p->p_memstat_effectivepriority > JETSAM_PRIORITY_FOREGROUND) {
-                       break;
-               }
-
-               if ((p->p_memstat_state & P_MEMSTAT_FROZEN) == FALSE) {
-                       continue;
-               }
-
-               if (p->p_memstat_state & P_MEMSTAT_ERROR) {
-                       p->p_memstat_state &= ~P_MEMSTAT_ERROR;
-               }
-
-               if (p->p_memstat_effectivepriority == memorystatus_freeze_jetsam_band) {
-                       continue;
-               }
-
-               /*
-                * We explicitly add this flag here so the process looks like a normal
-                * frozen process i.e. P_MEMSTAT_FROZEN and P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND.
-                * We don't bother with assigning the 'active' memory
-                * limits at this point because we are going to be killing it soon below.
-                */
-               p->p_memstat_state |= P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND;
-               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
-
-               memorystatus_update_priority_locked(p, memorystatus_freeze_jetsam_band, FALSE, TRUE);
-       }
-
-       bucket = &memstat_bucket[memorystatus_freeze_jetsam_band];
-       bucket_count = bucket->count;
-       proc_list_unlock();
-
-       /*
-        * Bucket count is already stale at this point. But, we don't expect
-        * freezing to continue since we have already disabled the freeze functionality.
-        * However, an existing freeze might be in progress. So we might miss that process
-        * in the first go-around. We hope to catch it in the next.
-        */
-
-       errors_over_prev_iteration = 0;
-       while (bucket_count) {
-               bucket_count--;
-
-               /*
-                * memorystatus_kill_elevated_process() drops a reference,
-                * so take another one so we can continue to use this exit reason
-                * even after it returns.
-                */
-
-               os_reason_ref(jetsam_reason);
-               retval = memorystatus_kill_elevated_process(
-                       kMemorystatusKilledDiskSpaceShortage,
-                       jetsam_reason,
-                       memorystatus_freeze_jetsam_band,
-                       0, /* the iteration of aggressive jetsam..ignored here */
-                       &errors);
-
-               if (errors > 0) {
-                       printf("memorystatus_disable_freeze: memorystatus_kill_elevated_process returned %d error(s)\n", errors);
-                       errors_over_prev_iteration += errors;
-                       errors = 0;
-               }
-
-               if (retval == 0) {
-                       /*
-                        * No frozen processes left to kill.
-                        */
-                       break;
-               }
-
-               killed = TRUE;
-       }
-
-       proc_list_lock();
-
-       if (memorystatus_frozen_count) {
-               /*
-                * A frozen process snuck in and so
-                * go back around to kill it. That
-                * process may have been resumed and
-                * put into the FG band too. So we
-                * have to do the relocation again.
-                */
-               assert(memorystatus_freeze_enabled == FALSE);
-
-               retries++;
-               if (retries < 3) {
-                       proc_list_unlock();
-                       goto again;
-               }
-#if DEVELOPMENT || DEBUG
-               panic("memorystatus_disable_freeze: Failed to kill all frozen processes, memorystatus_frozen_count = %d, errors = %d",
-                   memorystatus_frozen_count, errors_over_prev_iteration);
-#endif /* DEVELOPMENT || DEBUG */
-       }
-       proc_list_unlock();
-
-       os_reason_free(jetsam_reason);
-
-       if (killed) {
-               vm_swap_consider_defragmenting(VM_SWAP_FLAGS_FORCE_DEFRAG | VM_SWAP_FLAGS_FORCE_RECLAIM);
-
-               proc_list_lock();
-               size_t snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) +
-                   sizeof(memorystatus_jetsam_snapshot_entry_t) * (memorystatus_jetsam_snapshot_count);
-               uint64_t timestamp_now = mach_absolute_time();
-               memorystatus_jetsam_snapshot->notification_time = timestamp_now;
-               memorystatus_jetsam_snapshot->js_gencount++;
-               if (memorystatus_jetsam_snapshot_count > 0 && (memorystatus_jetsam_snapshot_last_timestamp == 0 ||
-                   timestamp_now > memorystatus_jetsam_snapshot_last_timestamp + memorystatus_jetsam_snapshot_timeout)) {
-                       proc_list_unlock();
-                       int ret = memorystatus_send_note(kMemorystatusSnapshotNote, &snapshot_size, sizeof(snapshot_size));
-                       if (!ret) {
-                               proc_list_lock();
-                               memorystatus_jetsam_snapshot_last_timestamp = timestamp_now;
-                               proc_list_unlock();
-                       }
-               } else {
-                       proc_list_unlock();
-               }
-       }
-
-       return;
-}
-#endif /* CONFIG_FREEZE */
-
-static boolean_t
-memorystatus_act_on_hiwat_processes(uint32_t *errors, uint32_t *hwm_kill, boolean_t *post_snapshot, __unused boolean_t *is_critical)
-{
-       boolean_t purged = FALSE;
-       boolean_t killed = memorystatus_kill_hiwat_proc(errors, &purged);
-
-       if (killed) {
-               *hwm_kill = *hwm_kill + 1;
-               *post_snapshot = TRUE;
-               return TRUE;
-       } else {
-               if (purged == FALSE) {
-                       /* couldn't purge and couldn't kill */
-                       memorystatus_hwm_candidates = FALSE;
-               }
-       }
-
-#if CONFIG_JETSAM
-       /* No highwater processes to kill. Continue or stop for now? */
-       if (!is_reason_thrashing(kill_under_pressure_cause) &&
-           !is_reason_zone_map_exhaustion(kill_under_pressure_cause) &&
-           (memorystatus_available_pages > memorystatus_available_pages_critical)) {
-               /*
-                * We are _not_ out of pressure but we are above the critical threshold and there's:
-                * - no compressor thrashing
-                * - enough zone memory
-                * - no more HWM processes left.
-                * For now, don't kill any other processes.
-                */
-
-               if (*hwm_kill == 0) {
-                       memorystatus_thread_wasted_wakeup++;
-               }
-
-               *is_critical = FALSE;
-
-               return TRUE;
-       }
-#endif /* CONFIG_JETSAM */
-
-       return FALSE;
-}
-
-static boolean_t
-memorystatus_act_aggressive(uint32_t cause, os_reason_t jetsam_reason, int *jld_idle_kills, boolean_t *corpse_list_purged, boolean_t *post_snapshot)
-{
-       if (memorystatus_jld_enabled == TRUE) {
-               boolean_t killed;
-               uint32_t errors = 0;
-
-               /* Jetsam Loop Detection - locals */
-               memstat_bucket_t *bucket;
-               int             jld_bucket_count = 0;
-               struct timeval  jld_now_tstamp = {0, 0};
-               uint64_t        jld_now_msecs = 0;
-               int             elevated_bucket_count = 0;
-
-               /* Jetsam Loop Detection - statics */
-               static uint64_t  jld_timestamp_msecs = 0;
-               static int       jld_idle_kill_candidates = 0;  /* Number of available processes in band 0,1 at start */
-               static int       jld_eval_aggressive_count = 0;         /* Bumps the max priority in aggressive loop */
-               static int32_t   jld_priority_band_max = JETSAM_PRIORITY_UI_SUPPORT;
-               /*
-                * Jetsam Loop Detection: attempt to detect
-                * rapid daemon relaunches in the lower bands.
-                */
-
-               microuptime(&jld_now_tstamp);
-
-               /*
-                * Ignore usecs in this calculation.
-                * msecs granularity is close enough.
-                */
-               jld_now_msecs = (jld_now_tstamp.tv_sec * 1000);
-
-               proc_list_lock();
-               switch (jetsam_aging_policy) {
-               case kJetsamAgingPolicyLegacy:
-                       bucket = &memstat_bucket[JETSAM_PRIORITY_IDLE];
-                       jld_bucket_count = bucket->count;
-                       bucket = &memstat_bucket[JETSAM_PRIORITY_AGING_BAND1];
-                       jld_bucket_count += bucket->count;
-                       break;
-               case kJetsamAgingPolicySysProcsReclaimedFirst:
-               case kJetsamAgingPolicyAppsReclaimedFirst:
-                       bucket = &memstat_bucket[JETSAM_PRIORITY_IDLE];
-                       jld_bucket_count = bucket->count;
-                       bucket = &memstat_bucket[system_procs_aging_band];
-                       jld_bucket_count += bucket->count;
-                       bucket = &memstat_bucket[applications_aging_band];
-                       jld_bucket_count += bucket->count;
-                       break;
-               case kJetsamAgingPolicyNone:
-               default:
-                       bucket = &memstat_bucket[JETSAM_PRIORITY_IDLE];
-                       jld_bucket_count = bucket->count;
-                       break;
-               }
-
-               bucket = &memstat_bucket[JETSAM_PRIORITY_ELEVATED_INACTIVE];
-               elevated_bucket_count = bucket->count;
-
-               proc_list_unlock();
-
-               /*
-                * memorystatus_jld_eval_period_msecs is a tunable
-                * memorystatus_jld_eval_aggressive_count is a tunable
-                * memorystatus_jld_eval_aggressive_priority_band_max is a tunable
-                */
-               if ((jld_bucket_count == 0) ||
-                   (jld_now_msecs > (jld_timestamp_msecs + memorystatus_jld_eval_period_msecs))) {
-                       /*
-                        * Refresh evaluation parameters
-                        */
-                       jld_timestamp_msecs      = jld_now_msecs;
-                       jld_idle_kill_candidates = jld_bucket_count;
-                       *jld_idle_kills          = 0;
-                       jld_eval_aggressive_count = 0;
-                       jld_priority_band_max   = JETSAM_PRIORITY_UI_SUPPORT;
-               }
-
-               if (*jld_idle_kills > jld_idle_kill_candidates) {
-                       jld_eval_aggressive_count++;
-
-#if DEVELOPMENT || DEBUG
-                       printf("memorystatus: aggressive%d: beginning of window: %lld ms, : timestamp now: %lld ms\n",
-                           jld_eval_aggressive_count,
-                           jld_timestamp_msecs,
-                           jld_now_msecs);
-                       printf("memorystatus: aggressive%d: idle candidates: %d, idle kills: %d\n",
-                           jld_eval_aggressive_count,
-                           jld_idle_kill_candidates,
-                           *jld_idle_kills);
-#endif /* DEVELOPMENT || DEBUG */
-
-                       if ((jld_eval_aggressive_count == memorystatus_jld_eval_aggressive_count) &&
-                           (total_corpses_count() > 0) && (*corpse_list_purged == FALSE)) {
-                               /*
-                                * If we reach this aggressive cycle, corpses might be causing memory pressure.
-                                * So, in an effort to avoid jetsams in the FG band, we will attempt to purge
-                                * corpse memory prior to this final march through JETSAM_PRIORITY_UI_SUPPORT.
-                                */
-                               task_purge_all_corpses();
-                               *corpse_list_purged = TRUE;
-                       } else if (jld_eval_aggressive_count > memorystatus_jld_eval_aggressive_count) {
-                               /*
-                                * Bump up the jetsam priority limit (eg: the bucket index)
-                                * Enforce bucket index sanity.
-                                */
-                               if ((memorystatus_jld_eval_aggressive_priority_band_max < 0) ||
-                                   (memorystatus_jld_eval_aggressive_priority_band_max >= MEMSTAT_BUCKET_COUNT)) {
-                                       /*
-                                        * Do nothing.  Stick with the default level.
-                                        */
-                               } else {
-                                       jld_priority_band_max = memorystatus_jld_eval_aggressive_priority_band_max;
-                               }
-                       }
-
-                       /* Visit elevated processes first */
-                       while (elevated_bucket_count) {
-                               elevated_bucket_count--;
-
-                               /*
-                                * memorystatus_kill_elevated_process() drops a reference,
-                                * so take another one so we can continue to use this exit reason
-                                * even after it returns.
-                                */
-
-                               os_reason_ref(jetsam_reason);
-                               killed = memorystatus_kill_elevated_process(
-                                       cause,
-                                       jetsam_reason,
-                                       JETSAM_PRIORITY_ELEVATED_INACTIVE,
-                                       jld_eval_aggressive_count,
-                                       &errors);
-
-                               if (killed) {
-                                       *post_snapshot = TRUE;
-                                       if (memorystatus_avail_pages_below_pressure()) {
-                                               /*
-                                                * Still under pressure.
-                                                * Find another pinned processes.
-                                                */
-                                               continue;
-                                       } else {
-                                               return TRUE;
-                                       }
-                               } else {
-                                       /*
-                                        * No pinned processes left to kill.
-                                        * Abandon elevated band.
-                                        */
-                                       break;
-                               }
-                       }
-
-                       /*
-                        * memorystatus_kill_top_process_aggressive() allocates its own
-                        * jetsam_reason so the kMemorystatusKilledProcThrashing cause
-                        * is consistent throughout the aggressive march.
-                        */
-                       killed = memorystatus_kill_top_process_aggressive(
-                               kMemorystatusKilledProcThrashing,
-                               jld_eval_aggressive_count,
-                               jld_priority_band_max,
-                               &errors);
-
-                       if (killed) {
-                               /* Always generate logs after aggressive kill */
-                               *post_snapshot = TRUE;
-                               *jld_idle_kills = 0;
-                               return TRUE;
-                       }
-               }
-
-               return FALSE;
-       }
-
-       return FALSE;
-}
-
-
-static void
-memorystatus_thread(void *param __unused, wait_result_t wr __unused)
-{
-       boolean_t post_snapshot = FALSE;
-       uint32_t errors = 0;
-       uint32_t hwm_kill = 0;
-       boolean_t sort_flag = TRUE;
-       boolean_t corpse_list_purged = FALSE;
-       int     jld_idle_kills = 0;
-       struct jetsam_thread_state *jetsam_thread = jetsam_current_thread();
-
-       if (jetsam_thread->inited == FALSE) {
-               /*
-                * It's the first time the thread has run, so just mark the thread as privileged and block.
-                * This avoids a spurious pass with unset variables, as set out in <rdar://problem/9609402>.
-                */
-
-               char name[32];
-               thread_wire(host_priv_self(), current_thread(), TRUE);
-               snprintf(name, 32, "VM_memorystatus_%d", jetsam_thread->index + 1);
-
-               if (jetsam_thread->index == 0) {
-                       if (vm_pageout_state.vm_restricted_to_single_processor == TRUE) {
-                               thread_vm_bind_group_add();
-                       }
-               }
-               thread_set_thread_name(current_thread(), name);
-               jetsam_thread->inited = TRUE;
-               memorystatus_thread_block(0, memorystatus_thread);
-       }
-
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_SCAN) | DBG_FUNC_START,
-           memorystatus_available_pages, memorystatus_jld_enabled, memorystatus_jld_eval_period_msecs, memorystatus_jld_eval_aggressive_count, 0);
-
-       /*
-        * Jetsam aware version.
-        *
-        * The VM pressure notification thread is working it's way through clients in parallel.
-        *
-        * So, while the pressure notification thread is targeting processes in order of
-        * increasing jetsam priority, we can hopefully reduce / stop it's work by killing
-        * any processes that have exceeded their highwater mark.
-        *
-        * If we run out of HWM processes and our available pages drops below the critical threshold, then,
-        * we target the least recently used process in order of increasing jetsam priority (exception: the FG band).
-        */
-       while (memorystatus_action_needed()) {
-               boolean_t killed;
-               int32_t priority;
-               uint32_t cause;
-               uint64_t jetsam_reason_code = JETSAM_REASON_INVALID;
-               os_reason_t jetsam_reason = OS_REASON_NULL;
-
-               cause = kill_under_pressure_cause;
-               switch (cause) {
-               case kMemorystatusKilledFCThrashing:
-                       jetsam_reason_code = JETSAM_REASON_MEMORY_FCTHRASHING;
-                       break;
-               case kMemorystatusKilledVMCompressorThrashing:
-                       jetsam_reason_code = JETSAM_REASON_MEMORY_VMCOMPRESSOR_THRASHING;
-                       break;
-               case kMemorystatusKilledVMCompressorSpaceShortage:
-                       jetsam_reason_code = JETSAM_REASON_MEMORY_VMCOMPRESSOR_SPACE_SHORTAGE;
-                       break;
-               case kMemorystatusKilledZoneMapExhaustion:
-                       jetsam_reason_code = JETSAM_REASON_ZONE_MAP_EXHAUSTION;
-                       break;
-               case kMemorystatusKilledVMPageShortage:
-               /* falls through */
-               default:
-                       jetsam_reason_code = JETSAM_REASON_MEMORY_VMPAGESHORTAGE;
-                       cause = kMemorystatusKilledVMPageShortage;
-                       break;
-               }
-
-               /* Highwater */
-               boolean_t is_critical = TRUE;
-               if (memorystatus_act_on_hiwat_processes(&errors, &hwm_kill, &post_snapshot, &is_critical)) {
-                       if (is_critical == FALSE) {
-                               /*
-                                * For now, don't kill any other processes.
-                                */
-                               break;
-                       } else {
-                               goto done;
-                       }
-               }
-
-               jetsam_reason = os_reason_create(OS_REASON_JETSAM, jetsam_reason_code);
-               if (jetsam_reason == OS_REASON_NULL) {
-                       printf("memorystatus_thread: failed to allocate jetsam reason\n");
-               }
-
-               if (memorystatus_act_aggressive(cause, jetsam_reason, &jld_idle_kills, &corpse_list_purged, &post_snapshot)) {
-                       goto done;
-               }
-
-               /*
-                * memorystatus_kill_top_process() drops a reference,
-                * so take another one so we can continue to use this exit reason
-                * even after it returns
-                */
-               os_reason_ref(jetsam_reason);
-
-               /* LRU */
-               killed = memorystatus_kill_top_process(TRUE, sort_flag, cause, jetsam_reason, &priority, &errors);
-               sort_flag = FALSE;
-
-               if (killed) {
-                       if (memorystatus_post_snapshot(priority, cause) == TRUE) {
-                               post_snapshot = TRUE;
-                       }
-
-                       /* Jetsam Loop Detection */
-                       if (memorystatus_jld_enabled == TRUE) {
-                               if ((priority == JETSAM_PRIORITY_IDLE) || (priority == system_procs_aging_band) || (priority == applications_aging_band)) {
-                                       jld_idle_kills++;
-                               } else {
-                                       /*
-                                        * We've reached into bands beyond idle deferred.
-                                        * We make no attempt to monitor them
-                                        */
-                               }
-                       }
-
-                       if ((priority >= JETSAM_PRIORITY_UI_SUPPORT) && (total_corpses_count() > 0) && (corpse_list_purged == FALSE)) {
-                               /*
-                                * If we have jetsammed a process in or above JETSAM_PRIORITY_UI_SUPPORT
-                                * then we attempt to relieve pressure by purging corpse memory.
-                                */
-                               task_purge_all_corpses();
-                               corpse_list_purged = TRUE;
-                       }
-                       goto done;
-               }
-
-               if (memorystatus_avail_pages_below_critical()) {
-                       /*
-                        * Still under pressure and unable to kill a process - purge corpse memory
-                        */
-                       if (total_corpses_count() > 0) {
-                               task_purge_all_corpses();
-                               corpse_list_purged = TRUE;
-                       }
-
-                       if (memorystatus_avail_pages_below_critical()) {
-                               /*
-                                * Still under pressure and unable to kill a process - panic
-                                */
-                               panic("memorystatus_jetsam_thread: no victim! available pages:%llu\n", (uint64_t)memorystatus_available_pages);
-                       }
-               }
-
-done:
-
-               /*
-                * We do not want to over-kill when thrashing has been detected.
-                * To avoid that, we reset the flag here and notify the
-                * compressor.
-                */
-               if (is_reason_thrashing(kill_under_pressure_cause)) {
-                       kill_under_pressure_cause = 0;
-#if CONFIG_JETSAM
-                       vm_thrashing_jetsam_done();
-#endif /* CONFIG_JETSAM */
-               } else if (is_reason_zone_map_exhaustion(kill_under_pressure_cause)) {
-                       kill_under_pressure_cause = 0;
-               }
-
-               os_reason_free(jetsam_reason);
-       }
-
-       kill_under_pressure_cause = 0;
-
-       if (errors) {
-               memorystatus_clear_errors();
-       }
-
-       if (post_snapshot) {
-               proc_list_lock();
-               size_t snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) +
-                   sizeof(memorystatus_jetsam_snapshot_entry_t) * (memorystatus_jetsam_snapshot_count);
-               uint64_t timestamp_now = mach_absolute_time();
-               memorystatus_jetsam_snapshot->notification_time = timestamp_now;
-               memorystatus_jetsam_snapshot->js_gencount++;
-               if (memorystatus_jetsam_snapshot_count > 0 && (memorystatus_jetsam_snapshot_last_timestamp == 0 ||
-                   timestamp_now > memorystatus_jetsam_snapshot_last_timestamp + memorystatus_jetsam_snapshot_timeout)) {
-                       proc_list_unlock();
-                       int ret = memorystatus_send_note(kMemorystatusSnapshotNote, &snapshot_size, sizeof(snapshot_size));
-                       if (!ret) {
-                               proc_list_lock();
-                               memorystatus_jetsam_snapshot_last_timestamp = timestamp_now;
-                               proc_list_unlock();
-                       }
-               } else {
-                       proc_list_unlock();
-               }
-       }
-
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_SCAN) | DBG_FUNC_END,
-           memorystatus_available_pages, 0, 0, 0, 0);
-
-       memorystatus_thread_block(0, memorystatus_thread);
-}
-
-/*
- * Returns TRUE:
- *      when an idle-exitable proc was killed
- * Returns FALSE:
- *     when there are no more idle-exitable procs found
- *      when the attempt to kill an idle-exitable proc failed
- */
-boolean_t
-memorystatus_idle_exit_from_VM(void)
-{
-       /*
-        * This routine should no longer be needed since we are
-        * now using jetsam bands on all platforms and so will deal
-        * with IDLE processes within the memorystatus thread itself.
-        *
-        * But we still use it because we observed that macos systems
-        * started heavy compression/swapping with a bunch of
-        * idle-exitable processes alive and doing nothing. We decided
-        * to rather kill those processes than start swapping earlier.
-        */
-
-       return kill_idle_exit_proc();
-}
-
-/*
- * Callback invoked when allowable physical memory footprint exceeded
- * (dirty pages + IOKit mappings)
- *
- * This is invoked for both advisory, non-fatal per-task high watermarks,
- * as well as the fatal task memory limits.
- */
-void
-memorystatus_on_ledger_footprint_exceeded(boolean_t warning, boolean_t memlimit_is_active, boolean_t memlimit_is_fatal)
-{
-       os_reason_t jetsam_reason = OS_REASON_NULL;
-
-       proc_t p = current_proc();
-
-#if VM_PRESSURE_EVENTS
-       if (warning == TRUE) {
-               /*
-                * This is a warning path which implies that the current process is close, but has
-                * not yet exceeded its per-process memory limit.
-                */
-               if (memorystatus_warn_process(p->p_pid, memlimit_is_active, memlimit_is_fatal, FALSE /* not exceeded */) != TRUE) {
-                       /* Print warning, since it's possible that task has not registered for pressure notifications */
-                       os_log(OS_LOG_DEFAULT, "memorystatus_on_ledger_footprint_exceeded: failed to warn the current task (%d exiting, or no handler registered?).\n", p->p_pid);
-               }
-               return;
-       }
-#endif /* VM_PRESSURE_EVENTS */
-
-       if (memlimit_is_fatal) {
-               /*
-                * If this process has no high watermark or has a fatal task limit, then we have been invoked because the task
-                * has violated either the system-wide per-task memory limit OR its own task limit.
-                */
-               jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_PERPROCESSLIMIT);
-               if (jetsam_reason == NULL) {
-                       printf("task_exceeded footprint: failed to allocate jetsam reason\n");
-               } else if (corpse_for_fatal_memkill != 0 && proc_send_synchronous_EXC_RESOURCE(p) == FALSE) {
-                       /* Set OS_REASON_FLAG_GENERATE_CRASH_REPORT to generate corpse */
-                       jetsam_reason->osr_flags |= OS_REASON_FLAG_GENERATE_CRASH_REPORT;
-               }
-
-               if (memorystatus_kill_process_sync(p->p_pid, kMemorystatusKilledPerProcessLimit, jetsam_reason) != TRUE) {
-                       printf("task_exceeded_footprint: failed to kill the current task (exiting?).\n");
-               }
-       } else {
-               /*
-                * HWM offender exists. Done without locks or synchronization.
-                * See comment near its declaration for more details.
-                */
-               memorystatus_hwm_candidates = TRUE;
-
-#if VM_PRESSURE_EVENTS
-               /*
-                * The current process is not in the warning path.
-                * This path implies the current process has exceeded a non-fatal (soft) memory limit.
-                * Failure to send note is ignored here.
-                */
-               (void)memorystatus_warn_process(p->p_pid, memlimit_is_active, memlimit_is_fatal, TRUE /* exceeded */);
-
-#endif /* VM_PRESSURE_EVENTS */
-       }
-}
-
-void
-memorystatus_log_exception(const int max_footprint_mb, boolean_t memlimit_is_active, boolean_t memlimit_is_fatal)
-{
-       proc_t p = current_proc();
-
-       /*
-        * The limit violation is logged here, but only once per process per limit.
-        * Soft memory limit is a non-fatal high-water-mark
-        * Hard memory limit is a fatal custom-task-limit or system-wide per-task memory limit.
-        */
-
-       os_log_with_startup_serial(OS_LOG_DEFAULT, "EXC_RESOURCE -> %s[%d] exceeded mem limit: %s%s %d MB (%s)\n",
-           (*p->p_name ? p->p_name : "unknown"), p->p_pid, (memlimit_is_active ? "Active" : "Inactive"),
-           (memlimit_is_fatal  ? "Hard" : "Soft"), max_footprint_mb,
-           (memlimit_is_fatal  ? "fatal" : "non-fatal"));
-
-       return;
-}
-
-
-/*
- * Description:
- *     Evaluates process state to determine which limit
- *     should be applied (active vs. inactive limit).
- *
- *     Processes that have the 'elevated inactive jetsam band' attribute
- *     are first evaluated based on their current priority band.
- *     presently elevated ==> active
- *
- *     Processes that opt into dirty tracking are evaluated
- *     based on clean vs dirty state.
- *     dirty ==> active
- *     clean ==> inactive
- *
- *     Process that do not opt into dirty tracking are
- *     evalulated based on priority level.
- *     Foreground or above ==> active
- *     Below Foreground    ==> inactive
- *
- *     Return: TRUE if active
- *             False if inactive
- */
-
-static boolean_t
-proc_jetsam_state_is_active_locked(proc_t p)
-{
-       if ((p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) &&
-           (p->p_memstat_effectivepriority == JETSAM_PRIORITY_ELEVATED_INACTIVE)) {
-               /*
-                * process has the 'elevated inactive jetsam band' attribute
-                * and process is present in the elevated band
-                * implies active state
-                */
-               return TRUE;
-       } else if (p->p_memstat_dirty & P_DIRTY_TRACK) {
-               /*
-                * process has opted into dirty tracking
-                * active state is based on dirty vs. clean
-                */
-               if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
-                       /*
-                        * process is dirty
-                        * implies active state
-                        */
-                       return TRUE;
-               } else {
-                       /*
-                        * process is clean
-                        * implies inactive state
-                        */
-                       return FALSE;
-               }
-       } else if (p->p_memstat_effectivepriority >= JETSAM_PRIORITY_FOREGROUND) {
-               /*
-                * process is Foreground or higher
-                * implies active state
-                */
-               return TRUE;
-       } else {
-               /*
-                * process found below Foreground
-                * implies inactive state
-                */
-               return FALSE;
-       }
-}
-
-static boolean_t
-memorystatus_kill_process_sync(pid_t victim_pid, uint32_t cause, os_reason_t jetsam_reason)
-{
-       boolean_t res;
-
-       uint32_t errors = 0;
-
-       if (victim_pid == -1) {
-               /* No pid, so kill first process */
-               res = memorystatus_kill_top_process(TRUE, TRUE, cause, jetsam_reason, NULL, &errors);
-       } else {
-               res = memorystatus_kill_specific_process(victim_pid, cause, jetsam_reason);
-       }
-
-       if (errors) {
-               memorystatus_clear_errors();
-       }
-
-       if (res == TRUE) {
-               /* Fire off snapshot notification */
-               proc_list_lock();
-               size_t snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) +
-                   sizeof(memorystatus_jetsam_snapshot_entry_t) * memorystatus_jetsam_snapshot_count;
-               uint64_t timestamp_now = mach_absolute_time();
-               memorystatus_jetsam_snapshot->notification_time = timestamp_now;
-               if (memorystatus_jetsam_snapshot_count > 0 && (memorystatus_jetsam_snapshot_last_timestamp == 0 ||
-                   timestamp_now > memorystatus_jetsam_snapshot_last_timestamp + memorystatus_jetsam_snapshot_timeout)) {
-                       proc_list_unlock();
-                       int ret = memorystatus_send_note(kMemorystatusSnapshotNote, &snapshot_size, sizeof(snapshot_size));
-                       if (!ret) {
-                               proc_list_lock();
-                               memorystatus_jetsam_snapshot_last_timestamp = timestamp_now;
-                               proc_list_unlock();
-                       }
-               } else {
-                       proc_list_unlock();
-               }
-       }
-
-       return res;
-}
-
-/*
- * Jetsam a specific process.
- */
-static boolean_t
-memorystatus_kill_specific_process(pid_t victim_pid, uint32_t cause, os_reason_t jetsam_reason)
-{
-       boolean_t killed;
-       proc_t p;
-       uint64_t killtime = 0;
-       clock_sec_t     tv_sec;
-       clock_usec_t    tv_usec;
-       uint32_t        tv_msec;
-
-       /* TODO - add a victim queue and push this into the main jetsam thread */
-
-       p = proc_find(victim_pid);
-       if (!p) {
-               os_reason_free(jetsam_reason);
-               return FALSE;
-       }
-
-       proc_list_lock();
-
-       if (memorystatus_jetsam_snapshot_count == 0) {
-               memorystatus_init_jetsam_snapshot_locked(NULL, 0);
-       }
-
-       killtime = mach_absolute_time();
-       absolutetime_to_microtime(killtime, &tv_sec, &tv_usec);
-       tv_msec = tv_usec / 1000;
-
-       memorystatus_update_jetsam_snapshot_entry_locked(p, cause, killtime);
-
-       proc_list_unlock();
-
-       os_log_with_startup_serial(OS_LOG_DEFAULT, "%lu.%03d memorystatus: killing_specific_process pid %d [%s] (%s %d) - memorystatus_available_pages: %llu\n",
-           (unsigned long)tv_sec, tv_msec, victim_pid, (*p->p_name ? p->p_name : "unknown"),
-           memorystatus_kill_cause_name[cause], p->p_memstat_effectivepriority, (uint64_t)memorystatus_available_pages);
-
-       killed = memorystatus_do_kill(p, cause, jetsam_reason);
-       proc_rele(p);
-
-       return killed;
-}
-
-
-/*
- * Toggle the P_MEMSTAT_TERMINATED state.
- * Takes the proc_list_lock.
- */
-void
-proc_memstat_terminated(proc_t p, boolean_t set)
-{
-#if DEVELOPMENT || DEBUG
-       if (p) {
-               proc_list_lock();
-               if (set == TRUE) {
-                       p->p_memstat_state |= P_MEMSTAT_TERMINATED;
-               } else {
-                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
-               }
-               proc_list_unlock();
-       }
-#else
-#pragma unused(p, set)
-       /*
-        * do nothing
-        */
-#endif /* DEVELOPMENT || DEBUG */
-       return;
-}
-
-
-#if CONFIG_JETSAM
-/*
- * This is invoked when cpulimits have been exceeded while in fatal mode.
- * The jetsam_flags do not apply as those are for memory related kills.
- * We call this routine so that the offending process is killed with
- * a non-zero exit status.
- */
-void
-jetsam_on_ledger_cpulimit_exceeded(void)
-{
-       int retval = 0;
-       int jetsam_flags = 0;  /* make it obvious */
-       proc_t p = current_proc();
-       os_reason_t jetsam_reason = OS_REASON_NULL;
-
-       printf("task_exceeded_cpulimit: killing pid %d [%s]\n",
-           p->p_pid, (*p->p_name ? p->p_name : "(unknown)"));
-
-       jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_CPULIMIT);
-       if (jetsam_reason == OS_REASON_NULL) {
-               printf("task_exceeded_cpulimit: unable to allocate memory for jetsam reason\n");
-       }
-
-       retval = jetsam_do_kill(p, jetsam_flags, jetsam_reason);
-
-       if (retval) {
-               printf("task_exceeded_cpulimit: failed to kill current task (exiting?).\n");
-       }
-}
-
-#endif /* CONFIG_JETSAM */
-
-static void
-memorystatus_get_task_memory_region_count(task_t task, uint64_t *count)
-{
-       assert(task);
-       assert(count);
-
-       *count = get_task_memory_region_count(task);
-}
-
-
-#define MEMORYSTATUS_VM_MAP_FORK_ALLOWED     0x100000000
-#define MEMORYSTATUS_VM_MAP_FORK_NOT_ALLOWED 0x200000000
-
-#if DEVELOPMENT || DEBUG
-
-/*
- * Sysctl only used to test memorystatus_allowed_vm_map_fork() path.
- *   set a new pidwatch value
- *     or
- *   get the current pidwatch value
- *
- * The pidwatch_val starts out with a PID to watch for in the map_fork path.
- * Its value is:
- * - OR'd with MEMORYSTATUS_VM_MAP_FORK_ALLOWED if we allow the map_fork.
- * - OR'd with MEMORYSTATUS_VM_MAP_FORK_NOT_ALLOWED if we disallow the map_fork.
- * - set to -1ull if the map_fork() is aborted for other reasons.
- */
-
-uint64_t memorystatus_vm_map_fork_pidwatch_val = 0;
-
-static int sysctl_memorystatus_vm_map_fork_pidwatch SYSCTL_HANDLER_ARGS {
-#pragma unused(oidp, arg1, arg2)
-
-       uint64_t new_value = 0;
-       uint64_t old_value = 0;
-       int error = 0;
-
-       /*
-        * The pid is held in the low 32 bits.
-        * The 'allowed' flags are in the upper 32 bits.
-        */
-       old_value = memorystatus_vm_map_fork_pidwatch_val;
-
-       error = sysctl_io_number(req, old_value, sizeof(old_value), &new_value, NULL);
-
-       if (error || !req->newptr) {
-               /*
-                * No new value passed in.
-                */
-               return error;
-       }
-
-       /*
-        * A new pid was passed in via req->newptr.
-        * Ignore any attempt to set the higher order bits.
-        */
-       memorystatus_vm_map_fork_pidwatch_val = new_value & 0xFFFFFFFF;
-       printf("memorystatus: pidwatch old_value = 0x%llx, new_value = 0x%llx \n", old_value, new_value);
-
-       return error;
-}
-
-SYSCTL_PROC(_kern, OID_AUTO, memorystatus_vm_map_fork_pidwatch, CTLTYPE_QUAD | CTLFLAG_RW | CTLFLAG_LOCKED | CTLFLAG_MASKED,
-    0, 0, sysctl_memorystatus_vm_map_fork_pidwatch, "Q", "get/set pid watched for in vm_map_fork");
-
-
-/*
- * Record if a watched process fails to qualify for a vm_map_fork().
- */
-void
-memorystatus_abort_vm_map_fork(task_t task)
-{
-       if (memorystatus_vm_map_fork_pidwatch_val != 0) {
-               proc_t p = get_bsdtask_info(task);
-               if (p != NULL && memorystatus_vm_map_fork_pidwatch_val == (uint64_t)p->p_pid) {
-                       memorystatus_vm_map_fork_pidwatch_val = -1ull;
-               }
-       }
-}
-
-static void
-set_vm_map_fork_pidwatch(task_t task, uint64_t x)
-{
-       if (memorystatus_vm_map_fork_pidwatch_val != 0) {
-               proc_t p = get_bsdtask_info(task);
-               if (p && (memorystatus_vm_map_fork_pidwatch_val == (uint64_t)p->p_pid)) {
-                       memorystatus_vm_map_fork_pidwatch_val |= x;
-               }
-       }
-}
-
-#else /* DEVELOPMENT || DEBUG */
-
-
-static void
-set_vm_map_fork_pidwatch(task_t task, uint64_t x)
-{
-#pragma unused(task)
-#pragma unused(x)
-}
-
-#endif /* DEVELOPMENT || DEBUG */
-
-/*
- * Called during EXC_RESOURCE handling when a process exceeds a soft
- * memory limit.  This is the corpse fork path and here we decide if
- * vm_map_fork will be allowed when creating the corpse.
- * The task being considered is suspended.
- *
- * By default, a vm_map_fork is allowed to proceed.
- *
- * A few simple policy assumptions:
- *     Desktop platform is not considered in this path.
- *     The vm_map_fork is always allowed.
- *
- *     If the device has a zero system-wide task limit,
- *     then the vm_map_fork is allowed.
- *
- *     And if a process's memory footprint calculates less
- *     than or equal to half of the system-wide task limit,
- *     then the vm_map_fork is allowed.  This calculation
- *     is based on the assumption that a process can
- *     munch memory up to the system-wide task limit.
- */
-boolean_t
-memorystatus_allowed_vm_map_fork(task_t task)
-{
-       boolean_t is_allowed = TRUE;   /* default */
-
-#if CONFIG_EMBEDDED
-
-       uint64_t footprint_in_bytes;
-       uint64_t max_allowed_bytes;
-
-       if (max_task_footprint_mb == 0) {
-               set_vm_map_fork_pidwatch(task, MEMORYSTATUS_VM_MAP_FORK_ALLOWED);
-               return is_allowed;
-       }
-
-       footprint_in_bytes = get_task_phys_footprint(task);
-
-       /*
-        * Maximum is 1/4 of the system-wide task limit.
-        */
-       max_allowed_bytes = ((uint64_t)max_task_footprint_mb * 1024 * 1024) >> 2;
-
-       if (footprint_in_bytes > max_allowed_bytes) {
-               printf("memorystatus disallowed vm_map_fork %lld  %lld\n", footprint_in_bytes, max_allowed_bytes);
-               set_vm_map_fork_pidwatch(task, MEMORYSTATUS_VM_MAP_FORK_NOT_ALLOWED);
-               return !is_allowed;
-       }
-#endif /* CONFIG_EMBEDDED */
-
-       set_vm_map_fork_pidwatch(task, MEMORYSTATUS_VM_MAP_FORK_ALLOWED);
-       return is_allowed;
-}
-
-static void
-memorystatus_get_task_page_counts(task_t task, uint32_t *footprint, uint32_t *max_footprint_lifetime, uint32_t *purgeable_pages)
-{
-       assert(task);
-       assert(footprint);
-
-       uint64_t pages;
-
-       pages = (get_task_phys_footprint(task) / PAGE_SIZE_64);
-       assert(((uint32_t)pages) == pages);
-       *footprint = (uint32_t)pages;
-
-       if (max_footprint_lifetime) {
-               pages = (get_task_phys_footprint_lifetime_max(task) / PAGE_SIZE_64);
-               assert(((uint32_t)pages) == pages);
-               *max_footprint_lifetime = (uint32_t)pages;
-       }
-       if (purgeable_pages) {
-               pages = (get_task_purgeable_size(task) / PAGE_SIZE_64);
-               assert(((uint32_t)pages) == pages);
-               *purgeable_pages = (uint32_t)pages;
-       }
-}
-
-static void
-memorystatus_get_task_phys_footprint_page_counts(task_t task,
-    uint64_t *internal_pages, uint64_t *internal_compressed_pages,
-    uint64_t *purgeable_nonvolatile_pages, uint64_t *purgeable_nonvolatile_compressed_pages,
-    uint64_t *alternate_accounting_pages, uint64_t *alternate_accounting_compressed_pages,
-    uint64_t *iokit_mapped_pages, uint64_t *page_table_pages)
-{
-       assert(task);
-
-       if (internal_pages) {
-               *internal_pages = (get_task_internal(task) / PAGE_SIZE_64);
-       }
-
-       if (internal_compressed_pages) {
-               *internal_compressed_pages = (get_task_internal_compressed(task) / PAGE_SIZE_64);
-       }
-
-       if (purgeable_nonvolatile_pages) {
-               *purgeable_nonvolatile_pages = (get_task_purgeable_nonvolatile(task) / PAGE_SIZE_64);
-       }
-
-       if (purgeable_nonvolatile_compressed_pages) {
-               *purgeable_nonvolatile_compressed_pages = (get_task_purgeable_nonvolatile_compressed(task) / PAGE_SIZE_64);
-       }
-
-       if (alternate_accounting_pages) {
-               *alternate_accounting_pages = (get_task_alternate_accounting(task) / PAGE_SIZE_64);
-       }
-
-       if (alternate_accounting_compressed_pages) {
-               *alternate_accounting_compressed_pages = (get_task_alternate_accounting_compressed(task) / PAGE_SIZE_64);
-       }
-
-       if (iokit_mapped_pages) {
-               *iokit_mapped_pages = (get_task_iokit_mapped(task) / PAGE_SIZE_64);
-       }
-
-       if (page_table_pages) {
-               *page_table_pages = (get_task_page_table(task) / PAGE_SIZE_64);
-       }
-}
-
-/*
- * This routine only acts on the global jetsam event snapshot.
- * Updating the process's entry can race when the memorystatus_thread
- * has chosen to kill a process that is racing to exit on another core.
- */
-static void
-memorystatus_update_jetsam_snapshot_entry_locked(proc_t p, uint32_t kill_cause, uint64_t killtime)
-{
-       memorystatus_jetsam_snapshot_entry_t *entry = NULL;
-       memorystatus_jetsam_snapshot_t *snapshot    = NULL;
-       memorystatus_jetsam_snapshot_entry_t *snapshot_list = NULL;
-
-       unsigned int i;
-
-       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
-
-       if (memorystatus_jetsam_snapshot_count == 0) {
-               /*
-                * No active snapshot.
-                * Nothing to do.
-                */
-               return;
-       }
-
-       /*
-        * Sanity check as this routine should only be called
-        * from a jetsam kill path.
-        */
-       assert(kill_cause != 0 && killtime != 0);
-
-       snapshot       = memorystatus_jetsam_snapshot;
-       snapshot_list  = memorystatus_jetsam_snapshot->entries;
-
-       for (i = 0; i < memorystatus_jetsam_snapshot_count; i++) {
-               if (snapshot_list[i].pid == p->p_pid) {
-                       entry = &snapshot_list[i];
-
-                       if (entry->killed || entry->jse_killtime) {
-                               /*
-                                * We apparently raced on the exit path
-                                * for this process, as it's snapshot entry
-                                * has already recorded a kill.
-                                */
-                               assert(entry->killed && entry->jse_killtime);
-                               break;
-                       }
-
-                       /*
-                        * Update the entry we just found in the snapshot.
-                        */
-
-                       entry->killed       = kill_cause;
-                       entry->jse_killtime = killtime;
-                       entry->jse_gencount = snapshot->js_gencount;
-                       entry->jse_idle_delta = p->p_memstat_idle_delta;
-#if CONFIG_FREEZE
-                       entry->jse_thaw_count = p->p_memstat_thaw_count;
-#else /* CONFIG_FREEZE */
-                       entry->jse_thaw_count = 0;
-#endif /* CONFIG_FREEZE */
-
-                       /*
-                        * If a process has moved between bands since snapshot was
-                        * initialized, then likely these fields changed too.
-                        */
-                       if (entry->priority != p->p_memstat_effectivepriority) {
-                               strlcpy(entry->name, p->p_name, sizeof(entry->name));
-                               entry->priority  = p->p_memstat_effectivepriority;
-                               entry->state     = memorystatus_build_state(p);
-                               entry->user_data = p->p_memstat_userdata;
-                               entry->fds       = p->p_fd->fd_nfiles;
+       } else {
+               int flag = (self == TRUE) ? P_DIRTY : P_DIRTY_SHUTDOWN;
+               if (pcontrol && !(p->p_memstat_dirty & flag)) {
+                       /* Mark the process as having been dirtied at some point */
+                       p->p_memstat_dirty |= (flag | P_DIRTY_MARKED);
+                       memorystatus_dirty_count++;
+                       ret = 0;
+               } else if ((pcontrol == 0) && (p->p_memstat_dirty & flag)) {
+                       if ((flag == P_DIRTY_SHUTDOWN) && (!(p->p_memstat_dirty & P_DIRTY))) {
+                               /* Clearing the dirty shutdown flag, and the process is otherwise clean - kill */
+                               p->p_memstat_dirty |= P_DIRTY_TERMINATED;
+                               kill = true;
+                       } else if ((flag == P_DIRTY) && (p->p_memstat_dirty & P_DIRTY_TERMINATED)) {
+                               /* Kill previously terminated processes if set clean */
+                               kill = true;
                        }
+                       p->p_memstat_dirty &= ~flag;
+                       memorystatus_dirty_count--;
+                       ret = 0;
+               } else {
+                       /* Already set */
+                       ret = EALREADY;
+               }
+       }
 
-                       /*
-                        * Always update the page counts on a kill.
-                        */
-
-                       uint32_t pages              = 0;
-                       uint32_t max_pages_lifetime = 0;
-                       uint32_t purgeable_pages    = 0;
-
-                       memorystatus_get_task_page_counts(p->task, &pages, &max_pages_lifetime, &purgeable_pages);
-                       entry->pages              = (uint64_t)pages;
-                       entry->max_pages_lifetime = (uint64_t)max_pages_lifetime;
-                       entry->purgeable_pages    = (uint64_t)purgeable_pages;
-
-                       uint64_t internal_pages                        = 0;
-                       uint64_t internal_compressed_pages             = 0;
-                       uint64_t purgeable_nonvolatile_pages           = 0;
-                       uint64_t purgeable_nonvolatile_compressed_pages = 0;
-                       uint64_t alternate_accounting_pages            = 0;
-                       uint64_t alternate_accounting_compressed_pages = 0;
-                       uint64_t iokit_mapped_pages                    = 0;
-                       uint64_t page_table_pages                      = 0;
-
-                       memorystatus_get_task_phys_footprint_page_counts(p->task, &internal_pages, &internal_compressed_pages,
-                           &purgeable_nonvolatile_pages, &purgeable_nonvolatile_compressed_pages,
-                           &alternate_accounting_pages, &alternate_accounting_compressed_pages,
-                           &iokit_mapped_pages, &page_table_pages);
-
-                       entry->jse_internal_pages = internal_pages;
-                       entry->jse_internal_compressed_pages = internal_compressed_pages;
-                       entry->jse_purgeable_nonvolatile_pages = purgeable_nonvolatile_pages;
-                       entry->jse_purgeable_nonvolatile_compressed_pages = purgeable_nonvolatile_compressed_pages;
-                       entry->jse_alternate_accounting_pages = alternate_accounting_pages;
-                       entry->jse_alternate_accounting_compressed_pages = alternate_accounting_compressed_pages;
-                       entry->jse_iokit_mapped_pages = iokit_mapped_pages;
-                       entry->jse_page_table_pages = page_table_pages;
+       if (ret != 0) {
+               goto exit;
+       }
 
-                       uint64_t region_count = 0;
-                       memorystatus_get_task_memory_region_count(p->task, &region_count);
-                       entry->jse_memory_region_count = region_count;
+       if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
+               now_dirty = TRUE;
+       }
 
-                       goto exit;
+       if ((was_dirty == TRUE && now_dirty == FALSE) ||
+           (was_dirty == FALSE && now_dirty == TRUE)) {
+#if CONFIG_DIRTYSTATUS_TRACKING
+               if (dirtystatus_tracking_enabled) {
+                       uint32_t pages = 0;
+                       memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
+                       change_event.dsc_pid = p->p_pid;
+                       change_event.dsc_event_type = (now_dirty == TRUE) ? kDirtyStatusChangedDirty : kDirtyStatusChangedClean;
+                       change_event.dsc_time =  mach_absolute_time();
+                       change_event.dsc_pages = pages;
+                       change_event.dsc_priority = p->p_memstat_effectivepriority;
+                       strlcpy(&change_event.dsc_process_name[0], p->p_name, sizeof(change_event.dsc_process_name));
+                       notify_change = TRUE;
                }
-       }
+#endif
 
-       if (entry == NULL) {
-               /*
-                * The entry was not found in the snapshot, so the process must have
-                * launched after the snapshot was initialized.
-                * Let's try to append the new entry.
-                */
-               if (memorystatus_jetsam_snapshot_count < memorystatus_jetsam_snapshot_max) {
+               /* Manage idle exit deferral, if applied */
+               if ((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED) {
                        /*
-                        * A populated snapshot buffer exists
-                        * and there is room to init a new entry.
+                        * Legacy mode: P_DIRTY_AGING_IN_PROGRESS means the process is in the aging band OR it might be heading back
+                        * there once it's clean again. For the legacy case, this only applies if it has some protection window left.
+                        * P_DIRTY_DEFER: one-time protection window given at launch
+                        * P_DIRTY_DEFER_ALWAYS: protection window given for every dirty->clean transition. Like non-legacy mode.
+                        *
+                        * Non-Legacy mode: P_DIRTY_AGING_IN_PROGRESS means the process is in the aging band. It will always stop over
+                        * in that band on it's way to IDLE.
                         */
-                       assert(memorystatus_jetsam_snapshot_count == snapshot->entry_count);
 
-                       unsigned int next = memorystatus_jetsam_snapshot_count;
+                       if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
+                               /*
+                                * New dirty process i.e. "was_dirty == FALSE && now_dirty == TRUE"
+                                *
+                                * The process will move from its aging band to its higher requested
+                                * jetsam band.
+                                */
+                               boolean_t reset_state = (jetsam_aging_policy != kJetsamAgingPolicyLegacy) ? TRUE : FALSE;
 
-                       if (memorystatus_init_jetsam_snapshot_entry_locked(p, &snapshot_list[next], (snapshot->js_gencount)) == TRUE) {
-                               entry = &snapshot_list[next];
-                               entry->killed       = kill_cause;
-                               entry->jse_killtime = killtime;
+                               memorystatus_invalidate_idle_demotion_locked(p, reset_state);
+                               reschedule = TRUE;
+                       } else {
+                               /*
+                                * Process is back from "dirty" to "clean".
+                                */
 
-                               snapshot->entry_count = ++next;
-                               memorystatus_jetsam_snapshot_count = next;
+                               if (jetsam_aging_policy == kJetsamAgingPolicyLegacy) {
+                                       if (((p->p_memstat_dirty & P_DIRTY_DEFER_ALWAYS) == FALSE) &&
+                                           (mach_absolute_time() >= p->p_memstat_idledeadline)) {
+                                               /*
+                                                * The process' hasn't enrolled in the "always defer after dirty"
+                                                * mode and its deadline has expired. It currently
+                                                * does not reside in any of the aging buckets.
+                                                *
+                                                * It's on its way to the JETSAM_PRIORITY_IDLE
+                                                * bucket via memorystatus_update_idle_priority_locked()
+                                                * below.
+                                                *
+                                                * So all we need to do is reset all the state on the
+                                                * process that's related to the aging bucket i.e.
+                                                * the AGING_IN_PROGRESS flag and the timer deadline.
+                                                */
 
-                               if (memorystatus_jetsam_snapshot_count >= memorystatus_jetsam_snapshot_max) {
-                                       /*
-                                        * We just used the last slot in the snapshot buffer.
-                                        * We only want to log it once... so we do it here
-                                        * when we notice we've hit the max.
-                                        */
-                                       printf("memorystatus: WARNING snapshot buffer is full, count %d\n",
-                                           memorystatus_jetsam_snapshot_count);
+                                               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+                                               reschedule = TRUE;
+                                       } else {
+                                               /*
+                                                * Process enrolled in "always stop in deferral band after dirty" OR
+                                                * it still has some protection window left and so
+                                                * we just re-arm the timer without modifying any
+                                                * state on the process iff it still wants into that band.
+                                                */
+
+                                               if (p->p_memstat_dirty & P_DIRTY_DEFER_ALWAYS) {
+                                                       memorystatus_schedule_idle_demotion_locked(p, TRUE);
+                                                       reschedule = TRUE;
+                                               } else if (p->p_memstat_dirty & P_DIRTY_AGING_IN_PROGRESS) {
+                                                       memorystatus_schedule_idle_demotion_locked(p, FALSE);
+                                                       reschedule = TRUE;
+                                               }
+                                       }
+                               } else {
+                                       memorystatus_schedule_idle_demotion_locked(p, TRUE);
+                                       reschedule = TRUE;
                                }
                        }
                }
-       }
-
-exit:
-       if (entry == NULL) {
-               /*
-                * If we reach here, the snapshot buffer could not be updated.
-                * Most likely, the buffer is full, in which case we would have
-                * logged a warning in the previous call.
-                *
-                * For now, we will stop appending snapshot entries.
-                * When the buffer is consumed, the snapshot state will reset.
-                */
-
-               MEMORYSTATUS_DEBUG(4, "memorystatus_update_jetsam_snapshot_entry_locked: failed to update pid %d, priority %d, count %d\n",
-                   p->p_pid, p->p_memstat_effectivepriority, memorystatus_jetsam_snapshot_count);
-       }
 
-       return;
-}
+               memorystatus_update_idle_priority_locked(p);
 
-#if CONFIG_JETSAM
-void
-memorystatus_pages_update(unsigned int pages_avail)
-{
-       memorystatus_available_pages = pages_avail;
+               if (memorystatus_highwater_enabled) {
+                       boolean_t ledger_update_needed = TRUE;
+                       boolean_t use_active;
+                       boolean_t is_fatal;
+                       /*
+                        * We are in this path because this process transitioned between
+                        * dirty <--> clean state.  Update the cached memory limits.
+                        */
 
-#if VM_PRESSURE_EVENTS
-       /*
-        * Since memorystatus_available_pages changes, we should
-        * re-evaluate the pressure levels on the system and
-        * check if we need to wake the pressure thread.
-        * We also update memorystatus_level in that routine.
-        */
-       vm_pressure_response();
+                       if (proc_jetsam_state_is_active_locked(p) == TRUE) {
+                               /*
+                                * process is pinned in elevated band
+                                * or
+                                * process is dirty
+                                */
+                               CACHE_ACTIVE_LIMITS_LOCKED(p, is_fatal);
+                               use_active = TRUE;
+                               ledger_update_needed = TRUE;
+                       } else {
+                               /*
+                                * process is clean...but if it has opted into pressured-exit
+                                * we don't apply the INACTIVE limit till the process has aged
+                                * out and is entering the IDLE band.
+                                * See memorystatus_update_priority_locked() for that.
+                                */
 
-       if (memorystatus_available_pages <= memorystatus_available_pages_pressure) {
-               if (memorystatus_hwm_candidates || (memorystatus_available_pages <= memorystatus_available_pages_critical)) {
-                       memorystatus_thread_wake();
-               }
-       }
-#if CONFIG_FREEZE
-       /*
-        * We can't grab the freezer_mutex here even though that synchronization would be correct to inspect
-        * the # of frozen processes and wakeup the freezer thread. Reason being that we come here into this
-        * code with (possibly) the page-queue locks held and preemption disabled. So trying to grab a mutex here
-        * will result in the "mutex with preemption disabled" panic.
-        */
+                               if (p->p_memstat_dirty & P_DIRTY_ALLOW_IDLE_EXIT) {
+                                       ledger_update_needed = FALSE;
+                               } else {
+                                       CACHE_INACTIVE_LIMITS_LOCKED(p, is_fatal);
+                                       use_active = FALSE;
+                                       ledger_update_needed = TRUE;
+                               }
+                       }
 
-       if (memorystatus_freeze_thread_should_run() == TRUE) {
-               /*
-                * The freezer thread is usually woken up by some user-space call i.e. pid_hibernate(any process).
-                * That trigger isn't invoked often enough and so we are enabling this explicit wakeup here.
-                */
-               if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
-                       thread_wakeup((event_t)&memorystatus_freeze_wakeup);
-               }
-       }
-#endif /* CONFIG_FREEZE */
+                       /*
+                        * Enforce the new limits by writing to the ledger.
+                        *
+                        * This is a hot path and holding the proc_list_lock while writing to the ledgers,
+                        * (where the task lock is taken) is bad.  So, we temporarily drop the proc_list_lock.
+                        * We aren't traversing the jetsam bucket list here, so we should be safe.
+                        * See rdar://21394491.
+                        */
 
-#else /* VM_PRESSURE_EVENTS */
+                       if (ledger_update_needed && proc_ref_locked(p) == p) {
+                               int ledger_limit;
+                               if (p->p_memstat_memlimit > 0) {
+                                       ledger_limit = p->p_memstat_memlimit;
+                               } else {
+                                       ledger_limit = -1;
+                               }
+                               proc_list_unlock();
+                               task_set_phys_footprint_limit_internal(p->task, ledger_limit, NULL, use_active, is_fatal);
+                               proc_list_lock();
+                               proc_rele_locked(p);
 
-       boolean_t critical, delta;
+                               MEMORYSTATUS_DEBUG(3, "memorystatus_dirty_set: new limit on pid %d (%dMB %s) priority(%d) dirty?=0x%x %s\n",
+                                   p->p_pid, (p->p_memstat_memlimit > 0 ? p->p_memstat_memlimit : -1),
+                                   (p->p_memstat_state & P_MEMSTAT_FATAL_MEMLIMIT ? "F " : "NF"), p->p_memstat_effectivepriority, p->p_memstat_dirty,
+                                   (p->p_memstat_dirty ? ((p->p_memstat_dirty & P_DIRTY) ? "isdirty" : "isclean") : ""));
+                       }
+               }
 
-       if (!memorystatus_delta) {
-               return;
+               /* If the deferral state changed, reschedule the demotion timer */
+               if (reschedule) {
+                       memorystatus_reschedule_idle_demotion_locked();
+               }
        }
 
-       critical = (pages_avail < memorystatus_available_pages_critical) ? TRUE : FALSE;
-       delta = ((pages_avail >= (memorystatus_available_pages + memorystatus_delta))
-           || (memorystatus_available_pages >= (pages_avail + memorystatus_delta))) ? TRUE : FALSE;
+       if (kill) {
+               if (proc_ref_locked(p) == p) {
+                       proc_list_unlock();
+                       psignal(p, SIGKILL);
+                       proc_list_lock();
+                       proc_rele_locked(p);
+               }
+       }
 
-       if (critical || delta) {
-               unsigned int total_pages;
+exit:
+       proc_list_unlock();
 
-               total_pages = (unsigned int) atop_64(max_mem);
-#if CONFIG_SECLUDED_MEMORY
-               total_pages -= vm_page_secluded_count;
-#endif /* CONFIG_SECLUDED_MEMORY */
-               memorystatus_level = memorystatus_available_pages * 100 / total_pages;
-               memorystatus_thread_wake();
+#if CONFIG_DIRTYSTATUS_TRACKING
+       // Before returning, let's notify the dirtiness status if we have to
+       if (notify_change) {
+               memorystatus_send_dirty_status_change_note(&change_event, sizeof(change_event));
        }
-#endif /* VM_PRESSURE_EVENTS */
+#endif
+
+       return ret;
 }
-#endif /* CONFIG_JETSAM */
 
-static boolean_t
-memorystatus_init_jetsam_snapshot_entry_locked(proc_t p, memorystatus_jetsam_snapshot_entry_t *entry, uint64_t gencount)
+int
+memorystatus_dirty_clear(proc_t p, uint32_t pcontrol)
 {
-       clock_sec_t                     tv_sec;
-       clock_usec_t                    tv_usec;
-       uint32_t pages = 0;
-       uint32_t max_pages_lifetime = 0;
-       uint32_t purgeable_pages = 0;
-       uint64_t internal_pages                         = 0;
-       uint64_t internal_compressed_pages              = 0;
-       uint64_t purgeable_nonvolatile_pages            = 0;
-       uint64_t purgeable_nonvolatile_compressed_pages = 0;
-       uint64_t alternate_accounting_pages             = 0;
-       uint64_t alternate_accounting_compressed_pages  = 0;
-       uint64_t iokit_mapped_pages                     = 0;
-       uint64_t page_table_pages                       = 0;
-       uint64_t region_count                           = 0;
-       uint64_t cids[COALITION_NUM_TYPES];
+       int ret = 0;
 
-       memset(entry, 0, sizeof(memorystatus_jetsam_snapshot_entry_t));
+       MEMORYSTATUS_DEBUG(1, "memorystatus_dirty_clear(): %d 0x%x 0x%x\n", p->p_pid, pcontrol, p->p_memstat_dirty);
 
-       entry->pid = p->p_pid;
-       strlcpy(&entry->name[0], p->p_name, sizeof(entry->name));
-       entry->priority = p->p_memstat_effectivepriority;
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_DIRTY_CLEAR), p->p_pid, pcontrol, 0, 0, 0);
 
-       memorystatus_get_task_page_counts(p->task, &pages, &max_pages_lifetime, &purgeable_pages);
-       entry->pages              = (uint64_t)pages;
-       entry->max_pages_lifetime = (uint64_t)max_pages_lifetime;
-       entry->purgeable_pages    = (uint64_t)purgeable_pages;
+       proc_list_lock();
 
-       memorystatus_get_task_phys_footprint_page_counts(p->task, &internal_pages, &internal_compressed_pages,
-           &purgeable_nonvolatile_pages, &purgeable_nonvolatile_compressed_pages,
-           &alternate_accounting_pages, &alternate_accounting_compressed_pages,
-           &iokit_mapped_pages, &page_table_pages);
+       if ((p->p_listflag & P_LIST_EXITED) != 0) {
+               /*
+                * Process is on its way out.
+                */
+               ret = EBUSY;
+               goto exit;
+       }
 
-       entry->jse_internal_pages = internal_pages;
-       entry->jse_internal_compressed_pages = internal_compressed_pages;
-       entry->jse_purgeable_nonvolatile_pages = purgeable_nonvolatile_pages;
-       entry->jse_purgeable_nonvolatile_compressed_pages = purgeable_nonvolatile_compressed_pages;
-       entry->jse_alternate_accounting_pages = alternate_accounting_pages;
-       entry->jse_alternate_accounting_compressed_pages = alternate_accounting_compressed_pages;
-       entry->jse_iokit_mapped_pages = iokit_mapped_pages;
-       entry->jse_page_table_pages = page_table_pages;
+       if (p->p_memstat_state & P_MEMSTAT_INTERNAL) {
+               ret = EPERM;
+               goto exit;
+       }
 
-       memorystatus_get_task_memory_region_count(p->task, &region_count);
-       entry->jse_memory_region_count = region_count;
+       if (!(p->p_memstat_dirty & P_DIRTY_TRACK)) {
+               /* Dirty tracking not enabled */
+               ret = EINVAL;
+               goto exit;
+       }
 
-       entry->state     = memorystatus_build_state(p);
-       entry->user_data = p->p_memstat_userdata;
-       memcpy(&entry->uuid[0], &p->p_uuid[0], sizeof(p->p_uuid));
-       entry->fds       = p->p_fd->fd_nfiles;
+       if (!pcontrol || (pcontrol & (PROC_DIRTY_LAUNCH_IN_PROGRESS | PROC_DIRTY_DEFER | PROC_DIRTY_DEFER_ALWAYS)) == 0) {
+               ret = EINVAL;
+               goto exit;
+       }
 
-       absolutetime_to_microtime(get_task_cpu_time(p->task), &tv_sec, &tv_usec);
-       entry->cpu_time.tv_sec = (int64_t)tv_sec;
-       entry->cpu_time.tv_usec = (int64_t)tv_usec;
+       if (pcontrol & PROC_DIRTY_LAUNCH_IN_PROGRESS) {
+               p->p_memstat_dirty &= ~P_DIRTY_LAUNCH_IN_PROGRESS;
+       }
 
-       assert(p->p_stats != NULL);
-       entry->jse_starttime =  p->p_stats->ps_start;   /* abstime process started */
-       entry->jse_killtime = 0;                        /* abstime jetsam chose to kill process */
-       entry->killed       = 0;                        /* the jetsam kill cause */
-       entry->jse_gencount = gencount;                 /* indicates a pass through jetsam thread, when process was targeted to be killed */
+       /* This can be set and cleared exactly once. */
+       if (pcontrol & (PROC_DIRTY_DEFER | PROC_DIRTY_DEFER_ALWAYS)) {
+               if (p->p_memstat_dirty & P_DIRTY_DEFER) {
+                       p->p_memstat_dirty &= ~(P_DIRTY_DEFER);
+               }
 
-       entry->jse_idle_delta = p->p_memstat_idle_delta; /* Most recent timespan spent in idle-band */
+               if (p->p_memstat_dirty & P_DIRTY_DEFER_ALWAYS) {
+                       p->p_memstat_dirty &= ~(P_DIRTY_DEFER_ALWAYS);
+               }
 
-#if CONFIG_FREEZE
-       entry->jse_thaw_count = p->p_memstat_thaw_count;
-#else /* CONFIG_FREEZE */
-       entry->jse_thaw_count = 0;
-#endif /* CONFIG_FREEZE */
+               memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+               memorystatus_update_idle_priority_locked(p);
+               memorystatus_reschedule_idle_demotion_locked();
+       }
 
-       proc_coalitionids(p, cids);
-       entry->jse_coalition_jetsam_id = cids[COALITION_TYPE_JETSAM];
+       ret = 0;
+exit:
+       proc_list_unlock();
 
-       return TRUE;
+       return ret;
 }
 
-static void
-memorystatus_init_snapshot_vmstats(memorystatus_jetsam_snapshot_t *snapshot)
+int
+memorystatus_dirty_get(proc_t p, boolean_t locked)
 {
-       kern_return_t kr = KERN_SUCCESS;
-       mach_msg_type_number_t  count = HOST_VM_INFO64_COUNT;
-       vm_statistics64_data_t  vm_stat;
+       int ret = 0;
 
-       if ((kr = host_statistics64(host_self(), HOST_VM_INFO64, (host_info64_t)&vm_stat, &count)) != KERN_SUCCESS) {
-               printf("memorystatus_init_jetsam_snapshot_stats: host_statistics64 failed with %d\n", kr);
-               memset(&snapshot->stats, 0, sizeof(snapshot->stats));
-       } else {
-               snapshot->stats.free_pages      = vm_stat.free_count;
-               snapshot->stats.active_pages    = vm_stat.active_count;
-               snapshot->stats.inactive_pages  = vm_stat.inactive_count;
-               snapshot->stats.throttled_pages = vm_stat.throttled_count;
-               snapshot->stats.purgeable_pages = vm_stat.purgeable_count;
-               snapshot->stats.wired_pages     = vm_stat.wire_count;
+       if (!locked) {
+               proc_list_lock();
+       }
 
-               snapshot->stats.speculative_pages = vm_stat.speculative_count;
-               snapshot->stats.filebacked_pages  = vm_stat.external_page_count;
-               snapshot->stats.anonymous_pages   = vm_stat.internal_page_count;
-               snapshot->stats.compressions      = vm_stat.compressions;
-               snapshot->stats.decompressions    = vm_stat.decompressions;
-               snapshot->stats.compressor_pages  = vm_stat.compressor_page_count;
-               snapshot->stats.total_uncompressed_pages_in_compressor = vm_stat.total_uncompressed_pages_in_compressor;
+       if (p->p_memstat_dirty & P_DIRTY_TRACK) {
+               ret |= PROC_DIRTY_TRACKED;
+               if (p->p_memstat_dirty & P_DIRTY_ALLOW_IDLE_EXIT) {
+                       ret |= PROC_DIRTY_ALLOWS_IDLE_EXIT;
+               }
+               if (p->p_memstat_dirty & P_DIRTY) {
+                       ret |= PROC_DIRTY_IS_DIRTY;
+               }
+               if (p->p_memstat_dirty & P_DIRTY_LAUNCH_IN_PROGRESS) {
+                       ret |= PROC_DIRTY_LAUNCH_IS_IN_PROGRESS;
+               }
        }
 
-       get_zone_map_size(&snapshot->stats.zone_map_size, &snapshot->stats.zone_map_capacity);
-       get_largest_zone_info(snapshot->stats.largest_zone_name, sizeof(snapshot->stats.largest_zone_name),
-           &snapshot->stats.largest_zone_size);
-}
+       if (!locked) {
+               proc_list_unlock();
+       }
 
-/*
- * Collect vm statistics at boot.
- * Called only once (see kern_exec.c)
- * Data can be consumed at any time.
- */
-void
-memorystatus_init_at_boot_snapshot()
-{
-       memorystatus_init_snapshot_vmstats(&memorystatus_at_boot_snapshot);
-       memorystatus_at_boot_snapshot.entry_count = 0;
-       memorystatus_at_boot_snapshot.notification_time = 0;   /* updated when consumed */
-       memorystatus_at_boot_snapshot.snapshot_time = mach_absolute_time();
+       return ret;
 }
 
-static void
-memorystatus_init_jetsam_snapshot_locked(memorystatus_jetsam_snapshot_t *od_snapshot, uint32_t ods_list_count )
+int
+memorystatus_on_terminate(proc_t p)
 {
-       proc_t p, next_p;
-       unsigned int b = 0, i = 0;
+       int sig;
 
-       memorystatus_jetsam_snapshot_t *snapshot = NULL;
-       memorystatus_jetsam_snapshot_entry_t *snapshot_list = NULL;
-       unsigned int snapshot_max = 0;
+       proc_list_lock();
 
-       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
+       p->p_memstat_dirty |= P_DIRTY_TERMINATED;
 
-       if (od_snapshot) {
+       if (((p->p_memstat_dirty & (P_DIRTY_TRACK | P_DIRTY_IS_DIRTY)) == P_DIRTY_TRACK) ||
+           (p->p_memstat_state & P_MEMSTAT_SUSPENDED)) {
                /*
-                * This is an on_demand snapshot
+                * Mark as terminated and issue SIGKILL if:-
+                * - process is clean, or,
+                * - if process is dirty but suspended. This case is likely
+                * an extension because apps don't opt into dirty-tracking
+                * and daemons aren't suspended.
                 */
-               snapshot      = od_snapshot;
-               snapshot_list = od_snapshot->entries;
-               snapshot_max  = ods_list_count;
+#if DEVELOPMENT || DEBUG
+               if (p->p_memstat_state & P_MEMSTAT_SUSPENDED) {
+                       os_log(OS_LOG_DEFAULT, "memorystatus: sending suspended process %s (pid %d) SIGKILL",
+                           (*p->p_name ? p->p_name : "unknown"), p->p_pid);
+               }
+#endif /* DEVELOPMENT || DEBUG */
+               sig = SIGKILL;
        } else {
-               /*
-                * This is a jetsam event snapshot
-                */
-               snapshot      = memorystatus_jetsam_snapshot;
-               snapshot_list = memorystatus_jetsam_snapshot->entries;
-               snapshot_max  = memorystatus_jetsam_snapshot_max;
+               /* Dirty, terminated, or state tracking is unsupported; issue SIGTERM to allow cleanup */
+               sig = SIGTERM;
        }
 
-       /*
-        * Init the snapshot header information
-        */
-       memorystatus_init_snapshot_vmstats(snapshot);
-       snapshot->snapshot_time = mach_absolute_time();
-       snapshot->notification_time = 0;
-       snapshot->js_gencount = 0;
+       proc_list_unlock();
+
+       return sig;
+}
+
+void
+memorystatus_on_suspend(proc_t p)
+{
+#if CONFIG_FREEZE
+       uint32_t pages;
+       memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
+#endif
+       proc_list_lock();
+#if CONFIG_FREEZE
+       memorystatus_suspended_count++;
+#endif
+       p->p_memstat_state |= P_MEMSTAT_SUSPENDED;
+       proc_list_unlock();
+}
 
-       next_p = memorystatus_get_first_proc_locked(&b, TRUE);
-       while (next_p) {
-               p = next_p;
-               next_p = memorystatus_get_next_proc_locked(&b, p, TRUE);
+extern uint64_t memorystatus_thaw_count_since_boot;
 
-               if (FALSE == memorystatus_init_jetsam_snapshot_entry_locked(p, &snapshot_list[i], snapshot->js_gencount)) {
-                       continue;
-               }
+void
+memorystatus_on_resume(proc_t p)
+{
+#if CONFIG_FREEZE
+       boolean_t frozen;
+       pid_t pid;
+#endif
 
-               MEMORYSTATUS_DEBUG(0, "jetsam snapshot pid %d, uuid = %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-                   p->p_pid,
-                   p->p_uuid[0], p->p_uuid[1], p->p_uuid[2], p->p_uuid[3], p->p_uuid[4], p->p_uuid[5], p->p_uuid[6], p->p_uuid[7],
-                   p->p_uuid[8], p->p_uuid[9], p->p_uuid[10], p->p_uuid[11], p->p_uuid[12], p->p_uuid[13], p->p_uuid[14], p->p_uuid[15]);
+       proc_list_lock();
 
-               if (++i == snapshot_max) {
-                       break;
+#if CONFIG_FREEZE
+       frozen = (p->p_memstat_state & P_MEMSTAT_FROZEN);
+       if (frozen) {
+               /*
+                * Now that we don't _thaw_ a process completely,
+                * resuming it (and having some on-demand swapins)
+                * shouldn't preclude it from being counted as frozen.
+                *
+                * memorystatus_frozen_count--;
+                *
+                * We preserve the P_MEMSTAT_FROZEN state since the process
+                * could have state on disk AND so will deserve some protection
+                * in the jetsam bands.
+                */
+               if ((p->p_memstat_state & P_MEMSTAT_REFREEZE_ELIGIBLE) == 0) {
+                       p->p_memstat_state |= P_MEMSTAT_REFREEZE_ELIGIBLE;
+                       memorystatus_refreeze_eligible_count++;
                }
-       }
-
-       snapshot->entry_count = i;
+               p->p_memstat_thaw_count++;
 
-       if (!od_snapshot) {
-               /* update the system buffer count */
-               memorystatus_jetsam_snapshot_count = i;
+               memorystatus_thaw_count++;
+               memorystatus_thaw_count_since_boot++;
        }
-}
-
-#if DEVELOPMENT || DEBUG
 
-#if CONFIG_JETSAM
-static int
-memorystatus_cmd_set_panic_bits(user_addr_t buffer, uint32_t buffer_size)
-{
-       int ret;
-       memorystatus_jetsam_panic_options_t debug;
+       memorystatus_suspended_count--;
 
-       if (buffer_size != sizeof(memorystatus_jetsam_panic_options_t)) {
-               return EINVAL;
-       }
+       pid = p->p_pid;
+#endif
 
-       ret = copyin(buffer, &debug, buffer_size);
-       if (ret) {
-               return ret;
-       }
+       /*
+        * P_MEMSTAT_FROZEN will remain unchanged. This used to be:
+        * p->p_memstat_state &= ~(P_MEMSTAT_SUSPENDED | P_MEMSTAT_FROZEN);
+        */
+       p->p_memstat_state &= ~P_MEMSTAT_SUSPENDED;
 
-       /* Panic bits match kMemorystatusKilled* enum */
-       memorystatus_jetsam_panic_debug = (memorystatus_jetsam_panic_debug & ~debug.mask) | (debug.data & debug.mask);
+       proc_list_unlock();
 
-       /* Copyout new value */
-       debug.data = memorystatus_jetsam_panic_debug;
-       ret = copyout(&debug, buffer, sizeof(memorystatus_jetsam_panic_options_t));
+#if CONFIG_FREEZE
+       if (frozen) {
+               memorystatus_freeze_entry_t data = { pid, FALSE, 0 };
+               memorystatus_send_note(kMemorystatusFreezeNote, &data, sizeof(data));
+       }
+#endif
+}
 
-       return ret;
+void
+memorystatus_on_inactivity(proc_t p)
+{
+#pragma unused(p)
+#if CONFIG_FREEZE
+       /* Wake the freeze thread */
+       thread_wakeup((event_t)&memorystatus_freeze_wakeup);
+#endif
 }
-#endif /* CONFIG_JETSAM */
 
 /*
- * Triggers a sort_order on a specified jetsam priority band.
- * This is for testing only, used to force a path through the sort
- * function.
+ * The proc_list_lock is held by the caller.
  */
-static int
-memorystatus_cmd_test_jetsam_sort(int priority, int sort_order)
+static uint32_t
+memorystatus_build_state(proc_t p)
 {
-       int error = 0;
-
-       unsigned int bucket_index = 0;
+       uint32_t snapshot_state = 0;
 
-       if (priority == -1) {
-               /* Use as shorthand for default priority */
-               bucket_index = JETSAM_PRIORITY_DEFAULT;
-       } else {
-               bucket_index = (unsigned int)priority;
+       /* General */
+       if (p->p_memstat_state & P_MEMSTAT_SUSPENDED) {
+               snapshot_state |= kMemorystatusSuspended;
+       }
+       if (p->p_memstat_state & P_MEMSTAT_FROZEN) {
+               snapshot_state |= kMemorystatusFrozen;
+       }
+       if (p->p_memstat_state & P_MEMSTAT_REFREEZE_ELIGIBLE) {
+               snapshot_state |= kMemorystatusWasThawed;
+       }
+       if (p->p_memstat_state & P_MEMSTAT_PRIORITY_ASSERTION) {
+               snapshot_state |= kMemorystatusAssertion;
        }
 
-       error = memorystatus_sort_bucket(bucket_index, sort_order);
+       /* Tracking */
+       if (p->p_memstat_dirty & P_DIRTY_TRACK) {
+               snapshot_state |= kMemorystatusTracked;
+       }
+       if ((p->p_memstat_dirty & P_DIRTY_IDLE_EXIT_ENABLED) == P_DIRTY_IDLE_EXIT_ENABLED) {
+               snapshot_state |= kMemorystatusSupportsIdleExit;
+       }
+       if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
+               snapshot_state |= kMemorystatusDirty;
+       }
 
-       return error;
+       return snapshot_state;
 }
 
-#endif /* DEVELOPMENT || DEBUG */
-
-/*
- * Prepare the process to be killed (set state, update snapshot) and kill it.
- */
-static uint64_t memorystatus_purge_before_jetsam_success = 0;
-
 static boolean_t
-memorystatus_kill_proc(proc_t p, uint32_t cause, os_reason_t jetsam_reason, boolean_t *killed)
+kill_idle_exit_proc(void)
 {
-       pid_t aPid = 0;
-       uint32_t aPid_ep = 0;
-
-       uint64_t        killtime = 0;
-       clock_sec_t     tv_sec;
-       clock_usec_t    tv_usec;
-       uint32_t        tv_msec;
-       boolean_t       retval = FALSE;
-       uint64_t        num_pages_purged = 0;
-
-       aPid = p->p_pid;
-       aPid_ep = p->p_memstat_effectivepriority;
-
-       if (cause != kMemorystatusKilledVnodes && cause != kMemorystatusKilledZoneMapExhaustion) {
-               /*
-                * Genuine memory pressure and not other (vnode/zone) resource exhaustion.
-                */
-               boolean_t success = FALSE;
-
-               networking_memstatus_callout(p, cause);
-               num_pages_purged = vm_purgeable_purge_task_owned(p->task);
+       proc_t p, victim_p = PROC_NULL;
+       uint64_t current_time, footprint_of_killed_proc;
+       boolean_t killed = FALSE;
+       unsigned int i = 0;
+       os_reason_t jetsam_reason = OS_REASON_NULL;
 
-               if (num_pages_purged) {
-                       /*
-                        * We actually purged something and so let's
-                        * check if we need to continue with the kill.
-                        */
-                       if (cause == kMemorystatusKilledHiwat) {
-                               uint64_t footprint_in_bytes = get_task_phys_footprint(p->task);
-                               uint64_t memlimit_in_bytes  = (((uint64_t)p->p_memstat_memlimit) * 1024ULL * 1024ULL);  /* convert MB to bytes */
-                               success = (footprint_in_bytes <= memlimit_in_bytes);
-                       } else {
-                               success = (memorystatus_avail_pages_below_pressure() == FALSE);
-                       }
+       /* Pick next idle exit victim. */
+       current_time = mach_absolute_time();
 
-                       if (success) {
-                               memorystatus_purge_before_jetsam_success++;
+       jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_IDLE_EXIT);
+       if (jetsam_reason == OS_REASON_NULL) {
+               printf("kill_idle_exit_proc: failed to allocate jetsam reason\n");
+       }
 
-                               os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus: purged %llu pages from pid %d [%s] and avoided %s\n",
-                                   num_pages_purged, aPid, (*p->p_name ? p->p_name : "unknown"), memorystatus_kill_cause_name[cause]);
+       proc_list_lock();
 
-                               *killed = FALSE;
+       p = memorystatus_get_first_proc_locked(&i, FALSE);
+       while (p) {
+               /* No need to look beyond the idle band */
+               if (p->p_memstat_effectivepriority != JETSAM_PRIORITY_IDLE) {
+                       break;
+               }
 
-                               return TRUE;
+               if ((p->p_memstat_dirty & (P_DIRTY_ALLOW_IDLE_EXIT | P_DIRTY_IS_DIRTY | P_DIRTY_TERMINATED)) == (P_DIRTY_ALLOW_IDLE_EXIT)) {
+                       if (current_time >= p->p_memstat_idledeadline) {
+                               p->p_memstat_dirty |= P_DIRTY_TERMINATED;
+                               victim_p = proc_ref_locked(p);
+                               break;
                        }
                }
+
+               p = memorystatus_get_next_proc_locked(&i, p, FALSE);
        }
 
-#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
-       MEMORYSTATUS_DEBUG(1, "jetsam: %s pid %d [%s] - %lld Mb > 1 (%d Mb)\n",
-           (memorystatus_jetsam_policy & kPolicyDiagnoseActive) ? "suspending": "killing",
-           aPid, (*p->p_name ? p->p_name : "unknown"),
-           (footprint_in_bytes / (1024ULL * 1024ULL)),                 /* converted bytes to MB */
-           p->p_memstat_memlimit);
-#endif /* CONFIG_JETSAM && (DEVELOPMENT || DEBUG) */
+       proc_list_unlock();
 
-       killtime = mach_absolute_time();
-       absolutetime_to_microtime(killtime, &tv_sec, &tv_usec);
-       tv_msec = tv_usec / 1000;
+       if (victim_p) {
+               printf("memorystatus: killing_idle_process pid %d [%s] jetsam_reason->osr_code: %llu\n", victim_p->p_pid, (*victim_p->p_name ? victim_p->p_name : "unknown"), jetsam_reason->osr_code);
+               killed = memorystatus_do_kill(victim_p, kMemorystatusKilledIdleExit, jetsam_reason, &footprint_of_killed_proc);
+               proc_rele(victim_p);
+       } else {
+               os_reason_free(jetsam_reason);
+       }
 
-#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
-       if (memorystatus_jetsam_policy & kPolicyDiagnoseActive) {
-               if (cause == kMemorystatusKilledHiwat) {
-                       MEMORYSTATUS_DEBUG(1, "jetsam: suspending pid %d [%s] for diagnosis - memorystatus_available_pages: %d\n",
-                           aPid, (*p->p_name ? p->p_name: "(unknown)"), memorystatus_available_pages);
-               } else {
-                       int activeProcess = p->p_memstat_state & P_MEMSTAT_FOREGROUND;
-                       if (activeProcess) {
-                               MEMORYSTATUS_DEBUG(1, "jetsam: suspending pid %d [%s] (active) for diagnosis - memorystatus_available_pages: %d\n",
-                                   aPid, (*p->p_name ? p->p_name: "(unknown)"), memorystatus_available_pages);
-
-                               if (memorystatus_jetsam_policy & kPolicyDiagnoseFirst) {
-                                       jetsam_diagnostic_suspended_one_active_proc = 1;
-                                       printf("jetsam: returning after suspending first active proc - %d\n", aPid);
-                               }
-                       }
-               }
+       return killed;
+}
 
-               proc_list_lock();
-               /* This diagnostic code is going away soon. Ignore the kMemorystatusInvalid cause here. */
-               memorystatus_update_jetsam_snapshot_entry_locked(p, kMemorystatusInvalid, killtime);
-               proc_list_unlock();
+static void
+memorystatus_thread_wake(void)
+{
+       int thr_id = 0;
+       int active_thr = atomic_load(&active_jetsam_threads);
 
-               p->p_memstat_state |= P_MEMSTAT_DIAG_SUSPENDED;
+       /* Wakeup all the jetsam threads */
+       for (thr_id = 0; thr_id < active_thr; thr_id++) {
+               thread_wakeup((event_t)&jetsam_threads[thr_id].memorystatus_wakeup);
+       }
+}
 
-               if (p) {
-                       task_suspend(p->task);
-                       *killed = TRUE;
-               }
-       } else
-#endif /* CONFIG_JETSAM && (DEVELOPMENT || DEBUG) */
-       {
-               proc_list_lock();
-               memorystatus_update_jetsam_snapshot_entry_locked(p, cause, killtime);
-               proc_list_unlock();
+#if CONFIG_JETSAM
 
-               char kill_reason_string[128];
+static void
+memorystatus_thread_pool_max()
+{
+       /* Increase the jetsam thread pool to max_jetsam_threads */
+       int max_threads = max_jetsam_threads;
+       printf("Expanding memorystatus pool to %d!\n", max_threads);
+       atomic_store(&active_jetsam_threads, max_threads);
+}
 
-               if (cause == kMemorystatusKilledHiwat) {
-                       strlcpy(kill_reason_string, "killing_highwater_process", 128);
-               } else {
-                       if (aPid_ep == JETSAM_PRIORITY_IDLE) {
-                               strlcpy(kill_reason_string, "killing_idle_process", 128);
-                       } else {
-                               strlcpy(kill_reason_string, "killing_top_process", 128);
-                       }
-               }
+static void
+memorystatus_thread_pool_default()
+{
+       /* Restore the jetsam thread pool to a single thread */
+       printf("Reverting memorystatus pool back to 1\n");
+       atomic_store(&active_jetsam_threads, 1);
+}
 
-               os_log_with_startup_serial(OS_LOG_DEFAULT, "%lu.%03d memorystatus: %s pid %d [%s] (%s %d) - memorystatus_available_pages: %llu\n",
-                   (unsigned long)tv_sec, tv_msec, kill_reason_string,
-                   aPid, (*p->p_name ? p->p_name : "unknown"),
-                   memorystatus_kill_cause_name[cause], aPid_ep, (uint64_t)memorystatus_available_pages);
+#endif /* CONFIG_JETSAM */
 
-               /*
-                * memorystatus_do_kill drops a reference, so take another one so we can
-                * continue to use this exit reason even after memorystatus_do_kill()
-                * returns
-                */
-               os_reason_ref(jetsam_reason);
+extern void vm_pressure_response(void);
 
-               retval = memorystatus_do_kill(p, cause, jetsam_reason);
+static int
+memorystatus_thread_block(uint32_t interval_ms, thread_continue_t continuation)
+{
+       struct jetsam_thread_state *jetsam_thread = jetsam_current_thread();
 
-               *killed = retval;
+       assert(jetsam_thread != NULL);
+       if (interval_ms) {
+               assert_wait_timeout(&jetsam_thread->memorystatus_wakeup, THREAD_UNINT, interval_ms, NSEC_PER_MSEC);
+       } else {
+               assert_wait(&jetsam_thread->memorystatus_wakeup, THREAD_UNINT);
        }
 
-       return retval;
+       return thread_block(continuation);
 }
 
-/*
- * Jetsam the first process in the queue.
- */
 static boolean_t
-memorystatus_kill_top_process(boolean_t any, boolean_t sort_flag, uint32_t cause, os_reason_t jetsam_reason,
-    int32_t *priority, uint32_t *errors)
+memorystatus_avail_pages_below_pressure(void)
 {
-       pid_t aPid;
-       proc_t p = PROC_NULL, next_p = PROC_NULL;
-       boolean_t new_snapshot = FALSE, force_new_snapshot = FALSE, killed = FALSE, freed_mem = FALSE;
-       unsigned int i = 0;
-       uint32_t aPid_ep;
-       int32_t         local_max_kill_prio = JETSAM_PRIORITY_IDLE;
-
-#ifndef CONFIG_FREEZE
-#pragma unused(any)
-#endif
-
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_START,
-           memorystatus_available_pages, 0, 0, 0, 0);
-
-
 #if CONFIG_JETSAM
-       if (sort_flag == TRUE) {
-               (void)memorystatus_sort_bucket(JETSAM_PRIORITY_FOREGROUND, JETSAM_SORT_DEFAULT);
-       }
-
-       local_max_kill_prio = max_kill_priority;
-
-       force_new_snapshot = FALSE;
+       return memorystatus_available_pages <= memorystatus_available_pages_pressure;
+#else /* CONFIG_JETSAM */
+       return FALSE;
+#endif /* CONFIG_JETSAM */
+}
 
+static boolean_t
+memorystatus_avail_pages_below_critical(void)
+{
+#if CONFIG_JETSAM
+       return memorystatus_available_pages <= memorystatus_available_pages_critical;
 #else /* CONFIG_JETSAM */
+       return FALSE;
+#endif /* CONFIG_JETSAM */
+}
 
-       if (sort_flag == TRUE) {
-               (void)memorystatus_sort_bucket(JETSAM_PRIORITY_IDLE, JETSAM_SORT_DEFAULT);
-       }
+static boolean_t
+memorystatus_post_snapshot(int32_t priority, uint32_t cause)
+{
+       boolean_t is_idle_priority;
 
-       /*
-        * On macos, we currently only have 2 reasons to be here:
-        *
-        * kMemorystatusKilledZoneMapExhaustion
-        * AND
-        * kMemorystatusKilledVMCompressorSpaceShortage
-        *
-        * If we are here because of kMemorystatusKilledZoneMapExhaustion, we will consider
-        * any and all processes as eligible kill candidates since we need to avoid a panic.
-        *
-        * Since this function can be called async. it is harder to toggle the max_kill_priority
-        * value before and after a call. And so we use this local variable to set the upper band
-        * on the eligible kill bands.
-        */
-       if (cause == kMemorystatusKilledZoneMapExhaustion) {
-               local_max_kill_prio = JETSAM_PRIORITY_MAX;
+       if (jetsam_aging_policy == kJetsamAgingPolicyLegacy) {
+               is_idle_priority = (priority == JETSAM_PRIORITY_IDLE);
        } else {
-               local_max_kill_prio = max_kill_priority;
+               is_idle_priority = (priority == JETSAM_PRIORITY_IDLE || priority == JETSAM_PRIORITY_IDLE_DEFERRED);
        }
-
+#if CONFIG_JETSAM
+#pragma unused(cause)
        /*
-        * And, because we are here under extreme circumstances, we force a snapshot even for
-        * IDLE kills.
+        * Don't generate logs for steady-state idle-exit kills,
+        * unless it is overridden for debug or by the device
+        * tree.
         */
-       force_new_snapshot = TRUE;
-
-#endif /* CONFIG_JETSAM */
-
-       proc_list_lock();
-
-       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
-       while (next_p && (next_p->p_memstat_effectivepriority <= local_max_kill_prio)) {
-#if DEVELOPMENT || DEBUG
-               int procSuspendedForDiagnosis;
-#endif /* DEVELOPMENT || DEBUG */
-
-               p = next_p;
-               next_p = memorystatus_get_next_proc_locked(&i, p, TRUE);
 
-#if DEVELOPMENT || DEBUG
-               procSuspendedForDiagnosis = p->p_memstat_state & P_MEMSTAT_DIAG_SUSPENDED;
-#endif /* DEVELOPMENT || DEBUG */
-
-               aPid = p->p_pid;
-               aPid_ep = p->p_memstat_effectivepriority;
-
-               if (p->p_memstat_state & (P_MEMSTAT_ERROR | P_MEMSTAT_TERMINATED)) {
-                       continue;   /* with lock held */
-               }
-
-#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
-               if ((memorystatus_jetsam_policy & kPolicyDiagnoseActive) && procSuspendedForDiagnosis) {
-                       printf("jetsam: continuing after ignoring proc suspended already for diagnosis - %d\n", aPid);
-                       continue;
-               }
-#endif /* CONFIG_JETSAM && (DEVELOPMENT || DEBUG) */
-
-               if (cause == kMemorystatusKilledVnodes) {
-                       /*
-                        * If the system runs out of vnodes, we systematically jetsam
-                        * processes in hopes of stumbling onto a vnode gain that helps
-                        * the system recover.  The process that happens to trigger
-                        * this path has no known relationship to the vnode shortage.
-                        * Deadlock avoidance: attempt to safeguard the caller.
-                        */
-
-                       if (p == current_proc()) {
-                               /* do not jetsam the current process */
-                               continue;
-                       }
-               }
-
-#if CONFIG_FREEZE
-               boolean_t skip;
-               boolean_t reclaim_proc = !(p->p_memstat_state & P_MEMSTAT_LOCKED);
-               if (any || reclaim_proc) {
-                       skip = FALSE;
-               } else {
-                       skip = TRUE;
-               }
+       return !is_idle_priority || memorystatus_idle_snapshot;
 
-               if (skip) {
-                       continue;
-               } else
-#endif
-               {
-                       if (proc_ref_locked(p) == p) {
-                               /*
-                                * Mark as terminated so that if exit1() indicates success, but the process (for example)
-                                * is blocked in task_exception_notify(), it'll be skipped if encountered again - see
-                                * <rdar://problem/13553476>. This is cheaper than examining P_LEXIT, which requires the
-                                * acquisition of the proc lock.
-                                */
-                               p->p_memstat_state |= P_MEMSTAT_TERMINATED;
-                       } else {
-                               /*
-                                * We need to restart the search again because
-                                * proc_ref_locked _can_ drop the proc_list lock
-                                * and we could have lost our stored next_p via
-                                * an exit() on another core.
-                                */
-                               i = 0;
-                               next_p = memorystatus_get_first_proc_locked(&i, TRUE);
-                               continue;
-                       }
+#else /* CONFIG_JETSAM */
+       /*
+        * Don't generate logs for steady-state idle-exit kills,
+        * unless
+        * - it is overridden for debug or by the device
+        * tree.
+        * OR
+        * - the kill causes are important i.e. not kMemorystatusKilledIdleExit
+        */
 
-                       /*
-                        * Capture a snapshot if none exists and:
-                        * - we are forcing a new snapshot creation, either because:
-                        *      - on a particular platform we need these snapshots every time, OR
-                        *      - a boot-arg/embedded device tree property has been set.
-                        * - priority was not requested (this is something other than an ambient kill)
-                        * - the priority was requested *and* the targeted process is not at idle priority
-                        */
-                       if ((memorystatus_jetsam_snapshot_count == 0) &&
-                           (force_new_snapshot || memorystatus_idle_snapshot || ((!priority) || (priority && (aPid_ep != JETSAM_PRIORITY_IDLE))))) {
-                               memorystatus_init_jetsam_snapshot_locked(NULL, 0);
-                               new_snapshot = TRUE;
-                       }
+       boolean_t snapshot_eligible_kill_cause = (is_reason_thrashing(cause) || is_reason_zone_map_exhaustion(cause));
+       return !is_idle_priority || memorystatus_idle_snapshot || snapshot_eligible_kill_cause;
+#endif /* CONFIG_JETSAM */
+}
 
-                       proc_list_unlock();
+static boolean_t
+memorystatus_action_needed(void)
+{
+#if CONFIG_JETSAM
+       return is_reason_thrashing(kill_under_pressure_cause) ||
+              is_reason_zone_map_exhaustion(kill_under_pressure_cause) ||
+              memorystatus_available_pages <= memorystatus_available_pages_pressure;
+#else /* CONFIG_JETSAM */
+       return is_reason_thrashing(kill_under_pressure_cause) ||
+              is_reason_zone_map_exhaustion(kill_under_pressure_cause);
+#endif /* CONFIG_JETSAM */
+}
 
-                       freed_mem = memorystatus_kill_proc(p, cause, jetsam_reason, &killed); /* purged and/or killed 'p' */
-                       /* Success? */
-                       if (freed_mem) {
-                               if (killed) {
-                                       if (priority) {
-                                               *priority = aPid_ep;
-                                       }
-                               } else {
-                                       /* purged */
-                                       proc_list_lock();
-                                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
-                                       proc_list_unlock();
-                               }
-                               proc_rele(p);
-                               goto exit;
-                       }
+static boolean_t
+memorystatus_act_on_hiwat_processes(uint32_t *errors, uint32_t *hwm_kill, boolean_t *post_snapshot, __unused boolean_t *is_critical, uint64_t *memory_reclaimed)
+{
+       boolean_t purged = FALSE, killed = FALSE;
 
-                       /*
-                        * Failure - first unwind the state,
-                        * then fall through to restart the search.
-                        */
-                       proc_list_lock();
-                       proc_rele_locked(p);
-                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
-                       p->p_memstat_state |= P_MEMSTAT_ERROR;
-                       *errors += 1;
+       *memory_reclaimed = 0;
+       killed = memorystatus_kill_hiwat_proc(errors, &purged, memory_reclaimed);
 
-                       i = 0;
-                       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+       if (killed) {
+               *hwm_kill = *hwm_kill + 1;
+               *post_snapshot = TRUE;
+               return TRUE;
+       } else {
+               if (purged == FALSE) {
+                       /* couldn't purge and couldn't kill */
+                       memorystatus_hwm_candidates = FALSE;
                }
        }
 
-       proc_list_unlock();
-
-exit:
-       os_reason_free(jetsam_reason);
+#if CONFIG_JETSAM
+       /* No highwater processes to kill. Continue or stop for now? */
+       if (!is_reason_thrashing(kill_under_pressure_cause) &&
+           !is_reason_zone_map_exhaustion(kill_under_pressure_cause) &&
+           (memorystatus_available_pages > memorystatus_available_pages_critical)) {
+               /*
+                * We are _not_ out of pressure but we are above the critical threshold and there's:
+                * - no compressor thrashing
+                * - enough zone memory
+                * - no more HWM processes left.
+                * For now, don't kill any other processes.
+                */
 
-       /* Clear snapshot if freshly captured and no target was found */
-       if (new_snapshot && !killed) {
-               proc_list_lock();
-               memorystatus_jetsam_snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
-               proc_list_unlock();
-       }
+               if (*hwm_kill == 0) {
+                       memorystatus_thread_wasted_wakeup++;
+               }
 
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_END,
-           memorystatus_available_pages, killed ? aPid : 0, 0, 0, 0);
+               *is_critical = FALSE;
 
-       return killed;
+               return TRUE;
+       }
+#endif /* CONFIG_JETSAM */
+
+       return FALSE;
 }
 
 /*
- * Jetsam aggressively
+ * kJetsamHighRelaunchCandidatesThreshold defines the percentage of candidates
+ * in the idle & deferred bands that need to be bad candidates in order to trigger
+ * aggressive jetsam.
+ */
+#define kJetsamHighRelaunchCandidatesThreshold  (100)
+
+/* kJetsamMinCandidatesThreshold defines the minimum number of candidates in the
+ * idle/deferred bands to trigger aggressive jetsam. This value basically decides
+ * how much memory the system is ready to hold in the lower bands without triggering
+ * aggressive jetsam. This number should ideally be tuned based on the memory config
+ * of the device.
  */
+#define kJetsamMinCandidatesThreshold           (5)
+
 static boolean_t
-memorystatus_kill_top_process_aggressive(uint32_t cause, int aggr_count,
-    int32_t priority_max, uint32_t *errors)
+memorystatus_aggressive_jetsam_needed_sysproc_aging(__unused int jld_eval_aggressive_count, __unused int *jld_idle_kills, __unused int jld_idle_kill_candidates, int *total_candidates, int *elevated_bucket_count)
 {
-       pid_t aPid;
-       proc_t p = PROC_NULL, next_p = PROC_NULL;
-       boolean_t new_snapshot = FALSE, killed = FALSE;
-       int kill_count = 0;
-       unsigned int i = 0;
-       int32_t aPid_ep = 0;
-       unsigned int memorystatus_level_snapshot = 0;
-       uint64_t killtime = 0;
-       clock_sec_t     tv_sec;
-       clock_usec_t    tv_usec;
-       uint32_t        tv_msec;
-       os_reason_t jetsam_reason = OS_REASON_NULL;
+       boolean_t aggressive_jetsam_needed = false;
 
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_START,
-           memorystatus_available_pages, priority_max, 0, 0, 0);
+       /*
+        * For the kJetsamAgingPolicySysProcsReclaimedFirst aging policy, we maintain the jetsam
+        * relaunch behavior for all daemons. Also, daemons and apps are aged in deferred bands on
+        * every dirty->clean transition. For this aging policy, the best way to determine if
+        * aggressive jetsam is needed, is to see if the kill candidates are mostly bad candidates.
+        * If yes, then we need to go to higher bands to reclaim memory.
+        */
+       proc_list_lock();
+       /* Get total candidate counts for idle and idle deferred bands */
+       *total_candidates = memstat_bucket[JETSAM_PRIORITY_IDLE].count + memstat_bucket[system_procs_aging_band].count;
+       /* Get counts of bad kill candidates in idle and idle deferred bands */
+       int bad_candidates = memstat_bucket[JETSAM_PRIORITY_IDLE].relaunch_high_count + memstat_bucket[system_procs_aging_band].relaunch_high_count;
 
-       memorystatus_sort_bucket(JETSAM_PRIORITY_FOREGROUND, JETSAM_SORT_DEFAULT);
+       *elevated_bucket_count = memstat_bucket[JETSAM_PRIORITY_ELEVATED_INACTIVE].count;
 
-       jetsam_reason = os_reason_create(OS_REASON_JETSAM, cause);
-       if (jetsam_reason == OS_REASON_NULL) {
-               printf("memorystatus_kill_top_process_aggressive: failed to allocate exit reason\n");
-       }
+       proc_list_unlock();
 
-       proc_list_lock();
+       /* Check if the number of bad candidates is greater than kJetsamHighRelaunchCandidatesThreshold % */
+       aggressive_jetsam_needed = (((bad_candidates * 100) / *total_candidates) >= kJetsamHighRelaunchCandidatesThreshold);
+
+       /*
+        * Since the new aging policy bases the aggressive jetsam trigger on percentage of
+        * bad candidates, it is prone to being overly aggressive. In order to mitigate that,
+        * make sure the system is really under memory pressure before triggering aggressive
+        * jetsam.
+        */
+       if (memorystatus_available_pages > memorystatus_sysproc_aging_aggr_pages) {
+               aggressive_jetsam_needed = false;
+       }
 
-       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
-       while (next_p) {
 #if DEVELOPMENT || DEBUG
-               int activeProcess;
-               int procSuspendedForDiagnosis;
+       printf("memorystatus: aggressive%d: [%s] Bad Candidate Threshold Check (total: %d, bad: %d, threshold: %d %%); Memory Pressure Check (available_pgs: %llu, threshold_pgs: %llu)\n",
+           jld_eval_aggressive_count, aggressive_jetsam_needed ? "PASSED" : "FAILED", *total_candidates, bad_candidates,
+           kJetsamHighRelaunchCandidatesThreshold, (uint64_t)MEMORYSTATUS_LOG_AVAILABLE_PAGES, (uint64_t)memorystatus_sysproc_aging_aggr_pages);
 #endif /* DEVELOPMENT || DEBUG */
+       return aggressive_jetsam_needed;
+}
 
-               if (((next_p->p_listflag & P_LIST_EXITED) != 0) ||
-                   ((unsigned int)(next_p->p_memstat_effectivepriority) != i)) {
-                       /*
-                        * We have raced with next_p running on another core.
-                        * It may be exiting or it may have moved to a different
-                        * jetsam priority band.  This means we have lost our
-                        * place in line while traversing the jetsam list.  We
-                        * attempt to recover by rewinding to the beginning of the band
-                        * we were already traversing.  By doing this, we do not guarantee
-                        * that no process escapes this aggressive march, but we can make
-                        * skipping an entire range of processes less likely. (PR-21069019)
-                        */
+/*
+ * Gets memory back from various system caches.
+ * Called before jetsamming in the foreground band in the hope that we'll
+ * avoid a jetsam.
+ */
+static void
+memorystatus_approaching_fg_band(boolean_t *corpse_list_purged)
+{
+       assert(corpse_list_purged != NULL);
+       pmap_release_pages_fast();
+       memorystatus_issue_fg_band_notify();
+       if (total_corpses_count() > 0 && !*corpse_list_purged) {
+               task_purge_all_corpses();
+               *corpse_list_purged = TRUE;
+       }
+}
 
-                       MEMORYSTATUS_DEBUG(1, "memorystatus: aggressive%d: rewinding band %d, %s(%d) moved or exiting.\n",
-                           aggr_count, i, (*next_p->p_name ? next_p->p_name : "unknown"), next_p->p_pid);
+static boolean_t
+memorystatus_aggressive_jetsam_needed_default(__unused int jld_eval_aggressive_count, int *jld_idle_kills, int jld_idle_kill_candidates, int *total_candidates, int *elevated_bucket_count)
+{
+       boolean_t aggressive_jetsam_needed = false;
+       /* Jetsam Loop Detection - locals */
+       memstat_bucket_t *bucket;
+       int             jld_bucket_count = 0;
 
-                       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
-                       continue;
-               }
+       proc_list_lock();
+       switch (jetsam_aging_policy) {
+       case kJetsamAgingPolicyLegacy:
+               bucket = &memstat_bucket[JETSAM_PRIORITY_IDLE];
+               jld_bucket_count = bucket->count;
+               bucket = &memstat_bucket[JETSAM_PRIORITY_AGING_BAND1];
+               jld_bucket_count += bucket->count;
+               break;
+       case kJetsamAgingPolicyAppsReclaimedFirst:
+               bucket = &memstat_bucket[JETSAM_PRIORITY_IDLE];
+               jld_bucket_count = bucket->count;
+               bucket = &memstat_bucket[system_procs_aging_band];
+               jld_bucket_count += bucket->count;
+               bucket = &memstat_bucket[applications_aging_band];
+               jld_bucket_count += bucket->count;
+               break;
+       case kJetsamAgingPolicyNone:
+       default:
+               bucket = &memstat_bucket[JETSAM_PRIORITY_IDLE];
+               jld_bucket_count = bucket->count;
+               break;
+       }
 
-               p = next_p;
-               next_p = memorystatus_get_next_proc_locked(&i, p, TRUE);
+       bucket = &memstat_bucket[JETSAM_PRIORITY_ELEVATED_INACTIVE];
+       *elevated_bucket_count = bucket->count;
+       *total_candidates = jld_bucket_count;
+       proc_list_unlock();
 
-               if (p->p_memstat_effectivepriority > priority_max) {
-                       /*
-                        * Bail out of this killing spree if we have
-                        * reached beyond the priority_max jetsam band.
-                        * That is, we kill up to and through the
-                        * priority_max jetsam band.
-                        */
-                       proc_list_unlock();
-                       goto exit;
-               }
+       aggressive_jetsam_needed = (*jld_idle_kills > jld_idle_kill_candidates);
 
 #if DEVELOPMENT || DEBUG
-               activeProcess = p->p_memstat_state & P_MEMSTAT_FOREGROUND;
-               procSuspendedForDiagnosis = p->p_memstat_state & P_MEMSTAT_DIAG_SUSPENDED;
+       if (aggressive_jetsam_needed) {
+               printf("memorystatus: aggressive%d: idle candidates: %d, idle kills: %d\n",
+                   jld_eval_aggressive_count,
+                   jld_idle_kill_candidates,
+                   *jld_idle_kills);
+       }
 #endif /* DEVELOPMENT || DEBUG */
+       return aggressive_jetsam_needed;
+}
 
-               aPid = p->p_pid;
-               aPid_ep = p->p_memstat_effectivepriority;
+static boolean_t
+memorystatus_act_aggressive(uint32_t cause, os_reason_t jetsam_reason, int *jld_idle_kills, boolean_t *corpse_list_purged, boolean_t *post_snapshot, uint64_t *memory_reclaimed)
+{
+       boolean_t aggressive_jetsam_needed = false;
+       boolean_t killed;
+       uint32_t errors = 0;
+       uint64_t footprint_of_killed_proc = 0;
+       int elevated_bucket_count = 0;
+       int total_candidates = 0;
+       *memory_reclaimed = 0;
 
-               if (p->p_memstat_state & (P_MEMSTAT_ERROR | P_MEMSTAT_TERMINATED)) {
-                       continue;
-               }
+       /*
+        * The aggressive jetsam logic looks at the number of times it has been in the
+        * aggressive loop to determine the max priority band it should kill upto. The
+        * static variables below are used to track that property.
+        *
+        * To reset those values, the implementation checks if it has been
+        * memorystatus_jld_eval_period_msecs since the parameters were reset.
+        */
+       static int       jld_eval_aggressive_count = 0;
+       static int32_t   jld_priority_band_max = JETSAM_PRIORITY_UI_SUPPORT;
+       static uint64_t  jld_timestamp_msecs = 0;
+       static int       jld_idle_kill_candidates = 0;
 
-#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
-               if ((memorystatus_jetsam_policy & kPolicyDiagnoseActive) && procSuspendedForDiagnosis) {
-                       printf("jetsam: continuing after ignoring proc suspended already for diagnosis - %d\n", aPid);
-                       continue;
-               }
-#endif /* CONFIG_JETSAM && (DEVELOPMENT || DEBUG) */
+       if (memorystatus_jld_enabled == FALSE) {
+               /* If aggressive jetsam is disabled, nothing to do here */
+               return FALSE;
+       }
 
-               /*
-                * Capture a snapshot if none exists.
-                */
-               if (memorystatus_jetsam_snapshot_count == 0) {
-                       memorystatus_init_jetsam_snapshot_locked(NULL, 0);
-                       new_snapshot = TRUE;
-               }
+       /* Get current timestamp (msecs only) */
+       struct timeval  jld_now_tstamp = {0, 0};
+       uint64_t        jld_now_msecs = 0;
+       microuptime(&jld_now_tstamp);
+       jld_now_msecs = (jld_now_tstamp.tv_sec * 1000);
 
+       /*
+        * The aggressive jetsam logic looks at the number of candidates and their
+        * properties to decide if aggressive jetsam should be engaged.
+        */
+       if (jetsam_aging_policy == kJetsamAgingPolicySysProcsReclaimedFirst) {
                /*
-                * Mark as terminated so that if exit1() indicates success, but the process (for example)
-                * is blocked in task_exception_notify(), it'll be skipped if encountered again - see
-                * <rdar://problem/13553476>. This is cheaper than examining P_LEXIT, which requires the
-                * acquisition of the proc lock.
+                * For the kJetsamAgingPolicySysProcsReclaimedFirst aging policy, the logic looks at the number of
+                * candidates in the idle and deferred band and how many out of them are marked as high relaunch
+                * probability.
                 */
-               p->p_memstat_state |= P_MEMSTAT_TERMINATED;
-
-               killtime = mach_absolute_time();
-               absolutetime_to_microtime(killtime, &tv_sec, &tv_usec);
-               tv_msec = tv_usec / 1000;
-
-               /* Shift queue, update stats */
-               memorystatus_update_jetsam_snapshot_entry_locked(p, cause, killtime);
-
+               aggressive_jetsam_needed = memorystatus_aggressive_jetsam_needed_sysproc_aging(jld_eval_aggressive_count,
+                   jld_idle_kills, jld_idle_kill_candidates, &total_candidates, &elevated_bucket_count);
+       } else {
                /*
-                * In order to kill the target process, we will drop the proc_list_lock.
-                * To guaranteee that p and next_p don't disappear out from under the lock,
-                * we must take a ref on both.
-                * If we cannot get a reference, then it's likely we've raced with
-                * that process exiting on another core.
+                * The other aging policies look at number of candidate processes over a specific time window and
+                * evaluate if the system is in a jetsam loop. If yes, aggressive jetsam is triggered.
                 */
-               if (proc_ref_locked(p) == p) {
-                       if (next_p) {
-                               while (next_p && (proc_ref_locked(next_p) != next_p)) {
-                                       proc_t temp_p;
-
-                                       /*
-                                        * We must have raced with next_p exiting on another core.
-                                        * Recover by getting the next eligible process in the band.
-                                        */
-
-                                       MEMORYSTATUS_DEBUG(1, "memorystatus: aggressive%d: skipping %d [%s] (exiting?)\n",
-                                           aggr_count, next_p->p_pid, (*next_p->p_name ? next_p->p_name : "(unknown)"));
-
-                                       temp_p = next_p;
-                                       next_p = memorystatus_get_next_proc_locked(&i, temp_p, TRUE);
-                               }
-                       }
-                       proc_list_unlock();
-
-                       printf("%lu.%03d memorystatus: %s%d pid %d [%s] (%s %d) - memorystatus_available_pages: %llu\n",
-                           (unsigned long)tv_sec, tv_msec,
-                           ((aPid_ep == JETSAM_PRIORITY_IDLE) ? "killing_idle_process_aggressive" : "killing_top_process_aggressive"),
-                           aggr_count, aPid, (*p->p_name ? p->p_name : "unknown"),
-                           memorystatus_kill_cause_name[cause], aPid_ep, (uint64_t)memorystatus_available_pages);
-
-                       memorystatus_level_snapshot = memorystatus_level;
+               aggressive_jetsam_needed = memorystatus_aggressive_jetsam_needed_default(jld_eval_aggressive_count,
+                   jld_idle_kills, jld_idle_kill_candidates, &total_candidates, &elevated_bucket_count);
+       }
 
-                       /*
-                        * memorystatus_do_kill() drops a reference, so take another one so we can
-                        * continue to use this exit reason even after memorystatus_do_kill()
-                        * returns.
-                        */
-                       os_reason_ref(jetsam_reason);
-                       killed = memorystatus_do_kill(p, cause, jetsam_reason);
+       /*
+        * Check if its been really long since the aggressive jetsam evaluation
+        * parameters have been refreshed. This logic also resets the jld_eval_aggressive_count
+        * counter to make sure we reset the aggressive jetsam severity.
+        */
+       boolean_t param_reval = false;
 
-                       /* Success? */
-                       if (killed) {
-                               proc_rele(p);
-                               kill_count++;
-                               p = NULL;
-                               killed = FALSE;
+       if ((total_candidates == 0) ||
+           (jld_now_msecs > (jld_timestamp_msecs + memorystatus_jld_eval_period_msecs))) {
+               jld_timestamp_msecs      = jld_now_msecs;
+               jld_idle_kill_candidates = total_candidates;
+               *jld_idle_kills          = 0;
+               jld_eval_aggressive_count = 0;
+               jld_priority_band_max   = JETSAM_PRIORITY_UI_SUPPORT;
+               param_reval = true;
+       }
 
-                               /*
-                                * Continue the killing spree.
-                                */
-                               proc_list_lock();
-                               if (next_p) {
-                                       proc_rele_locked(next_p);
-                               }
+       /*
+        * If the parameters have been updated, re-evaluate the aggressive_jetsam_needed condition for
+        * the non kJetsamAgingPolicySysProcsReclaimedFirst policy since its based on jld_idle_kill_candidates etc.
+        */
+       if ((param_reval == true) && (jetsam_aging_policy != kJetsamAgingPolicySysProcsReclaimedFirst)) {
+               aggressive_jetsam_needed = (*jld_idle_kills > jld_idle_kill_candidates);
+       }
 
-                               if (aPid_ep == JETSAM_PRIORITY_FOREGROUND && memorystatus_aggressive_jetsam_lenient == TRUE) {
-                                       if (memorystatus_level > memorystatus_level_snapshot && ((memorystatus_level - memorystatus_level_snapshot) >= AGGRESSIVE_JETSAM_LENIENT_MODE_THRESHOLD)) {
+       /*
+        * It is also possible that the system is down to a very small number of processes in the candidate
+        * bands. In that case, the decisions made by the memorystatus_aggressive_jetsam_needed_* routines
+        * would not be useful. In that case, do not trigger aggressive jetsam.
+        */
+       if (total_candidates < kJetsamMinCandidatesThreshold) {
 #if DEVELOPMENT || DEBUG
-                                               printf("Disabling Lenient mode after one-time deployment.\n");
+               printf("memorystatus: aggressive: [FAILED] Low Candidate Count (current: %d, threshold: %d)\n", total_candidates, kJetsamMinCandidatesThreshold);
 #endif /* DEVELOPMENT || DEBUG */
-                                               memorystatus_aggressive_jetsam_lenient = FALSE;
-                                               break;
-                                       }
-                               }
+               aggressive_jetsam_needed = false;
+       }
 
-                               continue;
-                       }
+       if (aggressive_jetsam_needed == false) {
+               /* Either the aging policy or the candidate count decided that aggressive jetsam is not needed. Nothing more to do here. */
+               return FALSE;
+       }
 
-                       /*
-                        * Failure - first unwind the state,
-                        * then fall through to restart the search.
-                        */
-                       proc_list_lock();
-                       proc_rele_locked(p);
-                       if (next_p) {
-                               proc_rele_locked(next_p);
-                       }
-                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
-                       p->p_memstat_state |= P_MEMSTAT_ERROR;
-                       *errors += 1;
-                       p = NULL;
-               }
+       /* Looks like aggressive jetsam is needed */
+       jld_eval_aggressive_count++;
 
+       if (jld_eval_aggressive_count == memorystatus_jld_eval_aggressive_count) {
+               memorystatus_approaching_fg_band(corpse_list_purged);
+       } else if (jld_eval_aggressive_count > memorystatus_jld_eval_aggressive_count) {
                /*
-                * Failure - restart the search at the beginning of
-                * the band we were already traversing.
-                *
-                * We might have raced with "p" exiting on another core, resulting in no
-                * ref on "p".  Or, we may have failed to kill "p".
-                *
-                * Either way, we fall thru to here, leaving the proc in the
-                * P_MEMSTAT_TERMINATED or P_MEMSTAT_ERROR state.
-                *
-                * And, we hold the the proc_list_lock at this point.
+                * Bump up the jetsam priority limit (eg: the bucket index)
+                * Enforce bucket index sanity.
                 */
-
-               next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+               if ((memorystatus_jld_eval_aggressive_priority_band_max < 0) ||
+                   (memorystatus_jld_eval_aggressive_priority_band_max >= MEMSTAT_BUCKET_COUNT)) {
+                       /*
+                        * Do nothing.  Stick with the default level.
+                        */
+               } else {
+                       jld_priority_band_max = memorystatus_jld_eval_aggressive_priority_band_max;
+               }
        }
 
-       proc_list_unlock();
+       /* Visit elevated processes first */
+       while (elevated_bucket_count) {
+               elevated_bucket_count--;
 
-exit:
-       os_reason_free(jetsam_reason);
+               /*
+                * memorystatus_kill_elevated_process() drops a reference,
+                * so take another one so we can continue to use this exit reason
+                * even after it returns.
+                */
 
-       /* Clear snapshot if freshly captured and no target was found */
-       if (new_snapshot && (kill_count == 0)) {
-               proc_list_lock();
-               memorystatus_jetsam_snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
-               proc_list_unlock();
+               os_reason_ref(jetsam_reason);
+               killed = memorystatus_kill_elevated_process(
+                       cause,
+                       jetsam_reason,
+                       JETSAM_PRIORITY_ELEVATED_INACTIVE,
+                       jld_eval_aggressive_count,
+                       &errors, &footprint_of_killed_proc);
+               if (killed) {
+                       *post_snapshot = TRUE;
+                       *memory_reclaimed += footprint_of_killed_proc;
+                       if (memorystatus_avail_pages_below_pressure()) {
+                               /*
+                                * Still under pressure.
+                                * Find another pinned processes.
+                                */
+                               continue;
+                       } else {
+                               return TRUE;
+                       }
+               } else {
+                       /*
+                        * No pinned processes left to kill.
+                        * Abandon elevated band.
+                        */
+                       break;
+               }
        }
 
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_END,
-           memorystatus_available_pages, killed ? aPid : 0, kill_count, 0, 0);
+       /*
+        * memorystatus_kill_processes_aggressive() allocates its own
+        * jetsam_reason so the kMemorystatusKilledProcThrashing cause
+        * is consistent throughout the aggressive march.
+        */
+       killed = memorystatus_kill_processes_aggressive(
+               kMemorystatusKilledProcThrashing,
+               jld_eval_aggressive_count,
+               jld_priority_band_max,
+               &errors, &footprint_of_killed_proc);
 
-       if (kill_count > 0) {
+       if (killed) {
+               /* Always generate logs after aggressive kill */
+               *post_snapshot = TRUE;
+               *memory_reclaimed += footprint_of_killed_proc;
+               *jld_idle_kills = 0;
                return TRUE;
-       } else {
-               return FALSE;
        }
+
+       return FALSE;
 }
 
-static boolean_t
-memorystatus_kill_hiwat_proc(uint32_t *errors, boolean_t *purged)
+
+static void
+memorystatus_thread(void *param __unused, wait_result_t wr __unused)
 {
-       pid_t aPid = 0;
-       proc_t p = PROC_NULL, next_p = PROC_NULL;
-       boolean_t new_snapshot = FALSE, killed = FALSE, freed_mem = FALSE;
-       unsigned int i = 0;
-       uint32_t aPid_ep;
-       os_reason_t jetsam_reason = OS_REASON_NULL;
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM_HIWAT) | DBG_FUNC_START,
-           memorystatus_available_pages, 0, 0, 0, 0);
+       boolean_t post_snapshot = FALSE;
+       uint32_t errors = 0;
+       uint32_t hwm_kill = 0;
+       boolean_t sort_flag = TRUE;
+       boolean_t corpse_list_purged = FALSE;
+       int     jld_idle_kills = 0;
+       struct jetsam_thread_state *jetsam_thread = jetsam_current_thread();
+       uint64_t total_memory_reclaimed = 0;
 
-       jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_HIGHWATER);
-       if (jetsam_reason == OS_REASON_NULL) {
-               printf("memorystatus_kill_hiwat_proc: failed to allocate exit reason\n");
+       assert(jetsam_thread != NULL);
+       if (jetsam_thread->inited == FALSE) {
+               /*
+                * It's the first time the thread has run, so just mark the thread as privileged and block.
+                * This avoids a spurious pass with unset variables, as set out in <rdar://problem/9609402>.
+                */
+
+               char name[32];
+               thread_wire(host_priv_self(), current_thread(), TRUE);
+               snprintf(name, 32, "VM_memorystatus_%d", jetsam_thread->index + 1);
+
+               /* Limit all but one thread to the lower jetsam bands, as that's where most of the victims are. */
+               if (jetsam_thread->index == 0) {
+                       if (vm_pageout_state.vm_restricted_to_single_processor == TRUE) {
+                               thread_vm_bind_group_add();
+                       }
+                       jetsam_thread->limit_to_low_bands = FALSE;
+               } else {
+                       jetsam_thread->limit_to_low_bands = TRUE;
+               }
+#if CONFIG_THREAD_GROUPS
+               thread_group_vm_add();
+#endif
+               thread_set_thread_name(current_thread(), name);
+               jetsam_thread->inited = TRUE;
+               memorystatus_thread_block(0, memorystatus_thread);
        }
 
-       proc_list_lock();
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_SCAN) | DBG_FUNC_START,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, memorystatus_jld_enabled, memorystatus_jld_eval_period_msecs, memorystatus_jld_eval_aggressive_count, 0);
 
-       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
-       while (next_p) {
-               uint64_t footprint_in_bytes = 0;
-               uint64_t memlimit_in_bytes  = 0;
-               boolean_t skip = 0;
+       /*
+        * Jetsam aware version.
+        *
+        * The VM pressure notification thread is working it's way through clients in parallel.
+        *
+        * So, while the pressure notification thread is targeting processes in order of
+        * increasing jetsam priority, we can hopefully reduce / stop it's work by killing
+        * any processes that have exceeded their highwater mark.
+        *
+        * If we run out of HWM processes and our available pages drops below the critical threshold, then,
+        * we target the least recently used process in order of increasing jetsam priority (exception: the FG band).
+        */
+       while (memorystatus_action_needed()) {
+               boolean_t killed;
+               int32_t priority;
+               uint32_t cause;
+               uint64_t memory_reclaimed = 0;
+               uint64_t jetsam_reason_code = JETSAM_REASON_INVALID;
+               os_reason_t jetsam_reason = OS_REASON_NULL;
 
-               p = next_p;
-               next_p = memorystatus_get_next_proc_locked(&i, p, TRUE);
+               cause = kill_under_pressure_cause;
+               switch (cause) {
+               case kMemorystatusKilledFCThrashing:
+                       jetsam_reason_code = JETSAM_REASON_MEMORY_FCTHRASHING;
+                       break;
+               case kMemorystatusKilledVMCompressorThrashing:
+                       jetsam_reason_code = JETSAM_REASON_MEMORY_VMCOMPRESSOR_THRASHING;
+                       break;
+               case kMemorystatusKilledVMCompressorSpaceShortage:
+                       jetsam_reason_code = JETSAM_REASON_MEMORY_VMCOMPRESSOR_SPACE_SHORTAGE;
+                       break;
+               case kMemorystatusKilledZoneMapExhaustion:
+                       jetsam_reason_code = JETSAM_REASON_ZONE_MAP_EXHAUSTION;
+                       break;
+               case kMemorystatusKilledVMPageShortage:
+               /* falls through */
+               default:
+                       jetsam_reason_code = JETSAM_REASON_MEMORY_VMPAGESHORTAGE;
+                       cause = kMemorystatusKilledVMPageShortage;
+                       break;
+               }
 
-               aPid = p->p_pid;
-               aPid_ep = p->p_memstat_effectivepriority;
+               /* Highwater */
+               boolean_t is_critical = TRUE;
+               if (memorystatus_act_on_hiwat_processes(&errors, &hwm_kill, &post_snapshot, &is_critical, &memory_reclaimed)) {
+                       total_memory_reclaimed += memory_reclaimed;
+                       if (is_critical == FALSE) {
+                               /*
+                                * For now, don't kill any other processes.
+                                */
+                               break;
+                       } else {
+                               goto done;
+                       }
+               }
 
-               if (p->p_memstat_state  & (P_MEMSTAT_ERROR | P_MEMSTAT_TERMINATED)) {
-                       continue;
+               jetsam_reason = os_reason_create(OS_REASON_JETSAM, jetsam_reason_code);
+               if (jetsam_reason == OS_REASON_NULL) {
+                       printf("memorystatus_thread: failed to allocate jetsam reason\n");
                }
 
-               /* skip if no limit set */
-               if (p->p_memstat_memlimit <= 0) {
-                       continue;
+               /* Only unlimited jetsam threads should act aggressive */
+               if (!jetsam_thread->limit_to_low_bands &&
+                   memorystatus_act_aggressive(cause, jetsam_reason, &jld_idle_kills, &corpse_list_purged, &post_snapshot, &memory_reclaimed)) {
+                       total_memory_reclaimed += memory_reclaimed;
+                       goto done;
                }
 
-               footprint_in_bytes = get_task_phys_footprint(p->task);
-               memlimit_in_bytes  = (((uint64_t)p->p_memstat_memlimit) * 1024ULL * 1024ULL);   /* convert MB to bytes */
-               skip = (footprint_in_bytes <= memlimit_in_bytes);
+               /*
+                * memorystatus_kill_top_process() drops a reference,
+                * so take another one so we can continue to use this exit reason
+                * even after it returns
+                */
+               os_reason_ref(jetsam_reason);
 
-#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
-               if (!skip && (memorystatus_jetsam_policy & kPolicyDiagnoseActive)) {
-                       if (p->p_memstat_state & P_MEMSTAT_DIAG_SUSPENDED) {
-                               continue;
+               /* LRU */
+               killed = memorystatus_kill_top_process(TRUE, sort_flag, cause, jetsam_reason, &priority, &errors, &memory_reclaimed);
+               sort_flag = FALSE;
+
+               if (killed) {
+                       total_memory_reclaimed += memory_reclaimed;
+                       if (memorystatus_post_snapshot(priority, cause) == TRUE) {
+                               post_snapshot = TRUE;
                        }
-               }
-#endif /* CONFIG_JETSAM && (DEVELOPMENT || DEBUG) */
 
-#if CONFIG_FREEZE
-               if (!skip) {
-                       if (p->p_memstat_state & P_MEMSTAT_LOCKED) {
-                               skip = TRUE;
-                       } else {
-                               skip = FALSE;
+                       /* Jetsam Loop Detection */
+                       if (memorystatus_jld_enabled == TRUE) {
+                               if ((priority == JETSAM_PRIORITY_IDLE) || (priority == system_procs_aging_band) || (priority == applications_aging_band)) {
+                                       jld_idle_kills++;
+                               } else {
+                                       /*
+                                        * We've reached into bands beyond idle deferred.
+                                        * We make no attempt to monitor them
+                                        */
+                               }
                        }
-               }
-#endif
 
-               if (skip) {
-                       continue;
-               } else {
-                       if (memorystatus_jetsam_snapshot_count == 0) {
-                               memorystatus_init_jetsam_snapshot_locked(NULL, 0);
-                               new_snapshot = TRUE;
+                       /*
+                        * If we have jetsammed a process in or above JETSAM_PRIORITY_UI_SUPPORT
+                        * then we attempt to relieve pressure by purging corpse memory and notifying
+                        * anybody wanting to know this.
+                        */
+                       if (priority >= JETSAM_PRIORITY_UI_SUPPORT) {
+                               memorystatus_approaching_fg_band(&corpse_list_purged);
                        }
+                       goto done;
+               }
 
-                       if (proc_ref_locked(p) == p) {
-                               /*
-                                * Mark as terminated so that if exit1() indicates success, but the process (for example)
-                                * is blocked in task_exception_notify(), it'll be skipped if encountered again - see
-                                * <rdar://problem/13553476>. This is cheaper than examining P_LEXIT, which requires the
-                                * acquisition of the proc lock.
-                                */
-                               p->p_memstat_state |= P_MEMSTAT_TERMINATED;
+               if (memorystatus_avail_pages_below_critical()) {
+                       /*
+                        * Still under pressure and unable to kill a process - purge corpse memory
+                        * and get everything back from the pmap.
+                        */
+                       pmap_release_pages_fast();
+                       if (total_corpses_count() > 0) {
+                               task_purge_all_corpses();
+                               corpse_list_purged = TRUE;
+                       }
 
-                               proc_list_unlock();
-                       } else {
+                       if (!jetsam_thread->limit_to_low_bands && memorystatus_avail_pages_below_critical()) {
                                /*
-                                * We need to restart the search again because
-                                * proc_ref_locked _can_ drop the proc_list lock
-                                * and we could have lost our stored next_p via
-                                * an exit() on another core.
+                                * Still under pressure and unable to kill a process - panic
                                 */
-                               i = 0;
-                               next_p = memorystatus_get_first_proc_locked(&i, TRUE);
-                               continue;
+                               panic("memorystatus_jetsam_thread: no victim! available pages:%llu\n", (uint64_t)MEMORYSTATUS_LOG_AVAILABLE_PAGES);
                        }
+               }
 
-                       freed_mem = memorystatus_kill_proc(p, kMemorystatusKilledHiwat, jetsam_reason, &killed); /* purged and/or killed 'p' */
+done:
 
-                       /* Success? */
-                       if (freed_mem) {
-                               if (killed == FALSE) {
-                                       /* purged 'p'..don't reset HWM candidate count */
-                                       *purged = TRUE;
+               /*
+                * We do not want to over-kill when thrashing has been detected.
+                * To avoid that, we reset the flag here and notify the
+                * compressor.
+                */
+               if (is_reason_thrashing(kill_under_pressure_cause)) {
+                       kill_under_pressure_cause = 0;
+#if CONFIG_JETSAM
+                       vm_thrashing_jetsam_done();
+#endif /* CONFIG_JETSAM */
+               } else if (is_reason_zone_map_exhaustion(kill_under_pressure_cause)) {
+                       kill_under_pressure_cause = 0;
+               }
 
-                                       proc_list_lock();
-                                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
-                                       proc_list_unlock();
-                               }
-                               proc_rele(p);
-                               goto exit;
-                       }
-                       /*
-                        * Failure - first unwind the state,
-                        * then fall through to restart the search.
-                        */
-                       proc_list_lock();
-                       proc_rele_locked(p);
-                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
-                       p->p_memstat_state |= P_MEMSTAT_ERROR;
-                       *errors += 1;
+               os_reason_free(jetsam_reason);
+       }
 
-                       i = 0;
-                       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+       kill_under_pressure_cause = 0;
+
+       if (errors) {
+               memorystatus_clear_errors();
+       }
+
+       if (post_snapshot) {
+               proc_list_lock();
+               size_t snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) +
+                   sizeof(memorystatus_jetsam_snapshot_entry_t) * (memorystatus_jetsam_snapshot_count);
+               uint64_t timestamp_now = mach_absolute_time();
+               memorystatus_jetsam_snapshot->notification_time = timestamp_now;
+               memorystatus_jetsam_snapshot->js_gencount++;
+               if (memorystatus_jetsam_snapshot_count > 0 && (memorystatus_jetsam_snapshot_last_timestamp == 0 ||
+                   timestamp_now > memorystatus_jetsam_snapshot_last_timestamp + memorystatus_jetsam_snapshot_timeout)) {
+                       proc_list_unlock();
+                       int ret = memorystatus_send_note(kMemorystatusSnapshotNote, &snapshot_size, sizeof(snapshot_size));
+                       if (!ret) {
+                               proc_list_lock();
+                               memorystatus_jetsam_snapshot_last_timestamp = timestamp_now;
+                               proc_list_unlock();
+                       }
+               } else {
+                       proc_list_unlock();
                }
        }
 
-       proc_list_unlock();
-
-exit:
-       os_reason_free(jetsam_reason);
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_SCAN) | DBG_FUNC_END,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, total_memory_reclaimed, 0, 0, 0);
 
-       /* Clear snapshot if freshly captured and no target was found */
-       if (new_snapshot && !killed) {
-               proc_list_lock();
-               memorystatus_jetsam_snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
-               proc_list_unlock();
-       }
+       memorystatus_thread_block(0, memorystatus_thread);
+}
 
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM_HIWAT) | DBG_FUNC_END,
-           memorystatus_available_pages, killed ? aPid : 0, 0, 0, 0);
+/*
+ * Returns TRUE:
+ *      when an idle-exitable proc was killed
+ * Returns FALSE:
+ *     when there are no more idle-exitable procs found
+ *      when the attempt to kill an idle-exitable proc failed
+ */
+boolean_t
+memorystatus_idle_exit_from_VM(void)
+{
+       /*
+        * This routine should no longer be needed since we are
+        * now using jetsam bands on all platforms and so will deal
+        * with IDLE processes within the memorystatus thread itself.
+        *
+        * But we still use it because we observed that macos systems
+        * started heavy compression/swapping with a bunch of
+        * idle-exitable processes alive and doing nothing. We decided
+        * to rather kill those processes than start swapping earlier.
+        */
 
-       return killed;
+       return kill_idle_exit_proc();
 }
 
 /*
- * Jetsam a process pinned in the elevated band.
+ * Callback invoked when allowable physical memory footprint exceeded
+ * (dirty pages + IOKit mappings)
  *
- * Return:  true -- at least one pinned process was jetsammed
- *         false -- no pinned process was jetsammed
+ * This is invoked for both advisory, non-fatal per-task high watermarks,
+ * as well as the fatal task memory limits.
  */
-static boolean_t
-memorystatus_kill_elevated_process(uint32_t cause, os_reason_t jetsam_reason, unsigned int band, int aggr_count, uint32_t *errors)
+void
+memorystatus_on_ledger_footprint_exceeded(boolean_t warning, boolean_t memlimit_is_active, boolean_t memlimit_is_fatal)
 {
-       pid_t aPid = 0;
-       proc_t p = PROC_NULL, next_p = PROC_NULL;
-       boolean_t new_snapshot = FALSE, killed = FALSE;
-       int kill_count = 0;
-       uint32_t aPid_ep;
-       uint64_t killtime = 0;
-       clock_sec_t     tv_sec;
-       clock_usec_t    tv_usec;
-       uint32_t        tv_msec;
-
-
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_START,
-           memorystatus_available_pages, 0, 0, 0, 0);
-
-#if CONFIG_FREEZE
-       boolean_t consider_frozen_only = FALSE;
-
-       if (band == (unsigned int) memorystatus_freeze_jetsam_band) {
-               consider_frozen_only = TRUE;
-       }
-#endif /* CONFIG_FREEZE */
-
-       proc_list_lock();
-
-       next_p = memorystatus_get_first_proc_locked(&band, FALSE);
-       while (next_p) {
-               p = next_p;
-               next_p = memorystatus_get_next_proc_locked(&band, p, FALSE);
+       os_reason_t jetsam_reason = OS_REASON_NULL;
 
-               aPid = p->p_pid;
-               aPid_ep = p->p_memstat_effectivepriority;
+       proc_t p = current_proc();
 
+#if VM_PRESSURE_EVENTS
+       if (warning == TRUE) {
                /*
-                * Only pick a process pinned in this elevated band
+                * This is a warning path which implies that the current process is close, but has
+                * not yet exceeded its per-process memory limit.
                 */
-               if (!(p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND)) {
-                       continue;
+               if (memorystatus_warn_process(p, memlimit_is_active, memlimit_is_fatal, FALSE /* not exceeded */) != TRUE) {
+                       /* Print warning, since it's possible that task has not registered for pressure notifications */
+                       os_log(OS_LOG_DEFAULT, "memorystatus_on_ledger_footprint_exceeded: failed to warn the current task (%d exiting, or no handler registered?).\n", p->p_pid);
                }
+               return;
+       }
+#endif /* VM_PRESSURE_EVENTS */
 
-               if (p->p_memstat_state  & (P_MEMSTAT_ERROR | P_MEMSTAT_TERMINATED)) {
-                       continue;
+       if (memlimit_is_fatal) {
+               /*
+                * If this process has no high watermark or has a fatal task limit, then we have been invoked because the task
+                * has violated either the system-wide per-task memory limit OR its own task limit.
+                */
+               jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_PERPROCESSLIMIT);
+               if (jetsam_reason == NULL) {
+                       printf("task_exceeded footprint: failed to allocate jetsam reason\n");
+               } else if (corpse_for_fatal_memkill != 0 && proc_send_synchronous_EXC_RESOURCE(p) == FALSE) {
+                       /* Set OS_REASON_FLAG_GENERATE_CRASH_REPORT to generate corpse */
+                       jetsam_reason->osr_flags |= OS_REASON_FLAG_GENERATE_CRASH_REPORT;
                }
 
-#if CONFIG_FREEZE
-               if (consider_frozen_only && !(p->p_memstat_state & P_MEMSTAT_FROZEN)) {
-                       continue;
+               if (memorystatus_kill_process_sync(p->p_pid, kMemorystatusKilledPerProcessLimit, jetsam_reason) != TRUE) {
+                       printf("task_exceeded_footprint: failed to kill the current task (exiting?).\n");
                }
+       } else {
+               /*
+                * HWM offender exists. Done without locks or synchronization.
+                * See comment near its declaration for more details.
+                */
+               memorystatus_hwm_candidates = TRUE;
 
-               if (p->p_memstat_state & P_MEMSTAT_LOCKED) {
-                       continue;
-               }
-#endif /* CONFIG_FREEZE */
+#if VM_PRESSURE_EVENTS
+               /*
+                * The current process is not in the warning path.
+                * This path implies the current process has exceeded a non-fatal (soft) memory limit.
+                * Failure to send note is ignored here.
+                */
+               (void)memorystatus_warn_process(p, memlimit_is_active, memlimit_is_fatal, TRUE /* exceeded */);
 
-#if DEVELOPMENT || DEBUG
-               MEMORYSTATUS_DEBUG(1, "jetsam: elevated%d process pid %d [%s] - memorystatus_available_pages: %d\n",
-                   aggr_count,
-                   aPid, (*p->p_name ? p->p_name : "unknown"),
-                   memorystatus_available_pages);
-#endif /* DEVELOPMENT || DEBUG */
+#endif /* VM_PRESSURE_EVENTS */
+       }
+}
 
-               if (memorystatus_jetsam_snapshot_count == 0) {
-                       memorystatus_init_jetsam_snapshot_locked(NULL, 0);
-                       new_snapshot = TRUE;
-               }
+void
+memorystatus_log_exception(const int max_footprint_mb, boolean_t memlimit_is_active, boolean_t memlimit_is_fatal)
+{
+       proc_t p = current_proc();
 
-               p->p_memstat_state |= P_MEMSTAT_TERMINATED;
+       /*
+        * The limit violation is logged here, but only once per process per limit.
+        * Soft memory limit is a non-fatal high-water-mark
+        * Hard memory limit is a fatal custom-task-limit or system-wide per-task memory limit.
+        */
 
-               killtime = mach_absolute_time();
-               absolutetime_to_microtime(killtime, &tv_sec, &tv_usec);
-               tv_msec = tv_usec / 1000;
+       os_log_with_startup_serial(OS_LOG_DEFAULT, "EXC_RESOURCE -> %s[%d] exceeded mem limit: %s%s %d MB (%s)\n",
+           ((p && *p->p_name) ? p->p_name : "unknown"), (p ? p->p_pid : -1), (memlimit_is_active ? "Active" : "Inactive"),
+           (memlimit_is_fatal  ? "Hard" : "Soft"), max_footprint_mb,
+           (memlimit_is_fatal  ? "fatal" : "non-fatal"));
 
-               memorystatus_update_jetsam_snapshot_entry_locked(p, cause, killtime);
+       return;
+}
 
-               if (proc_ref_locked(p) == p) {
-                       proc_list_unlock();
 
-                       os_log_with_startup_serial(OS_LOG_DEFAULT, "%lu.%03d memorystatus: killing_top_process_elevated%d pid %d [%s] (%s %d) - memorystatus_available_pages: %llu\n",
-                           (unsigned long)tv_sec, tv_msec,
-                           aggr_count,
-                           aPid, (*p->p_name ? p->p_name : "unknown"),
-                           memorystatus_kill_cause_name[cause], aPid_ep, (uint64_t)memorystatus_available_pages);
+/*
+ * Description:
+ *     Evaluates process state to determine which limit
+ *     should be applied (active vs. inactive limit).
+ *
+ *     Processes that have the 'elevated inactive jetsam band' attribute
+ *     are first evaluated based on their current priority band.
+ *     presently elevated ==> active
+ *
+ *     Processes that opt into dirty tracking are evaluated
+ *     based on clean vs dirty state.
+ *     dirty ==> active
+ *     clean ==> inactive
+ *
+ *     Process that do not opt into dirty tracking are
+ *     evalulated based on priority level.
+ *     Foreground or above ==> active
+ *     Below Foreground    ==> inactive
+ *
+ *     Return: TRUE if active
+ *             False if inactive
+ */
 
+static boolean_t
+proc_jetsam_state_is_active_locked(proc_t p)
+{
+       if ((p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND) &&
+           (p->p_memstat_effectivepriority == JETSAM_PRIORITY_ELEVATED_INACTIVE)) {
+               /*
+                * process has the 'elevated inactive jetsam band' attribute
+                * and process is present in the elevated band
+                * implies active state
+                */
+               return TRUE;
+       } else if (p->p_memstat_dirty & P_DIRTY_TRACK) {
+               /*
+                * process has opted into dirty tracking
+                * active state is based on dirty vs. clean
+                */
+               if (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) {
                        /*
-                        * memorystatus_do_kill drops a reference, so take another one so we can
-                        * continue to use this exit reason even after memorystatus_do_kill()
-                        * returns
+                        * process is dirty
+                        * implies active state
                         */
-                       os_reason_ref(jetsam_reason);
-                       killed = memorystatus_do_kill(p, cause, jetsam_reason);
-
-                       /* Success? */
-                       if (killed) {
-                               proc_rele(p);
-                               kill_count++;
-                               goto exit;
-                       }
-
+                       return TRUE;
+               } else {
                        /*
-                        * Failure - first unwind the state,
-                        * then fall through to restart the search.
+                        * process is clean
+                        * implies inactive state
                         */
-                       proc_list_lock();
-                       proc_rele_locked(p);
-                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
-                       p->p_memstat_state |= P_MEMSTAT_ERROR;
-                       *errors += 1;
+                       return FALSE;
                }
-
+       } else if (p->p_memstat_effectivepriority >= JETSAM_PRIORITY_FOREGROUND) {
                /*
-                * Failure - restart the search.
-                *
-                * We might have raced with "p" exiting on another core, resulting in no
-                * ref on "p".  Or, we may have failed to kill "p".
-                *
-                * Either way, we fall thru to here, leaving the proc in the
-                * P_MEMSTAT_TERMINATED state or P_MEMSTAT_ERROR state.
-                *
-                * And, we hold the the proc_list_lock at this point.
+                * process is Foreground or higher
+                * implies active state
                 */
-
-               next_p = memorystatus_get_first_proc_locked(&band, FALSE);
+               return TRUE;
+       } else {
+               /*
+                * process found below Foreground
+                * implies inactive state
+                */
+               return FALSE;
        }
+}
+
+static boolean_t
+memorystatus_kill_process_sync(pid_t victim_pid, uint32_t cause, os_reason_t jetsam_reason)
+{
+       boolean_t res;
+
+       uint32_t errors = 0;
+       uint64_t memory_reclaimed = 0;
 
-       proc_list_unlock();
+       if (victim_pid == -1) {
+               /* No pid, so kill first process */
+               res = memorystatus_kill_top_process(TRUE, TRUE, cause, jetsam_reason, NULL, &errors, &memory_reclaimed);
+       } else {
+               res = memorystatus_kill_specific_process(victim_pid, cause, jetsam_reason);
+       }
 
-exit:
-       os_reason_free(jetsam_reason);
+       if (errors) {
+               memorystatus_clear_errors();
+       }
 
-       /* Clear snapshot if freshly captured and no target was found */
-       if (new_snapshot && (kill_count == 0)) {
+       if (res == TRUE) {
+               /* Fire off snapshot notification */
                proc_list_lock();
-               memorystatus_jetsam_snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
-               proc_list_unlock();
+               size_t snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) +
+                   sizeof(memorystatus_jetsam_snapshot_entry_t) * memorystatus_jetsam_snapshot_count;
+               uint64_t timestamp_now = mach_absolute_time();
+               memorystatus_jetsam_snapshot->notification_time = timestamp_now;
+               if (memorystatus_jetsam_snapshot_count > 0 && (memorystatus_jetsam_snapshot_last_timestamp == 0 ||
+                   timestamp_now > memorystatus_jetsam_snapshot_last_timestamp + memorystatus_jetsam_snapshot_timeout)) {
+                       proc_list_unlock();
+                       int ret = memorystatus_send_note(kMemorystatusSnapshotNote, &snapshot_size, sizeof(snapshot_size));
+                       if (!ret) {
+                               proc_list_lock();
+                               memorystatus_jetsam_snapshot_last_timestamp = timestamp_now;
+                               proc_list_unlock();
+                       }
+               } else {
+                       proc_list_unlock();
+               }
        }
 
-       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_END,
-           memorystatus_available_pages, killed ? aPid : 0, kill_count, 0, 0);
-
-       return killed;
+       return res;
 }
 
+/*
+ * Jetsam a specific process.
+ */
 static boolean_t
-memorystatus_kill_process_async(pid_t victim_pid, uint32_t cause)
+memorystatus_kill_specific_process(pid_t victim_pid, uint32_t cause, os_reason_t jetsam_reason)
 {
-       /*
-        * TODO: allow a general async path
-        *
-        * NOTE: If a new async kill cause is added, make sure to update memorystatus_thread() to
-        * add the appropriate exit reason code mapping.
-        */
-       if ((victim_pid != -1) ||
-           (cause != kMemorystatusKilledVMPageShortage &&
-           cause != kMemorystatusKilledVMCompressorThrashing &&
-           cause != kMemorystatusKilledVMCompressorSpaceShortage &&
-           cause != kMemorystatusKilledFCThrashing &&
-           cause != kMemorystatusKilledZoneMapExhaustion)) {
+       boolean_t killed;
+       proc_t p;
+       uint64_t killtime = 0;
+       uint64_t footprint_of_killed_proc;
+       clock_sec_t     tv_sec;
+       clock_usec_t    tv_usec;
+       uint32_t        tv_msec;
+
+       /* TODO - add a victim queue and push this into the main jetsam thread */
+
+       p = proc_find(victim_pid);
+       if (!p) {
+               os_reason_free(jetsam_reason);
                return FALSE;
        }
 
-       kill_under_pressure_cause = cause;
-       memorystatus_thread_wake();
-       return TRUE;
-}
-
-boolean_t
-memorystatus_kill_on_VM_compressor_space_shortage(boolean_t async)
-{
-       if (async) {
-               return memorystatus_kill_process_async(-1, kMemorystatusKilledVMCompressorSpaceShortage);
-       } else {
-               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_VMCOMPRESSOR_SPACE_SHORTAGE);
-               if (jetsam_reason == OS_REASON_NULL) {
-                       printf("memorystatus_kill_on_VM_compressor_space_shortage -- sync: failed to allocate jetsam reason\n");
-               }
+       proc_list_lock();
 
-               return memorystatus_kill_process_sync(-1, kMemorystatusKilledVMCompressorSpaceShortage, jetsam_reason);
+       if (memorystatus_jetsam_snapshot_count == 0) {
+               memorystatus_init_jetsam_snapshot_locked(NULL, 0);
        }
-}
 
-#if CONFIG_JETSAM
-boolean_t
-memorystatus_kill_on_VM_compressor_thrashing(boolean_t async)
-{
-       if (async) {
-               return memorystatus_kill_process_async(-1, kMemorystatusKilledVMCompressorThrashing);
-       } else {
-               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_VMCOMPRESSOR_THRASHING);
-               if (jetsam_reason == OS_REASON_NULL) {
-                       printf("memorystatus_kill_on_VM_compressor_thrashing -- sync: failed to allocate jetsam reason\n");
-               }
+       killtime = mach_absolute_time();
+       absolutetime_to_microtime(killtime, &tv_sec, &tv_usec);
+       tv_msec = tv_usec / 1000;
 
-               return memorystatus_kill_process_sync(-1, kMemorystatusKilledVMCompressorThrashing, jetsam_reason);
-       }
-}
+       memorystatus_update_jetsam_snapshot_entry_locked(p, cause, killtime);
 
-boolean_t
-memorystatus_kill_on_VM_page_shortage(boolean_t async)
-{
-       if (async) {
-               return memorystatus_kill_process_async(-1, kMemorystatusKilledVMPageShortage);
-       } else {
-               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_VMPAGESHORTAGE);
-               if (jetsam_reason == OS_REASON_NULL) {
-                       printf("memorystatus_kill_on_VM_page_shortage -- sync: failed to allocate jetsam reason\n");
-               }
+       proc_list_unlock();
 
-               return memorystatus_kill_process_sync(-1, kMemorystatusKilledVMPageShortage, jetsam_reason);
-       }
+       killed = memorystatus_do_kill(p, cause, jetsam_reason, &footprint_of_killed_proc);
+
+       os_log_with_startup_serial(OS_LOG_DEFAULT, "%lu.%03d memorystatus: killing_specific_process pid %d [%s] (%s %d) %lluKB - memorystatus_available_pages: %llu\n",
+           (unsigned long)tv_sec, tv_msec, victim_pid, ((p && *p->p_name) ? p->p_name : "unknown"),
+           memorystatus_kill_cause_name[cause], (p ? p->p_memstat_effectivepriority: -1),
+           footprint_of_killed_proc >> 10, (uint64_t)MEMORYSTATUS_LOG_AVAILABLE_PAGES);
+
+       proc_rele(p);
+
+       return killed;
 }
 
-boolean_t
-memorystatus_kill_on_FC_thrashing(boolean_t async)
+
+/*
+ * Toggle the P_MEMSTAT_TERMINATED state.
+ * Takes the proc_list_lock.
+ */
+void
+proc_memstat_terminated(proc_t p, boolean_t set)
 {
-       if (async) {
-               return memorystatus_kill_process_async(-1, kMemorystatusKilledFCThrashing);
-       } else {
-               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_FCTHRASHING);
-               if (jetsam_reason == OS_REASON_NULL) {
-                       printf("memorystatus_kill_on_FC_thrashing -- sync: failed to allocate jetsam reason\n");
+#if DEVELOPMENT || DEBUG
+       if (p) {
+               proc_list_lock();
+               if (set == TRUE) {
+                       p->p_memstat_state |= P_MEMSTAT_TERMINATED;
+               } else {
+                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
                }
-
-               return memorystatus_kill_process_sync(-1, kMemorystatusKilledFCThrashing, jetsam_reason);
+               proc_list_unlock();
        }
+#else
+#pragma unused(p, set)
+       /*
+        * do nothing
+        */
+#endif /* DEVELOPMENT || DEBUG */
+       return;
 }
 
-boolean_t
-memorystatus_kill_on_vnode_limit(void)
+
+#if CONFIG_JETSAM
+/*
+ * This is invoked when cpulimits have been exceeded while in fatal mode.
+ * The jetsam_flags do not apply as those are for memory related kills.
+ * We call this routine so that the offending process is killed with
+ * a non-zero exit status.
+ */
+void
+jetsam_on_ledger_cpulimit_exceeded(void)
 {
-       os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_VNODE);
+       int retval = 0;
+       int jetsam_flags = 0;  /* make it obvious */
+       proc_t p = current_proc();
+       os_reason_t jetsam_reason = OS_REASON_NULL;
+
+       printf("task_exceeded_cpulimit: killing pid %d [%s]\n",
+           p->p_pid, (*p->p_name ? p->p_name : "(unknown)"));
+
+       jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_CPULIMIT);
        if (jetsam_reason == OS_REASON_NULL) {
-               printf("memorystatus_kill_on_vnode_limit: failed to allocate jetsam reason\n");
+               printf("task_exceeded_cpulimit: unable to allocate memory for jetsam reason\n");
        }
 
-       return memorystatus_kill_process_sync(-1, kMemorystatusKilledVnodes, jetsam_reason);
+       retval = jetsam_do_kill(p, jetsam_flags, jetsam_reason);
+
+       if (retval) {
+               printf("task_exceeded_cpulimit: failed to kill current task (exiting?).\n");
+       }
 }
 
 #endif /* CONFIG_JETSAM */
 
-boolean_t
-memorystatus_kill_on_zone_map_exhaustion(pid_t pid)
+static void
+memorystatus_get_task_memory_region_count(task_t task, uint64_t *count)
 {
-       boolean_t res = FALSE;
-       if (pid == -1) {
-               res = memorystatus_kill_process_async(-1, kMemorystatusKilledZoneMapExhaustion);
-       } else {
-               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_ZONE_MAP_EXHAUSTION);
-               if (jetsam_reason == OS_REASON_NULL) {
-                       printf("memorystatus_kill_on_zone_map_exhaustion: failed to allocate jetsam reason\n");
-               }
+       assert(task);
+       assert(count);
 
-               res = memorystatus_kill_process_sync(pid, kMemorystatusKilledZoneMapExhaustion, jetsam_reason);
-       }
-       return res;
+       *count = get_task_memory_region_count(task);
 }
 
-#if CONFIG_FREEZE
 
-__private_extern__ void
-memorystatus_freeze_init(void)
-{
-       kern_return_t result;
-       thread_t thread;
+#define MEMORYSTATUS_VM_MAP_FORK_ALLOWED     0x100000000
+#define MEMORYSTATUS_VM_MAP_FORK_NOT_ALLOWED 0x200000000
 
-       freezer_lck_grp_attr = lck_grp_attr_alloc_init();
-       freezer_lck_grp = lck_grp_alloc_init("freezer", freezer_lck_grp_attr);
+#if DEVELOPMENT || DEBUG
 
-       lck_mtx_init(&freezer_mutex, freezer_lck_grp, NULL);
+/*
+ * Sysctl only used to test memorystatus_allowed_vm_map_fork() path.
+ *   set a new pidwatch value
+ *     or
+ *   get the current pidwatch value
+ *
+ * The pidwatch_val starts out with a PID to watch for in the map_fork path.
+ * Its value is:
+ * - OR'd with MEMORYSTATUS_VM_MAP_FORK_ALLOWED if we allow the map_fork.
+ * - OR'd with MEMORYSTATUS_VM_MAP_FORK_NOT_ALLOWED if we disallow the map_fork.
+ * - set to -1ull if the map_fork() is aborted for other reasons.
+ */
 
-       /*
-        * This is just the default value if the underlying
-        * storage device doesn't have any specific budget.
-        * We check with the storage layer in memorystatus_freeze_update_throttle()
-        * before we start our freezing the first time.
-        */
-       memorystatus_freeze_budget_pages_remaining = (memorystatus_freeze_daily_mb_max * 1024 * 1024) / PAGE_SIZE;
+uint64_t memorystatus_vm_map_fork_pidwatch_val = 0;
 
-       result = kernel_thread_start(memorystatus_freeze_thread, NULL, &thread);
-       if (result == KERN_SUCCESS) {
-               proc_set_thread_policy(thread, TASK_POLICY_INTERNAL, TASK_POLICY_IO, THROTTLE_LEVEL_COMPRESSOR_TIER2);
-               proc_set_thread_policy(thread, TASK_POLICY_INTERNAL, TASK_POLICY_PASSIVE_IO, TASK_POLICY_ENABLE);
-               thread_set_thread_name(thread, "VM_freezer");
+static int sysctl_memorystatus_vm_map_fork_pidwatch SYSCTL_HANDLER_ARGS {
+#pragma unused(oidp, arg1, arg2)
 
-               thread_deallocate(thread);
-       } else {
-               panic("Could not create memorystatus_freeze_thread");
-       }
-}
+       uint64_t new_value = 0;
+       uint64_t old_value = 0;
+       int error = 0;
 
-static boolean_t
-memorystatus_is_process_eligible_for_freeze(proc_t p)
-{
        /*
-        * Called with proc_list_lock held.
+        * The pid is held in the low 32 bits.
+        * The 'allowed' flags are in the upper 32 bits.
         */
+       old_value = memorystatus_vm_map_fork_pidwatch_val;
 
-       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
-
-       boolean_t should_freeze = FALSE;
-       uint32_t state = 0, entry_count = 0, pages = 0, i = 0;
-       int probability_of_use = 0;
+       error = sysctl_io_number(req, old_value, sizeof(old_value), &new_value, NULL);
 
-       if (isApp(p) == FALSE) {
-               goto out;
+       if (error || !req->newptr) {
+               /*
+                * No new value passed in.
+                */
+               return error;
        }
 
-       state = p->p_memstat_state;
-
-       if ((state & (P_MEMSTAT_TERMINATED | P_MEMSTAT_LOCKED | P_MEMSTAT_FREEZE_DISABLED | P_MEMSTAT_FREEZE_IGNORE)) ||
-           !(state & P_MEMSTAT_SUSPENDED)) {
-               goto out;
-       }
+       /*
+        * A new pid was passed in via req->newptr.
+        * Ignore any attempt to set the higher order bits.
+        */
+       memorystatus_vm_map_fork_pidwatch_val = new_value & 0xFFFFFFFF;
+       printf("memorystatus: pidwatch old_value = 0x%llx, new_value = 0x%llx \n", old_value, new_value);
 
-       /* Only freeze processes meeting our minimum resident page criteria */
-       memorystatus_get_task_page_counts(p->task, &pages, NULL, NULL);
-       if (pages < memorystatus_freeze_pages_min) {
-               goto out;
-       }
+       return error;
+}
 
-       entry_count = (memorystatus_global_probabilities_size / sizeof(memorystatus_internal_probabilities_t));
+SYSCTL_PROC(_kern, OID_AUTO, memorystatus_vm_map_fork_pidwatch, CTLTYPE_QUAD | CTLFLAG_RW | CTLFLAG_LOCKED | CTLFLAG_MASKED,
+    0, 0, sysctl_memorystatus_vm_map_fork_pidwatch, "Q", "get/set pid watched for in vm_map_fork");
 
-       if (entry_count) {
-               for (i = 0; i < entry_count; i++) {
-                       if (strncmp(memorystatus_global_probabilities_table[i].proc_name,
-                           p->p_name,
-                           MAXCOMLEN + 1) == 0) {
-                               probability_of_use = memorystatus_global_probabilities_table[i].use_probability;
-                               break;
-                       }
+
+/*
+ * Record if a watched process fails to qualify for a vm_map_fork().
+ */
+void
+memorystatus_abort_vm_map_fork(task_t task)
+{
+       if (memorystatus_vm_map_fork_pidwatch_val != 0) {
+               proc_t p = get_bsdtask_info(task);
+               if (p != NULL && memorystatus_vm_map_fork_pidwatch_val == (uint64_t)p->p_pid) {
+                       memorystatus_vm_map_fork_pidwatch_val = -1ull;
                }
+       }
+}
 
-               if (probability_of_use == 0) {
-                       goto out;
+static void
+set_vm_map_fork_pidwatch(task_t task, uint64_t x)
+{
+       if (memorystatus_vm_map_fork_pidwatch_val != 0) {
+               proc_t p = get_bsdtask_info(task);
+               if (p && (memorystatus_vm_map_fork_pidwatch_val == (uint64_t)p->p_pid)) {
+                       memorystatus_vm_map_fork_pidwatch_val |= x;
                }
        }
+}
 
-       should_freeze = TRUE;
-out:
-       return should_freeze;
+#else /* DEVELOPMENT || DEBUG */
+
+
+static void
+set_vm_map_fork_pidwatch(task_t task, uint64_t x)
+{
+#pragma unused(task)
+#pragma unused(x)
 }
 
+#endif /* DEVELOPMENT || DEBUG */
+
 /*
- * Synchronously freeze the passed proc. Called with a reference to the proc held.
+ * Called during EXC_RESOURCE handling when a process exceeds a soft
+ * memory limit.  This is the corpse fork path and here we decide if
+ * vm_map_fork will be allowed when creating the corpse.
+ * The task being considered is suspended.
+ *
+ * By default, a vm_map_fork is allowed to proceed.
  *
- * Doesn't deal with re-freezing because this is called on a specific process and
- * not by the freezer thread. If that changes, we'll have to teach it about
- * refreezing a frozen process.
+ * A few simple policy assumptions:
+ *     If the device has a zero system-wide task limit,
+ *     then the vm_map_fork is allowed. macOS always has a zero
+ *     system wide task limit (unless overriden by a boot-arg).
  *
- * Returns EINVAL or the value returned by task_freeze().
+ *     And if a process's memory footprint calculates less
+ *     than or equal to quarter of the system-wide task limit,
+ *     then the vm_map_fork is allowed.  This calculation
+ *     is based on the assumption that a process can
+ *     munch memory up to the system-wide task limit.
  */
-int
-memorystatus_freeze_process_sync(proc_t p)
+extern boolean_t corpse_threshold_system_limit;
+boolean_t
+memorystatus_allowed_vm_map_fork(task_t task)
 {
-       int ret = EINVAL;
-       pid_t aPid = 0;
-       boolean_t memorystatus_freeze_swap_low = FALSE;
-       int     freezer_error_code = 0;
+       boolean_t is_allowed = TRUE;   /* default */
 
-       lck_mtx_lock(&freezer_mutex);
+       uint64_t footprint_in_bytes;
+       uint64_t max_allowed_bytes;
 
-       if (p == NULL) {
-               printf("memorystatus_freeze_process_sync: Invalid process\n");
-               goto exit;
+       if (max_task_footprint_mb == 0) {
+               set_vm_map_fork_pidwatch(task, MEMORYSTATUS_VM_MAP_FORK_ALLOWED);
+               return is_allowed;
        }
 
-       if (memorystatus_freeze_enabled == FALSE) {
-               printf("memorystatus_freeze_process_sync: Freezing is DISABLED\n");
-               goto exit;
-       }
+       footprint_in_bytes = get_task_phys_footprint(task);
 
-       if (!memorystatus_can_freeze(&memorystatus_freeze_swap_low)) {
-               printf("memorystatus_freeze_process_sync: Low compressor and/or low swap space...skipping freeze\n");
-               goto exit;
-       }
+       /*
+        * Maximum is 1/4 of the system-wide task limit by default.
+        */
+       max_allowed_bytes = ((uint64_t)max_task_footprint_mb * 1024 * 1024) >> 2;
 
-       memorystatus_freeze_update_throttle(&memorystatus_freeze_budget_pages_remaining);
-       if (!memorystatus_freeze_budget_pages_remaining) {
-               printf("memorystatus_freeze_process_sync: exit with NO available budget\n");
-               goto exit;
+#if DEBUG || DEVELOPMENT
+       if (corpse_threshold_system_limit) {
+               max_allowed_bytes = (uint64_t)max_task_footprint_mb * (1UL << 20);
        }
+#endif /* DEBUG || DEVELOPMENT */
 
-       proc_list_lock();
-
-       if (p != NULL) {
-               uint32_t purgeable, wired, clean, dirty, shared;
-               uint32_t max_pages, i;
-
-               aPid = p->p_pid;
-
-               /* Ensure the process is eligible for freezing */
-               if (memorystatus_is_process_eligible_for_freeze(p) == FALSE) {
-                       proc_list_unlock();
-                       goto exit;
-               }
-
-               if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
-                       max_pages = MIN(memorystatus_freeze_pages_max, memorystatus_freeze_budget_pages_remaining);
-               } else {
-                       /*
-                        * We only have the compressor without any swap.
-                        */
-                       max_pages = UINT32_MAX - 1;
-               }
-
-               /* Mark as locked temporarily to avoid kill */
-               p->p_memstat_state |= P_MEMSTAT_LOCKED;
-               proc_list_unlock();
-
-               KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_FREEZE) | DBG_FUNC_START,
-                   memorystatus_available_pages, 0, 0, 0, 0);
-
-               ret = task_freeze(p->task, &purgeable, &wired, &clean, &dirty, max_pages, &shared, &freezer_error_code, FALSE /* eval only */);
-
-               KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_FREEZE) | DBG_FUNC_END,
-                   memorystatus_available_pages, aPid, 0, 0, 0);
-
-               DTRACE_MEMORYSTATUS6(memorystatus_freeze, proc_t, p, unsigned int, memorystatus_available_pages, boolean_t, purgeable, unsigned int, wired, uint32_t, clean, uint32_t, dirty);
-
-               MEMORYSTATUS_DEBUG(1, "memorystatus_freeze_process_sync: task_freeze %s for pid %d [%s] - "
-                   "memorystatus_pages: %d, purgeable: %d, wired: %d, clean: %d, dirty: %d, max_pages %d, shared %d\n",
-                   (ret == KERN_SUCCESS) ? "SUCCEEDED" : "FAILED", aPid, (*p->p_name ? p->p_name : "(unknown)"),
-                   memorystatus_available_pages, purgeable, wired, clean, dirty, max_pages, shared);
+       if (footprint_in_bytes > max_allowed_bytes) {
+               printf("memorystatus disallowed vm_map_fork %lld  %lld\n", footprint_in_bytes, max_allowed_bytes);
+               set_vm_map_fork_pidwatch(task, MEMORYSTATUS_VM_MAP_FORK_NOT_ALLOWED);
+               return !is_allowed;
+       }
 
-               proc_list_lock();
+       set_vm_map_fork_pidwatch(task, MEMORYSTATUS_VM_MAP_FORK_ALLOWED);
+       return is_allowed;
+}
 
-               if (ret == KERN_SUCCESS) {
-                       os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus: freezing (specific) pid %d [%s]...done",
-                           aPid, (*p->p_name ? p->p_name : "unknown"));
+void
+memorystatus_get_task_page_counts(task_t task, uint32_t *footprint, uint32_t *max_footprint_lifetime, uint32_t *purgeable_pages)
+{
+       assert(task);
+       assert(footprint);
 
-                       memorystatus_freeze_entry_t data = { aPid, TRUE, dirty };
+       uint64_t pages;
 
-                       p->p_memstat_freeze_sharedanon_pages += shared;
+       pages = (get_task_phys_footprint(task) / PAGE_SIZE_64);
+       assert(((uint32_t)pages) == pages);
+       *footprint = (uint32_t)pages;
 
-                       memorystatus_frozen_shared_mb += shared;
+       if (max_footprint_lifetime) {
+               pages = (get_task_phys_footprint_lifetime_max(task) / PAGE_SIZE_64);
+               assert(((uint32_t)pages) == pages);
+               *max_footprint_lifetime = (uint32_t)pages;
+       }
+       if (purgeable_pages) {
+               pages = (get_task_purgeable_size(task) / PAGE_SIZE_64);
+               assert(((uint32_t)pages) == pages);
+               *purgeable_pages = (uint32_t)pages;
+       }
+}
 
-                       if ((p->p_memstat_state & P_MEMSTAT_FROZEN) == 0) {
-                               p->p_memstat_state |= P_MEMSTAT_FROZEN;
-                               memorystatus_frozen_count++;
-                       }
+static void
+memorystatus_get_task_phys_footprint_page_counts(task_t task,
+    uint64_t *internal_pages, uint64_t *internal_compressed_pages,
+    uint64_t *purgeable_nonvolatile_pages, uint64_t *purgeable_nonvolatile_compressed_pages,
+    uint64_t *alternate_accounting_pages, uint64_t *alternate_accounting_compressed_pages,
+    uint64_t *iokit_mapped_pages, uint64_t *page_table_pages, uint64_t *frozen_to_swap_pages)
+{
+       assert(task);
 
-                       p->p_memstat_frozen_count++;
+       if (internal_pages) {
+               *internal_pages = (get_task_internal(task) / PAGE_SIZE_64);
+       }
 
-                       /*
-                        * Still keeping the P_MEMSTAT_LOCKED bit till we are actually done elevating this frozen process
-                        * to its higher jetsam band.
-                        */
-                       proc_list_unlock();
+       if (internal_compressed_pages) {
+               *internal_compressed_pages = (get_task_internal_compressed(task) / PAGE_SIZE_64);
+       }
 
-                       memorystatus_send_note(kMemorystatusFreezeNote, &data, sizeof(data));
+       if (purgeable_nonvolatile_pages) {
+               *purgeable_nonvolatile_pages = (get_task_purgeable_nonvolatile(task) / PAGE_SIZE_64);
+       }
 
-                       if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
-                               ret = memorystatus_update_inactive_jetsam_priority_band(p->p_pid, MEMORYSTATUS_CMD_ELEVATED_INACTIVEJETSAMPRIORITY_ENABLE,
-                                   memorystatus_freeze_jetsam_band, TRUE);
+       if (purgeable_nonvolatile_compressed_pages) {
+               *purgeable_nonvolatile_compressed_pages = (get_task_purgeable_nonvolatile_compressed(task) / PAGE_SIZE_64);
+       }
 
-                               if (ret) {
-                                       printf("Elevating the frozen process failed with %d\n", ret);
-                                       /* not fatal */
-                                       ret = 0;
-                               }
+       if (alternate_accounting_pages) {
+               *alternate_accounting_pages = (get_task_alternate_accounting(task) / PAGE_SIZE_64);
+       }
 
-                               proc_list_lock();
+       if (alternate_accounting_compressed_pages) {
+               *alternate_accounting_compressed_pages = (get_task_alternate_accounting_compressed(task) / PAGE_SIZE_64);
+       }
 
-                               /* Update stats */
-                               for (i = 0; i < sizeof(throttle_intervals) / sizeof(struct throttle_interval_t); i++) {
-                                       throttle_intervals[i].pageouts += dirty;
-                               }
-                       } else {
-                               proc_list_lock();
-                       }
+       if (iokit_mapped_pages) {
+               *iokit_mapped_pages = (get_task_iokit_mapped(task) / PAGE_SIZE_64);
+       }
 
-                       memorystatus_freeze_pageouts += dirty;
+       if (page_table_pages) {
+               *page_table_pages = (get_task_page_table(task) / PAGE_SIZE_64);
+       }
 
-                       if (memorystatus_frozen_count == (memorystatus_frozen_processes_max - 1)) {
-                               /*
-                                * Add some eviction logic here? At some point should we
-                                * jetsam a process to get back its swap space so that we
-                                * can freeze a more eligible process at this moment in time?
-                                */
-                       }
-               } else {
-                       char reason[128];
-                       if (freezer_error_code == FREEZER_ERROR_EXCESS_SHARED_MEMORY) {
-                               strlcpy(reason, "too much shared memory", 128);
-                       }
+#if CONFIG_FREEZE
+       if (frozen_to_swap_pages) {
+               *frozen_to_swap_pages = (get_task_frozen_to_swap(task) / PAGE_SIZE_64);
+       }
+#else /* CONFIG_FREEZE */
+#pragma unused(frozen_to_swap_pages)
+#endif /* CONFIG_FREEZE */
+}
 
-                       if (freezer_error_code == FREEZER_ERROR_LOW_PRIVATE_SHARED_RATIO) {
-                               strlcpy(reason, "low private-shared pages ratio", 128);
-                       }
+#if CONFIG_FREEZE
+/*
+ * Copies the source entry into the destination snapshot.
+ * Returns true on success. Fails if the destination snapshot is full.
+ * Caller must hold the proc list lock.
+ */
+static bool
+memorystatus_jetsam_snapshot_copy_entry_locked(memorystatus_jetsam_snapshot_t *dst_snapshot, unsigned int dst_snapshot_size, const memorystatus_jetsam_snapshot_entry_t *src_entry)
+{
+       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
+       assert(dst_snapshot);
 
-                       if (freezer_error_code == FREEZER_ERROR_NO_COMPRESSOR_SPACE) {
-                               strlcpy(reason, "no compressor space", 128);
-                       }
+       if (dst_snapshot->entry_count == dst_snapshot_size) {
+               /* Destination snapshot is full. Can not be updated until it is consumed. */
+               return false;
+       }
+       if (dst_snapshot->entry_count == 0) {
+               memorystatus_init_jetsam_snapshot_header(dst_snapshot);
+       }
+       memorystatus_jetsam_snapshot_entry_t *dst_entry = &dst_snapshot->entries[dst_snapshot->entry_count++];
+       memcpy(dst_entry, src_entry, sizeof(memorystatus_jetsam_snapshot_entry_t));
+       return true;
+}
+#endif /* CONFIG_FREEZE */
 
-                       if (freezer_error_code == FREEZER_ERROR_NO_SWAP_SPACE) {
-                               strlcpy(reason, "no swap space", 128);
-                       }
+static bool
+memorystatus_init_jetsam_snapshot_entry_with_kill_locked(memorystatus_jetsam_snapshot_t *snapshot, proc_t p, uint32_t kill_cause, uint64_t killtime, memorystatus_jetsam_snapshot_entry_t **entry)
+{
+       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
+       memorystatus_jetsam_snapshot_entry_t *snapshot_list = snapshot->entries;
+       size_t i = snapshot->entry_count;
 
-                       os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus: freezing (specific) pid %d [%s]...skipped (%s)",
-                           aPid, (*p->p_name ? p->p_name : "unknown"), reason);
-                       p->p_memstat_state |= P_MEMSTAT_FREEZE_IGNORE;
-               }
+       if (memorystatus_init_jetsam_snapshot_entry_locked(p, &snapshot_list[i], (snapshot->js_gencount)) == TRUE) {
+               *entry = &snapshot_list[i];
+               (*entry)->killed       = kill_cause;
+               (*entry)->jse_killtime = killtime;
 
-               p->p_memstat_state &= ~P_MEMSTAT_LOCKED;
-               proc_list_unlock();
+               snapshot->entry_count = i + 1;
+               return true;
        }
-
-exit:
-       lck_mtx_unlock(&freezer_mutex);
-
-       return ret;
+       return false;
 }
 
-static int
-memorystatus_freeze_top_process(void)
+/*
+ * This routine only acts on the global jetsam event snapshot.
+ * Updating the process's entry can race when the memorystatus_thread
+ * has chosen to kill a process that is racing to exit on another core.
+ */
+static void
+memorystatus_update_jetsam_snapshot_entry_locked(proc_t p, uint32_t kill_cause, uint64_t killtime)
 {
-       pid_t aPid = 0;
-       int ret = -1;
-       proc_t p = PROC_NULL, next_p = PROC_NULL;
-       unsigned int i = 0;
-       unsigned int band = JETSAM_PRIORITY_IDLE;
-       boolean_t refreeze_processes = FALSE;
+       memorystatus_jetsam_snapshot_entry_t *entry = NULL;
+       memorystatus_jetsam_snapshot_t *snapshot    = NULL;
+       memorystatus_jetsam_snapshot_entry_t *snapshot_list = NULL;
 
-       proc_list_lock();
+       unsigned int i;
+#if CONFIG_FREEZE
+       bool copied_to_freezer_snapshot = false;
+#endif /* CONFIG_FREEZE */
+
+       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
 
-       if (memorystatus_frozen_count >= memorystatus_frozen_processes_max) {
+       if (memorystatus_jetsam_snapshot_count == 0) {
                /*
-                * Freezer is already full but we are here and so let's
-                * try to refreeze any processes we might have thawed
-                * in the past and push out their compressed state out.
+                * No active snapshot.
+                * Nothing to do.
                 */
-               refreeze_processes = TRUE;
-               band = (unsigned int) memorystatus_freeze_jetsam_band;
+               goto exit;
        }
 
-freeze_process:
-
-       next_p = memorystatus_get_first_proc_locked(&band, FALSE);
-       while (next_p) {
-               kern_return_t kr;
-               uint32_t purgeable, wired, clean, dirty, shared;
-               uint32_t max_pages = 0;
-               int     freezer_error_code = 0;
-
-               p = next_p;
-               next_p = memorystatus_get_next_proc_locked(&band, p, FALSE);
+       /*
+        * Sanity check as this routine should only be called
+        * from a jetsam kill path.
+        */
+       assert(kill_cause != 0 && killtime != 0);
 
-               aPid = p->p_pid;
+       snapshot       = memorystatus_jetsam_snapshot;
+       snapshot_list  = memorystatus_jetsam_snapshot->entries;
 
-               if (p->p_memstat_effectivepriority != (int32_t) band) {
-                       /*
-                        * We shouldn't be freezing processes outside the
-                        * prescribed band.
-                        */
-                       break;
-               }
+       for (i = 0; i < memorystatus_jetsam_snapshot_count; i++) {
+               if (snapshot_list[i].pid == p->p_pid) {
+                       entry = &snapshot_list[i];
 
-               /* Ensure the process is eligible for (re-)freezing */
-               if (refreeze_processes) {
-                       /*
-                        * Has to have been frozen once before.
-                        */
-                       if ((p->p_memstat_state & P_MEMSTAT_FROZEN) == FALSE) {
-                               continue;
+                       if (entry->killed || entry->jse_killtime) {
+                               /*
+                                * We apparently raced on the exit path
+                                * for this process, as it's snapshot entry
+                                * has already recorded a kill.
+                                */
+                               assert(entry->killed && entry->jse_killtime);
+                               break;
                        }
 
                        /*
-                        * Has to have been resumed once before.
+                        * Update the entry we just found in the snapshot.
                         */
-                       if ((p->p_memstat_state & P_MEMSTAT_REFREEZE_ELIGIBLE) == FALSE) {
-                               continue;
-                       }
 
-                       /*
-                        * Not currently being looked at for something.
-                        */
-                       if (p->p_memstat_state & P_MEMSTAT_LOCKED) {
-                               continue;
-                       }
+                       entry->killed       = kill_cause;
+                       entry->jse_killtime = killtime;
+                       entry->jse_gencount = snapshot->js_gencount;
+                       entry->jse_idle_delta = p->p_memstat_idle_delta;
+#if CONFIG_FREEZE
+                       entry->jse_thaw_count = p->p_memstat_thaw_count;
+                       entry->jse_freeze_skip_reason = p->p_memstat_freeze_skip_reason;
+#else /* CONFIG_FREEZE */
+                       entry->jse_thaw_count = 0;
+                       entry->jse_freeze_skip_reason = kMemorystatusFreezeSkipReasonNone;
+#endif /* CONFIG_FREEZE */
 
                        /*
-                        * We are going to try and refreeze and so re-evaluate
-                        * the process. We don't want to double count the shared
-                        * memory. So deduct the old snapshot here.
+                        * If a process has moved between bands since snapshot was
+                        * initialized, then likely these fields changed too.
                         */
-                       memorystatus_frozen_shared_mb -= p->p_memstat_freeze_sharedanon_pages;
-                       p->p_memstat_freeze_sharedanon_pages = 0;
-
-                       p->p_memstat_state &= ~P_MEMSTAT_REFREEZE_ELIGIBLE;
-                       memorystatus_refreeze_eligible_count--;
-               } else {
-                       if (memorystatus_is_process_eligible_for_freeze(p) == FALSE) {
-                               continue; // with lock held
+                       if (entry->priority != p->p_memstat_effectivepriority) {
+                               strlcpy(entry->name, p->p_name, sizeof(entry->name));
+                               entry->priority  = p->p_memstat_effectivepriority;
+                               entry->state     = memorystatus_build_state(p);
+                               entry->user_data = p->p_memstat_userdata;
+                               entry->fds       = p->p_fd->fd_nfiles;
                        }
-               }
 
-               if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
                        /*
-                        * Freezer backed by the compressor and swap file(s)
-                        * will hold compressed data.
+                        * Always update the page counts on a kill.
                         */
 
-                       max_pages = MIN(memorystatus_freeze_pages_max, memorystatus_freeze_budget_pages_remaining);
-               } else {
-                       /*
-                        * We only have the compressor pool.
-                        */
-                       max_pages = UINT32_MAX - 1;
-               }
+                       uint32_t pages              = 0;
+                       uint32_t max_pages_lifetime = 0;
+                       uint32_t purgeable_pages    = 0;
 
-               /* Mark as locked temporarily to avoid kill */
-               p->p_memstat_state |= P_MEMSTAT_LOCKED;
+                       memorystatus_get_task_page_counts(p->task, &pages, &max_pages_lifetime, &purgeable_pages);
+                       entry->pages              = (uint64_t)pages;
+                       entry->max_pages_lifetime = (uint64_t)max_pages_lifetime;
+                       entry->purgeable_pages    = (uint64_t)purgeable_pages;
 
-               p = proc_ref_locked(p);
-               if (!p) {
-                       break;
-               }
+                       uint64_t internal_pages                        = 0;
+                       uint64_t internal_compressed_pages             = 0;
+                       uint64_t purgeable_nonvolatile_pages           = 0;
+                       uint64_t purgeable_nonvolatile_compressed_pages = 0;
+                       uint64_t alternate_accounting_pages            = 0;
+                       uint64_t alternate_accounting_compressed_pages = 0;
+                       uint64_t iokit_mapped_pages                    = 0;
+                       uint64_t page_table_pages                      = 0;
+                       uint64_t frozen_to_swap_pages                  = 0;
 
-               proc_list_unlock();
+                       memorystatus_get_task_phys_footprint_page_counts(p->task, &internal_pages, &internal_compressed_pages,
+                           &purgeable_nonvolatile_pages, &purgeable_nonvolatile_compressed_pages,
+                           &alternate_accounting_pages, &alternate_accounting_compressed_pages,
+                           &iokit_mapped_pages, &page_table_pages, &frozen_to_swap_pages);
 
-               KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_FREEZE) | DBG_FUNC_START,
-                   memorystatus_available_pages, 0, 0, 0, 0);
+                       entry->jse_internal_pages = internal_pages;
+                       entry->jse_internal_compressed_pages = internal_compressed_pages;
+                       entry->jse_purgeable_nonvolatile_pages = purgeable_nonvolatile_pages;
+                       entry->jse_purgeable_nonvolatile_compressed_pages = purgeable_nonvolatile_compressed_pages;
+                       entry->jse_alternate_accounting_pages = alternate_accounting_pages;
+                       entry->jse_alternate_accounting_compressed_pages = alternate_accounting_compressed_pages;
+                       entry->jse_iokit_mapped_pages = iokit_mapped_pages;
+                       entry->jse_page_table_pages = page_table_pages;
+                       entry->jse_frozen_to_swap_pages = frozen_to_swap_pages;
 
-               kr = task_freeze(p->task, &purgeable, &wired, &clean, &dirty, max_pages, &shared, &freezer_error_code, FALSE /* eval only */);
+                       uint64_t region_count = 0;
+                       memorystatus_get_task_memory_region_count(p->task, &region_count);
+                       entry->jse_memory_region_count = region_count;
 
-               KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_FREEZE) | DBG_FUNC_END,
-                   memorystatus_available_pages, aPid, 0, 0, 0);
+                       goto exit;
+               }
+       }
 
-               MEMORYSTATUS_DEBUG(1, "memorystatus_freeze_top_process: task_freeze %s for pid %d [%s] - "
-                   "memorystatus_pages: %d, purgeable: %d, wired: %d, clean: %d, dirty: %d, max_pages %d, shared %d\n",
-                   (kr == KERN_SUCCESS) ? "SUCCEEDED" : "FAILED", aPid, (*p->p_name ? p->p_name : "(unknown)"),
-                   memorystatus_available_pages, purgeable, wired, clean, dirty, max_pages, shared);
+       if (entry == NULL) {
+               /*
+                * The entry was not found in the snapshot, so the process must have
+                * launched after the snapshot was initialized.
+                * Let's try to append the new entry.
+                */
+               if (memorystatus_jetsam_snapshot_count < memorystatus_jetsam_snapshot_max) {
+                       /*
+                        * A populated snapshot buffer exists
+                        * and there is room to init a new entry.
+                        */
+                       assert(memorystatus_jetsam_snapshot_count == snapshot->entry_count);
 
-               proc_list_lock();
+                       if (memorystatus_init_jetsam_snapshot_entry_with_kill_locked(snapshot, p, kill_cause, killtime, &entry)) {
+                               memorystatus_jetsam_snapshot_count++;
 
-               /* Success? */
-               if (KERN_SUCCESS == kr) {
-                       if (refreeze_processes) {
-                               os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus: Refreezing (general) pid %d [%s]...done",
-                                   aPid, (*p->p_name ? p->p_name : "unknown"));
-                       } else {
-                               os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus: freezing (general) pid %d [%s]...done",
-                                   aPid, (*p->p_name ? p->p_name : "unknown"));
+                               if (memorystatus_jetsam_snapshot_count >= memorystatus_jetsam_snapshot_max) {
+                                       /*
+                                        * We just used the last slot in the snapshot buffer.
+                                        * We only want to log it once... so we do it here
+                                        * when we notice we've hit the max.
+                                        */
+                                       printf("memorystatus: WARNING snapshot buffer is full, count %d\n",
+                                           memorystatus_jetsam_snapshot_count);
+                               }
                        }
+               }
+       }
 
-                       memorystatus_freeze_entry_t data = { aPid, TRUE, dirty };
-
-                       p->p_memstat_freeze_sharedanon_pages += shared;
+exit:
+       if (entry) {
+#if CONFIG_FREEZE
+               if (memorystatus_jetsam_use_freezer_snapshot && isApp(p)) {
+                       /* This is an app kill. Record it in the freezer snapshot so dasd can incorporate this in its recommendations. */
+                       copied_to_freezer_snapshot = memorystatus_jetsam_snapshot_copy_entry_locked(memorystatus_jetsam_snapshot_freezer, memorystatus_jetsam_snapshot_freezer_max, entry);
+                       if (copied_to_freezer_snapshot && memorystatus_jetsam_snapshot_freezer->entry_count == memorystatus_jetsam_snapshot_freezer_max) {
+                               /*
+                                * We just used the last slot in the freezer snapshot buffer.
+                                * We only want to log it once... so we do it here
+                                * when we notice we've hit the max.
+                                */
+                               os_log_error(OS_LOG_DEFAULT, "memorystatus: WARNING freezer snapshot buffer is full, count %zu",
+                                   memorystatus_jetsam_snapshot_freezer->entry_count);
+                       }
+               }
+#endif /* CONFIG_FREEZE */
+       } else {
+               /*
+                * If we reach here, the snapshot buffer could not be updated.
+                * Most likely, the buffer is full, in which case we would have
+                * logged a warning in the previous call.
+                *
+                * For now, we will stop appending snapshot entries.
+                * When the buffer is consumed, the snapshot state will reset.
+                */
 
-                       memorystatus_frozen_shared_mb += shared;
+               MEMORYSTATUS_DEBUG(4, "memorystatus_update_jetsam_snapshot_entry_locked: failed to update pid %d, priority %d, count %d\n",
+                   p->p_pid, p->p_memstat_effectivepriority, memorystatus_jetsam_snapshot_count);
 
-                       if ((p->p_memstat_state & P_MEMSTAT_FROZEN) == 0) {
-                               p->p_memstat_state |= P_MEMSTAT_FROZEN;
-                               memorystatus_frozen_count++;
+#if CONFIG_FREEZE
+               /* We still attempt to record this in the freezer snapshot */
+               if (memorystatus_jetsam_use_freezer_snapshot && isApp(p)) {
+                       snapshot = memorystatus_jetsam_snapshot_freezer;
+                       if (snapshot->entry_count < memorystatus_jetsam_snapshot_freezer_max) {
+                               copied_to_freezer_snapshot = memorystatus_init_jetsam_snapshot_entry_with_kill_locked(snapshot, p, kill_cause, killtime, &entry);
+                               if (copied_to_freezer_snapshot && memorystatus_jetsam_snapshot_freezer->entry_count == memorystatus_jetsam_snapshot_freezer_max) {
+                                       /*
+                                        * We just used the last slot in the freezer snapshot buffer.
+                                        * We only want to log it once... so we do it here
+                                        * when we notice we've hit the max.
+                                        */
+                                       os_log_error(OS_LOG_DEFAULT, "memorystatus: WARNING freezer snapshot buffer is full, count %zu",
+                                           memorystatus_jetsam_snapshot_freezer->entry_count);
+                               }
                        }
+               }
+#endif /* CONFIG_FREEZE */
+       }
 
-                       p->p_memstat_frozen_count++;
+       return;
+}
 
-                       /*
-                        * Still keeping the P_MEMSTAT_LOCKED bit till we are actually done elevating this frozen process
-                        * to its higher jetsam band.
-                        */
-                       proc_list_unlock();
+#if CONFIG_JETSAM
+void
+memorystatus_pages_update(unsigned int pages_avail)
+{
+       memorystatus_available_pages = pages_avail;
 
-                       memorystatus_send_note(kMemorystatusFreezeNote, &data, sizeof(data));
+#if VM_PRESSURE_EVENTS
+       /*
+        * Since memorystatus_available_pages changes, we should
+        * re-evaluate the pressure levels on the system and
+        * check if we need to wake the pressure thread.
+        * We also update memorystatus_level in that routine.
+        */
+       vm_pressure_response();
 
-                       if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
-                               ret = memorystatus_update_inactive_jetsam_priority_band(p->p_pid, MEMORYSTATUS_CMD_ELEVATED_INACTIVEJETSAMPRIORITY_ENABLE, memorystatus_freeze_jetsam_band, TRUE);
+       if (memorystatus_available_pages <= memorystatus_available_pages_pressure) {
+               if (memorystatus_hwm_candidates || (memorystatus_available_pages <= memorystatus_available_pages_critical)) {
+                       memorystatus_thread_wake();
+               }
+       }
+#if CONFIG_FREEZE
+       /*
+        * We can't grab the freezer_mutex here even though that synchronization would be correct to inspect
+        * the # of frozen processes and wakeup the freezer thread. Reason being that we come here into this
+        * code with (possibly) the page-queue locks held and preemption disabled. So trying to grab a mutex here
+        * will result in the "mutex with preemption disabled" panic.
+        */
 
-                               if (ret) {
-                                       printf("Elevating the frozen process failed with %d\n", ret);
-                                       /* not fatal */
-                                       ret = 0;
-                               }
+       if (memorystatus_freeze_thread_should_run() == TRUE) {
+               /*
+                * The freezer thread is usually woken up by some user-space call i.e. pid_hibernate(any process).
+                * That trigger isn't invoked often enough and so we are enabling this explicit wakeup here.
+                */
+               if (VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
+                       thread_wakeup((event_t)&memorystatus_freeze_wakeup);
+               }
+       }
+#endif /* CONFIG_FREEZE */
 
-                               proc_list_lock();
+#else /* VM_PRESSURE_EVENTS */
 
-                               /* Update stats */
-                               for (i = 0; i < sizeof(throttle_intervals) / sizeof(struct throttle_interval_t); i++) {
-                                       throttle_intervals[i].pageouts += dirty;
-                               }
-                       } else {
-                               proc_list_lock();
-                       }
+       boolean_t critical, delta;
 
-                       memorystatus_freeze_pageouts += dirty;
+       if (!memorystatus_delta) {
+               return;
+       }
 
-                       if (memorystatus_frozen_count == (memorystatus_frozen_processes_max - 1)) {
-                               /*
-                                * Add some eviction logic here? At some point should we
-                                * jetsam a process to get back its swap space so that we
-                                * can freeze a more eligible process at this moment in time?
-                                */
-                       }
+       critical = (pages_avail < memorystatus_available_pages_critical) ? TRUE : FALSE;
+       delta = ((pages_avail >= (memorystatus_available_pages + memorystatus_delta))
+           || (memorystatus_available_pages >= (pages_avail + memorystatus_delta))) ? TRUE : FALSE;
 
-                       /* Return KERN_SUCCESS */
-                       ret = kr;
+       if (critical || delta) {
+               unsigned int total_pages;
 
-                       p->p_memstat_state &= ~P_MEMSTAT_LOCKED;
-                       proc_rele_locked(p);
+               total_pages = (unsigned int) atop_64(max_mem);
+#if CONFIG_SECLUDED_MEMORY
+               total_pages -= vm_page_secluded_count;
+#endif /* CONFIG_SECLUDED_MEMORY */
+               memorystatus_level = memorystatus_available_pages * 100 / total_pages;
+               memorystatus_thread_wake();
+       }
+#endif /* VM_PRESSURE_EVENTS */
+}
+#endif /* CONFIG_JETSAM */
 
-                       /*
-                        * We froze a process successfully. We can stop now
-                        * and see if that helped.
-                        */
+static boolean_t
+memorystatus_init_jetsam_snapshot_entry_locked(proc_t p, memorystatus_jetsam_snapshot_entry_t *entry, uint64_t gencount)
+{
+       clock_sec_t                     tv_sec;
+       clock_usec_t                    tv_usec;
+       uint32_t pages = 0;
+       uint32_t max_pages_lifetime = 0;
+       uint32_t purgeable_pages = 0;
+       uint64_t internal_pages                         = 0;
+       uint64_t internal_compressed_pages              = 0;
+       uint64_t purgeable_nonvolatile_pages            = 0;
+       uint64_t purgeable_nonvolatile_compressed_pages = 0;
+       uint64_t alternate_accounting_pages             = 0;
+       uint64_t alternate_accounting_compressed_pages  = 0;
+       uint64_t iokit_mapped_pages                     = 0;
+       uint64_t page_table_pages                       = 0;
+       uint64_t frozen_to_swap_pages                   = 0;
+       uint64_t region_count                           = 0;
+       uint64_t cids[COALITION_NUM_TYPES];
 
-                       break;
-               } else {
-                       p->p_memstat_state &= ~P_MEMSTAT_LOCKED;
+       memset(entry, 0, sizeof(memorystatus_jetsam_snapshot_entry_t));
 
-                       if (refreeze_processes == TRUE) {
-                               if ((freezer_error_code == FREEZER_ERROR_EXCESS_SHARED_MEMORY) ||
-                                   (freezer_error_code == FREEZER_ERROR_LOW_PRIVATE_SHARED_RATIO)) {
-                                       /*
-                                        * Keeping this prior-frozen process in this high band when
-                                        * we failed to re-freeze it due to bad shared memory usage
-                                        * could cause excessive pressure on the lower bands.
-                                        * We need to demote it for now. It'll get re-evaluated next
-                                        * time because we don't set the P_MEMSTAT_FREEZE_IGNORE
-                                        * bit.
-                                        */
+       entry->pid = p->p_pid;
+       strlcpy(&entry->name[0], p->p_name, sizeof(entry->name));
+       entry->priority = p->p_memstat_effectivepriority;
 
-                                       p->p_memstat_state &= ~P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND;
-                                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
-                                       memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, TRUE, TRUE);
-                               }
-                       } else {
-                               p->p_memstat_state |= P_MEMSTAT_FREEZE_IGNORE;
-                       }
+       memorystatus_get_task_page_counts(p->task, &pages, &max_pages_lifetime, &purgeable_pages);
+       entry->pages              = (uint64_t)pages;
+       entry->max_pages_lifetime = (uint64_t)max_pages_lifetime;
+       entry->purgeable_pages    = (uint64_t)purgeable_pages;
 
-                       proc_rele_locked(p);
+       memorystatus_get_task_phys_footprint_page_counts(p->task, &internal_pages, &internal_compressed_pages,
+           &purgeable_nonvolatile_pages, &purgeable_nonvolatile_compressed_pages,
+           &alternate_accounting_pages, &alternate_accounting_compressed_pages,
+           &iokit_mapped_pages, &page_table_pages, &frozen_to_swap_pages);
 
-                       char reason[128];
-                       if (freezer_error_code == FREEZER_ERROR_EXCESS_SHARED_MEMORY) {
-                               strlcpy(reason, "too much shared memory", 128);
-                       }
+       entry->jse_internal_pages = internal_pages;
+       entry->jse_internal_compressed_pages = internal_compressed_pages;
+       entry->jse_purgeable_nonvolatile_pages = purgeable_nonvolatile_pages;
+       entry->jse_purgeable_nonvolatile_compressed_pages = purgeable_nonvolatile_compressed_pages;
+       entry->jse_alternate_accounting_pages = alternate_accounting_pages;
+       entry->jse_alternate_accounting_compressed_pages = alternate_accounting_compressed_pages;
+       entry->jse_iokit_mapped_pages = iokit_mapped_pages;
+       entry->jse_page_table_pages = page_table_pages;
+       entry->jse_frozen_to_swap_pages = frozen_to_swap_pages;
 
-                       if (freezer_error_code == FREEZER_ERROR_LOW_PRIVATE_SHARED_RATIO) {
-                               strlcpy(reason, "low private-shared pages ratio", 128);
-                       }
+       memorystatus_get_task_memory_region_count(p->task, &region_count);
+       entry->jse_memory_region_count = region_count;
+
+       entry->state     = memorystatus_build_state(p);
+       entry->user_data = p->p_memstat_userdata;
+       memcpy(&entry->uuid[0], &p->p_uuid[0], sizeof(p->p_uuid));
+       entry->fds       = p->p_fd->fd_nfiles;
+
+       absolutetime_to_microtime(get_task_cpu_time(p->task), &tv_sec, &tv_usec);
+       entry->cpu_time.tv_sec = (int64_t)tv_sec;
+       entry->cpu_time.tv_usec = (int64_t)tv_usec;
 
-                       if (freezer_error_code == FREEZER_ERROR_NO_COMPRESSOR_SPACE) {
-                               strlcpy(reason, "no compressor space", 128);
-                       }
+       assert(p->p_stats != NULL);
+       entry->jse_starttime =  p->p_stats->ps_start;   /* abstime process started */
+       entry->jse_killtime = 0;                        /* abstime jetsam chose to kill process */
+       entry->killed       = 0;                        /* the jetsam kill cause */
+       entry->jse_gencount = gencount;                 /* indicates a pass through jetsam thread, when process was targeted to be killed */
 
-                       if (freezer_error_code == FREEZER_ERROR_NO_SWAP_SPACE) {
-                               strlcpy(reason, "no swap space", 128);
-                       }
+       entry->jse_idle_delta = p->p_memstat_idle_delta; /* Most recent timespan spent in idle-band */
 
-                       os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus: freezing (general) pid %d [%s]...skipped (%s)",
-                           aPid, (*p->p_name ? p->p_name : "unknown"), reason);
+#if CONFIG_FREEZE
+       entry->jse_freeze_skip_reason = p->p_memstat_freeze_skip_reason;
+       entry->jse_thaw_count = p->p_memstat_thaw_count;
+#else /* CONFIG_FREEZE */
+       entry->jse_thaw_count = 0;
+       entry->jse_freeze_skip_reason = kMemorystatusFreezeSkipReasonNone;
+#endif /* CONFIG_FREEZE */
 
-                       if (vm_compressor_low_on_space() || vm_swap_low_on_space()) {
-                               break;
-                       }
-               }
-       }
+       proc_coalitionids(p, cids);
+       entry->jse_coalition_jetsam_id = cids[COALITION_TYPE_JETSAM];
 
-       if ((ret == -1) &&
-           (memorystatus_refreeze_eligible_count >= MIN_THAW_REFREEZE_THRESHOLD) &&
-           (refreeze_processes == FALSE)) {
-               /*
-                * We failed to freeze a process from the IDLE
-                * band AND we have some thawed  processes
-                * AND haven't tried refreezing as yet.
-                * Let's try and re-freeze processes in the
-                * frozen band that have been resumed in the past
-                * and so have brought in state from disk.
-                */
+       return TRUE;
+}
 
-               band = (unsigned int) memorystatus_freeze_jetsam_band;
+static void
+memorystatus_init_snapshot_vmstats(memorystatus_jetsam_snapshot_t *snapshot)
+{
+       kern_return_t kr = KERN_SUCCESS;
+       mach_msg_type_number_t  count = HOST_VM_INFO64_COUNT;
+       vm_statistics64_data_t  vm_stat;
 
-               refreeze_processes = TRUE;
+       if ((kr = host_statistics64(host_self(), HOST_VM_INFO64, (host_info64_t)&vm_stat, &count)) != KERN_SUCCESS) {
+               printf("memorystatus_init_jetsam_snapshot_stats: host_statistics64 failed with %d\n", kr);
+               memset(&snapshot->stats, 0, sizeof(snapshot->stats));
+       } else {
+               snapshot->stats.free_pages      = vm_stat.free_count;
+               snapshot->stats.active_pages    = vm_stat.active_count;
+               snapshot->stats.inactive_pages  = vm_stat.inactive_count;
+               snapshot->stats.throttled_pages = vm_stat.throttled_count;
+               snapshot->stats.purgeable_pages = vm_stat.purgeable_count;
+               snapshot->stats.wired_pages     = vm_stat.wire_count;
 
-               goto freeze_process;
+               snapshot->stats.speculative_pages = vm_stat.speculative_count;
+               snapshot->stats.filebacked_pages  = vm_stat.external_page_count;
+               snapshot->stats.anonymous_pages   = vm_stat.internal_page_count;
+               snapshot->stats.compressions      = vm_stat.compressions;
+               snapshot->stats.decompressions    = vm_stat.decompressions;
+               snapshot->stats.compressor_pages  = vm_stat.compressor_page_count;
+               snapshot->stats.total_uncompressed_pages_in_compressor = vm_stat.total_uncompressed_pages_in_compressor;
        }
 
-       proc_list_unlock();
+       get_zone_map_size(&snapshot->stats.zone_map_size, &snapshot->stats.zone_map_capacity);
 
-       return ret;
+       bzero(snapshot->stats.largest_zone_name, sizeof(snapshot->stats.largest_zone_name));
+       get_largest_zone_info(snapshot->stats.largest_zone_name, sizeof(snapshot->stats.largest_zone_name),
+           &snapshot->stats.largest_zone_size);
 }
 
-static inline boolean_t
-memorystatus_can_freeze_processes(void)
+/*
+ * Collect vm statistics at boot.
+ * Called only once (see kern_exec.c)
+ * Data can be consumed at any time.
+ */
+void
+memorystatus_init_at_boot_snapshot()
 {
-       boolean_t ret;
-
-       proc_list_lock();
-
-       if (memorystatus_suspended_count) {
-               memorystatus_freeze_suspended_threshold = MIN(memorystatus_freeze_suspended_threshold, FREEZE_SUSPENDED_THRESHOLD_DEFAULT);
-
-               if ((memorystatus_suspended_count - memorystatus_frozen_count) > memorystatus_freeze_suspended_threshold) {
-                       ret = TRUE;
-               } else {
-                       ret = FALSE;
-               }
-       } else {
-               ret = FALSE;
-       }
-
-       proc_list_unlock();
+       memorystatus_init_snapshot_vmstats(&memorystatus_at_boot_snapshot);
+       memorystatus_at_boot_snapshot.entry_count = 0;
+       memorystatus_at_boot_snapshot.notification_time = 0;   /* updated when consumed */
+       memorystatus_at_boot_snapshot.snapshot_time = mach_absolute_time();
+}
 
-       return ret;
+static void
+memorystatus_init_jetsam_snapshot_header(memorystatus_jetsam_snapshot_t *snapshot)
+{
+       memorystatus_init_snapshot_vmstats(snapshot);
+       snapshot->snapshot_time = mach_absolute_time();
+       snapshot->notification_time = 0;
+       snapshot->js_gencount = 0;
 }
 
-static boolean_t
-memorystatus_can_freeze(boolean_t *memorystatus_freeze_swap_low)
+static void
+memorystatus_init_jetsam_snapshot_locked(memorystatus_jetsam_snapshot_t *od_snapshot, uint32_t ods_list_count )
 {
-       boolean_t can_freeze = TRUE;
+       proc_t p, next_p;
+       unsigned int b = 0, i = 0;
 
-       /* Only freeze if we're sufficiently low on memory; this holds off freeze right
-       *  after boot,  and is generally is a no-op once we've reached steady state. */
-       if (memorystatus_available_pages > memorystatus_freeze_threshold) {
-               return FALSE;
-       }
+       memorystatus_jetsam_snapshot_t *snapshot = NULL;
+       memorystatus_jetsam_snapshot_entry_t *snapshot_list = NULL;
+       unsigned int snapshot_max = 0;
 
-       /* Check minimum suspended process threshold. */
-       if (!memorystatus_can_freeze_processes()) {
-               return FALSE;
-       }
-       assert(VM_CONFIG_COMPRESSOR_IS_PRESENT);
+       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
 
-       if (!VM_CONFIG_FREEZER_SWAP_IS_ACTIVE) {
+       if (od_snapshot) {
                /*
-                * In-core compressor used for freezing WITHOUT on-disk swap support.
+                * This is an on_demand snapshot
                 */
-               if (vm_compressor_low_on_space()) {
-                       if (*memorystatus_freeze_swap_low) {
-                               *memorystatus_freeze_swap_low = TRUE;
-                       }
-
-                       can_freeze = FALSE;
-               } else {
-                       if (*memorystatus_freeze_swap_low) {
-                               *memorystatus_freeze_swap_low = FALSE;
-                       }
-
-                       can_freeze = TRUE;
-               }
+               snapshot      = od_snapshot;
+               snapshot_list = od_snapshot->entries;
+               snapshot_max  = ods_list_count;
        } else {
                /*
-                * Freezing WITH on-disk swap support.
-                *
-                * In-core compressor fronts the swap.
+                * This is a jetsam event snapshot
                 */
-               if (vm_swap_low_on_space()) {
-                       if (*memorystatus_freeze_swap_low) {
-                               *memorystatus_freeze_swap_low = TRUE;
-                       }
-
-                       can_freeze = FALSE;
-               }
+               snapshot      = memorystatus_jetsam_snapshot;
+               snapshot_list = memorystatus_jetsam_snapshot->entries;
+               snapshot_max  = memorystatus_jetsam_snapshot_max;
        }
 
-       return can_freeze;
-}
-
-/*
- * This function evaluates if the currently frozen processes deserve
- * to stay in the higher jetsam band. If the # of thaws of a process
- * is below our threshold, then we will demote that process into the IDLE
- * band and put it at the head. We don't immediately kill the process here
- * because it  already has state on disk and so it might be worth giving
- * it another shot at getting thawed/resumed and used.
- */
-static void
-memorystatus_demote_frozen_processes(void)
-{
-       unsigned int band = (unsigned int) memorystatus_freeze_jetsam_band;
-       unsigned int demoted_proc_count = 0;
-       proc_t p = PROC_NULL, next_p = PROC_NULL;
-
-       proc_list_lock();
-
-       if (memorystatus_freeze_enabled == FALSE) {
-               /*
-                * Freeze has been disabled likely to
-                * reclaim swap space. So don't change
-                * any state on the frozen processes.
-                */
-               proc_list_unlock();
-               return;
-       }
+       memorystatus_init_jetsam_snapshot_header(snapshot);
 
-       next_p = memorystatus_get_first_proc_locked(&band, FALSE);
+       next_p = memorystatus_get_first_proc_locked(&b, TRUE);
        while (next_p) {
                p = next_p;
-               next_p = memorystatus_get_next_proc_locked(&band, p, FALSE);
+               next_p = memorystatus_get_next_proc_locked(&b, p, TRUE);
 
-               if ((p->p_memstat_state & P_MEMSTAT_FROZEN) == FALSE) {
+               if (FALSE == memorystatus_init_jetsam_snapshot_entry_locked(p, &snapshot_list[i], snapshot->js_gencount)) {
                        continue;
                }
 
-               if (p->p_memstat_state & P_MEMSTAT_LOCKED) {
-                       continue;
+               MEMORYSTATUS_DEBUG(0, "jetsam snapshot pid %d, uuid = %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
+                   p->p_pid,
+                   p->p_uuid[0], p->p_uuid[1], p->p_uuid[2], p->p_uuid[3], p->p_uuid[4], p->p_uuid[5], p->p_uuid[6], p->p_uuid[7],
+                   p->p_uuid[8], p->p_uuid[9], p->p_uuid[10], p->p_uuid[11], p->p_uuid[12], p->p_uuid[13], p->p_uuid[14], p->p_uuid[15]);
+
+               if (++i == snapshot_max) {
+                       break;
                }
+       }
 
-               if (p->p_memstat_thaw_count < memorystatus_thaw_count_demotion_threshold) {
-                       p->p_memstat_state &= ~P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND;
-                       memorystatus_invalidate_idle_demotion_locked(p, TRUE);
+       snapshot->entry_count = i;
+
+       if (!od_snapshot) {
+               /* update the system buffer count */
+               memorystatus_jetsam_snapshot_count = i;
+       }
+}
 
-                       memorystatus_update_priority_locked(p, JETSAM_PRIORITY_IDLE, TRUE, TRUE);
 #if DEVELOPMENT || DEBUG
-                       os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus_demote_frozen_process pid %d [%s]",
-                           p->p_pid, (*p->p_name ? p->p_name : "unknown"));
-#endif /* DEVELOPMENT || DEBUG */
 
-                       /*
-                        * The freezer thread will consider this a normal app to be frozen
-                        * because it is in the IDLE band. So we don't need the
-                        * P_MEMSTAT_REFREEZE_ELIGIBLE state here. Also, if it gets resumed
-                        * we'll correctly count it as eligible for re-freeze again.
-                        *
-                        * We don't drop the frozen count because this process still has
-                        * state on disk. So there's a chance it gets resumed and then it
-                        * should land in the higher jetsam band. For that it needs to
-                        * remain marked frozen.
-                        */
-                       if (p->p_memstat_state & P_MEMSTAT_REFREEZE_ELIGIBLE) {
-                               p->p_memstat_state &= ~P_MEMSTAT_REFREEZE_ELIGIBLE;
-                               memorystatus_refreeze_eligible_count--;
-                       }
+#if CONFIG_JETSAM
+static int
+memorystatus_cmd_set_panic_bits(user_addr_t buffer, size_t buffer_size)
+{
+       int ret;
+       memorystatus_jetsam_panic_options_t debug;
 
-                       demoted_proc_count++;
-               }
+       if (buffer_size != sizeof(memorystatus_jetsam_panic_options_t)) {
+               return EINVAL;
+       }
 
-               if (demoted_proc_count == memorystatus_max_frozen_demotions_daily) {
-                       break;
-               }
+       ret = copyin(buffer, &debug, buffer_size);
+       if (ret) {
+               return ret;
        }
 
-       memorystatus_thaw_count = 0;
-       proc_list_unlock();
-}
+       /* Panic bits match kMemorystatusKilled* enum */
+       memorystatus_jetsam_panic_debug = (memorystatus_jetsam_panic_debug & ~debug.mask) | (debug.data & debug.mask);
+
+       /* Copyout new value */
+       debug.data = memorystatus_jetsam_panic_debug;
+       ret = copyout(&debug, buffer, sizeof(memorystatus_jetsam_panic_options_t));
 
+       return ret;
+}
+#endif /* CONFIG_JETSAM */
 
 /*
- * This function will do 4 things:
+ * Verify that the given bucket has been sorted correctly.
  *
- * 1) check to see if we are currently in a degraded freezer mode, and if so:
- *     - check to see if our window has expired and we should exit this mode, OR,
- *     - return a budget based on the degraded throttle window's max. pageouts vs current pageouts.
+ * Walks through the bucket and verifies that all pids in the
+ * expected_order buffer are in that bucket and in the same
+ * relative order.
  *
- * 2) check to see if we are in a NEW normal window and update the normal throttle window's params.
- *
- * 3) check what the current normal window allows for a budget.
- *
- * 4) calculate the current rate of pageouts for DEGRADED_WINDOW_MINS duration. If that rate is below
- *    what we would normally expect, then we are running low on our daily budget and need to enter
- *    degraded perf. mode.
+ * The proc_list_lock must be held by the caller.
  */
+static int
+memorystatus_verify_sort_order(unsigned int bucket_index, pid_t *expected_order, size_t num_pids)
+{
+       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
 
-static void
-memorystatus_freeze_update_throttle(uint64_t *budget_pages_allowed)
+       int error = 0;
+       proc_t p = NULL;
+       size_t i = 0;
+
+       /*
+        * NB: We allow other procs to be mixed in within the expected ones.
+        * We just need the expected procs to be in the right order relative to each other.
+        */
+       p = memorystatus_get_first_proc_locked(&bucket_index, FALSE);
+       while (p) {
+               if (p->p_pid == expected_order[i]) {
+                       i++;
+               }
+               if (i == num_pids) {
+                       break;
+               }
+               p = memorystatus_get_next_proc_locked(&bucket_index, p, FALSE);
+       }
+       if (i != num_pids) {
+               char buffer[128];
+               size_t len = sizeof(buffer);
+               size_t buffer_idx = 0;
+               os_log_error(OS_LOG_DEFAULT, "memorystatus_verify_sort_order: Processes in bucket %d were not sorted properly\n", bucket_index);
+               for (i = 0; i < num_pids; i++) {
+                       int num_written = snprintf(buffer + buffer_idx, len - buffer_idx, "%d,", expected_order[i]);
+                       if (num_written <= 0) {
+                               break;
+                       }
+                       if (buffer_idx + (unsigned int) num_written >= len) {
+                               break;
+                       }
+                       buffer_idx += num_written;
+               }
+               os_log_error(OS_LOG_DEFAULT, "memorystatus_verify_sort_order: Expected order [%s]", buffer);
+               memset(buffer, 0, len);
+               buffer_idx = 0;
+               p = memorystatus_get_first_proc_locked(&bucket_index, FALSE);
+               i = 0;
+               os_log_error(OS_LOG_DEFAULT, "memorystatus_verify_sort_order: Actual order:");
+               while (p) {
+                       int num_written;
+                       if (buffer_idx == 0) {
+                               num_written = snprintf(buffer + buffer_idx, len - buffer_idx, "%zu: %d,", i, p->p_pid);
+                       } else {
+                               num_written = snprintf(buffer + buffer_idx, len - buffer_idx, "%d,", p->p_pid);
+                       }
+                       if (num_written <= 0) {
+                               break;
+                       }
+                       buffer_idx += (unsigned int) num_written;
+                       assert(buffer_idx <= len);
+                       if (i % 10 == 0) {
+                               os_log_error(OS_LOG_DEFAULT, "memorystatus_verify_sort_order: %s", buffer);
+                               buffer_idx = 0;
+                       }
+                       p = memorystatus_get_next_proc_locked(&bucket_index, p, FALSE);
+                       i++;
+               }
+               if (buffer_idx != 0) {
+                       os_log_error(OS_LOG_DEFAULT, "memorystatus_verify_sort_order: %s", buffer);
+               }
+               error = EINVAL;
+       }
+       return error;
+}
+
+/*
+ * Triggers a sort_order on a specified jetsam priority band.
+ * This is for testing only, used to force a path through the sort
+ * function.
+ */
+static int
+memorystatus_cmd_test_jetsam_sort(int priority,
+    int sort_order,
+    user_addr_t expected_order_user,
+    size_t expected_order_user_len)
 {
-       clock_sec_t sec;
-       clock_nsec_t nsec;
-       mach_timespec_t ts;
+       int error = 0;
+       unsigned int bucket_index = 0;
+       static size_t kMaxPids = 8;
+       pid_t expected_order[kMaxPids];
+       size_t copy_size = sizeof(expected_order);
+       size_t num_pids;
 
-       unsigned int freeze_daily_pageouts_max = 0;
+       if (expected_order_user_len < copy_size) {
+               copy_size = expected_order_user_len;
+       }
+       num_pids = copy_size / sizeof(pid_t);
 
-#if DEVELOPMENT || DEBUG
-       if (!memorystatus_freeze_throttle_enabled) {
-               /*
-                * No throttling...we can use the full budget everytime.
-                */
-               *budget_pages_allowed = UINT64_MAX;
-               return;
+       error = copyin(expected_order_user, expected_order, copy_size);
+       if (error != 0) {
+               return error;
        }
-#endif
 
-       clock_get_system_nanotime(&sec, &nsec);
-       ts.tv_sec = sec;
-       ts.tv_nsec = nsec;
+       if (priority == -1) {
+               /* Use as shorthand for default priority */
+               bucket_index = JETSAM_PRIORITY_DEFAULT;
+       } else {
+               bucket_index = (unsigned int)priority;
+       }
 
-       struct throttle_interval_t *interval = NULL;
+       /*
+        * Acquire lock before sorting so we can check the sort order
+        * while still holding the lock.
+        */
+       proc_list_lock();
 
-       if (memorystatus_freeze_degradation == TRUE) {
-               interval = degraded_throttle_window;
+       memorystatus_sort_bucket_locked(bucket_index, sort_order);
 
-               if (CMP_MACH_TIMESPEC(&ts, &interval->ts) >= 0) {
-                       memorystatus_freeze_degradation = FALSE;
-                       interval->pageouts = 0;
-                       interval->max_pageouts = 0;
-               } else {
-                       *budget_pages_allowed = interval->max_pageouts - interval->pageouts;
-               }
+       if (expected_order_user != CAST_USER_ADDR_T(NULL) && expected_order_user_len > 0) {
+               error = memorystatus_verify_sort_order(bucket_index, expected_order, num_pids);
        }
 
-       interval = normal_throttle_window;
+       proc_list_unlock();
 
-       if (CMP_MACH_TIMESPEC(&ts, &interval->ts) >= 0) {
-               /*
-                * New throttle window.
-                * Rollover any unused budget.
-                * Also ask the storage layer what the new budget needs to be.
-                */
-               uint64_t freeze_daily_budget = 0;
-               unsigned int daily_budget_pageouts = 0;
+       return error;
+}
 
-               if (vm_swap_max_budget(&freeze_daily_budget)) {
-                       memorystatus_freeze_daily_mb_max = (freeze_daily_budget / (1024 * 1024));
-                       os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus: memorystatus_freeze_daily_mb_max set to %dMB\n", memorystatus_freeze_daily_mb_max);
-               }
+#endif /* DEVELOPMENT || DEBUG */
 
-               freeze_daily_pageouts_max = memorystatus_freeze_daily_mb_max * (1024 * 1024 / PAGE_SIZE);
+/*
+ * Prepare the process to be killed (set state, update snapshot) and kill it.
+ */
+static uint64_t memorystatus_purge_before_jetsam_success = 0;
 
-               daily_budget_pageouts =  (interval->burst_multiple * (((uint64_t)interval->mins * freeze_daily_pageouts_max) / NORMAL_WINDOW_MINS));
-               interval->max_pageouts = (interval->max_pageouts - interval->pageouts) + daily_budget_pageouts;
+static boolean_t
+memorystatus_kill_proc(proc_t p, uint32_t cause, os_reason_t jetsam_reason, boolean_t *killed, uint64_t *footprint_of_killed_proc)
+{
+       pid_t aPid = 0;
+       uint32_t aPid_ep = 0;
 
-               interval->ts.tv_sec = interval->mins * 60;
-               interval->ts.tv_nsec = 0;
-               ADD_MACH_TIMESPEC(&interval->ts, &ts);
-               /* Since we update the throttle stats pre-freeze, adjust for overshoot here */
-               if (interval->pageouts > interval->max_pageouts) {
-                       interval->pageouts -= interval->max_pageouts;
-               } else {
-                       interval->pageouts = 0;
-               }
-               *budget_pages_allowed = interval->max_pageouts;
+       uint64_t        killtime = 0;
+       clock_sec_t     tv_sec;
+       clock_usec_t    tv_usec;
+       uint32_t        tv_msec;
+       boolean_t       retval = FALSE;
 
-               memorystatus_demote_frozen_processes();
-       } else {
-               /*
-                * Current throttle window.
-                * Deny freezing if we have no budget left.
-                * Try graceful degradation if we are within 25% of:
-                * - the daily budget, and
-                * - the current budget left is below our normal budget expectations.
-                */
+       aPid = p->p_pid;
+       aPid_ep = p->p_memstat_effectivepriority;
 
-#if DEVELOPMENT || DEBUG
+       if (cause != kMemorystatusKilledVnodes && cause != kMemorystatusKilledZoneMapExhaustion) {
                /*
-                * This can only happen in the INTERNAL configs because we allow modifying the daily budget for testing.
+                * Genuine memory pressure and not other (vnode/zone) resource exhaustion.
                 */
+               boolean_t success = FALSE;
+               uint64_t num_pages_purged;
+               uint64_t num_pages_reclaimed = 0;
+               uint64_t num_pages_unsecluded = 0;
 
-               if (freeze_daily_pageouts_max > interval->max_pageouts) {
+               networking_memstatus_callout(p, cause);
+               num_pages_purged = vm_purgeable_purge_task_owned(p->task);
+               num_pages_reclaimed += num_pages_purged;
+#if CONFIG_SECLUDED_MEMORY
+               if (cause == kMemorystatusKilledVMPageShortage &&
+                   vm_page_secluded_count > 0 &&
+                   task_can_use_secluded_mem(p->task, FALSE)) {
                        /*
-                        * We just bumped the daily budget. Re-evaluate our normal window params.
+                        * We're about to kill a process that has access
+                        * to the secluded pool.  Drain that pool into the
+                        * free or active queues to make these pages re-appear
+                        * as "available", which might make us no longer need
+                        * to kill that process.
+                        * Since the secluded pool does not get refilled while
+                        * a process has access to it, it should remain
+                        * drained.
                         */
-                       interval->max_pageouts = (interval->burst_multiple * (((uint64_t)interval->mins * freeze_daily_pageouts_max) / NORMAL_WINDOW_MINS));
-                       memorystatus_freeze_degradation = FALSE; //we'll re-evaluate this below...
+                       num_pages_unsecluded = vm_page_secluded_drain();
+                       num_pages_reclaimed += num_pages_unsecluded;
                }
-#endif /* DEVELOPMENT || DEBUG */
+#endif /* CONFIG_SECLUDED_MEMORY */
 
-               if (memorystatus_freeze_degradation == FALSE) {
-                       if (interval->pageouts >= interval->max_pageouts) {
-                               *budget_pages_allowed = 0;
+               if (num_pages_reclaimed) {
+                       /*
+                        * We actually reclaimed something and so let's
+                        * check if we need to continue with the kill.
+                        */
+                       if (cause == kMemorystatusKilledHiwat) {
+                               uint64_t footprint_in_bytes = get_task_phys_footprint(p->task);
+                               uint64_t memlimit_in_bytes  = (((uint64_t)p->p_memstat_memlimit) * 1024ULL * 1024ULL);  /* convert MB to bytes */
+                               success = (footprint_in_bytes <= memlimit_in_bytes);
                        } else {
-                               int budget_left = interval->max_pageouts - interval->pageouts;
-                               int budget_threshold = (freeze_daily_pageouts_max * FREEZE_DEGRADATION_BUDGET_THRESHOLD) / 100;
-
-                               mach_timespec_t time_left = {0, 0};
-
-                               time_left.tv_sec = interval->ts.tv_sec;
-                               time_left.tv_nsec = 0;
-
-                               SUB_MACH_TIMESPEC(&time_left, &ts);
-
-                               if (budget_left <= budget_threshold) {
+                               success = (memorystatus_avail_pages_below_pressure() == FALSE);
+#if CONFIG_SECLUDED_MEMORY
+                               if (!success && num_pages_unsecluded) {
                                        /*
-                                        * For the current normal window, calculate how much we would pageout in a DEGRADED_WINDOW_MINS duration.
-                                        * And also calculate what we would pageout for the same DEGRADED_WINDOW_MINS duration if we had the full
-                                        * daily pageout budget.
+                                        * We just drained the secluded pool
+                                        * because we're about to kill a
+                                        * process that has access to it.
+                                        * This is an important process and
+                                        * we'd rather not kill it unless
+                                        * absolutely necessary, so declare
+                                        * success even if draining the pool
+                                        * did not quite get us out of the
+                                        * "pressure" level but still got
+                                        * us out of the "critical" level.
                                         */
+                                       success = (memorystatus_avail_pages_below_critical() == FALSE);
+                               }
+#endif /* CONFIG_SECLUDED_MEMORY */
+                       }
 
-                                       unsigned int current_budget_rate_allowed = ((budget_left / time_left.tv_sec) / 60) * DEGRADED_WINDOW_MINS;
-                                       unsigned int normal_budget_rate_allowed = (freeze_daily_pageouts_max / NORMAL_WINDOW_MINS) * DEGRADED_WINDOW_MINS;
-
-                                       /*
-                                        * The current rate of pageouts is below what we would expect for
-                                        * the normal rate i.e. we have below normal budget left and so...
-                                        */
+                       if (success) {
+                               memorystatus_purge_before_jetsam_success++;
 
-                                       if (current_budget_rate_allowed < normal_budget_rate_allowed) {
-                                               memorystatus_freeze_degradation = TRUE;
-                                               degraded_throttle_window->max_pageouts = current_budget_rate_allowed;
-                                               degraded_throttle_window->pageouts = 0;
+                               os_log_with_startup_serial(OS_LOG_DEFAULT, "memorystatus: reclaimed %llu pages (%llu purged, %llu unsecluded) from pid %d [%s] and avoided %s\n",
+                                   num_pages_reclaimed, num_pages_purged, num_pages_unsecluded, aPid, ((p && *p->p_name) ? p->p_name : "unknown"), memorystatus_kill_cause_name[cause]);
 
-                                               /*
-                                                * Switch over to the degraded throttle window so the budget
-                                                * doled out is based on that window.
-                                                */
-                                               interval = degraded_throttle_window;
-                                       }
-                               }
+                               *killed = FALSE;
 
-                               *budget_pages_allowed = interval->max_pageouts - interval->pageouts;
+                               return TRUE;
                        }
                }
        }
 
-       MEMORYSTATUS_DEBUG(1, "memorystatus_freeze_update_throttle_interval: throttle updated - %d frozen (%d max) within %dm; %dm remaining; throttle %s\n",
-           interval->pageouts, interval->max_pageouts, interval->mins, (interval->ts.tv_sec - ts->tv_sec) / 60,
-           interval->throttle ? "on" : "off");
-}
+#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
+       MEMORYSTATUS_DEBUG(1, "jetsam: killing pid %d [%s] - %lld Mb > 1 (%d Mb)\n",
+           aPid, (*p->p_name ? p->p_name : "unknown"),
+           (footprint_in_bytes / (1024ULL * 1024ULL)),                 /* converted bytes to MB */
+           p->p_memstat_memlimit);
+#endif /* CONFIG_JETSAM && (DEVELOPMENT || DEBUG) */
 
-static void
-memorystatus_freeze_thread(void *param __unused, wait_result_t wr __unused)
-{
-       static boolean_t memorystatus_freeze_swap_low = FALSE;
+       killtime = mach_absolute_time();
+       absolutetime_to_microtime(killtime, &tv_sec, &tv_usec);
+       tv_msec = tv_usec / 1000;
 
-       lck_mtx_lock(&freezer_mutex);
+       proc_list_lock();
+       memorystatus_update_jetsam_snapshot_entry_locked(p, cause, killtime);
+       proc_list_unlock();
 
-       if (memorystatus_freeze_enabled) {
-               if ((memorystatus_frozen_count < memorystatus_frozen_processes_max) ||
-                   (memorystatus_refreeze_eligible_count >= MIN_THAW_REFREEZE_THRESHOLD)) {
-                       if (memorystatus_can_freeze(&memorystatus_freeze_swap_low)) {
-                               /* Only freeze if we've not exceeded our pageout budgets.*/
-                               memorystatus_freeze_update_throttle(&memorystatus_freeze_budget_pages_remaining);
+       char kill_reason_string[128];
 
-                               if (memorystatus_freeze_budget_pages_remaining) {
-                                       memorystatus_freeze_top_process();
-                               }
-                       }
+       if (cause == kMemorystatusKilledHiwat) {
+               strlcpy(kill_reason_string, "killing_highwater_process", 128);
+       } else {
+               if (aPid_ep == JETSAM_PRIORITY_IDLE) {
+                       strlcpy(kill_reason_string, "killing_idle_process", 128);
+               } else {
+                       strlcpy(kill_reason_string, "killing_top_process", 128);
                }
        }
 
        /*
-        * We use memorystatus_apps_idle_delay_time because if/when we adopt aging for applications,
-        * it'll tie neatly into running the freezer once we age an application.
-        *
-        * Till then, it serves as a good interval that can be tuned via a sysctl too.
+        * memorystatus_do_kill drops a reference, so take another one so we can
+        * continue to use this exit reason even after memorystatus_do_kill()
+        * returns
         */
-       memorystatus_freezer_thread_next_run_ts = mach_absolute_time() + memorystatus_apps_idle_delay_time;
+       os_reason_ref(jetsam_reason);
+
+       retval = memorystatus_do_kill(p, cause, jetsam_reason, footprint_of_killed_proc);
+       *killed = retval;
 
-       assert_wait((event_t) &memorystatus_freeze_wakeup, THREAD_UNINT);
-       lck_mtx_unlock(&freezer_mutex);
+       os_log_with_startup_serial(OS_LOG_DEFAULT, "%lu.%03d memorystatus: %s pid %d [%s] (%s %d) %lluKB - memorystatus_available_pages: %llu",
+           (unsigned long)tv_sec, tv_msec, kill_reason_string,
+           aPid, ((p && *p->p_name) ? p->p_name : "unknown"),
+           memorystatus_kill_cause_name[cause], aPid_ep,
+           (*footprint_of_killed_proc) >> 10, (uint64_t)MEMORYSTATUS_LOG_AVAILABLE_PAGES);
 
-       thread_block((thread_continue_t) memorystatus_freeze_thread);
+       return retval;
 }
 
+/*
+ * Jetsam the first process in the queue.
+ */
 static boolean_t
-memorystatus_freeze_thread_should_run(void)
+memorystatus_kill_top_process(boolean_t any, boolean_t sort_flag, uint32_t cause, os_reason_t jetsam_reason,
+    int32_t *priority, uint32_t *errors, uint64_t *memory_reclaimed)
 {
-       /*
-        * No freezer_mutex held here...see why near call-site
-        * within memorystatus_pages_update().
-        */
-
-       boolean_t should_run = FALSE;
-
-       if (memorystatus_freeze_enabled == FALSE) {
-               goto out;
-       }
-
-       if (memorystatus_available_pages > memorystatus_freeze_threshold) {
-               goto out;
-       }
+       pid_t aPid;
+       proc_t p = PROC_NULL, next_p = PROC_NULL;
+       boolean_t new_snapshot = FALSE, force_new_snapshot = FALSE, killed = FALSE, freed_mem = FALSE;
+       unsigned int i = 0;
+       uint32_t aPid_ep;
+       int32_t local_max_kill_prio = JETSAM_PRIORITY_IDLE;
+       uint64_t footprint_of_killed_proc = 0;
 
-       if ((memorystatus_frozen_count >= memorystatus_frozen_processes_max) &&
-           (memorystatus_refreeze_eligible_count < MIN_THAW_REFREEZE_THRESHOLD)) {
-               goto out;
-       }
+#ifndef CONFIG_FREEZE
+#pragma unused(any)
+#endif
 
-       if (memorystatus_frozen_shared_mb_max && (memorystatus_frozen_shared_mb >= memorystatus_frozen_shared_mb_max)) {
-               goto out;
-       }
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_START,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, 0, 0, 0, 0);
 
-       uint64_t curr_time = mach_absolute_time();
 
-       if (curr_time < memorystatus_freezer_thread_next_run_ts) {
-               goto out;
+#if CONFIG_JETSAM
+       if (sort_flag == TRUE) {
+               (void)memorystatus_sort_bucket(JETSAM_PRIORITY_FOREGROUND, JETSAM_SORT_DEFAULT);
        }
 
-       should_run = TRUE;
+       local_max_kill_prio = max_kill_priority;
 
-out:
-       return should_run;
-}
+       force_new_snapshot = FALSE;
 
-static int
-sysctl_memorystatus_do_fastwake_warmup_all  SYSCTL_HANDLER_ARGS
-{
-#pragma unused(oidp, req, arg1, arg2)
+#else /* CONFIG_JETSAM */
 
-       /* Need to be root or have entitlement */
-       if (!kauth_cred_issuser(kauth_cred_get()) && !IOTaskHasEntitlement(current_task(), MEMORYSTATUS_ENTITLEMENT)) {
-               return EPERM;
+       if (sort_flag == TRUE) {
+               (void)memorystatus_sort_bucket(JETSAM_PRIORITY_IDLE, JETSAM_SORT_DEFAULT);
        }
 
-       if (memorystatus_freeze_enabled == FALSE) {
-               return ENOTSUP;
+       /*
+        * On macos, we currently only have 2 reasons to be here:
+        *
+        * kMemorystatusKilledZoneMapExhaustion
+        * AND
+        * kMemorystatusKilledVMCompressorSpaceShortage
+        *
+        * If we are here because of kMemorystatusKilledZoneMapExhaustion, we will consider
+        * any and all processes as eligible kill candidates since we need to avoid a panic.
+        *
+        * Since this function can be called async. it is harder to toggle the max_kill_priority
+        * value before and after a call. And so we use this local variable to set the upper band
+        * on the eligible kill bands.
+        */
+       if (cause == kMemorystatusKilledZoneMapExhaustion) {
+               local_max_kill_prio = JETSAM_PRIORITY_MAX;
+       } else {
+               local_max_kill_prio = max_kill_priority;
        }
 
-       do_fastwake_warmup_all();
-
-       return 0;
-}
-
-SYSCTL_PROC(_kern, OID_AUTO, memorystatus_do_fastwake_warmup_all, CTLTYPE_INT | CTLFLAG_WR | CTLFLAG_LOCKED | CTLFLAG_MASKED,
-    0, 0, &sysctl_memorystatus_do_fastwake_warmup_all, "I", "");
-
-#endif /* CONFIG_FREEZE */
-
-#if VM_PRESSURE_EVENTS
-
-#if CONFIG_MEMORYSTATUS
-
-static int
-memorystatus_send_note(int event_code, void *data, size_t data_length)
-{
-       int ret;
-       struct kev_msg ev_msg;
-
-       ev_msg.vendor_code    = KEV_VENDOR_APPLE;
-       ev_msg.kev_class      = KEV_SYSTEM_CLASS;
-       ev_msg.kev_subclass   = KEV_MEMORYSTATUS_SUBCLASS;
-
-       ev_msg.event_code     = event_code;
+       /*
+        * And, because we are here under extreme circumstances, we force a snapshot even for
+        * IDLE kills.
+        */
+       force_new_snapshot = TRUE;
 
-       ev_msg.dv[0].data_length = data_length;
-       ev_msg.dv[0].data_ptr = data;
-       ev_msg.dv[1].data_length = 0;
+#endif /* CONFIG_JETSAM */
 
-       ret = kev_post_msg(&ev_msg);
-       if (ret) {
-               printf("%s: kev_post_msg() failed, err %d\n", __func__, ret);
+       if (cause != kMemorystatusKilledZoneMapExhaustion &&
+           jetsam_current_thread() != NULL &&
+           jetsam_current_thread()->limit_to_low_bands &&
+           local_max_kill_prio > JETSAM_PRIORITY_BACKGROUND) {
+               local_max_kill_prio = JETSAM_PRIORITY_BACKGROUND;
        }
 
-       return ret;
-}
+       proc_list_lock();
 
-boolean_t
-memorystatus_warn_process(pid_t pid, __unused boolean_t is_active, __unused boolean_t is_fatal, boolean_t limit_exceeded)
-{
-       boolean_t ret = FALSE;
-       boolean_t found_knote = FALSE;
-       struct knote *kn = NULL;
-       int send_knote_count = 0;
+       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+       while (next_p && (next_p->p_memstat_effectivepriority <= local_max_kill_prio)) {
+               p = next_p;
+               next_p = memorystatus_get_next_proc_locked(&i, p, TRUE);
 
-       /*
-        * See comment in sysctl_memorystatus_vm_pressure_send.
-        */
 
-       memorystatus_klist_lock();
+               aPid = p->p_pid;
+               aPid_ep = p->p_memstat_effectivepriority;
 
-       SLIST_FOREACH(kn, &memorystatus_klist, kn_selnext) {
-               proc_t knote_proc = knote_get_kq(kn)->kq_p;
-               pid_t knote_pid = knote_proc->p_pid;
+               if (p->p_memstat_state & (P_MEMSTAT_ERROR | P_MEMSTAT_TERMINATED)) {
+                       continue;   /* with lock held */
+               }
 
-               if (knote_pid == pid) {
+               if (cause == kMemorystatusKilledVnodes) {
                        /*
-                        * By setting the "fflags" here, we are forcing
-                        * a process to deal with the case where it's
-                        * bumping up into its memory limits. If we don't
-                        * do this here, we will end up depending on the
-                        * system pressure snapshot evaluation in
-                        * filt_memorystatus().
+                        * If the system runs out of vnodes, we systematically jetsam
+                        * processes in hopes of stumbling onto a vnode gain that helps
+                        * the system recover.  The process that happens to trigger
+                        * this path has no known relationship to the vnode shortage.
+                        * Deadlock avoidance: attempt to safeguard the caller.
                         */
 
-#if CONFIG_EMBEDDED
-                       if (!limit_exceeded) {
+                       if (p == current_proc()) {
+                               /* do not jetsam the current process */
+                               continue;
+                       }
+               }
+
+#if CONFIG_FREEZE
+               boolean_t skip;
+               boolean_t reclaim_proc = !(p->p_memstat_state & P_MEMSTAT_LOCKED);
+               if (any || reclaim_proc) {
+                       skip = FALSE;
+               } else {
+                       skip = TRUE;
+               }
+
+               if (skip) {
+                       continue;
+               } else
+#endif
+               {
+                       if (proc_ref_locked(p) == p) {
                                /*
-                                * Intentionally set either the unambiguous limit warning,
-                                * the system-wide critical or the system-wide warning
-                                * notification bit.
+                                * Mark as terminated so that if exit1() indicates success, but the process (for example)
+                                * is blocked in task_exception_notify(), it'll be skipped if encountered again - see
+                                * <rdar://problem/13553476>. This is cheaper than examining P_LEXIT, which requires the
+                                * acquisition of the proc lock.
                                 */
-
-                               if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN) {
-                                       kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_WARN;
-                                       found_knote = TRUE;
-                                       send_knote_count++;
-                               } else if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PRESSURE_CRITICAL) {
-                                       kn->kn_fflags = NOTE_MEMORYSTATUS_PRESSURE_CRITICAL;
-                                       found_knote = TRUE;
-                                       send_knote_count++;
-                               } else if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PRESSURE_WARN) {
-                                       kn->kn_fflags = NOTE_MEMORYSTATUS_PRESSURE_WARN;
-                                       found_knote = TRUE;
-                                       send_knote_count++;
-                               }
+                               p->p_memstat_state |= P_MEMSTAT_TERMINATED;
                        } else {
                                /*
-                                * Send this notification when a process has exceeded a soft limit.
+                                * We need to restart the search again because
+                                * proc_ref_locked _can_ drop the proc_list lock
+                                * and we could have lost our stored next_p via
+                                * an exit() on another core.
                                 */
-                               if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL) {
-                                       kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL;
-                                       found_knote = TRUE;
-                                       send_knote_count++;
-                               }
+                               i = 0;
+                               next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+                               continue;
                        }
-#else /* CONFIG_EMBEDDED */
-                       if (!limit_exceeded) {
-                               /*
-                                * Processes on desktop are not expecting to handle a system-wide
-                                * critical or system-wide warning notification from this path.
-                                * Intentionally set only the unambiguous limit warning here.
-                                *
-                                * If the limit is soft, however, limit this to one notification per
-                                * active/inactive limit (per each registered listener).
-                                */
 
-                               if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN) {
-                                       found_knote = TRUE;
-                                       if (!is_fatal) {
-                                               /*
-                                                * Restrict proc_limit_warn notifications when
-                                                * non-fatal (soft) limit is at play.
-                                                */
-                                               if (is_active) {
-                                                       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_ACTIVE) {
-                                                               /*
-                                                                * Mark this knote for delivery.
-                                                                */
-                                                               kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_WARN;
-                                                               /*
-                                                                * And suppress it from future notifications.
-                                                                */
-                                                               kn->kn_sfflags &= ~NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_ACTIVE;
-                                                               send_knote_count++;
-                                                       }
-                                               } else {
-                                                       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_INACTIVE) {
-                                                               /*
-                                                                * Mark this knote for delivery.
-                                                                */
-                                                               kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_WARN;
-                                                               /*
-                                                                * And suppress it from future notifications.
-                                                                */
-                                                               kn->kn_sfflags &= ~NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_INACTIVE;
-                                                               send_knote_count++;
-                                                       }
-                                               }
-                                       } else {
-                                               /*
-                                                * No restriction on proc_limit_warn notifications when
-                                                * fatal (hard) limit is at play.
-                                                */
-                                               kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_WARN;
-                                               send_knote_count++;
-                                       }
-                               }
-                       } else {
-                               /*
-                                * Send this notification when a process has exceeded a soft limit,
-                                */
+                       /*
+                        * Capture a snapshot if none exists and:
+                        * - we are forcing a new snapshot creation, either because:
+                        *      - on a particular platform we need these snapshots every time, OR
+                        *      - a boot-arg/embedded device tree property has been set.
+                        * - priority was not requested (this is something other than an ambient kill)
+                        * - the priority was requested *and* the targeted process is not at idle priority
+                        */
+                       if ((memorystatus_jetsam_snapshot_count == 0) &&
+                           (force_new_snapshot || memorystatus_idle_snapshot || ((!priority) || (priority && (aPid_ep != JETSAM_PRIORITY_IDLE))))) {
+                               memorystatus_init_jetsam_snapshot_locked(NULL, 0);
+                               new_snapshot = TRUE;
+                       }
 
-                               if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL) {
-                                       found_knote = TRUE;
-                                       if (!is_fatal) {
-                                               /*
-                                                * Restrict critical notifications for soft limits.
-                                                */
+                       proc_list_unlock();
 
-                                               if (is_active) {
-                                                       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_ACTIVE) {
-                                                               /*
-                                                                * Suppress future proc_limit_critical notifications
-                                                                * for the active soft limit.
-                                                                */
-                                                               kn->kn_sfflags &= ~NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_ACTIVE;
-                                                               kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL;
-                                                               send_knote_count++;
-                                                       }
-                                               } else {
-                                                       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_INACTIVE) {
-                                                               /*
-                                                                * Suppress future proc_limit_critical_notifications
-                                                                * for the inactive soft limit.
-                                                                */
-                                                               kn->kn_sfflags &= ~NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_INACTIVE;
-                                                               kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL;
-                                                               send_knote_count++;
-                                                       }
-                                               }
-                                       } else {
-                                               /*
-                                                * We should never be trying to send a critical notification for
-                                                * a hard limit... the process would be killed before it could be
-                                                * received.
-                                                */
-                                               panic("Caught sending pid %d a critical warning for a fatal limit.\n", pid);
+                       freed_mem = memorystatus_kill_proc(p, cause, jetsam_reason, &killed, &footprint_of_killed_proc); /* purged and/or killed 'p' */
+                       /* Success? */
+                       if (freed_mem) {
+                               if (killed) {
+                                       *memory_reclaimed = footprint_of_killed_proc;
+                                       if (priority) {
+                                               *priority = aPid_ep;
                                        }
+                               } else {
+                                       /* purged */
+                                       proc_list_lock();
+                                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
+                                       proc_list_unlock();
                                }
+                               proc_rele(p);
+                               goto exit;
                        }
-#endif /* CONFIG_EMBEDDED */
-               }
-       }
 
-       if (found_knote) {
-               if (send_knote_count > 0) {
-                       KNOTE(&memorystatus_klist, 0);
+                       /*
+                        * Failure - first unwind the state,
+                        * then fall through to restart the search.
+                        */
+                       proc_list_lock();
+                       proc_rele_locked(p);
+                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
+                       p->p_memstat_state |= P_MEMSTAT_ERROR;
+                       *errors += 1;
+
+                       i = 0;
+                       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
                }
-               ret = TRUE;
        }
 
-       memorystatus_klist_unlock();
-
-       return ret;
-}
-
-/*
- * Can only be set by the current task on itself.
- */
-int
-memorystatus_low_mem_privileged_listener(uint32_t op_flags)
-{
-       boolean_t set_privilege = FALSE;
-       /*
-        * Need an entitlement check here?
-        */
-       if (op_flags == MEMORYSTATUS_CMD_PRIVILEGED_LISTENER_ENABLE) {
-               set_privilege = TRUE;
-       } else if (op_flags == MEMORYSTATUS_CMD_PRIVILEGED_LISTENER_DISABLE) {
-               set_privilege = FALSE;
-       } else {
-               return EINVAL;
-       }
+       proc_list_unlock();
 
-       return task_low_mem_privileged_listener(current_task(), set_privilege, NULL);
-}
+exit:
+       os_reason_free(jetsam_reason);
 
-int
-memorystatus_send_pressure_note(pid_t pid)
-{
-       MEMORYSTATUS_DEBUG(1, "memorystatus_send_pressure_note(): pid %d\n", pid);
-       return memorystatus_send_note(kMemorystatusPressureNote, &pid, sizeof(pid));
-}
+       if (!killed) {
+               *memory_reclaimed = 0;
 
-void
-memorystatus_send_low_swap_note(void)
-{
-       struct knote *kn = NULL;
-
-       memorystatus_klist_lock();
-       SLIST_FOREACH(kn, &memorystatus_klist, kn_selnext) {
-               /* We call is_knote_registered_modify_task_pressure_bits to check if the sfflags for the
-                * current note contain NOTE_MEMORYSTATUS_LOW_SWAP. Once we find one note in the memorystatus_klist
-                * that has the NOTE_MEMORYSTATUS_LOW_SWAP flags in its sfflags set, we call KNOTE with
-                * kMemoryStatusLowSwap as the hint to process and update all knotes on the memorystatus_klist accordingly. */
-               if (is_knote_registered_modify_task_pressure_bits(kn, NOTE_MEMORYSTATUS_LOW_SWAP, NULL, 0, 0) == TRUE) {
-                       KNOTE(&memorystatus_klist, kMemorystatusLowSwap);
-                       break;
+               /* Clear snapshot if freshly captured and no target was found */
+               if (new_snapshot) {
+                       proc_list_lock();
+                       memorystatus_jetsam_snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
+                       proc_list_unlock();
                }
        }
 
-       memorystatus_klist_unlock();
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_END,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, killed ? aPid : 0, killed, *memory_reclaimed, 0);
+
+       return killed;
 }
 
-boolean_t
-memorystatus_bg_pressure_eligible(proc_t p)
+/*
+ * Jetsam aggressively
+ */
+static boolean_t
+memorystatus_kill_processes_aggressive(uint32_t cause, int aggr_count,
+    int32_t priority_max, uint32_t *errors, uint64_t *memory_reclaimed)
 {
-       boolean_t eligible = FALSE;
-
-       proc_list_lock();
+       pid_t aPid;
+       proc_t p = PROC_NULL, next_p = PROC_NULL;
+       boolean_t new_snapshot = FALSE, killed = FALSE;
+       int kill_count = 0;
+       unsigned int i = 0;
+       int32_t aPid_ep = 0;
+       unsigned int memorystatus_level_snapshot = 0;
+       uint64_t killtime = 0;
+       clock_sec_t     tv_sec;
+       clock_usec_t    tv_usec;
+       uint32_t        tv_msec;
+       os_reason_t jetsam_reason = OS_REASON_NULL;
+       uint64_t footprint_of_killed_proc = 0;
 
-       MEMORYSTATUS_DEBUG(1, "memorystatus_bg_pressure_eligible: pid %d, state 0x%x\n", p->p_pid, p->p_memstat_state);
+       *memory_reclaimed = 0;
 
-       /* Foreground processes have already been dealt with at this point, so just test for eligibility */
-       if (!(p->p_memstat_state & (P_MEMSTAT_TERMINATED | P_MEMSTAT_LOCKED | P_MEMSTAT_SUSPENDED | P_MEMSTAT_FROZEN))) {
-               eligible = TRUE;
-       }
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_START,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, priority_max, 0, 0, 0);
 
-       if (p->p_memstat_effectivepriority < JETSAM_PRIORITY_BACKGROUND_OPPORTUNISTIC) {
+       if (priority_max >= JETSAM_PRIORITY_FOREGROUND) {
                /*
-                * IDLE and IDLE_DEFERRED bands contain processes
-                * that have dropped memory to be under their inactive
-                * memory limits. And so they can't really give back
-                * anything.
+                * Check if aggressive jetsam has been asked to kill upto or beyond the
+                * JETSAM_PRIORITY_FOREGROUND bucket. If yes, sort the FG band based on
+                * coalition footprint.
                 */
-               eligible = FALSE;
+               memorystatus_sort_bucket(JETSAM_PRIORITY_FOREGROUND, JETSAM_SORT_DEFAULT);
        }
 
-       proc_list_unlock();
-
-       return eligible;
-}
-
-boolean_t
-memorystatus_is_foreground_locked(proc_t p)
-{
-       return (p->p_memstat_effectivepriority == JETSAM_PRIORITY_FOREGROUND) ||
-              (p->p_memstat_effectivepriority == JETSAM_PRIORITY_FOREGROUND_SUPPORT);
-}
-
-/*
- * This is meant for stackshot and kperf -- it does not take the proc_list_lock
- * to access the p_memstat_dirty field.
- */
-void
-memorystatus_proc_flags_unsafe(void * v, boolean_t *is_dirty, boolean_t *is_dirty_tracked, boolean_t *allow_idle_exit)
-{
-       if (!v) {
-               *is_dirty = FALSE;
-               *is_dirty_tracked = FALSE;
-               *allow_idle_exit = FALSE;
-       } else {
-               proc_t p = (proc_t)v;
-               *is_dirty = (p->p_memstat_dirty & P_DIRTY_IS_DIRTY) != 0;
-               *is_dirty_tracked = (p->p_memstat_dirty & P_DIRTY_TRACK) != 0;
-               *allow_idle_exit = (p->p_memstat_dirty & P_DIRTY_ALLOW_IDLE_EXIT) != 0;
+       jetsam_reason = os_reason_create(OS_REASON_JETSAM, cause);
+       if (jetsam_reason == OS_REASON_NULL) {
+               printf("memorystatus_kill_processes_aggressive: failed to allocate exit reason\n");
        }
-}
 
-#endif /* CONFIG_MEMORYSTATUS */
-
-/*
- * Trigger levels to test the mechanism.
- * Can be used via a sysctl.
- */
-#define TEST_LOW_MEMORY_TRIGGER_ONE             1
-#define TEST_LOW_MEMORY_TRIGGER_ALL             2
-#define TEST_PURGEABLE_TRIGGER_ONE              3
-#define TEST_PURGEABLE_TRIGGER_ALL              4
-#define TEST_LOW_MEMORY_PURGEABLE_TRIGGER_ONE   5
-#define TEST_LOW_MEMORY_PURGEABLE_TRIGGER_ALL   6
-
-boolean_t               memorystatus_manual_testing_on = FALSE;
-vm_pressure_level_t     memorystatus_manual_testing_level = kVMPressureNormal;
-
-extern struct knote *
-vm_pressure_select_optimal_candidate_to_notify(struct klist *, int, boolean_t);
+       proc_list_lock();
 
+       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+       while (next_p) {
+               if (((next_p->p_listflag & P_LIST_EXITED) != 0) ||
+                   ((unsigned int)(next_p->p_memstat_effectivepriority) != i)) {
+                       /*
+                        * We have raced with next_p running on another core.
+                        * It may be exiting or it may have moved to a different
+                        * jetsam priority band.  This means we have lost our
+                        * place in line while traversing the jetsam list.  We
+                        * attempt to recover by rewinding to the beginning of the band
+                        * we were already traversing.  By doing this, we do not guarantee
+                        * that no process escapes this aggressive march, but we can make
+                        * skipping an entire range of processes less likely. (PR-21069019)
+                        */
 
-#define VM_PRESSURE_NOTIFY_WAIT_PERIOD          10000   /* milliseconds */
+                       MEMORYSTATUS_DEBUG(1, "memorystatus: aggressive%d: rewinding band %d, %s(%d) moved or exiting.\n",
+                           aggr_count, i, (*next_p->p_name ? next_p->p_name : "unknown"), next_p->p_pid);
 
-#if DEBUG
-#define VM_PRESSURE_DEBUG(cond, format, ...)      \
-do {                                              \
-       if (cond) { printf(format, ##__VA_ARGS__); } \
-} while(0)
-#else
-#define VM_PRESSURE_DEBUG(cond, format, ...)
-#endif
+                       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+                       continue;
+               }
 
-#define INTER_NOTIFICATION_DELAY        (250000)        /* .25 second */
+               p = next_p;
+               next_p = memorystatus_get_next_proc_locked(&i, p, TRUE);
 
-void
-memorystatus_on_pageout_scan_end(void)
-{
-       /* No-op */
-}
+               if (p->p_memstat_effectivepriority > priority_max) {
+                       /*
+                        * Bail out of this killing spree if we have
+                        * reached beyond the priority_max jetsam band.
+                        * That is, we kill up to and through the
+                        * priority_max jetsam band.
+                        */
+                       proc_list_unlock();
+                       goto exit;
+               }
 
-/*
- * kn_max - knote
- *
- * knote_pressure_level - to check if the knote is registered for this notification level.
- *
- * task        - task whose bits we'll be modifying
- *
- * pressure_level_to_clear - if the task has been notified of this past level, clear that notification bit so that if/when we revert to that level, the task will be notified again.
- *
- * pressure_level_to_set - the task is about to be notified of this new level. Update the task's bit notification information appropriately.
- *
- */
+               aPid = p->p_pid;
+               aPid_ep = p->p_memstat_effectivepriority;
 
-boolean_t
-is_knote_registered_modify_task_pressure_bits(struct knote *kn_max, int knote_pressure_level, task_t task, vm_pressure_level_t pressure_level_to_clear, vm_pressure_level_t pressure_level_to_set)
-{
-       if (kn_max->kn_sfflags & knote_pressure_level) {
-               if (pressure_level_to_clear && task_has_been_notified(task, pressure_level_to_clear) == TRUE) {
-                       task_clear_has_been_notified(task, pressure_level_to_clear);
+               if (p->p_memstat_state & (P_MEMSTAT_ERROR | P_MEMSTAT_TERMINATED)) {
+                       continue;
                }
 
-               task_mark_has_been_notified(task, pressure_level_to_set);
-               return TRUE;
-       }
+               /*
+                * Capture a snapshot if none exists.
+                */
+               if (memorystatus_jetsam_snapshot_count == 0) {
+                       memorystatus_init_jetsam_snapshot_locked(NULL, 0);
+                       new_snapshot = TRUE;
+               }
 
-       return FALSE;
-}
+               /*
+                * Mark as terminated so that if exit1() indicates success, but the process (for example)
+                * is blocked in task_exception_notify(), it'll be skipped if encountered again - see
+                * <rdar://problem/13553476>. This is cheaper than examining P_LEXIT, which requires the
+                * acquisition of the proc lock.
+                */
+               p->p_memstat_state |= P_MEMSTAT_TERMINATED;
 
-void
-memorystatus_klist_reset_all_for_level(vm_pressure_level_t pressure_level_to_clear)
-{
-       struct knote *kn = NULL;
+               killtime = mach_absolute_time();
+               absolutetime_to_microtime(killtime, &tv_sec, &tv_usec);
+               tv_msec = tv_usec / 1000;
 
-       memorystatus_klist_lock();
-       SLIST_FOREACH(kn, &memorystatus_klist, kn_selnext) {
-               proc_t                  p = PROC_NULL;
-               struct task*            t = TASK_NULL;
+               /* Shift queue, update stats */
+               memorystatus_update_jetsam_snapshot_entry_locked(p, cause, killtime);
 
-               p = knote_get_kq(kn)->kq_p;
-               proc_list_lock();
-               if (p != proc_ref_locked(p)) {
-                       p = PROC_NULL;
-                       proc_list_unlock();
-                       continue;
-               }
-               proc_list_unlock();
+               /*
+                * In order to kill the target process, we will drop the proc_list_lock.
+                * To guaranteee that p and next_p don't disappear out from under the lock,
+                * we must take a ref on both.
+                * If we cannot get a reference, then it's likely we've raced with
+                * that process exiting on another core.
+                */
+               if (proc_ref_locked(p) == p) {
+                       if (next_p) {
+                               while (next_p && (proc_ref_locked(next_p) != next_p)) {
+                                       proc_t temp_p;
 
-               t = (struct task *)(p->task);
+                                       /*
+                                        * We must have raced with next_p exiting on another core.
+                                        * Recover by getting the next eligible process in the band.
+                                        */
 
-               task_clear_has_been_notified(t, pressure_level_to_clear);
+                                       MEMORYSTATUS_DEBUG(1, "memorystatus: aggressive%d: skipping %d [%s] (exiting?)\n",
+                                           aggr_count, next_p->p_pid, (*next_p->p_name ? next_p->p_name : "(unknown)"));
 
-               proc_rele(p);
-       }
+                                       temp_p = next_p;
+                                       next_p = memorystatus_get_next_proc_locked(&i, temp_p, TRUE);
+                               }
+                       }
+                       proc_list_unlock();
 
-       memorystatus_klist_unlock();
-}
+                       printf("%lu.%03d memorystatus: %s%d pid %d [%s] (%s %d) - memorystatus_available_pages: %llu\n",
+                           (unsigned long)tv_sec, tv_msec,
+                           ((aPid_ep == JETSAM_PRIORITY_IDLE) ? "killing_idle_process_aggressive" : "killing_top_process_aggressive"),
+                           aggr_count, aPid, (*p->p_name ? p->p_name : "unknown"),
+                           memorystatus_kill_cause_name[cause], aPid_ep, (uint64_t)MEMORYSTATUS_LOG_AVAILABLE_PAGES);
 
-extern kern_return_t vm_pressure_notify_dispatch_vm_clients(boolean_t target_foreground_process);
+                       memorystatus_level_snapshot = memorystatus_level;
 
-struct knote *
-vm_pressure_select_optimal_candidate_to_notify(struct klist *candidate_list, int level, boolean_t target_foreground_process);
+                       /*
+                        * memorystatus_do_kill() drops a reference, so take another one so we can
+                        * continue to use this exit reason even after memorystatus_do_kill()
+                        * returns.
+                        */
+                       os_reason_ref(jetsam_reason);
+                       killed = memorystatus_do_kill(p, cause, jetsam_reason, &footprint_of_killed_proc);
 
-/*
- * Used by the vm_pressure_thread which is
- * signalled from within vm_pageout_scan().
- */
-static void vm_dispatch_memory_pressure(void);
-void consider_vm_pressure_events(void);
+                       /* Success? */
+                       if (killed) {
+                               *memory_reclaimed += footprint_of_killed_proc;
+                               proc_rele(p);
+                               kill_count++;
+                               p = NULL;
+                               killed = FALSE;
 
-void
-consider_vm_pressure_events(void)
-{
-       vm_dispatch_memory_pressure();
-}
-static void
-vm_dispatch_memory_pressure(void)
-{
-       memorystatus_update_vm_pressure(FALSE);
-}
+                               /*
+                                * Continue the killing spree.
+                                */
+                               proc_list_lock();
+                               if (next_p) {
+                                       proc_rele_locked(next_p);
+                               }
 
-extern vm_pressure_level_t
-convert_internal_pressure_level_to_dispatch_level(vm_pressure_level_t);
+                               if (aPid_ep == JETSAM_PRIORITY_FOREGROUND && memorystatus_aggressive_jetsam_lenient == TRUE) {
+                                       if (memorystatus_level > memorystatus_level_snapshot && ((memorystatus_level - memorystatus_level_snapshot) >= AGGRESSIVE_JETSAM_LENIENT_MODE_THRESHOLD)) {
+#if DEVELOPMENT || DEBUG
+                                               printf("Disabling Lenient mode after one-time deployment.\n");
+#endif /* DEVELOPMENT || DEBUG */
+                                               memorystatus_aggressive_jetsam_lenient = FALSE;
+                                               break;
+                                       }
+                               }
 
-struct knote *
-vm_pressure_select_optimal_candidate_to_notify(struct klist *candidate_list, int level, boolean_t target_foreground_process)
-{
-       struct knote    *kn = NULL, *kn_max = NULL;
-       uint64_t        resident_max = 0;       /* MB */
-       struct timeval  curr_tstamp = {0, 0};
-       int             elapsed_msecs = 0;
-       int             selected_task_importance = 0;
-       static int      pressure_snapshot = -1;
-       boolean_t       pressure_increase = FALSE;
+                               continue;
+                       }
 
-       if (pressure_snapshot == -1) {
-               /*
-                * Initial snapshot.
-                */
-               pressure_snapshot = level;
-               pressure_increase = TRUE;
-       } else {
-               if (level && (level >= pressure_snapshot)) {
-                       pressure_increase = TRUE;
-               } else {
-                       pressure_increase = FALSE;
+                       /*
+                        * Failure - first unwind the state,
+                        * then fall through to restart the search.
+                        */
+                       proc_list_lock();
+                       proc_rele_locked(p);
+                       if (next_p) {
+                               proc_rele_locked(next_p);
+                       }
+                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
+                       p->p_memstat_state |= P_MEMSTAT_ERROR;
+                       *errors += 1;
+                       p = NULL;
                }
 
-               pressure_snapshot = level;
-       }
-
-       if (pressure_increase == TRUE) {
-               /*
-                * We'll start by considering the largest
-                * unimportant task in our list.
-                */
-               selected_task_importance = INT_MAX;
-       } else {
                /*
-                * We'll start by considering the largest
-                * important task in our list.
+                * Failure - restart the search at the beginning of
+                * the band we were already traversing.
+                *
+                * We might have raced with "p" exiting on another core, resulting in no
+                * ref on "p".  Or, we may have failed to kill "p".
+                *
+                * Either way, we fall thru to here, leaving the proc in the
+                * P_MEMSTAT_TERMINATED or P_MEMSTAT_ERROR state.
+                *
+                * And, we hold the the proc_list_lock at this point.
                 */
-               selected_task_importance = 0;
+
+               next_p = memorystatus_get_first_proc_locked(&i, TRUE);
        }
 
-       microuptime(&curr_tstamp);
+       proc_list_unlock();
 
-       SLIST_FOREACH(kn, candidate_list, kn_selnext) {
-               uint64_t                resident_size = 0;      /* MB */
-               proc_t                  p = PROC_NULL;
-               struct task*            t = TASK_NULL;
-               int                     curr_task_importance = 0;
-               boolean_t               consider_knote = FALSE;
-               boolean_t               privileged_listener = FALSE;
+exit:
+       os_reason_free(jetsam_reason);
 
-               p = knote_get_kq(kn)->kq_p;
+       /* Clear snapshot if freshly captured and no target was found */
+       if (new_snapshot && (kill_count == 0)) {
                proc_list_lock();
-               if (p != proc_ref_locked(p)) {
-                       p = PROC_NULL;
-                       proc_list_unlock();
-                       continue;
-               }
+               memorystatus_jetsam_snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
                proc_list_unlock();
+       }
 
-#if CONFIG_MEMORYSTATUS
-               if (target_foreground_process == TRUE && !memorystatus_is_foreground_locked(p)) {
-                       /*
-                        * Skip process not marked foreground.
-                        */
-                       proc_rele(p);
-                       continue;
-               }
-#endif /* CONFIG_MEMORYSTATUS */
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_END,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, 0, kill_count, *memory_reclaimed, 0);
+
+       if (kill_count > 0) {
+               return TRUE;
+       } else {
+               return FALSE;
+       }
+}
+
+static boolean_t
+memorystatus_kill_hiwat_proc(uint32_t *errors, boolean_t *purged, uint64_t *memory_reclaimed)
+{
+       pid_t aPid = 0;
+       proc_t p = PROC_NULL, next_p = PROC_NULL;
+       boolean_t new_snapshot = FALSE, killed = FALSE, freed_mem = FALSE;
+       unsigned int i = 0;
+       uint32_t aPid_ep;
+       os_reason_t jetsam_reason = OS_REASON_NULL;
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM_HIWAT) | DBG_FUNC_START,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, 0, 0, 0, 0);
+
+       jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_HIGHWATER);
+       if (jetsam_reason == OS_REASON_NULL) {
+               printf("memorystatus_kill_hiwat_proc: failed to allocate exit reason\n");
+       }
 
-               t = (struct task *)(p->task);
+       proc_list_lock();
+
+       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+       while (next_p) {
+               uint64_t footprint_in_bytes = 0;
+               uint64_t memlimit_in_bytes  = 0;
+               boolean_t skip = 0;
 
-               timevalsub(&curr_tstamp, &p->vm_pressure_last_notify_tstamp);
-               elapsed_msecs = curr_tstamp.tv_sec * 1000 + curr_tstamp.tv_usec / 1000;
+               p = next_p;
+               next_p = memorystatus_get_next_proc_locked(&i, p, TRUE);
 
-               vm_pressure_level_t dispatch_level = convert_internal_pressure_level_to_dispatch_level(level);
+               aPid = p->p_pid;
+               aPid_ep = p->p_memstat_effectivepriority;
 
-               if ((kn->kn_sfflags & dispatch_level) == 0) {
-                       proc_rele(p);
+               if (p->p_memstat_state  & (P_MEMSTAT_ERROR | P_MEMSTAT_TERMINATED)) {
                        continue;
                }
 
-#if CONFIG_MEMORYSTATUS
-               if (target_foreground_process == FALSE && !memorystatus_bg_pressure_eligible(p)) {
-                       VM_PRESSURE_DEBUG(1, "[vm_pressure] skipping process %d\n", p->p_pid);
-                       proc_rele(p);
+               /* skip if no limit set */
+               if (p->p_memstat_memlimit <= 0) {
                        continue;
                }
-#endif /* CONFIG_MEMORYSTATUS */
 
-#if CONFIG_EMBEDDED
-               curr_task_importance = p->p_memstat_effectivepriority;
-#else /* CONFIG_EMBEDDED */
-               curr_task_importance = task_importance_estimate(t);
-#endif /* CONFIG_EMBEDDED */
+               footprint_in_bytes = get_task_phys_footprint(p->task);
+               memlimit_in_bytes  = (((uint64_t)p->p_memstat_memlimit) * 1024ULL * 1024ULL);   /* convert MB to bytes */
+               skip = (footprint_in_bytes <= memlimit_in_bytes);
 
-               /*
-                * Privileged listeners are only considered in the multi-level pressure scheme
-                * AND only if the pressure is increasing.
-                */
-               if (level > 0) {
-                       if (task_has_been_notified(t, level) == FALSE) {
-                               /*
-                                * Is this a privileged listener?
-                                */
-                               if (task_low_mem_privileged_listener(t, FALSE, &privileged_listener) == 0) {
-                                       if (privileged_listener) {
-                                               kn_max = kn;
-                                               proc_rele(p);
-                                               goto done_scanning;
-                                       }
-                               }
+#if CONFIG_FREEZE
+               if (!skip) {
+                       if (p->p_memstat_state & P_MEMSTAT_LOCKED) {
+                               skip = TRUE;
                        } else {
-                               proc_rele(p);
-                               continue;
-                       }
-               } else if (level == 0) {
-                       /*
-                        * Task wasn't notified when the pressure was increasing and so
-                        * no need to notify it that the pressure is decreasing.
-                        */
-                       if ((task_has_been_notified(t, kVMPressureWarning) == FALSE) && (task_has_been_notified(t, kVMPressureCritical) == FALSE)) {
-                               proc_rele(p);
-                               continue;
+                               skip = FALSE;
                        }
                }
+#endif
 
-               /*
-                * We don't want a small process to block large processes from
-                * being notified again. <rdar://problem/7955532>
-                */
-               resident_size = (get_task_phys_footprint(t)) / (1024 * 1024ULL);  /* MB */
+               if (skip) {
+                       continue;
+               } else {
+                       if (memorystatus_jetsam_snapshot_count == 0) {
+                               memorystatus_init_jetsam_snapshot_locked(NULL, 0);
+                               new_snapshot = TRUE;
+                       }
 
-               if (resident_size >= vm_pressure_task_footprint_min) {
-                       if (level > 0) {
+                       if (proc_ref_locked(p) == p) {
                                /*
-                                * Warning or Critical Pressure.
+                                * Mark as terminated so that if exit1() indicates success, but the process (for example)
+                                * is blocked in task_exception_notify(), it'll be skipped if encountered again - see
+                                * <rdar://problem/13553476>. This is cheaper than examining P_LEXIT, which requires the
+                                * acquisition of the proc lock.
                                 */
-                               if (pressure_increase) {
-                                       if ((curr_task_importance < selected_task_importance) ||
-                                           ((curr_task_importance == selected_task_importance) && (resident_size > resident_max))) {
-                                               /*
-                                                * We have found a candidate process which is:
-                                                * a) at a lower importance than the current selected process
-                                                * OR
-                                                * b) has importance equal to that of the current selected process but is larger
-                                                */
-
-                                               consider_knote = TRUE;
-                                       }
-                               } else {
-                                       if ((curr_task_importance > selected_task_importance) ||
-                                           ((curr_task_importance == selected_task_importance) && (resident_size > resident_max))) {
-                                               /*
-                                                * We have found a candidate process which is:
-                                                * a) at a higher importance than the current selected process
-                                                * OR
-                                                * b) has importance equal to that of the current selected process but is larger
-                                                */
+                               p->p_memstat_state |= P_MEMSTAT_TERMINATED;
 
-                                               consider_knote = TRUE;
-                                       }
-                               }
-                       } else if (level == 0) {
+                               proc_list_unlock();
+                       } else {
                                /*
-                                * Pressure back to normal.
+                                * We need to restart the search again because
+                                * proc_ref_locked _can_ drop the proc_list lock
+                                * and we could have lost our stored next_p via
+                                * an exit() on another core.
                                 */
-                               if ((curr_task_importance > selected_task_importance) ||
-                                   ((curr_task_importance == selected_task_importance) && (resident_size > resident_max))) {
-                                       consider_knote = TRUE;
-                               }
-                       }
-
-                       if (consider_knote) {
-                               resident_max = resident_size;
-                               kn_max = kn;
-                               selected_task_importance = curr_task_importance;
-                               consider_knote = FALSE; /* reset for the next candidate */
+                               i = 0;
+                               next_p = memorystatus_get_first_proc_locked(&i, TRUE);
+                               continue;
                        }
-               } else {
-                       /* There was no candidate with enough resident memory to scavenge */
-                       VM_PRESSURE_DEBUG(0, "[vm_pressure] threshold failed for pid %d with %llu resident...\n", p->p_pid, resident_size);
-               }
-               proc_rele(p);
-       }
-
-done_scanning:
-       if (kn_max) {
-               VM_DEBUG_CONSTANT_EVENT(vm_pressure_event, VM_PRESSURE_EVENT, DBG_FUNC_NONE, knote_get_kq(kn_max)->kq_p->p_pid, resident_max, 0, 0);
-               VM_PRESSURE_DEBUG(1, "[vm_pressure] sending event to pid %d with %llu resident\n", knote_get_kq(kn_max)->kq_p->p_pid, resident_max);
-       }
-
-       return kn_max;
-}
-
-#define VM_PRESSURE_DECREASED_SMOOTHING_PERIOD          5000    /* milliseconds */
-#define WARNING_NOTIFICATION_RESTING_PERIOD             25      /* seconds */
-#define CRITICAL_NOTIFICATION_RESTING_PERIOD            25      /* seconds */
-
-uint64_t next_warning_notification_sent_at_ts = 0;
-uint64_t next_critical_notification_sent_at_ts = 0;
 
-kern_return_t
-memorystatus_update_vm_pressure(boolean_t target_foreground_process)
-{
-       struct knote                    *kn_max = NULL;
-       struct knote                    *kn_cur = NULL, *kn_temp = NULL;  /* for safe list traversal */
-       pid_t                           target_pid = -1;
-       struct klist                    dispatch_klist = { NULL };
-       proc_t                          target_proc = PROC_NULL;
-       struct task                     *task = NULL;
-       boolean_t                       found_candidate = FALSE;
-
-       static vm_pressure_level_t      level_snapshot = kVMPressureNormal;
-       static vm_pressure_level_t      prev_level_snapshot = kVMPressureNormal;
-       boolean_t                       smoothing_window_started = FALSE;
-       struct timeval                  smoothing_window_start_tstamp = {0, 0};
-       struct timeval                  curr_tstamp = {0, 0};
-       int                             elapsed_msecs = 0;
-       uint64_t                        curr_ts = mach_absolute_time();
-
-#if !CONFIG_JETSAM
-#define MAX_IDLE_KILLS 100      /* limit the number of idle kills allowed */
+                       footprint_in_bytes = 0;
+                       freed_mem = memorystatus_kill_proc(p, kMemorystatusKilledHiwat, jetsam_reason, &killed, &footprint_in_bytes); /* purged and/or killed 'p' */
 
-       int     idle_kill_counter = 0;
-
-       /*
-        * On desktop we take this opportunity to free up memory pressure
-        * by immediately killing idle exitable processes. We use a delay
-        * to avoid overkill.  And we impose a max counter as a fail safe
-        * in case daemons re-launch too fast.
-        */
-       while ((memorystatus_vm_pressure_level != kVMPressureNormal) && (idle_kill_counter < MAX_IDLE_KILLS)) {
-               if (memorystatus_idle_exit_from_VM() == FALSE) {
-                       /* No idle exitable processes left to kill */
-                       break;
-               }
-               idle_kill_counter++;
+                       /* Success? */
+                       if (freed_mem) {
+                               if (killed == FALSE) {
+                                       /* purged 'p'..don't reset HWM candidate count */
+                                       *purged = TRUE;
 
-               if (memorystatus_manual_testing_on == TRUE) {
+                                       proc_list_lock();
+                                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
+                                       proc_list_unlock();
+                               } else {
+                                       *memory_reclaimed = footprint_in_bytes;
+                               }
+                               proc_rele(p);
+                               goto exit;
+                       }
                        /*
-                        * Skip the delay when testing
-                        * the pressure notification scheme.
+                        * Failure - first unwind the state,
+                        * then fall through to restart the search.
                         */
-               } else {
-                       delay(1000000);    /* 1 second */
+                       proc_list_lock();
+                       proc_rele_locked(p);
+                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
+                       p->p_memstat_state |= P_MEMSTAT_ERROR;
+                       *errors += 1;
+
+                       i = 0;
+                       next_p = memorystatus_get_first_proc_locked(&i, TRUE);
                }
        }
-#endif /* !CONFIG_JETSAM */
 
-       if (level_snapshot != kVMPressureNormal) {
-               /*
-                * Check to see if we are still in the 'resting' period
-                * after having notified all clients interested in
-                * a particular pressure level.
-                */
+       proc_list_unlock();
 
-               level_snapshot = memorystatus_vm_pressure_level;
+exit:
+       os_reason_free(jetsam_reason);
 
-               if (level_snapshot == kVMPressureWarning || level_snapshot == kVMPressureUrgent) {
-                       if (next_warning_notification_sent_at_ts) {
-                               if (curr_ts < next_warning_notification_sent_at_ts) {
-                                       delay(INTER_NOTIFICATION_DELAY * 4 /* 1 sec */);
-                                       return KERN_SUCCESS;
-                               }
+       if (!killed) {
+               *memory_reclaimed = 0;
 
-                               next_warning_notification_sent_at_ts = 0;
-                               memorystatus_klist_reset_all_for_level(kVMPressureWarning);
-                       }
-               } else if (level_snapshot == kVMPressureCritical) {
-                       if (next_critical_notification_sent_at_ts) {
-                               if (curr_ts < next_critical_notification_sent_at_ts) {
-                                       delay(INTER_NOTIFICATION_DELAY * 4 /* 1 sec */);
-                                       return KERN_SUCCESS;
-                               }
-                               next_critical_notification_sent_at_ts = 0;
-                               memorystatus_klist_reset_all_for_level(kVMPressureCritical);
-                       }
+               /* Clear snapshot if freshly captured and no target was found */
+               if (new_snapshot) {
+                       proc_list_lock();
+                       memorystatus_jetsam_snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
+                       proc_list_unlock();
                }
        }
 
-       while (1) {
-               /*
-                * There is a race window here. But it's not clear
-                * how much we benefit from having extra synchronization.
-                */
-               level_snapshot = memorystatus_vm_pressure_level;
-
-               if (prev_level_snapshot > level_snapshot) {
-                       /*
-                        * Pressure decreased? Let's take a little breather
-                        * and see if this condition stays.
-                        */
-                       if (smoothing_window_started == FALSE) {
-                               smoothing_window_started = TRUE;
-                               microuptime(&smoothing_window_start_tstamp);
-                       }
-
-                       microuptime(&curr_tstamp);
-                       timevalsub(&curr_tstamp, &smoothing_window_start_tstamp);
-                       elapsed_msecs = curr_tstamp.tv_sec * 1000 + curr_tstamp.tv_usec / 1000;
-
-                       if (elapsed_msecs < VM_PRESSURE_DECREASED_SMOOTHING_PERIOD) {
-                               delay(INTER_NOTIFICATION_DELAY);
-                               continue;
-                       }
-               }
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM_HIWAT) | DBG_FUNC_END,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, killed ? aPid : 0, killed, *memory_reclaimed, 0);
 
-               prev_level_snapshot = level_snapshot;
-               smoothing_window_started = FALSE;
+       return killed;
+}
 
-               memorystatus_klist_lock();
-               kn_max = vm_pressure_select_optimal_candidate_to_notify(&memorystatus_klist, level_snapshot, target_foreground_process);
+/*
+ * Jetsam a process pinned in the elevated band.
+ *
+ * Return:  true -- a pinned process was jetsammed
+ *         false -- no pinned process was jetsammed
+ */
+boolean_t
+memorystatus_kill_elevated_process(uint32_t cause, os_reason_t jetsam_reason, unsigned int band, int aggr_count, uint32_t *errors, uint64_t *memory_reclaimed)
+{
+       pid_t aPid = 0;
+       proc_t p = PROC_NULL, next_p = PROC_NULL;
+       boolean_t new_snapshot = FALSE, killed = FALSE;
+       int kill_count = 0;
+       uint32_t aPid_ep;
+       uint64_t killtime = 0;
+       clock_sec_t     tv_sec;
+       clock_usec_t    tv_usec;
+       uint32_t        tv_msec;
+       uint64_t footprint_of_killed_proc = 0;
 
-               if (kn_max == NULL) {
-                       memorystatus_klist_unlock();
 
-                       /*
-                        * No more level-based clients to notify.
-                        *
-                        * Start the 'resting' window within which clients will not be re-notified.
-                        */
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_START,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, 0, 0, 0, 0);
 
-                       if (level_snapshot != kVMPressureNormal) {
-                               if (level_snapshot == kVMPressureWarning || level_snapshot == kVMPressureUrgent) {
-                                       nanoseconds_to_absolutetime(WARNING_NOTIFICATION_RESTING_PERIOD * NSEC_PER_SEC, &curr_ts);
+#if CONFIG_FREEZE
+       boolean_t consider_frozen_only = FALSE;
 
-                                       /* Next warning notification (if nothing changes) won't be sent before...*/
-                                       next_warning_notification_sent_at_ts = mach_absolute_time() + curr_ts;
-                               }
+       if (band == (unsigned int) memorystatus_freeze_jetsam_band) {
+               consider_frozen_only = TRUE;
+       }
+#endif /* CONFIG_FREEZE */
 
-                               if (level_snapshot == kVMPressureCritical) {
-                                       nanoseconds_to_absolutetime(CRITICAL_NOTIFICATION_RESTING_PERIOD * NSEC_PER_SEC, &curr_ts);
+       proc_list_lock();
 
-                                       /* Next critical notification (if nothing changes) won't be sent before...*/
-                                       next_critical_notification_sent_at_ts = mach_absolute_time() + curr_ts;
-                               }
-                       }
-                       return KERN_FAILURE;
-               }
+       next_p = memorystatus_get_first_proc_locked(&band, FALSE);
+       while (next_p) {
+               p = next_p;
+               next_p = memorystatus_get_next_proc_locked(&band, p, FALSE);
 
-               target_proc = knote_get_kq(kn_max)->kq_p;
+               aPid = p->p_pid;
+               aPid_ep = p->p_memstat_effectivepriority;
 
-               proc_list_lock();
-               if (target_proc != proc_ref_locked(target_proc)) {
-                       target_proc = PROC_NULL;
-                       proc_list_unlock();
-                       memorystatus_klist_unlock();
+               /*
+                * Only pick a process pinned in this elevated band
+                */
+               if (!(p->p_memstat_state & P_MEMSTAT_USE_ELEVATED_INACTIVE_BAND)) {
                        continue;
                }
-               proc_list_unlock();
-
-               target_pid = target_proc->p_pid;
-
-               task = (struct task *)(target_proc->task);
-
-               if (level_snapshot != kVMPressureNormal) {
-                       if (level_snapshot == kVMPressureWarning || level_snapshot == kVMPressureUrgent) {
-                               if (is_knote_registered_modify_task_pressure_bits(kn_max, NOTE_MEMORYSTATUS_PRESSURE_WARN, task, 0, kVMPressureWarning) == TRUE) {
-                                       found_candidate = TRUE;
-                               }
-                       } else {
-                               if (level_snapshot == kVMPressureCritical) {
-                                       if (is_knote_registered_modify_task_pressure_bits(kn_max, NOTE_MEMORYSTATUS_PRESSURE_CRITICAL, task, 0, kVMPressureCritical) == TRUE) {
-                                               found_candidate = TRUE;
-                                       }
-                               }
-                       }
-               } else {
-                       if (kn_max->kn_sfflags & NOTE_MEMORYSTATUS_PRESSURE_NORMAL) {
-                               task_clear_has_been_notified(task, kVMPressureWarning);
-                               task_clear_has_been_notified(task, kVMPressureCritical);
 
-                               found_candidate = TRUE;
-                       }
+               if (p->p_memstat_state  & (P_MEMSTAT_ERROR | P_MEMSTAT_TERMINATED)) {
+                       continue;
                }
 
-               if (found_candidate == FALSE) {
-                       proc_rele(target_proc);
-                       memorystatus_klist_unlock();
+#if CONFIG_FREEZE
+               if (consider_frozen_only && !(p->p_memstat_state & P_MEMSTAT_FROZEN)) {
                        continue;
                }
 
-               SLIST_FOREACH_SAFE(kn_cur, &memorystatus_klist, kn_selnext, kn_temp) {
-                       int knote_pressure_level = convert_internal_pressure_level_to_dispatch_level(level_snapshot);
-
-                       if (is_knote_registered_modify_task_pressure_bits(kn_cur, knote_pressure_level, task, 0, level_snapshot) == TRUE) {
-                               proc_t knote_proc = knote_get_kq(kn_cur)->kq_p;
-                               pid_t knote_pid = knote_proc->p_pid;
-                               if (knote_pid == target_pid) {
-                                       KNOTE_DETACH(&memorystatus_klist, kn_cur);
-                                       KNOTE_ATTACH(&dispatch_klist, kn_cur);
-                               }
-                       }
+               if (p->p_memstat_state & P_MEMSTAT_LOCKED) {
+                       continue;
                }
+#endif /* CONFIG_FREEZE */
 
-               KNOTE(&dispatch_klist, (level_snapshot != kVMPressureNormal) ? kMemorystatusPressure : kMemorystatusNoPressure);
+#if DEVELOPMENT || DEBUG
+               MEMORYSTATUS_DEBUG(1, "jetsam: elevated%d process pid %d [%s] - memorystatus_available_pages: %d\n",
+                   aggr_count,
+                   aPid, (*p->p_name ? p->p_name : "unknown"),
+                   MEMORYSTATUS_LOG_AVAILABLE_PAGES);
+#endif /* DEVELOPMENT || DEBUG */
 
-               SLIST_FOREACH_SAFE(kn_cur, &dispatch_klist, kn_selnext, kn_temp) {
-                       KNOTE_DETACH(&dispatch_klist, kn_cur);
-                       KNOTE_ATTACH(&memorystatus_klist, kn_cur);
+               if (memorystatus_jetsam_snapshot_count == 0) {
+                       memorystatus_init_jetsam_snapshot_locked(NULL, 0);
+                       new_snapshot = TRUE;
                }
 
-               memorystatus_klist_unlock();
+               p->p_memstat_state |= P_MEMSTAT_TERMINATED;
 
-               microuptime(&target_proc->vm_pressure_last_notify_tstamp);
-               proc_rele(target_proc);
+               killtime = mach_absolute_time();
+               absolutetime_to_microtime(killtime, &tv_sec, &tv_usec);
+               tv_msec = tv_usec / 1000;
 
-               if (memorystatus_manual_testing_on == TRUE && target_foreground_process == TRUE) {
-                       break;
-               }
+               memorystatus_update_jetsam_snapshot_entry_locked(p, cause, killtime);
+
+               if (proc_ref_locked(p) == p) {
+                       proc_list_unlock();
 
-               if (memorystatus_manual_testing_on == TRUE) {
                        /*
-                        * Testing out the pressure notification scheme.
-                        * No need for delays etc.
+                        * memorystatus_do_kill drops a reference, so take another one so we can
+                        * continue to use this exit reason even after memorystatus_do_kill()
+                        * returns
                         */
-               } else {
-                       uint32_t sleep_interval = INTER_NOTIFICATION_DELAY;
-#if CONFIG_JETSAM
-                       unsigned int page_delta = 0;
-                       unsigned int skip_delay_page_threshold = 0;
-
-                       assert(memorystatus_available_pages_pressure >= memorystatus_available_pages_critical_base);
+                       os_reason_ref(jetsam_reason);
+                       killed = memorystatus_do_kill(p, cause, jetsam_reason, &footprint_of_killed_proc);
 
-                       page_delta = (memorystatus_available_pages_pressure - memorystatus_available_pages_critical_base) / 2;
-                       skip_delay_page_threshold = memorystatus_available_pages_pressure - page_delta;
+                       os_log_with_startup_serial(OS_LOG_DEFAULT, "%lu.%03d memorystatus: killing_top_process_elevated%d pid %d [%s] (%s %d) %lluKB - memorystatus_available_pages: %llu\n",
+                           (unsigned long)tv_sec, tv_msec,
+                           aggr_count,
+                           aPid, ((p && *p->p_name) ? p->p_name : "unknown"),
+                           memorystatus_kill_cause_name[cause], aPid_ep,
+                           footprint_of_killed_proc >> 10, (uint64_t)MEMORYSTATUS_LOG_AVAILABLE_PAGES);
 
-                       if (memorystatus_available_pages <= skip_delay_page_threshold) {
-                               /*
-                                * We are nearing the critcal mark fast and can't afford to wait between
-                                * notifications.
-                                */
-                               sleep_interval = 0;
+                       /* Success? */
+                       if (killed) {
+                               *memory_reclaimed = footprint_of_killed_proc;
+                               proc_rele(p);
+                               kill_count++;
+                               goto exit;
                        }
-#endif /* CONFIG_JETSAM */
 
-                       if (sleep_interval) {
-                               delay(sleep_interval);
-                       }
+                       /*
+                        * Failure - first unwind the state,
+                        * then fall through to restart the search.
+                        */
+                       proc_list_lock();
+                       proc_rele_locked(p);
+                       p->p_memstat_state &= ~P_MEMSTAT_TERMINATED;
+                       p->p_memstat_state |= P_MEMSTAT_ERROR;
+                       *errors += 1;
                }
-       }
-
-       return KERN_SUCCESS;
-}
 
-vm_pressure_level_t
-convert_internal_pressure_level_to_dispatch_level(vm_pressure_level_t internal_pressure_level)
-{
-       vm_pressure_level_t     dispatch_level = NOTE_MEMORYSTATUS_PRESSURE_NORMAL;
+               /*
+                * Failure - restart the search.
+                *
+                * We might have raced with "p" exiting on another core, resulting in no
+                * ref on "p".  Or, we may have failed to kill "p".
+                *
+                * Either way, we fall thru to here, leaving the proc in the
+                * P_MEMSTAT_TERMINATED state or P_MEMSTAT_ERROR state.
+                *
+                * And, we hold the the proc_list_lock at this point.
+                */
 
-       switch (internal_pressure_level) {
-       case kVMPressureNormal:
-       {
-               dispatch_level = NOTE_MEMORYSTATUS_PRESSURE_NORMAL;
-               break;
+               next_p = memorystatus_get_first_proc_locked(&band, FALSE);
        }
 
-       case kVMPressureWarning:
-       case kVMPressureUrgent:
-       {
-               dispatch_level = NOTE_MEMORYSTATUS_PRESSURE_WARN;
-               break;
-       }
+       proc_list_unlock();
 
-       case kVMPressureCritical:
-       {
-               dispatch_level = NOTE_MEMORYSTATUS_PRESSURE_CRITICAL;
-               break;
-       }
+exit:
+       os_reason_free(jetsam_reason);
 
-       default:
-               break;
+       if (kill_count == 0) {
+               *memory_reclaimed = 0;
+
+               /* Clear snapshot if freshly captured and no target was found */
+               if (new_snapshot) {
+                       proc_list_lock();
+                       memorystatus_jetsam_snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
+                       proc_list_unlock();
+               }
        }
 
-       return dispatch_level;
+       KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_JETSAM) | DBG_FUNC_END,
+           MEMORYSTATUS_LOG_AVAILABLE_PAGES, killed ? aPid : 0, kill_count, *memory_reclaimed, 0);
+
+       return killed;
 }
 
-static int
-sysctl_memorystatus_vm_pressure_level SYSCTL_HANDLER_ARGS
+static boolean_t
+memorystatus_kill_process_async(pid_t victim_pid, uint32_t cause)
 {
-#pragma unused(arg1, arg2, oidp)
-#if CONFIG_EMBEDDED
-       int error = 0;
-
-       error = priv_check_cred(kauth_cred_get(), PRIV_VM_PRESSURE, 0);
-       if (error) {
-               return error;
+       /*
+        * TODO: allow a general async path
+        *
+        * NOTE: If a new async kill cause is added, make sure to update memorystatus_thread() to
+        * add the appropriate exit reason code mapping.
+        */
+       if ((victim_pid != -1) ||
+           (cause != kMemorystatusKilledVMPageShortage &&
+           cause != kMemorystatusKilledVMCompressorThrashing &&
+           cause != kMemorystatusKilledVMCompressorSpaceShortage &&
+           cause != kMemorystatusKilledFCThrashing &&
+           cause != kMemorystatusKilledZoneMapExhaustion)) {
+               return FALSE;
        }
 
-#endif /* CONFIG_EMBEDDED */
-       vm_pressure_level_t dispatch_level = convert_internal_pressure_level_to_dispatch_level(memorystatus_vm_pressure_level);
-
-       return SYSCTL_OUT(req, &dispatch_level, sizeof(dispatch_level));
+       kill_under_pressure_cause = cause;
+       memorystatus_thread_wake();
+       return TRUE;
 }
 
-#if DEBUG || DEVELOPMENT
-
-SYSCTL_PROC(_kern, OID_AUTO, memorystatus_vm_pressure_level, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED,
-    0, 0, &sysctl_memorystatus_vm_pressure_level, "I", "");
-
-#else /* DEBUG || DEVELOPMENT */
-
-SYSCTL_PROC(_kern, OID_AUTO, memorystatus_vm_pressure_level, CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_LOCKED | CTLFLAG_MASKED,
-    0, 0, &sysctl_memorystatus_vm_pressure_level, "I", "");
-
-#endif /* DEBUG || DEVELOPMENT */
-
-
-static int
-sysctl_memorypressure_manual_trigger SYSCTL_HANDLER_ARGS
+boolean_t
+memorystatus_kill_on_VM_compressor_space_shortage(boolean_t async)
 {
-#pragma unused(arg1, arg2)
-
-       int level = 0;
-       int error = 0;
-       int pressure_level = 0;
-       int trigger_request = 0;
-       int force_purge;
+       if (async) {
+               return memorystatus_kill_process_async(-1, kMemorystatusKilledVMCompressorSpaceShortage);
+       } else {
+               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_VMCOMPRESSOR_SPACE_SHORTAGE);
+               if (jetsam_reason == OS_REASON_NULL) {
+                       printf("memorystatus_kill_on_VM_compressor_space_shortage -- sync: failed to allocate jetsam reason\n");
+               }
 
-       error = sysctl_handle_int(oidp, &level, 0, req);
-       if (error || !req->newptr) {
-               return error;
+               return memorystatus_kill_process_sync(-1, kMemorystatusKilledVMCompressorSpaceShortage, jetsam_reason);
        }
+}
 
-       memorystatus_manual_testing_on = TRUE;
-
-       trigger_request = (level >> 16) & 0xFFFF;
-       pressure_level = (level & 0xFFFF);
+#if CONFIG_JETSAM
+boolean_t
+memorystatus_kill_on_VM_compressor_thrashing(boolean_t async)
+{
+       if (async) {
+               return memorystatus_kill_process_async(-1, kMemorystatusKilledVMCompressorThrashing);
+       } else {
+               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_VMCOMPRESSOR_THRASHING);
+               if (jetsam_reason == OS_REASON_NULL) {
+                       printf("memorystatus_kill_on_VM_compressor_thrashing -- sync: failed to allocate jetsam reason\n");
+               }
 
-       if (trigger_request < TEST_LOW_MEMORY_TRIGGER_ONE ||
-           trigger_request > TEST_LOW_MEMORY_PURGEABLE_TRIGGER_ALL) {
-               return EINVAL;
-       }
-       switch (pressure_level) {
-       case NOTE_MEMORYSTATUS_PRESSURE_NORMAL:
-       case NOTE_MEMORYSTATUS_PRESSURE_WARN:
-       case NOTE_MEMORYSTATUS_PRESSURE_CRITICAL:
-               break;
-       default:
-               return EINVAL;
+               return memorystatus_kill_process_sync(-1, kMemorystatusKilledVMCompressorThrashing, jetsam_reason);
        }
+}
 
-       /*
-        * The pressure level is being set from user-space.
-        * And user-space uses the constants in sys/event.h
-        * So we translate those events to our internal levels here.
-        */
-       if (pressure_level == NOTE_MEMORYSTATUS_PRESSURE_NORMAL) {
-               memorystatus_manual_testing_level = kVMPressureNormal;
-               force_purge = 0;
-       } else if (pressure_level == NOTE_MEMORYSTATUS_PRESSURE_WARN) {
-               memorystatus_manual_testing_level = kVMPressureWarning;
-               force_purge = vm_pageout_state.memorystatus_purge_on_warning;
-       } else if (pressure_level == NOTE_MEMORYSTATUS_PRESSURE_CRITICAL) {
-               memorystatus_manual_testing_level = kVMPressureCritical;
-               force_purge = vm_pageout_state.memorystatus_purge_on_critical;
-       }
-
-       memorystatus_vm_pressure_level = memorystatus_manual_testing_level;
-
-       /* purge according to the new pressure level */
-       switch (trigger_request) {
-       case TEST_PURGEABLE_TRIGGER_ONE:
-       case TEST_LOW_MEMORY_PURGEABLE_TRIGGER_ONE:
-               if (force_purge == 0) {
-                       /* no purging requested */
-                       break;
-               }
-               vm_purgeable_object_purge_one_unlocked(force_purge);
-               break;
-       case TEST_PURGEABLE_TRIGGER_ALL:
-       case TEST_LOW_MEMORY_PURGEABLE_TRIGGER_ALL:
-               if (force_purge == 0) {
-                       /* no purging requested */
-                       break;
-               }
-               while (vm_purgeable_object_purge_one_unlocked(force_purge)) {
-                       ;
+boolean_t
+memorystatus_kill_on_VM_page_shortage(boolean_t async)
+{
+       if (async) {
+               return memorystatus_kill_process_async(-1, kMemorystatusKilledVMPageShortage);
+       } else {
+               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_VMPAGESHORTAGE);
+               if (jetsam_reason == OS_REASON_NULL) {
+                       printf("memorystatus_kill_on_VM_page_shortage -- sync: failed to allocate jetsam reason\n");
                }
-               break;
-       }
 
-       if ((trigger_request == TEST_LOW_MEMORY_TRIGGER_ONE) ||
-           (trigger_request == TEST_LOW_MEMORY_PURGEABLE_TRIGGER_ONE)) {
-               memorystatus_update_vm_pressure(TRUE);
+               return memorystatus_kill_process_sync(-1, kMemorystatusKilledVMPageShortage, jetsam_reason);
        }
+}
 
-       if ((trigger_request == TEST_LOW_MEMORY_TRIGGER_ALL) ||
-           (trigger_request == TEST_LOW_MEMORY_PURGEABLE_TRIGGER_ALL)) {
-               while (memorystatus_update_vm_pressure(FALSE) == KERN_SUCCESS) {
-                       continue;
+boolean_t
+memorystatus_kill_on_FC_thrashing(boolean_t async)
+{
+       if (async) {
+               return memorystatus_kill_process_async(-1, kMemorystatusKilledFCThrashing);
+       } else {
+               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_MEMORY_FCTHRASHING);
+               if (jetsam_reason == OS_REASON_NULL) {
+                       printf("memorystatus_kill_on_FC_thrashing -- sync: failed to allocate jetsam reason\n");
                }
+
+               return memorystatus_kill_process_sync(-1, kMemorystatusKilledFCThrashing, jetsam_reason);
        }
+}
 
-       if (pressure_level == NOTE_MEMORYSTATUS_PRESSURE_NORMAL) {
-               memorystatus_manual_testing_on = FALSE;
+boolean_t
+memorystatus_kill_on_vnode_limit(void)
+{
+       os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_VNODE);
+       if (jetsam_reason == OS_REASON_NULL) {
+               printf("memorystatus_kill_on_vnode_limit: failed to allocate jetsam reason\n");
        }
 
-       return 0;
+       return memorystatus_kill_process_sync(-1, kMemorystatusKilledVnodes, jetsam_reason);
 }
 
-SYSCTL_PROC(_kern, OID_AUTO, memorypressure_manual_trigger, CTLTYPE_INT | CTLFLAG_WR | CTLFLAG_LOCKED | CTLFLAG_MASKED,
-    0, 0, &sysctl_memorypressure_manual_trigger, "I", "");
-
+#endif /* CONFIG_JETSAM */
 
-SYSCTL_INT(_kern, OID_AUTO, memorystatus_purge_on_warning, CTLFLAG_RW | CTLFLAG_LOCKED, &vm_pageout_state.memorystatus_purge_on_warning, 0, "");
-SYSCTL_INT(_kern, OID_AUTO, memorystatus_purge_on_urgent, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &vm_pageout_state.memorystatus_purge_on_urgent, 0, "");
-SYSCTL_INT(_kern, OID_AUTO, memorystatus_purge_on_critical, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &vm_pageout_state.memorystatus_purge_on_critical, 0, "");
+boolean_t
+memorystatus_kill_on_zone_map_exhaustion(pid_t pid)
+{
+       boolean_t res = FALSE;
+       if (pid == -1) {
+               res = memorystatus_kill_process_async(-1, kMemorystatusKilledZoneMapExhaustion);
+       } else {
+               os_reason_t jetsam_reason = os_reason_create(OS_REASON_JETSAM, JETSAM_REASON_ZONE_MAP_EXHAUSTION);
+               if (jetsam_reason == OS_REASON_NULL) {
+                       printf("memorystatus_kill_on_zone_map_exhaustion: failed to allocate jetsam reason\n");
+               }
 
-#if DEBUG || DEVELOPMENT
-SYSCTL_UINT(_kern, OID_AUTO, memorystatus_vm_pressure_events_enabled, CTLFLAG_RW | CTLFLAG_LOCKED, &vm_pressure_events_enabled, 0, "");
-#endif
+               res = memorystatus_kill_process_sync(pid, kMemorystatusKilledZoneMapExhaustion, jetsam_reason);
+       }
+       return res;
+}
 
-#endif /* VM_PRESSURE_EVENTS */
+void
+memorystatus_on_pageout_scan_end(void)
+{
+       /* No-op */
+}
 
 /* Return both allocated and actual size, since there's a race between allocation and list compilation */
 static int
@@ -8540,13 +6491,11 @@ memorystatus_get_priority_list(memorystatus_priority_entry_t **list_ptr, size_t
                return EINVAL;
        }
 
-       *list_ptr = (memorystatus_priority_entry_t*)kalloc(*list_size);
+       *list_ptr = kheap_alloc(KHEAP_TEMP, *list_size, Z_WAITOK | Z_ZERO);
        if (!*list_ptr) {
                return ENOMEM;
        }
 
-       memset(*list_ptr, 0, *list_size);
-
        *buffer_size = *list_size;
        *list_size = 0;
 
@@ -8586,6 +6535,7 @@ memorystatus_get_priority_pid(pid_t pid, user_addr_t buffer, size_t buffer_size)
 {
        int error = 0;
        memorystatus_priority_entry_t mp_entry;
+       kern_return_t ret;
 
        /* Validate inputs */
        if ((pid == 0) || (buffer == USER_ADDR_NULL) || (buffer_size != sizeof(memorystatus_priority_entry_t))) {
@@ -8603,7 +6553,11 @@ memorystatus_get_priority_pid(pid_t pid, user_addr_t buffer, size_t buffer_size)
        mp_entry.priority = p->p_memstat_effectivepriority;
        mp_entry.user_data = p->p_memstat_userdata;
        if (p->p_memstat_memlimit <= 0) {
-               task_get_phys_footprint_limit(p->task, &mp_entry.limit);
+               ret = task_get_phys_footprint_limit(p->task, &mp_entry.limit);
+               if (ret != KERN_SUCCESS) {
+                       proc_rele(p);
+                       return EINVAL;
+               }
        } else {
                mp_entry.limit = p->p_memstat_memlimit;
        }
@@ -8645,12 +6599,13 @@ memorystatus_cmd_get_priority_list(pid_t pid, user_addr_t buffer, size_t buffer_
                }
 
                if (list) {
-                       kfree(list, buffer_size);
+                       kheap_free(KHEAP_TEMP, list, buffer_size);
                }
        }
 
        if (error == 0) {
-               *retval = list_size;
+               assert(list_size <= INT32_MAX);
+               *retval = (int32_t) list_size;
        }
 
        return error;
@@ -8701,19 +6656,6 @@ memorystatus_update_levels_locked(boolean_t critical_only)
                }
        }
 
-#if DEBUG || DEVELOPMENT
-       if (memorystatus_jetsam_policy & kPolicyDiagnoseActive) {
-               memorystatus_available_pages_critical += memorystatus_jetsam_policy_offset_pages_diagnostic;
-
-               if (memorystatus_available_pages_critical > memorystatus_available_pages_pressure) {
-                       /*
-                        * The critical threshold must never exceed the pressure threshold
-                        */
-                       memorystatus_available_pages_critical = memorystatus_available_pages_pressure;
-               }
-       }
-#endif /* DEBUG || DEVELOPMENT */
-
        if (memorystatus_jetsam_policy & kPolicyMoreFree) {
                memorystatus_available_pages_critical += memorystatus_policy_more_free_offset_pages;
        }
@@ -8723,12 +6665,7 @@ memorystatus_update_levels_locked(boolean_t critical_only)
        }
 
 #if VM_PRESSURE_EVENTS
-       memorystatus_available_pages_pressure = (pressure_threshold_percentage / delta_percentage) * memorystatus_delta;
-#if DEBUG || DEVELOPMENT
-       if (memorystatus_jetsam_policy & kPolicyDiagnoseActive) {
-               memorystatus_available_pages_pressure += memorystatus_jetsam_policy_offset_pages_diagnostic;
-       }
-#endif
+       memorystatus_available_pages_pressure = (int32_t)(pressure_threshold_percentage * (atop_64(max_mem) / 100));
 #endif
 }
 
@@ -8824,24 +6761,53 @@ memorystatus_get_at_boot_snapshot(memorystatus_jetsam_snapshot_t **snapshot, siz
        memorystatus_at_boot_snapshot.notification_time = mach_absolute_time();
        *snapshot = &memorystatus_at_boot_snapshot;
 
-       MEMORYSTATUS_DEBUG(7, "memorystatus_get_at_boot_snapshot: returned inputsize (%ld), snapshot_size(%ld), listcount(%d)\n",
-           (long)input_size, (long)*snapshot_size, 0);
+       MEMORYSTATUS_DEBUG(7, "memorystatus_get_at_boot_snapshot: returned inputsize (%ld), snapshot_size(%ld), listcount(%d)\n",
+           (long)input_size, (long)*snapshot_size, 0);
+       return 0;
+}
+
+/*
+ * Get the previous fully populated snapshot
+ */
+static int
+memorystatus_get_jetsam_snapshot_copy(memorystatus_jetsam_snapshot_t **snapshot, size_t *snapshot_size, boolean_t size_only)
+{
+       size_t input_size = *snapshot_size;
+
+       if (memorystatus_jetsam_snapshot_copy_count > 0) {
+               *snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) + (sizeof(memorystatus_jetsam_snapshot_entry_t) * (memorystatus_jetsam_snapshot_copy_count));
+       } else {
+               *snapshot_size = 0;
+       }
+
+       if (size_only) {
+               return 0;
+       }
+
+       if (input_size < *snapshot_size) {
+               return EINVAL;
+       }
+
+       *snapshot = memorystatus_jetsam_snapshot_copy;
+
+       MEMORYSTATUS_DEBUG(7, "memorystatus_get_jetsam_snapshot_copy: returned inputsize (%ld), snapshot_size(%ld), listcount(%ld)\n",
+           (long)input_size, (long)*snapshot_size, (long)memorystatus_jetsam_snapshot_copy_count);
+
        return 0;
 }
 
-/*
- * Get the previous fully populated snapshot
- */
+#if CONFIG_FREEZE
 static int
-memorystatus_get_jetsam_snapshot_copy(memorystatus_jetsam_snapshot_t **snapshot, size_t *snapshot_size, boolean_t size_only)
+memorystatus_get_jetsam_snapshot_freezer(memorystatus_jetsam_snapshot_t **snapshot, size_t *snapshot_size, boolean_t size_only)
 {
        size_t input_size = *snapshot_size;
 
-       if (memorystatus_jetsam_snapshot_copy_count > 0) {
-               *snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) + (sizeof(memorystatus_jetsam_snapshot_entry_t) * (memorystatus_jetsam_snapshot_copy_count));
+       if (memorystatus_jetsam_snapshot_freezer->entry_count > 0) {
+               *snapshot_size = sizeof(memorystatus_jetsam_snapshot_t) + (sizeof(memorystatus_jetsam_snapshot_entry_t) * (memorystatus_jetsam_snapshot_freezer->entry_count));
        } else {
                *snapshot_size = 0;
        }
+       assert(*snapshot_size <= memorystatus_jetsam_snapshot_freezer_size);
 
        if (size_only) {
                return 0;
@@ -8851,13 +6817,14 @@ memorystatus_get_jetsam_snapshot_copy(memorystatus_jetsam_snapshot_t **snapshot,
                return EINVAL;
        }
 
-       *snapshot = memorystatus_jetsam_snapshot_copy;
+       *snapshot = memorystatus_jetsam_snapshot_freezer;
 
-       MEMORYSTATUS_DEBUG(7, "memorystatus_get_jetsam_snapshot_copy: returned inputsize (%ld), snapshot_size(%ld), listcount(%ld)\n",
-           (long)input_size, (long)*snapshot_size, (long)memorystatus_jetsam_snapshot_copy_count);
+       MEMORYSTATUS_DEBUG(7, "memorystatus_get_jetsam_snapshot_freezer: returned inputsize (%ld), snapshot_size(%ld), listcount(%ld)\n",
+           (long)input_size, (long)*snapshot_size, (long)memorystatus_jetsam_snapshot_freezer->entry_count);
 
        return 0;
 }
+#endif /* CONFIG_FREEZE */
 
 static int
 memorystatus_get_on_demand_snapshot(memorystatus_jetsam_snapshot_t **snapshot, size_t *snapshot_size, boolean_t size_only)
@@ -8885,7 +6852,7 @@ memorystatus_get_on_demand_snapshot(memorystatus_jetsam_snapshot_t **snapshot, s
        /*
         * Allocate and initialize a snapshot buffer.
         */
-       ods = (memorystatus_jetsam_snapshot_t *)kalloc(*snapshot_size);
+       ods = kalloc(*snapshot_size);
        if (!ods) {
                return ENOMEM;
        }
@@ -8946,6 +6913,9 @@ memorystatus_cmd_get_jetsam_snapshot(int32_t flags, user_addr_t buffer, size_t b
        boolean_t is_default_snapshot = FALSE;
        boolean_t is_on_demand_snapshot = FALSE;
        boolean_t is_at_boot_snapshot = FALSE;
+#if CONFIG_FREEZE
+       bool is_freezer_snapshot = false;
+#endif /* CONFIG_FREEZE */
        memorystatus_jetsam_snapshot_t *snapshot;
 
        size_only = ((buffer == USER_ADDR_NULL) ? TRUE : FALSE);
@@ -8955,7 +6925,7 @@ memorystatus_cmd_get_jetsam_snapshot(int32_t flags, user_addr_t buffer, size_t b
                is_default_snapshot = TRUE;
                error = memorystatus_get_jetsam_snapshot(&snapshot, &buffer_size, size_only);
        } else {
-               if (flags & ~(MEMORYSTATUS_SNAPSHOT_ON_DEMAND | MEMORYSTATUS_SNAPSHOT_AT_BOOT | MEMORYSTATUS_SNAPSHOT_COPY)) {
+               if (flags & ~(MEMORYSTATUS_SNAPSHOT_ON_DEMAND | MEMORYSTATUS_SNAPSHOT_AT_BOOT | MEMORYSTATUS_SNAPSHOT_COPY | MEMORYSTATUS_FLAGS_SNAPSHOT_FREEZER)) {
                        /*
                         * Unsupported bit set in flag.
                         */
@@ -8981,6 +6951,11 @@ memorystatus_cmd_get_jetsam_snapshot(int32_t flags, user_addr_t buffer, size_t b
                        error = memorystatus_get_at_boot_snapshot(&snapshot, &buffer_size, size_only);
                } else if (flags & MEMORYSTATUS_SNAPSHOT_COPY) {
                        error = memorystatus_get_jetsam_snapshot_copy(&snapshot, &buffer_size, size_only);
+#if CONFIG_FREEZE
+               } else if (flags & MEMORYSTATUS_FLAGS_SNAPSHOT_FREEZER) {
+                       is_freezer_snapshot = true;
+                       error = memorystatus_get_jetsam_snapshot_freezer(&snapshot, &buffer_size, size_only);
+#endif /* CONFIG_FREEZE */
                } else {
                        /*
                         * Invalid flag setting.
@@ -9003,20 +6978,40 @@ memorystatus_cmd_get_jetsam_snapshot(int32_t flags, user_addr_t buffer, size_t b
         *      there is nothing to clear or update.
         * If working with a copy of the snapshot
         *      there is nothing to clear or update.
+        * If working with the freezer snapshot
+        *      clearing the buffer means, reset the count.
         */
        if (!size_only) {
                if ((error = copyout(snapshot, buffer, buffer_size)) == 0) {
+#if CONFIG_FREEZE
+                       if (is_default_snapshot || is_freezer_snapshot) {
+#else
                        if (is_default_snapshot) {
+#endif /* CONFIG_FREEZE */
                                /*
                                 * The jetsam snapshot is never freed, its count is simply reset.
                                 * However, we make a copy for any parties that might be interested
                                 * in the previous fully populated snapshot.
                                 */
                                proc_list_lock();
-                               memcpy(memorystatus_jetsam_snapshot_copy, memorystatus_jetsam_snapshot, memorystatus_jetsam_snapshot_size);
-                               memorystatus_jetsam_snapshot_copy_count = memorystatus_jetsam_snapshot_count;
-                               snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
-                               memorystatus_jetsam_snapshot_last_timestamp = 0;
+#if DEVELOPMENT || DEBUG
+                               if (memorystatus_snapshot_owner != 0 && memorystatus_snapshot_owner != current_proc()->p_pid) {
+                                       /* Snapshot is currently owned by someone else. Don't consume it. */
+                                       proc_list_unlock();
+                                       goto out;
+                               }
+#endif /* (DEVELOPMENT || DEBUG)*/
+                               if (is_default_snapshot) {
+                                       memcpy(memorystatus_jetsam_snapshot_copy, memorystatus_jetsam_snapshot, memorystatus_jetsam_snapshot_size);
+                                       memorystatus_jetsam_snapshot_copy_count = memorystatus_jetsam_snapshot_count;
+                                       snapshot->entry_count = memorystatus_jetsam_snapshot_count = 0;
+                                       memorystatus_jetsam_snapshot_last_timestamp = 0;
+                               }
+#if CONFIG_FREEZE
+                               else if (is_freezer_snapshot) {
+                                       memorystatus_jetsam_snapshot_freezer->entry_count = 0;
+                               }
+#endif /* CONFIG_FREEZE */
                                proc_list_unlock();
                        }
                }
@@ -9032,13 +7027,47 @@ memorystatus_cmd_get_jetsam_snapshot(int32_t flags, user_addr_t buffer, size_t b
                }
        }
 
+out:
        if (error == 0) {
-               *retval = buffer_size;
+               assert(buffer_size <= INT32_MAX);
+               *retval = (int32_t) buffer_size;
        }
-out:
        return error;
 }
 
+#if DEVELOPMENT || DEBUG
+static int
+memorystatus_cmd_set_jetsam_snapshot_ownership(int32_t flags)
+{
+       int error = EINVAL;
+       proc_t caller = current_proc();
+       assert(caller != kernproc);
+       proc_list_lock();
+       if (flags & MEMORYSTATUS_FLAGS_SNAPSHOT_TAKE_OWNERSHIP) {
+               if (memorystatus_snapshot_owner == 0) {
+                       memorystatus_snapshot_owner = caller->p_pid;
+                       error = 0;
+               } else if (memorystatus_snapshot_owner == caller->p_pid) {
+                       error = 0;
+               } else {
+                       /* We don't allow ownership to be taken from another proc. */
+                       error = EBUSY;
+               }
+       } else if (flags & MEMORYSTATUS_FLAGS_SNAPSHOT_DROP_OWNERSHIP) {
+               if (memorystatus_snapshot_owner == caller->p_pid) {
+                       memorystatus_snapshot_owner = 0;
+                       error = 0;
+               } else if (memorystatus_snapshot_owner != 0) {
+                       /* We don't allow ownership to be taken from another proc. */
+                       error = EPERM;
+               }
+       }
+       proc_list_unlock();
+
+       return error;
+}
+#endif /* DEVELOPMENT || DEBUG */
+
 /*
  *      Routine:       memorystatus_cmd_grp_set_priorities
  *     Purpose:        Update priorities for a group of processes.
@@ -9084,7 +7113,7 @@ memorystatus_cmd_grp_set_priorities(user_addr_t buffer, size_t buffer_size)
 
        int error = 0;
        memorystatus_properties_entry_v1_t *entries = NULL;
-       uint32_t entry_count = 0;
+       size_t entry_count = 0;
 
        /* This will be the ordered proc list */
        typedef struct memorystatus_internal_properties {
@@ -9096,7 +7125,7 @@ memorystatus_cmd_grp_set_priorities(user_addr_t buffer, size_t buffer_size)
        size_t table_size = 0;
        uint32_t table_count = 0;
 
-       uint32_t i = 0;
+       size_t i = 0;
        uint32_t bucket_index = 0;
        boolean_t head_insert;
        int32_t new_priority;
@@ -9110,7 +7139,13 @@ memorystatus_cmd_grp_set_priorities(user_addr_t buffer, size_t buffer_size)
        }
 
        entry_count = (buffer_size / sizeof(memorystatus_properties_entry_v1_t));
-       if ((entries = (memorystatus_properties_entry_v1_t *)kalloc(buffer_size)) == NULL) {
+       if (entry_count == 0) {
+               /* buffer size was not large enough for a single entry */
+               error = EINVAL;
+               goto out;
+       }
+
+       if ((entries = kheap_alloc(KHEAP_TEMP, buffer_size, Z_WAITOK)) == NULL) {
                error = ENOMEM;
                goto out;
        }
@@ -9152,11 +7187,10 @@ memorystatus_cmd_grp_set_priorities(user_addr_t buffer, size_t buffer_size)
        }
 
        table_size = sizeof(memorystatus_internal_properties_t) * entry_count;
-       if ((table = (memorystatus_internal_properties_t *)kalloc(table_size)) == NULL) {
+       if ((table = kheap_alloc(KHEAP_TEMP, table_size, Z_WAITOK | Z_ZERO)) == NULL) {
                error = ENOMEM;
                goto out;
        }
-       memset(table, 0, table_size);
 
 
        /*
@@ -9227,21 +7261,24 @@ out:
        KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_GRP_SET_PROP) | DBG_FUNC_END, MEMORYSTATUS_FLAGS_GRP_SET_PRIORITY, entry_count, table_count, 0, 0);
 
        if (entries) {
-               kfree(entries, buffer_size);
+               kheap_free(KHEAP_TEMP, entries, buffer_size);
        }
        if (table) {
-               kfree(table, table_size);
+               kheap_free(KHEAP_TEMP, table, table_size);
        }
 
        return error;
 }
 
+memorystatus_internal_probabilities_t *memorystatus_global_probabilities_table = NULL;
+size_t memorystatus_global_probabilities_size = 0;
+
 static int
 memorystatus_cmd_grp_set_probabilities(user_addr_t buffer, size_t buffer_size)
 {
        int error = 0;
        memorystatus_properties_entry_v1_t *entries = NULL;
-       uint32_t entry_count = 0, i = 0;
+       size_t entry_count = 0, i = 0;
        memorystatus_internal_probabilities_t *tmp_table_new = NULL, *tmp_table_old = NULL;
        size_t tmp_table_new_size = 0, tmp_table_old_size = 0;
 
@@ -9253,7 +7290,7 @@ memorystatus_cmd_grp_set_probabilities(user_addr_t buffer, size_t buffer_size)
 
        entry_count = (buffer_size / sizeof(memorystatus_properties_entry_v1_t));
 
-       if ((entries = (memorystatus_properties_entry_v1_t *) kalloc(buffer_size)) == NULL) {
+       if ((entries = kheap_alloc(KHEAP_TEMP, buffer_size, Z_WAITOK)) == NULL) {
                error = ENOMEM;
                goto out;
        }
@@ -9292,11 +7329,10 @@ memorystatus_cmd_grp_set_probabilities(user_addr_t buffer, size_t buffer_size)
 
        tmp_table_new_size = sizeof(memorystatus_internal_probabilities_t) * entry_count;
 
-       if ((tmp_table_new = (memorystatus_internal_probabilities_t *) kalloc(tmp_table_new_size)) == NULL) {
+       if ((tmp_table_new = kalloc_flags(tmp_table_new_size, Z_WAITOK | Z_ZERO)) == NULL) {
                error = ENOMEM;
                goto out;
        }
-       memset(tmp_table_new, 0, tmp_table_new_size);
 
        proc_list_lock();
 
@@ -9321,7 +7357,7 @@ out:
        KERNEL_DEBUG_CONSTANT(BSDDBG_CODE(DBG_BSD_MEMSTAT, BSD_MEMSTAT_GRP_SET_PROP) | DBG_FUNC_END, MEMORYSTATUS_FLAGS_GRP_SET_PROBABILITY, entry_count, tmp_table_new_size, 0, 0);
 
        if (entries) {
-               kfree(entries, buffer_size);
+               kheap_free(KHEAP_TEMP, entries, buffer_size);
                entries = NULL;
        }
 
@@ -9353,12 +7389,24 @@ memorystatus_cmd_grp_set_properties(int32_t flags, user_addr_t buffer, size_t bu
  * This routine is used to update a process's jetsam priority position and stored user_data.
  * It is not used for the setting of memory limits, which is why the last 6 args to the
  * memorystatus_update() call are 0 or FALSE.
+ *
+ * Flags passed into this call are used to distinguish the motivation behind a jetsam priority
+ * transition.  By default, the kernel updates the process's original requested priority when
+ * no flag is passed.  But when the MEMORYSTATUS_SET_PRIORITY_ASSERTION flag is used, the kernel
+ * updates the process's assertion driven priority.
+ *
+ * The assertion flag was introduced for use by the device's assertion mediator (eg: runningboardd).
+ * When an assertion is controlling a process's jetsam priority, it may conflict with that process's
+ * dirty/clean (active/inactive) jetsam state.  The kernel attempts to resolve a priority transition
+ * conflict by reviewing the process state and then choosing the maximum jetsam band at play,
+ * eg: requested priority versus assertion priority.
  */
 
 static int
-memorystatus_cmd_set_priority_properties(pid_t pid, user_addr_t buffer, size_t buffer_size, __unused int32_t *retval)
+memorystatus_cmd_set_priority_properties(pid_t pid, uint32_t flags, user_addr_t buffer, size_t buffer_size, __unused int32_t *retval)
 {
        int error = 0;
+       boolean_t is_assertion = FALSE;         /* priority is driven by an assertion */
        memorystatus_priority_properties_t mpp_entry;
 
        /* Validate inputs */
@@ -9366,6 +7414,22 @@ memorystatus_cmd_set_priority_properties(pid_t pid, user_addr_t buffer, size_t b
                return EINVAL;
        }
 
+       /* Validate flags */
+       if (flags == 0) {
+               /*
+                * Default. This path updates requestedpriority.
+                */
+       } else {
+               if (flags & ~(MEMORYSTATUS_SET_PRIORITY_ASSERTION)) {
+                       /*
+                        * Unsupported bit set in flag.
+                        */
+                       return EINVAL;
+               } else if (flags & MEMORYSTATUS_SET_PRIORITY_ASSERTION) {
+                       is_assertion = TRUE;
+               }
+       }
+
        error = copyin(buffer, &mpp_entry, buffer_size);
 
        if (error == 0) {
@@ -9381,7 +7445,12 @@ memorystatus_cmd_set_priority_properties(pid_t pid, user_addr_t buffer, size_t b
                        return EPERM;
                }
 
-               error = memorystatus_update(p, mpp_entry.priority, mpp_entry.user_data, FALSE, FALSE, 0, 0, FALSE, FALSE);
+               if (is_assertion) {
+                       os_log(OS_LOG_DEFAULT, "memorystatus: set assertion priority(%d) target %s:%d\n",
+                           mpp_entry.priority, (*p->p_name ? p->p_name : "unknown"), p->p_pid);
+               }
+
+               error = memorystatus_update(p, mpp_entry.priority, mpp_entry.user_data, is_assertion, FALSE, FALSE, 0, 0, FALSE, FALSE);
                proc_rele(p);
        }
 
@@ -9408,6 +7477,34 @@ memorystatus_cmd_set_memlimit_properties(pid_t pid, user_addr_t buffer, size_t b
        return error;
 }
 
+static void
+memorystatus_get_memlimit_properties_internal(proc_t p, memorystatus_memlimit_properties_t* p_entry)
+{
+       memset(p_entry, 0, sizeof(memorystatus_memlimit_properties_t));
+
+       if (p->p_memstat_memlimit_active > 0) {
+               p_entry->memlimit_active = p->p_memstat_memlimit_active;
+       } else {
+               task_convert_phys_footprint_limit(-1, &p_entry->memlimit_active);
+       }
+
+       if (p->p_memstat_state & P_MEMSTAT_MEMLIMIT_ACTIVE_FATAL) {
+               p_entry->memlimit_active_attr |= MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
+       }
+
+       /*
+        * Get the inactive limit and attributes
+        */
+       if (p->p_memstat_memlimit_inactive <= 0) {
+               task_convert_phys_footprint_limit(-1, &p_entry->memlimit_inactive);
+       } else {
+               p_entry->memlimit_inactive = p->p_memstat_memlimit_inactive;
+       }
+       if (p->p_memstat_state & P_MEMSTAT_MEMLIMIT_INACTIVE_FATAL) {
+               p_entry->memlimit_inactive_attr |= MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
+       }
+}
+
 /*
  * When getting the memlimit settings, we can't simply call task_get_phys_footprint_limit().
  * That gets the proc's cached memlimit and there is no guarantee that the active/inactive
@@ -9418,15 +7515,16 @@ memorystatus_cmd_set_memlimit_properties(pid_t pid, user_addr_t buffer, size_t b
 static int
 memorystatus_cmd_get_memlimit_properties(pid_t pid, user_addr_t buffer, size_t buffer_size, __unused int32_t *retval)
 {
-       int error = 0;
-       memorystatus_memlimit_properties_t mmp_entry;
+       memorystatus_memlimit_properties2_t mmp_entry;
 
        /* Validate inputs */
-       if ((pid == 0) || (buffer == USER_ADDR_NULL) || (buffer_size != sizeof(memorystatus_memlimit_properties_t))) {
+       if ((pid == 0) || (buffer == USER_ADDR_NULL) ||
+           ((buffer_size != sizeof(memorystatus_memlimit_properties_t)) &&
+           (buffer_size != sizeof(memorystatus_memlimit_properties2_t)))) {
                return EINVAL;
        }
 
-       memset(&mmp_entry, 0, sizeof(memorystatus_memlimit_properties_t));
+       memset(&mmp_entry, 0, sizeof(memorystatus_memlimit_properties2_t));
 
        proc_t p = proc_find(pid);
        if (!p) {
@@ -9438,30 +7536,21 @@ memorystatus_cmd_get_memlimit_properties(pid_t pid, user_addr_t buffer, size_t b
         * No locks taken since we hold a reference to the proc.
         */
 
-       if (p->p_memstat_memlimit_active > 0) {
-               mmp_entry.memlimit_active = p->p_memstat_memlimit_active;
-       } else {
-               task_convert_phys_footprint_limit(-1, &mmp_entry.memlimit_active);
-       }
-
-       if (p->p_memstat_state & P_MEMSTAT_MEMLIMIT_ACTIVE_FATAL) {
-               mmp_entry.memlimit_active_attr |= MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
-       }
+       memorystatus_get_memlimit_properties_internal(p, &mmp_entry.v1);
 
+#if CONFIG_JETSAM
+#if DEVELOPMENT || DEBUG
        /*
-        * Get the inactive limit and attributes
+        * Get the limit increased via SPI
         */
-       if (p->p_memstat_memlimit_inactive <= 0) {
-               task_convert_phys_footprint_limit(-1, &mmp_entry.memlimit_inactive);
-       } else {
-               mmp_entry.memlimit_inactive = p->p_memstat_memlimit_inactive;
-       }
-       if (p->p_memstat_state & P_MEMSTAT_MEMLIMIT_INACTIVE_FATAL) {
-               mmp_entry.memlimit_inactive_attr |= MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
-       }
+       mmp_entry.memlimit_increase = roundToNearestMB(p->p_memlimit_increase);
+       mmp_entry.memlimit_increase_bytes = p->p_memlimit_increase;
+#endif /* DEVELOPMENT || DEBUG */
+#endif /* CONFIG_JETSAM */
+
        proc_rele(p);
 
-       error = copyout(&mmp_entry, buffer, buffer_size);
+       int error = copyout(&mmp_entry, buffer, buffer_size);
 
        return error;
 }
@@ -9586,87 +7675,21 @@ memorystatus_cmd_set_jetsam_memory_limit(pid_t pid, int32_t high_water_mark, __u
 #endif /* CONFIG_JETSAM */
 
 static int
-memorystatus_set_memlimit_properties(pid_t pid, memorystatus_memlimit_properties_t *entry)
+memorystatus_set_memlimit_properties_internal(proc_t p, memorystatus_memlimit_properties_t *p_entry)
 {
-       int32_t  memlimit_active;
-       boolean_t memlimit_active_is_fatal;
-       int32_t  memlimit_inactive;
-       boolean_t memlimit_inactive_is_fatal;
-       uint32_t valid_attrs = 0;
-       int       error = 0;
-
-       proc_t p = proc_find(pid);
-       if (!p) {
-               return ESRCH;
-       }
-
-       /*
-        * Check for valid attribute flags.
-        */
-       valid_attrs |= (MEMORYSTATUS_MEMLIMIT_ATTR_FATAL);
-       if ((entry->memlimit_active_attr & (~valid_attrs)) != 0) {
-               proc_rele(p);
-               return EINVAL;
-       }
-       if ((entry->memlimit_inactive_attr & (~valid_attrs)) != 0) {
-               proc_rele(p);
-               return EINVAL;
-       }
-
-       /*
-        * Setup the active memlimit properties
-        */
-       memlimit_active = entry->memlimit_active;
-       if (entry->memlimit_active_attr & MEMORYSTATUS_MEMLIMIT_ATTR_FATAL) {
-               memlimit_active_is_fatal = TRUE;
-       } else {
-               memlimit_active_is_fatal = FALSE;
-       }
-
-       /*
-        * Setup the inactive memlimit properties
-        */
-       memlimit_inactive = entry->memlimit_inactive;
-       if (entry->memlimit_inactive_attr & MEMORYSTATUS_MEMLIMIT_ATTR_FATAL) {
-               memlimit_inactive_is_fatal = TRUE;
-       } else {
-               memlimit_inactive_is_fatal = FALSE;
-       }
-
-       /*
-        * Setting a limit of <= 0 implies that the process has no
-        * high-water-mark and has no per-task-limit.  That means
-        * the system_wide task limit is in place, which by the way,
-        * is always fatal.
-        */
-
-       if (memlimit_active <= 0) {
-               /*
-                * Enforce the fatal system_wide task limit while process is active.
-                */
-               memlimit_active = -1;
-               memlimit_active_is_fatal = TRUE;
-       }
-
-       if (memlimit_inactive <= 0) {
-               /*
-                * Enforce the fatal system_wide task limit while process is inactive.
-                */
-               memlimit_inactive = -1;
-               memlimit_inactive_is_fatal = TRUE;
-       }
+       int error = 0;
 
-       proc_list_lock();
+       LCK_MTX_ASSERT(proc_list_mlock, LCK_MTX_ASSERT_OWNED);
 
        /*
         * Store the active limit variants in the proc.
         */
-       SET_ACTIVE_LIMITS_LOCKED(p, memlimit_active, memlimit_active_is_fatal);
+       SET_ACTIVE_LIMITS_LOCKED(p, p_entry->memlimit_active, p_entry->memlimit_active_attr);
 
        /*
         * Store the inactive limit variants in the proc.
         */
-       SET_INACTIVE_LIMITS_LOCKED(p, memlimit_inactive, memlimit_inactive_is_fatal);
+       SET_INACTIVE_LIMITS_LOCKED(p, p_entry->memlimit_inactive, p_entry->memlimit_inactive_attr);
 
        /*
         * Enforce appropriate limit variant by updating the cached values
@@ -9696,84 +7719,116 @@ memorystatus_set_memlimit_properties(pid_t pid, memorystatus_memlimit_properties
                DTRACE_MEMORYSTATUS2(memorystatus_set_memlimit, proc_t, p, int32_t, (p->p_memstat_memlimit > 0 ? p->p_memstat_memlimit : -1));
        }
 
-       proc_list_unlock();
-       proc_rele(p);
-
        return error;
 }
 
-/*
- * Returns the jetsam priority (effective or requested) of the process
- * associated with this task.
- */
-int
-proc_get_memstat_priority(proc_t p, boolean_t effective_priority)
-{
-       if (p) {
-               if (effective_priority) {
-                       return p->p_memstat_effectivepriority;
-               } else {
-                       return p->p_memstat_requestedpriority;
-               }
-       }
-       return 0;
-}
-
 static int
-memorystatus_get_process_is_managed(pid_t pid, int *is_managed)
+memorystatus_set_memlimit_properties(pid_t pid, memorystatus_memlimit_properties_t *entry)
 {
-       proc_t p = NULL;
+       memorystatus_memlimit_properties_t set_entry;
 
-       /* Validate inputs */
-       if (pid == 0) {
-               return EINVAL;
-       }
-
-       p = proc_find(pid);
+       proc_t p = proc_find(pid);
        if (!p) {
                return ESRCH;
        }
 
-       proc_list_lock();
-       *is_managed = ((p->p_memstat_state & P_MEMSTAT_MANAGED) ? 1 : 0);
-       proc_rele_locked(p);
-       proc_list_unlock();
+       /*
+        * Check for valid attribute flags.
+        */
+       const uint32_t valid_attrs = MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
+       if ((entry->memlimit_active_attr & (~valid_attrs)) != 0) {
+               proc_rele(p);
+               return EINVAL;
+       }
+       if ((entry->memlimit_inactive_attr & (~valid_attrs)) != 0) {
+               proc_rele(p);
+               return EINVAL;
+       }
 
-       return 0;
-}
+       /*
+        * Setup the active memlimit properties
+        */
+       set_entry.memlimit_active = entry->memlimit_active;
+       set_entry.memlimit_active_attr = entry->memlimit_active_attr & MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
 
-static int
-memorystatus_set_process_is_managed(pid_t pid, boolean_t set_managed)
-{
-       proc_t p = NULL;
+       /*
+        * Setup the inactive memlimit properties
+        */
+       set_entry.memlimit_inactive = entry->memlimit_inactive;
+       set_entry.memlimit_inactive_attr = entry->memlimit_inactive_attr & MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
 
-       /* Validate inputs */
-       if (pid == 0) {
-               return EINVAL;
+       /*
+        * Setting a limit of <= 0 implies that the process has no
+        * high-water-mark and has no per-task-limit.  That means
+        * the system_wide task limit is in place, which by the way,
+        * is always fatal.
+        */
+
+       if (set_entry.memlimit_active <= 0) {
+               /*
+                * Enforce the fatal system_wide task limit while process is active.
+                */
+               set_entry.memlimit_active = -1;
+               set_entry.memlimit_active_attr = MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
+       }
+#if CONFIG_JETSAM
+#if DEVELOPMENT || DEBUG
+       else {
+               /* add the current increase to it, for roots */
+               set_entry.memlimit_active += roundToNearestMB(p->p_memlimit_increase);
        }
+#endif /* DEVELOPMENT || DEBUG */
+#endif /* CONFIG_JETSAM */
 
-       p = proc_find(pid);
-       if (!p) {
-               return ESRCH;
+       if (set_entry.memlimit_inactive <= 0) {
+               /*
+                * Enforce the fatal system_wide task limit while process is inactive.
+                */
+               set_entry.memlimit_inactive = -1;
+               set_entry.memlimit_inactive_attr = MEMORYSTATUS_MEMLIMIT_ATTR_FATAL;
+       }
+#if CONFIG_JETSAM
+#if DEVELOPMENT || DEBUG
+       else {
+               /* add the current increase to it, for roots */
+               set_entry.memlimit_inactive += roundToNearestMB(p->p_memlimit_increase);
        }
+#endif /* DEVELOPMENT || DEBUG */
+#endif /* CONFIG_JETSAM */
 
        proc_list_lock();
-       if (set_managed == TRUE) {
-               p->p_memstat_state |= P_MEMSTAT_MANAGED;
-       } else {
-               p->p_memstat_state &= ~P_MEMSTAT_MANAGED;
-       }
-       proc_rele_locked(p);
+
+       int error = memorystatus_set_memlimit_properties_internal(p, &set_entry);
+
        proc_list_unlock();
+       proc_rele(p);
 
+       return error;
+}
+
+/*
+ * Returns the jetsam priority (effective or requested) of the process
+ * associated with this task.
+ */
+int
+proc_get_memstat_priority(proc_t p, boolean_t effective_priority)
+{
+       if (p) {
+               if (effective_priority) {
+                       return p->p_memstat_effectivepriority;
+               } else {
+                       return p->p_memstat_requestedpriority;
+               }
+       }
        return 0;
 }
 
 static int
-memorystatus_get_process_is_freezable(pid_t pid, int *is_freezable)
+memorystatus_get_process_is_managed(pid_t pid, int *is_managed)
 {
-       proc_t p = PROC_NULL;
+       proc_t p = NULL;
 
+       /* Validate inputs */
        if (pid == 0) {
                return EINVAL;
        }
@@ -9783,17 +7838,8 @@ memorystatus_get_process_is_freezable(pid_t pid, int *is_freezable)
                return ESRCH;
        }
 
-       /*
-        * Only allow this on the current proc for now.
-        * We can check for privileges and allow targeting another process in the future.
-        */
-       if (p != current_proc()) {
-               proc_rele(p);
-               return EPERM;
-       }
-
        proc_list_lock();
-       *is_freezable = ((p->p_memstat_state & P_MEMSTAT_FREEZE_DISABLED) ? 0 : 1);
+       *is_managed = ((p->p_memstat_state & P_MEMSTAT_MANAGED) ? 1 : 0);
        proc_rele_locked(p);
        proc_list_unlock();
 
@@ -9801,10 +7847,11 @@ memorystatus_get_process_is_freezable(pid_t pid, int *is_freezable)
 }
 
 static int
-memorystatus_set_process_is_freezable(pid_t pid, boolean_t is_freezable)
+memorystatus_set_process_is_managed(pid_t pid, boolean_t set_managed)
 {
-       proc_t p = PROC_NULL;
+       proc_t p = NULL;
 
+       /* Validate inputs */
        if (pid == 0) {
                return EINVAL;
        }
@@ -9814,25 +7861,17 @@ memorystatus_set_process_is_freezable(pid_t pid, boolean_t is_freezable)
                return ESRCH;
        }
 
-       /*
-        * Only allow this on the current proc for now.
-        * We can check for privileges and allow targeting another process in the future.
-        */
-       if (p != current_proc()) {
-               proc_rele(p);
-               return EPERM;
-       }
-
        proc_list_lock();
-       if (is_freezable == FALSE) {
-               /* Freeze preference set to FALSE. Set the P_MEMSTAT_FREEZE_DISABLED bit. */
-               p->p_memstat_state |= P_MEMSTAT_FREEZE_DISABLED;
-               printf("memorystatus_set_process_is_freezable: disabling freeze for pid %d [%s]\n",
-                   p->p_pid, (*p->p_name ? p->p_name : "unknown"));
-       } else {
+       if (set_managed == TRUE) {
+               p->p_memstat_state |= P_MEMSTAT_MANAGED;
+               /*
+                * The P_MEMSTAT_MANAGED bit is set by assertiond for Apps.
+                * Also opt them in to being frozen (they might have started
+                * off with the P_MEMSTAT_FREEZE_DISABLED bit set.)
+                */
                p->p_memstat_state &= ~P_MEMSTAT_FREEZE_DISABLED;
-               printf("memorystatus_set_process_is_freezable: enabling freeze for pid %d [%s]\n",
-                   p->p_pid, (*p->p_name ? p->p_name : "unknown"));
+       } else {
+               p->p_memstat_state &= ~P_MEMSTAT_MANAGED;
        }
        proc_rele_locked(p);
        proc_list_unlock();
@@ -9848,12 +7887,14 @@ memorystatus_control(struct proc *p __unused, struct memorystatus_control_args *
        os_reason_t jetsam_reason = OS_REASON_NULL;
 
 #if !CONFIG_JETSAM
-       #pragma unused(ret)
-       #pragma unused(jetsam_reason)
+    #pragma unused(ret)
+    #pragma unused(jetsam_reason)
 #endif
 
-       /* We don't need entitlements if we're setting/ querying the freeze preference for a process. Skip the check below. */
-       if (args->command == MEMORYSTATUS_CMD_SET_PROCESS_IS_FREEZABLE || args->command == MEMORYSTATUS_CMD_GET_PROCESS_IS_FREEZABLE) {
+       /* We don't need entitlements if we're setting / querying the freeze preference or frozen status for a process. */
+       if (args->command == MEMORYSTATUS_CMD_SET_PROCESS_IS_FREEZABLE ||
+           args->command == MEMORYSTATUS_CMD_GET_PROCESS_IS_FREEZABLE ||
+           args->command == MEMORYSTATUS_CMD_GET_PROCESS_IS_FROZEN) {
                skip_auth_check = TRUE;
        }
 
@@ -9879,7 +7920,7 @@ memorystatus_control(struct proc *p __unused, struct memorystatus_control_args *
                error = memorystatus_cmd_get_priority_list(args->pid, args->buffer, args->buffersize, ret);
                break;
        case MEMORYSTATUS_CMD_SET_PRIORITY_PROPERTIES:
-               error = memorystatus_cmd_set_priority_properties(args->pid, args->buffer, args->buffersize, ret);
+               error = memorystatus_cmd_set_priority_properties(args->pid, args->flags, args->buffer, args->buffersize, ret);
                break;
        case MEMORYSTATUS_CMD_SET_MEMLIMIT_PROPERTIES:
                error = memorystatus_cmd_set_memlimit_properties(args->pid, args->buffer, args->buffersize, ret);
@@ -9896,6 +7937,11 @@ memorystatus_control(struct proc *p __unused, struct memorystatus_control_args *
        case MEMORYSTATUS_CMD_GET_JETSAM_SNAPSHOT:
                error = memorystatus_cmd_get_jetsam_snapshot((int32_t)args->flags, args->buffer, args->buffersize, ret);
                break;
+#if DEVELOPMENT || DEBUG
+       case MEMORYSTATUS_CMD_SET_JETSAM_SNAPSHOT_OWNERSHIP:
+               error = memorystatus_cmd_set_jetsam_snapshot_ownership((int32_t) args->flags);
+               break;
+#endif
        case MEMORYSTATUS_CMD_GET_PRESSURE_STATUS:
                error = memorystatus_cmd_get_pressure_status(ret);
                break;
@@ -9928,7 +7974,7 @@ memorystatus_control(struct proc *p __unused, struct memorystatus_control_args *
                error = memorystatus_kill_process_sync(args->pid, kMemorystatusKilled, jetsam_reason) ? 0 : EINVAL;
                break;
        case MEMORYSTATUS_CMD_TEST_JETSAM_SORT:
-               error = memorystatus_cmd_test_jetsam_sort(args->pid, (int32_t)args->flags);
+               error = memorystatus_cmd_test_jetsam_sort(args->pid, (int32_t)args->flags, args->buffer, args->buffersize);
                break;
 #if CONFIG_JETSAM
        case MEMORYSTATUS_CMD_SET_JETSAM_PANIC_BITS:
@@ -9957,6 +8003,10 @@ memorystatus_control(struct proc *p __unused, struct memorystatus_control_args *
                memorystatus_aggressive_jetsam_lenient = FALSE;
                error = 0;
                break;
+       case MEMORYSTATUS_CMD_GET_AGGRESSIVE_JETSAM_LENIENT_MODE:
+               *ret = (memorystatus_aggressive_jetsam_lenient ? 1 : 0);
+               error = 0;
+               break;
        case MEMORYSTATUS_CMD_PRIVILEGED_LISTENER_ENABLE:
        case MEMORYSTATUS_CMD_PRIVILEGED_LISTENER_DISABLE:
                error = memorystatus_low_mem_privileged_listener(args->command);
@@ -9974,6 +8024,7 @@ memorystatus_control(struct proc *p __unused, struct memorystatus_control_args *
                error = memorystatus_get_process_is_managed(args->pid, ret);
                break;
 
+#if CONFIG_FREEZE
        case MEMORYSTATUS_CMD_SET_PROCESS_IS_FREEZABLE:
                error = memorystatus_set_process_is_freezable(args->pid, args->flags ? TRUE : FALSE);
                break;
@@ -9981,15 +8032,23 @@ memorystatus_control(struct proc *p __unused, struct memorystatus_control_args *
        case MEMORYSTATUS_CMD_GET_PROCESS_IS_FREEZABLE:
                error = memorystatus_get_process_is_freezable(args->pid, ret);
                break;
+       case MEMORYSTATUS_CMD_GET_PROCESS_IS_FROZEN:
+               error = memorystatus_get_process_is_frozen(args->pid, ret);
+               break;
 
-#if CONFIG_FREEZE
-#if DEVELOPMENT || DEBUG
        case MEMORYSTATUS_CMD_FREEZER_CONTROL:
                error = memorystatus_freezer_control(args->flags, args->buffer, args->buffersize, ret);
                break;
-#endif /* DEVELOPMENT || DEBUG */
 #endif /* CONFIG_FREEZE */
 
+#if CONFIG_JETSAM
+#if DEVELOPMENT || DEBUG
+       case MEMORYSTATUS_CMD_INCREASE_JETSAM_TASK_LIMIT:
+               error = memorystatus_cmd_increase_jetsam_task_limit(args->pid, args->flags);
+               break;
+#endif /* DEVELOPMENT || DEBUG */
+#endif /* CONFIG_JETSAM */
+
        default:
                break;
        }
@@ -9998,263 +8057,6 @@ out:
        return error;
 }
 
-
-static int
-filt_memorystatusattach(struct knote *kn, __unused struct kevent_internal_s *kev)
-{
-       int error;
-
-       kn->kn_flags |= EV_CLEAR;
-       error = memorystatus_knote_register(kn);
-       if (error) {
-               kn->kn_flags = EV_ERROR;
-               kn->kn_data = error;
-       }
-       return 0;
-}
-
-static void
-filt_memorystatusdetach(struct knote *kn)
-{
-       memorystatus_knote_unregister(kn);
-}
-
-static int
-filt_memorystatus(struct knote *kn __unused, long hint)
-{
-       if (hint) {
-               switch (hint) {
-               case kMemorystatusNoPressure:
-                       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PRESSURE_NORMAL) {
-                               kn->kn_fflags = NOTE_MEMORYSTATUS_PRESSURE_NORMAL;
-                       }
-                       break;
-               case kMemorystatusPressure:
-                       if (memorystatus_vm_pressure_level == kVMPressureWarning || memorystatus_vm_pressure_level == kVMPressureUrgent) {
-                               if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PRESSURE_WARN) {
-                                       kn->kn_fflags = NOTE_MEMORYSTATUS_PRESSURE_WARN;
-                               }
-                       } else if (memorystatus_vm_pressure_level == kVMPressureCritical) {
-                               if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PRESSURE_CRITICAL) {
-                                       kn->kn_fflags = NOTE_MEMORYSTATUS_PRESSURE_CRITICAL;
-                               }
-                       }
-                       break;
-               case kMemorystatusLowSwap:
-                       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_LOW_SWAP) {
-                               kn->kn_fflags = NOTE_MEMORYSTATUS_LOW_SWAP;
-                       }
-                       break;
-
-               case kMemorystatusProcLimitWarn:
-                       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN) {
-                               kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_WARN;
-                       }
-                       break;
-
-               case kMemorystatusProcLimitCritical:
-                       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL) {
-                               kn->kn_fflags = NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL;
-                       }
-                       break;
-
-               default:
-                       break;
-               }
-       }
-
-#if 0
-       if (kn->kn_fflags != 0) {
-               proc_t knote_proc = knote_get_kq(kn)->kq_p;
-               pid_t knote_pid = knote_proc->p_pid;
-
-               printf("filt_memorystatus: sending kn 0x%lx (event 0x%x) for pid (%d)\n",
-                   (unsigned long)kn, kn->kn_fflags, knote_pid);
-       }
-#endif
-
-       return kn->kn_fflags != 0;
-}
-
-static int
-filt_memorystatustouch(struct knote *kn, struct kevent_internal_s *kev)
-{
-       int res;
-       int prev_kn_sfflags = 0;
-
-       memorystatus_klist_lock();
-
-       /*
-        * copy in new kevent settings
-        * (saving the "desired" data and fflags).
-        */
-
-       prev_kn_sfflags = kn->kn_sfflags;
-       kn->kn_sfflags = (kev->fflags & EVFILT_MEMORYSTATUS_ALL_MASK);
-
-#if !CONFIG_EMBEDDED
-       /*
-        * Only on desktop do we restrict notifications to
-        * one per active/inactive state (soft limits only).
-        */
-       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN) {
-               /*
-                * Is there previous state to preserve?
-                */
-               if (prev_kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN) {
-                       /*
-                        * This knote was previously interested in proc_limit_warn,
-                        * so yes, preserve previous state.
-                        */
-                       if (prev_kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_ACTIVE) {
-                               kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_ACTIVE;
-                       }
-                       if (prev_kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_INACTIVE) {
-                               kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_INACTIVE;
-                       }
-               } else {
-                       /*
-                        * This knote was not previously interested in proc_limit_warn,
-                        * but it is now.  Set both states.
-                        */
-                       kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_ACTIVE;
-                       kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_INACTIVE;
-               }
-       }
-
-       if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL) {
-               /*
-                * Is there previous state to preserve?
-                */
-               if (prev_kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL) {
-                       /*
-                        * This knote was previously interested in proc_limit_critical,
-                        * so yes, preserve previous state.
-                        */
-                       if (prev_kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_ACTIVE) {
-                               kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_ACTIVE;
-                       }
-                       if (prev_kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_INACTIVE) {
-                               kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_INACTIVE;
-                       }
-               } else {
-                       /*
-                        * This knote was not previously interested in proc_limit_critical,
-                        * but it is now.  Set both states.
-                        */
-                       kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_ACTIVE;
-                       kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_INACTIVE;
-               }
-       }
-#endif /* !CONFIG_EMBEDDED */
-
-       /*
-        * reset the output flags based on a
-        * combination of the old events and
-        * the new desired event list.
-        */
-       //kn->kn_fflags &= kn->kn_sfflags;
-
-       res = (kn->kn_fflags != 0);
-
-       memorystatus_klist_unlock();
-
-       return res;
-}
-
-static int
-filt_memorystatusprocess(struct knote *kn, struct filt_process_s *data, struct kevent_internal_s *kev)
-{
-#pragma unused(data)
-       int res;
-
-       memorystatus_klist_lock();
-       res = (kn->kn_fflags != 0);
-       if (res) {
-               *kev = kn->kn_kevent;
-               kn->kn_flags |= EV_CLEAR; /* automatic */
-               kn->kn_fflags = 0;
-               kn->kn_data = 0;
-       }
-       memorystatus_klist_unlock();
-
-       return res;
-}
-
-static void
-memorystatus_klist_lock(void)
-{
-       lck_mtx_lock(&memorystatus_klist_mutex);
-}
-
-static void
-memorystatus_klist_unlock(void)
-{
-       lck_mtx_unlock(&memorystatus_klist_mutex);
-}
-
-void
-memorystatus_kevent_init(lck_grp_t *grp, lck_attr_t *attr)
-{
-       lck_mtx_init(&memorystatus_klist_mutex, grp, attr);
-       klist_init(&memorystatus_klist);
-}
-
-int
-memorystatus_knote_register(struct knote *kn)
-{
-       int error = 0;
-
-       memorystatus_klist_lock();
-
-       /*
-        * Support only userspace visible flags.
-        */
-       if ((kn->kn_sfflags & EVFILT_MEMORYSTATUS_ALL_MASK) == (unsigned int) kn->kn_sfflags) {
-#if !CONFIG_EMBEDDED
-               if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN) {
-                       kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_ACTIVE;
-                       kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_WARN_INACTIVE;
-               }
-
-               if (kn->kn_sfflags & NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL) {
-                       kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_ACTIVE;
-                       kn->kn_sfflags |= NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL_INACTIVE;
-               }
-#endif /* !CONFIG_EMBEDDED */
-
-               KNOTE_ATTACH(&memorystatus_klist, kn);
-       } else {
-               error = ENOTSUP;
-       }
-
-       memorystatus_klist_unlock();
-
-       return error;
-}
-
-void
-memorystatus_knote_unregister(struct knote *kn __unused)
-{
-       memorystatus_klist_lock();
-       KNOTE_DETACH(&memorystatus_klist, kn);
-       memorystatus_klist_unlock();
-}
-
-
-#if 0
-#if CONFIG_JETSAM && VM_PRESSURE_EVENTS
-static boolean_t
-memorystatus_issue_pressure_kevent(boolean_t pressured)
-{
-       memorystatus_klist_lock();
-       KNOTE(&memorystatus_klist, pressured ? kMemorystatusPressure : kMemorystatusNoPressure);
-       memorystatus_klist_unlock();
-       return TRUE;
-}
-#endif /* CONFIG_JETSAM && VM_PRESSURE_EVENTS */
-#endif /* 0 */
-
 /* Coalition support */
 
 /* sorting info for a particular priority bucket */
@@ -10322,7 +8124,8 @@ memorystatus_sort_by_largest_coalition_locked(unsigned int bucket_index, int coa
 
        p = memorystatus_get_first_proc_locked(&b, FALSE);
        while (p) {
-               if (coalition_is_leader(p->task, COALITION_TYPE_JETSAM, &coal)) {
+               coal = task_get_coalition(p->task, COALITION_TYPE_JETSAM);
+               if (coalition_is_leader(p->task, coal)) {
                        if (nleaders < MAX_COAL_LEADERS) {
                                int coal_ntasks = 0;
                                uint64_t coal_page_count = coalition_get_page_count(coal, &coal_ntasks);
@@ -10610,10 +8413,14 @@ memorystatus_update_priority_for_appnap(proc_t p, boolean_t is_appnap)
 
        TAILQ_REMOVE(&current_bucket->list, p, p_memstat_list);
        current_bucket->count--;
-
+       if (p->p_memstat_relaunch_flags & (P_MEMSTAT_RELAUNCH_HIGH)) {
+               current_bucket->relaunch_high_count--;
+       }
        TAILQ_INSERT_TAIL(&new_bucket->list, p, p_memstat_list);
        new_bucket->count++;
-
+       if (p->p_memstat_relaunch_flags & (P_MEMSTAT_RELAUNCH_HIGH)) {
+               new_bucket->relaunch_high_count++;
+       }
        /*
         * Record idle start or idle delta.
         */
@@ -10655,3 +8462,96 @@ memorystatus_update_priority_for_appnap(proc_t p, boolean_t is_appnap)
        return -1;
 #endif /* !CONFIG_JETSAM */
 }
+
+uint64_t
+memorystatus_available_memory_internal(struct proc *p)
+{
+#ifdef XNU_TARGET_OS_OSX
+       if (p->p_memstat_memlimit <= 0) {
+               return 0;
+       }
+#endif /* XNU_TARGET_OS_OSX */
+       const uint64_t footprint_in_bytes = get_task_phys_footprint(p->task);
+       int32_t memlimit_mb;
+       int64_t memlimit_bytes;
+       int64_t rc;
+
+       if (isApp(p) == FALSE) {
+               return 0;
+       }
+
+       if (p->p_memstat_memlimit > 0) {
+               memlimit_mb = p->p_memstat_memlimit;
+       } else if (task_convert_phys_footprint_limit(-1, &memlimit_mb) != KERN_SUCCESS) {
+               return 0;
+       }
+
+       if (memlimit_mb <= 0) {
+               memlimit_bytes = INT_MAX & ~((1 << 20) - 1);
+       } else {
+               memlimit_bytes = ((int64_t) memlimit_mb) << 20;
+       }
+
+       rc = memlimit_bytes - footprint_in_bytes;
+
+       return (rc >= 0) ? rc : 0;
+}
+
+int
+memorystatus_available_memory(struct proc *p, __unused struct memorystatus_available_memory_args *args, uint64_t *ret)
+{
+       *ret = memorystatus_available_memory_internal(p);
+
+       return 0;
+}
+
+#if CONFIG_JETSAM
+#if DEVELOPMENT || DEBUG
+static int
+memorystatus_cmd_increase_jetsam_task_limit(pid_t pid, uint32_t byte_increase)
+{
+       memorystatus_memlimit_properties_t mmp_entry;
+
+       /* Validate inputs */
+       if ((pid == 0) || (byte_increase == 0)) {
+               return EINVAL;
+       }
+
+       proc_t p = proc_find(pid);
+
+       if (!p) {
+               return ESRCH;
+       }
+
+       const uint32_t current_memlimit_increase = roundToNearestMB(p->p_memlimit_increase);
+       /* round to page */
+       const int32_t page_aligned_increase = (int32_t) MIN(round_page(p->p_memlimit_increase + byte_increase), INT32_MAX);
+
+       proc_list_lock();
+
+       memorystatus_get_memlimit_properties_internal(p, &mmp_entry);
+
+       if (mmp_entry.memlimit_active > 0) {
+               mmp_entry.memlimit_active -= current_memlimit_increase;
+               mmp_entry.memlimit_active += roundToNearestMB(page_aligned_increase);
+       }
+
+       if (mmp_entry.memlimit_inactive > 0) {
+               mmp_entry.memlimit_inactive -= current_memlimit_increase;
+               mmp_entry.memlimit_inactive += roundToNearestMB(page_aligned_increase);
+       }
+
+       /*
+        * Store the updated delta limit in the proc.
+        */
+       p->p_memlimit_increase = page_aligned_increase;
+
+       int error = memorystatus_set_memlimit_properties_internal(p, &mmp_entry);
+
+       proc_list_unlock();
+       proc_rele(p);
+
+       return error;
+}
+#endif /* DEVELOPMENT */
+#endif /* CONFIG_JETSAM */