]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/vm/vm_compressor_backing_store.c
xnu-3789.21.4.tar.gz
[apple/xnu.git] / osfmk / vm / vm_compressor_backing_store.c
index 0cb37f7dcfeb547c02921ae4e2d041ccfc858da1..7015971be0c3bc1feb735ccbb7882bbacb12d212 100644 (file)
@@ -31,9 +31,9 @@
 
 #include <IOKit/IOHibernatePrivate.h>
 
+#include <kern/policy_internal.h>
 
 boolean_t      compressor_store_stop_compaction = FALSE;
-boolean_t      vm_swap_up = FALSE;
 boolean_t      vm_swapfile_create_needed = FALSE;
 boolean_t      vm_swapfile_gc_needed = FALSE;
 
@@ -44,6 +44,7 @@ uint64_t      vm_swapout_thread_id;
 uint64_t       vm_swap_put_failures = 0;
 uint64_t       vm_swap_get_failures = 0;
 int            vm_num_swap_files = 0;
+int            vm_num_pinned_swap_files = 0;
 int            vm_swapout_thread_processed_segments = 0;
 int            vm_swapout_thread_awakened = 0;
 int            vm_swapfile_create_thread_awakened = 0;
@@ -51,14 +52,20 @@ int         vm_swapfile_create_thread_running = 0;
 int            vm_swapfile_gc_thread_awakened = 0;
 int            vm_swapfile_gc_thread_running = 0;
 
+int64_t                vm_swappin_avail = 0;
+boolean_t      vm_swappin_enabled = FALSE;
 unsigned int   vm_swapfile_total_segs_alloced = 0;
 unsigned int   vm_swapfile_total_segs_used = 0;
 
+extern vm_map_t compressor_map;
+
 
 #define SWAP_READY     0x1     /* Swap file is ready to be used */
 #define SWAP_RECLAIM   0x2     /* Swap file is marked to be reclaimed */
 #define SWAP_WANTED    0x4     /* Swap file has waiters */
 #define SWAP_REUSE     0x8     /* Swap file is on the Q and has a name. Reuse after init-ing.*/
+#define SWAP_PINNED    0x10    /* Swap file is pinned (FusionDrive) */
+
 
 struct swapfile{
        queue_head_t            swp_queue;      /* list of swap files */
@@ -82,14 +89,14 @@ struct swapfile{
 queue_head_t   swf_global_queue;
 boolean_t      swp_trim_supported = FALSE;
 
-#define                VM_SWAPFILE_DELAYED_TRIM_MAX    128
-
 extern clock_sec_t     dont_trim_until_ts;
 clock_sec_t            vm_swapfile_last_failed_to_create_ts = 0;
 clock_sec_t            vm_swapfile_last_successful_create_ts = 0;
 int                    vm_swapfile_can_be_created = FALSE;
 boolean_t              delayed_trim_handling_in_progress = FALSE;
 
+boolean_t              hibernate_in_progress_with_pinned_swap = FALSE;
+
 static void vm_swapout_thread_throttle_adjust(void);
 static void vm_swap_free_now(struct swapfile *swf, uint64_t f_offset);
 static void vm_swapout_thread(void);
@@ -102,10 +109,14 @@ static void vm_swap_wait_on_trim_handling_in_progress(void);
 
 
 
+#define VM_MAX_SWAP_FILE_NUM           100
+#define        VM_SWAPFILE_DELAYED_TRIM_MAX    128
+
 #define        VM_SWAP_SHOULD_DEFRAGMENT()     (c_swappedout_sparse_count > (vm_swapfile_total_segs_used / 4) ? 1 : 0)
 #define VM_SWAP_SHOULD_RECLAIM()       (((vm_swapfile_total_segs_alloced - vm_swapfile_total_segs_used) >= SWAPFILE_RECLAIM_THRESHOLD_SEGS) ? 1 : 0)
 #define VM_SWAP_SHOULD_ABORT_RECLAIM() (((vm_swapfile_total_segs_alloced - vm_swapfile_total_segs_used) <= SWAPFILE_RECLAIM_MINIMUM_SEGS) ? 1 : 0)
-#define VM_SWAP_SHOULD_CREATE(cur_ts)  (((vm_swapfile_total_segs_alloced - vm_swapfile_total_segs_used) < (unsigned int)VM_SWAPFILE_HIWATER_SEGS) && \
+#define VM_SWAP_SHOULD_PIN(_size)      (vm_swappin_avail > 0 && vm_swappin_avail >= (int64_t)(_size))
+#define VM_SWAP_SHOULD_CREATE(cur_ts)  ((vm_num_swap_files < VM_MAX_SWAP_FILE_NUM) && ((vm_swapfile_total_segs_alloced - vm_swapfile_total_segs_used) < (unsigned int)VM_SWAPFILE_HIWATER_SEGS) && \
                                         ((cur_ts - vm_swapfile_last_failed_to_create_ts) > VM_SWAPFILE_DELAYED_CREATE) ? 1 : 0)
 #define VM_SWAP_SHOULD_TRIM(swf)       ((swf->swp_delayed_trim_count >= VM_SWAPFILE_DELAYED_TRIM_MAX) ? 1 : 0)
 
@@ -119,6 +130,15 @@ static void vm_swap_wait_on_trim_handling_in_progress(void);
 extern unsigned int hash_string(char *cp, int len);
 #endif
 
+#if RECORD_THE_COMPRESSED_DATA
+boolean_t      c_compressed_record_init_done = FALSE;
+int            c_compressed_record_write_error = 0;
+struct vnode   *c_compressed_record_vp = NULL;
+uint64_t       c_compressed_record_file_offset = 0;
+void   c_compressed_record_init(void);
+void   c_compressed_record_write(char *, int);
+#endif
+
 #if ENCRYPTED_SWAP
 extern boolean_t               swap_crypt_ctx_initialized;
 extern void                    swap_crypt_ctx_initialize(void);
@@ -129,16 +149,14 @@ extern unsigned long              vm_page_decrypt_counter;
 #endif /* ENCRYPTED_SWAP */
 
 extern void                    vm_pageout_io_throttle(void);
-extern void                    vm_pageout_reinit_tuneables(void);
-extern void                    vm_swap_file_set_tuneables(void);
 
-struct swapfile *vm_swapfile_for_handle(uint64_t);
+static struct swapfile *vm_swapfile_for_handle(uint64_t);
 
 /*
  * Called with the vm_swap_data_lock held.
  */ 
 
-struct swapfile *
+static struct swapfile *
 vm_swapfile_for_handle(uint64_t f_offset) 
 {
        
@@ -189,7 +207,6 @@ vm_compressor_swap_init()
                                         BASEPRI_PREEMPT - 1, &thread) != KERN_SUCCESS) {
                panic("vm_swapout_thread: create failed");
        }
-       thread->options |= TH_OPT_VMPRIV;
        vm_swapout_thread_id = thread->thread_id;
 
        thread_deallocate(thread);
@@ -198,22 +215,20 @@ vm_compressor_swap_init()
                                 BASEPRI_PREEMPT - 1, &thread) != KERN_SUCCESS) {
                panic("vm_swapfile_create_thread: create failed");
        }
-       thread->options |= TH_OPT_VMPRIV;
 
        thread_deallocate(thread);
 
-
        if (kernel_thread_start_priority((thread_continue_t)vm_swapfile_gc_thread, NULL,
                                 BASEPRI_PREEMPT - 1, &thread) != KERN_SUCCESS) {
                panic("vm_swapfile_gc_thread: create failed");
        }
        thread_deallocate(thread);
 
-       proc_set_task_policy_thread(kernel_task, thread->thread_id,
-                                   TASK_POLICY_INTERNAL, TASK_POLICY_IO, THROTTLE_LEVEL_COMPRESSOR_TIER2);
-       proc_set_task_policy_thread(kernel_task, thread->thread_id,
-                                   TASK_POLICY_INTERNAL, TASK_POLICY_PASSIVE_IO, TASK_POLICY_ENABLE);
-       
+       proc_set_thread_policy_with_tid(kernel_task, thread->thread_id,
+                                       TASK_POLICY_INTERNAL, TASK_POLICY_IO, THROTTLE_LEVEL_COMPRESSOR_TIER2);
+       proc_set_thread_policy_with_tid(kernel_task, thread->thread_id,
+                                       TASK_POLICY_INTERNAL, TASK_POLICY_PASSIVE_IO, TASK_POLICY_ENABLE);
+
 #if ENCRYPTED_SWAP
        if (swap_crypt_ctx_initialized == FALSE) {
                swap_crypt_ctx_initialize();
@@ -222,49 +237,93 @@ vm_compressor_swap_init()
                
        memset(swapfilename, 0, MAX_SWAPFILENAME_LEN + 1);
 
-       vm_swap_up = TRUE;
+       printf("VM Swap Subsystem is ON\n");
+}
+
 
-       printf("VM Swap Subsystem is %s\n", (vm_swap_up == TRUE) ? "ON" : "OFF"); 
+#if RECORD_THE_COMPRESSED_DATA
+
+void
+c_compressed_record_init()
+{
+       if (c_compressed_record_init_done == FALSE) {
+               vm_swapfile_open("/tmp/compressed_data", &c_compressed_record_vp);
+               c_compressed_record_init_done = TRUE;
+       }
+}
+
+void
+c_compressed_record_write(char *buf, int size)
+{
+       if (c_compressed_record_write_error == 0) {
+               c_compressed_record_write_error = vm_record_file_write(c_compressed_record_vp, c_compressed_record_file_offset, buf, size);
+               c_compressed_record_file_offset += size;
+       }
 }
+#endif
+
 
+int            compaction_swapper_inited = 0;
 
 void
-vm_swap_file_set_tuneables()
+vm_compaction_swapper_do_init(void)
 {
        struct  vnode *vp;
        char    *pathname;
        int     namelen;
 
-       if (strlen(swapfilename) == 0) {
-               /*
-                * If no swapfile name has been set, we'll
-                * use the default name.
-                *
-                * Also, this function is only called from the vm_pageout_scan thread
-                * via vm_consider_waking_compactor_swapper, 
-                * so we don't need to worry about a race in checking/setting the name here.
-                */
-               strlcpy(swapfilename, SWAP_FILE_NAME, MAX_SWAPFILENAME_LEN);
+       if (compaction_swapper_inited)
+               return;
+
+       if (vm_compressor_mode != VM_PAGER_COMPRESSOR_WITH_SWAP) {
+               compaction_swapper_inited = 1;
+               return;
        }
-       namelen = (int)strlen(swapfilename) + SWAPFILENAME_INDEX_LEN + 1;
-       pathname = (char*)kalloc(namelen);
-       memset(pathname, 0, namelen);
-       snprintf(pathname, namelen, "%s%d", swapfilename, 0);
+       lck_mtx_lock(&vm_swap_data_lock);
 
-       vm_swapfile_open(pathname, &vp);
+       if ( !compaction_swapper_inited) {
 
-       if (vp == NULL)
-               goto done;
+               if (strlen(swapfilename) == 0) {
+                       /*
+                        * If no swapfile name has been set, we'll
+                        * use the default name.
+                        *
+                        * Also, this function is only called from the vm_pageout_scan thread
+                        * via vm_consider_waking_compactor_swapper, 
+                        * so we don't need to worry about a race in checking/setting the name here.
+                        */
+                       strlcpy(swapfilename, SWAP_FILE_NAME, MAX_SWAPFILENAME_LEN);
+               }
+               namelen = (int)strlen(swapfilename) + SWAPFILENAME_INDEX_LEN + 1;
+               pathname = (char*)kalloc(namelen);
+               memset(pathname, 0, namelen);
+               snprintf(pathname, namelen, "%s%d", swapfilename, 0);
 
-        if (vnode_pager_isSSD(vp) == FALSE)
-               vm_pageout_reinit_tuneables();
-       vnode_setswapmount(vp);
-       vm_swapfile_close((uint64_t)pathname, vp);
-done:
-       kfree(pathname, namelen);
+               vm_swapfile_open(pathname, &vp);
+
+               if (vp) {
+                       
+                       if (vnode_pager_isSSD(vp) == FALSE) {
+                               vm_compressor_minorcompact_threshold_divisor = 18;
+                               vm_compressor_majorcompact_threshold_divisor = 22;
+                               vm_compressor_unthrottle_threshold_divisor = 32;
+                       }
+                       vnode_setswapmount(vp);
+                       vm_swappin_avail = vnode_getswappin_avail(vp);
+
+                       if (vm_swappin_avail)
+                               vm_swappin_enabled = TRUE;
+                       vm_swapfile_close((uint64_t)pathname, vp);
+               }
+               kfree(pathname, namelen);
+
+               compaction_swapper_inited = 1;
+       }
+       lck_mtx_unlock(&vm_swap_data_lock);
 }
 
 
+
 #if ENCRYPTED_SWAP
 void
 vm_swap_encrypt(c_segment_t c_seg)
@@ -279,6 +338,9 @@ vm_swap_encrypt(c_segment_t c_seg)
        
        assert(swap_crypt_ctx_initialized);
        
+#if DEVELOPMENT || DEBUG
+       C_SEG_MAKE_WRITEABLE(c_seg);
+#endif
        bzero(&encrypt_iv.aes_iv[0], sizeof (encrypt_iv.aes_iv));
 
        encrypt_iv.c_seg = (void*)c_seg;
@@ -303,6 +365,10 @@ vm_swap_encrypt(c_segment_t c_seg)
                        &swap_crypt_ctx.encrypt);
 
        vm_page_encrypt_counter += (size/PAGE_SIZE_64);
+
+#if DEVELOPMENT || DEBUG
+       C_SEG_WRITE_PROTECT(c_seg);
+#endif
 }
 
 void
@@ -320,6 +386,9 @@ vm_swap_decrypt(c_segment_t c_seg)
        
        assert(swap_crypt_ctx_initialized);
 
+#if DEVELOPMENT || DEBUG
+       C_SEG_MAKE_WRITEABLE(c_seg);
+#endif
        /*
         * Prepare an "initial vector" for the decryption.
         * It has to be the same as the "initial vector" we
@@ -349,6 +418,10 @@ vm_swap_decrypt(c_segment_t c_seg)
                        &swap_crypt_ctx.decrypt);
 
        vm_page_decrypt_counter += (size/PAGE_SIZE_64);
+
+#if DEVELOPMENT || DEBUG
+       C_SEG_WRITE_PROTECT(c_seg);
+#endif
 }
 #endif /* ENCRYPTED_SWAP */
 
@@ -400,7 +473,7 @@ vm_swap_defragment()
 
                lck_mtx_lock_spin_always(&c_seg->c_lock);
 
-               assert(c_seg->c_on_swappedout_sparse_q);
+               assert(c_seg->c_state == C_ON_SWAPPEDOUTSPARSE_Q);
 
                if (c_seg->c_busy) {
                        lck_mtx_unlock_always(c_list_lock);
@@ -423,14 +496,15 @@ vm_swap_defragment()
                         * c_seg_free_locked consumes the c_list_lock
                         * and c_seg->c_lock
                         */
+                       C_SEG_BUSY(c_seg);
                        c_seg_free_locked(c_seg);
 
                        vm_swap_defragment_free++;
                } else {
                        lck_mtx_unlock_always(c_list_lock);
 
-                       c_seg_swapin(c_seg, TRUE);
-                       lck_mtx_unlock_always(&c_seg->c_lock);
+                       if (c_seg_swapin(c_seg, TRUE, FALSE) == 0)
+                               lck_mtx_unlock_always(&c_seg->c_lock);
 
                        vm_swap_defragment_swapin++;
                }
@@ -461,6 +535,8 @@ vm_swapfile_create_thread(void)
        clock_sec_t     sec;
        clock_nsec_t    nsec;
 
+       current_thread()->options |= TH_OPT_VMPRIV;
+
        vm_swapfile_create_thread_awakened++;
        vm_swapfile_create_thread_running = 1;
 
@@ -475,6 +551,9 @@ vm_swapfile_create_thread(void)
 
                lck_mtx_lock(&vm_swap_data_lock);
 
+               if (hibernate_in_progress_with_pinned_swap == TRUE)
+                       break;
+
                clock_get_system_nanotime(&sec, &nsec);
 
                if (VM_SWAP_SHOULD_CREATE(sec) == 0)
@@ -491,6 +570,9 @@ vm_swapfile_create_thread(void)
        }
        vm_swapfile_create_thread_running = 0;
 
+       if (hibernate_in_progress_with_pinned_swap == TRUE)
+               thread_wakeup((event_t)&hibernate_in_progress_with_pinned_swap);
+
        assert_wait((event_t)&vm_swapfile_create_needed, THREAD_UNINT);
 
        lck_mtx_unlock(&vm_swap_data_lock);
@@ -501,8 +583,59 @@ vm_swapfile_create_thread(void)
 }
 
 
+#if HIBERNATION
+
+kern_return_t
+hibernate_pin_swap(boolean_t start)
+{
+       vm_compaction_swapper_do_init();
+
+       if (start == FALSE) {
+
+               lck_mtx_lock(&vm_swap_data_lock);
+               hibernate_in_progress_with_pinned_swap = FALSE;
+               lck_mtx_unlock(&vm_swap_data_lock);
+
+               return (KERN_SUCCESS);
+       }
+       if (vm_swappin_enabled == FALSE)
+               return (KERN_SUCCESS);
+
+       lck_mtx_lock(&vm_swap_data_lock);
+
+       hibernate_in_progress_with_pinned_swap = TRUE;
+               
+       while (vm_swapfile_create_thread_running || vm_swapfile_gc_thread_running) {
+
+               assert_wait((event_t)&hibernate_in_progress_with_pinned_swap, THREAD_UNINT);
+
+               lck_mtx_unlock(&vm_swap_data_lock);
+
+               thread_block(THREAD_CONTINUE_NULL);
+
+               lck_mtx_lock(&vm_swap_data_lock);
+       }
+       if (vm_num_swap_files > vm_num_pinned_swap_files) {
+               hibernate_in_progress_with_pinned_swap = FALSE;
+               lck_mtx_unlock(&vm_swap_data_lock);
+
+               HIBLOG("hibernate_pin_swap failed - vm_num_swap_files = %d, vm_num_pinned_swap_files = %d\n",
+                      vm_num_swap_files, vm_num_pinned_swap_files);
+               return (KERN_FAILURE);
+       }
+       lck_mtx_unlock(&vm_swap_data_lock);
+
+       while (VM_SWAP_SHOULD_PIN(MAX_SWAP_FILE_SIZE)) {
+               if (vm_swap_create_file() == FALSE)
+                       break;
+       }
+       return (KERN_SUCCESS);
+}
+#endif
+
 static void
 vm_swapfile_gc_thread(void)
+
 {
        boolean_t       need_defragment;
        boolean_t       need_reclaim;
@@ -514,6 +647,9 @@ vm_swapfile_gc_thread(void)
 
                lck_mtx_lock(&vm_swap_data_lock);
                
+               if (hibernate_in_progress_with_pinned_swap == TRUE)
+                       break;
+
                if (VM_SWAP_BUSY() || compressor_store_stop_compaction == TRUE)
                        break;
 
@@ -539,6 +675,9 @@ vm_swapfile_gc_thread(void)
        }
        vm_swapfile_gc_thread_running = 0;
 
+       if (hibernate_in_progress_with_pinned_swap == TRUE)
+               thread_wakeup((event_t)&hibernate_in_progress_with_pinned_swap);
+
        assert_wait((event_t)&vm_swapfile_gc_needed, THREAD_UNINT);
 
        lck_mtx_unlock(&vm_swap_data_lock);
@@ -614,16 +753,18 @@ vm_swapout_thread_throttle_adjust(void)
        }
 done:
        if (swapper_throttle != swapper_throttle_new) {
-               proc_set_task_policy_thread(kernel_task, vm_swapout_thread_id,
-                                           TASK_POLICY_INTERNAL, TASK_POLICY_IO, swapper_throttle_new);
-               proc_set_task_policy_thread(kernel_task, vm_swapout_thread_id,
-                                           TASK_POLICY_INTERNAL, TASK_POLICY_PASSIVE_IO, TASK_POLICY_ENABLE);
+               proc_set_thread_policy_with_tid(kernel_task, vm_swapout_thread_id,
+                                               TASK_POLICY_INTERNAL, TASK_POLICY_IO, swapper_throttle_new);
+               proc_set_thread_policy_with_tid(kernel_task, vm_swapout_thread_id,
+                                               TASK_POLICY_INTERNAL, TASK_POLICY_PASSIVE_IO, TASK_POLICY_ENABLE);
 
                swapper_throttle = swapper_throttle_new;
        }
 }
 
 
+int vm_swapout_found_empty = 0;
+
 static void
 vm_swapout_thread(void)
 {
@@ -633,6 +774,8 @@ vm_swapout_thread(void)
        kern_return_t   kr = KERN_SUCCESS;
        vm_offset_t     addr = 0;
 
+       current_thread()->options |= TH_OPT_VMPRIV;
+
        vm_swapout_thread_awakened++;
 
        lck_mtx_lock_spin_always(c_list_lock);
@@ -643,7 +786,7 @@ vm_swapout_thread(void)
 
                lck_mtx_lock_spin_always(&c_seg->c_lock);
 
-               assert(c_seg->c_on_swapout_q);
+               assert(c_seg->c_state == C_ON_SWAPOUT_Q);
 
                if (c_seg->c_busy) {
                        lck_mtx_unlock_always(c_list_lock);
@@ -654,19 +797,22 @@ vm_swapout_thread(void)
 
                        continue;
                }
-               queue_remove(&c_swapout_list_head, c_seg, c_segment_t, c_age_list);
-               c_seg->c_on_swapout_q = 0;
-               c_swapout_count--;
-
                vm_swapout_thread_processed_segments++;
 
-               thread_wakeup((event_t)&compaction_swapper_running);
-
                size = round_page_32(C_SEG_OFFSET_TO_BYTES(c_seg->c_populated_offset));
                
                if (size == 0) {
-                       c_seg_free_locked(c_seg);
-                       goto c_seg_was_freed;
+                       assert(c_seg->c_bytes_used == 0);
+
+                       if (!c_seg->c_on_minorcompact_q)
+                               c_seg_need_delayed_compaction(c_seg, TRUE);
+
+                       c_seg_switch_state(c_seg, C_IS_EMPTY, FALSE);
+                       lck_mtx_unlock_always(&c_seg->c_lock);
+                       lck_mtx_unlock_always(c_list_lock);
+
+                       vm_swapout_found_empty++;
+                       goto c_seg_is_empty;
                }
                C_SEG_BUSY(c_seg);
                c_seg->c_busy_swapping = 1;
@@ -692,64 +838,59 @@ vm_swapout_thread(void)
 
                PAGE_REPLACEMENT_DISALLOWED(TRUE);
 
+               if (kr == KERN_SUCCESS) {
+                       kernel_memory_depopulate(compressor_map, (vm_offset_t) addr, size, KMA_COMPRESSOR);
+               }
+#if ENCRYPTED_SWAP
+               else {
+                       vm_swap_decrypt(c_seg);
+               }
+#endif /* ENCRYPTED_SWAP */
                lck_mtx_lock_spin_always(c_list_lock);
                lck_mtx_lock_spin_always(&c_seg->c_lock);
 
                if (kr == KERN_SUCCESS) {
+                       int             new_state = C_ON_SWAPPEDOUT_Q;
+                       boolean_t       insert_head = FALSE;
 
-                       if (C_SEG_ONDISK_IS_SPARSE(c_seg) && hibernate_flushing == FALSE) {
+                       if (hibernate_flushing == TRUE) {
+                               if (c_seg->c_generation_id >= first_c_segment_to_warm_generation_id &&
+                                   c_seg->c_generation_id <= last_c_segment_to_warm_generation_id)
+                                       insert_head = TRUE;
+                       } else if (C_SEG_ONDISK_IS_SPARSE(c_seg))
+                               new_state = C_ON_SWAPPEDOUTSPARSE_Q;
 
-                               c_seg_insert_into_q(&c_swappedout_sparse_list_head, c_seg);
-                               c_seg->c_on_swappedout_sparse_q = 1;
-                               c_swappedout_sparse_count++;
+                       c_seg_switch_state(c_seg, new_state, insert_head);
 
-                       } else {
-                               if (hibernate_flushing == TRUE && (c_seg->c_generation_id >= first_c_segment_to_warm_generation_id &&
-                                                                  c_seg->c_generation_id <= last_c_segment_to_warm_generation_id))
-                                       queue_enter_first(&c_swappedout_list_head, c_seg, c_segment_t, c_age_list);
-                               else
-                                       queue_enter(&c_swappedout_list_head, c_seg, c_segment_t, c_age_list);
-                               c_seg->c_on_swappedout_q = 1;
-                               c_swappedout_count++;
-                       }
                        c_seg->c_store.c_swap_handle = f_offset;
-                       c_seg->c_ondisk = 1;
 
                        VM_STAT_INCR_BY(swapouts, size >> PAGE_SHIFT);
                        
                        if (c_seg->c_bytes_used)
                                OSAddAtomic64(-c_seg->c_bytes_used, &compressor_bytes_used);
                } else {
-#if ENCRYPTED_SWAP
-                       vm_swap_decrypt(c_seg);
-#endif /* ENCRYPTED_SWAP */
-                       c_seg_insert_into_q(&c_age_list_head, c_seg);
-                       c_seg->c_on_age_q = 1;
-                       c_age_count++;
+                       if (c_seg->c_overage_swap == TRUE) {
+                               c_seg->c_overage_swap = FALSE;
+                               c_overage_swapped_count--;
+                       }
+                       c_seg_switch_state(c_seg, C_ON_AGE_Q, FALSE);
 
-                       vm_swap_put_failures++;
+                       if (!c_seg->c_on_minorcompact_q && C_SEG_UNUSED_BYTES(c_seg) >= PAGE_SIZE)
+                               c_seg_need_delayed_compaction(c_seg, TRUE);
                }
-               lck_mtx_unlock_always(c_list_lock);
+               assert(c_seg->c_busy_swapping);
+               assert(c_seg->c_busy);
 
-               if (c_seg->c_must_free)
-                       c_seg_free(c_seg);
-               else {
-                       c_seg->c_busy_swapping = 0;
-                       C_SEG_WAKEUP_DONE(c_seg);
-                       lck_mtx_unlock_always(&c_seg->c_lock);
-               }
+               c_seg->c_busy_swapping = 0;
+               lck_mtx_unlock_always(c_list_lock);
 
-               if (kr == KERN_SUCCESS)
-                       kernel_memory_depopulate(kernel_map, (vm_offset_t) addr, size, KMA_COMPRESSOR);
+               C_SEG_WAKEUP_DONE(c_seg);
+               lck_mtx_unlock_always(&c_seg->c_lock);
 
                PAGE_REPLACEMENT_DISALLOWED(FALSE);
 
-               if (kr == KERN_SUCCESS) {
-                       kmem_free(kernel_map, (vm_offset_t) addr, C_SEG_ALLOCSIZE);
-                       OSAddAtomic64(-C_SEG_ALLOCSIZE, &compressor_kvspace_used);
-               }
                vm_pageout_io_throttle();
-c_seg_was_freed:
+c_seg_is_empty:
                if (c_swapout_count == 0)
                        vm_swap_consider_defragmenting();
 
@@ -772,8 +913,18 @@ vm_swap_create_file()
        int             namelen = 0;
        boolean_t       swap_file_created = FALSE;
        boolean_t       swap_file_reuse = FALSE;
+       boolean_t       swap_file_pin = FALSE;
        struct swapfile *swf = NULL;
 
+       /*
+        * make sure we've got all the info we need
+        * to potentially pin a swap file... we could
+        * be swapping out due to hibernation w/o ever
+        * having run vm_pageout_scan, which is normally
+        * the trigger to do the init
+        */
+       vm_compaction_swapper_do_init();
+
        /*
         * Any swapfile structure ready for re-use?
         */      
@@ -835,7 +986,9 @@ vm_swap_create_file()
 
        while (size >= MIN_SWAP_FILE_SIZE) {
 
-               if (vm_swapfile_preallocate(swf->swp_vp, &size) == 0) {
+               swap_file_pin = VM_SWAP_SHOULD_PIN(size);
+
+               if (vm_swapfile_preallocate(swf->swp_vp, &size, &swap_file_pin) == 0) {
 
                        int num_bytes_for_bitmap = 0;
 
@@ -877,10 +1030,15 @@ vm_swap_create_file()
 
                        vm_swapfile_total_segs_alloced += swf->swp_nsegs;
 
+                       if (swap_file_pin == TRUE) {
+                               vm_num_pinned_swap_files++;
+                               swf->swp_flags |= SWAP_PINNED;
+                               vm_swappin_avail -= swf->swp_size;
+                       }
+
                        lck_mtx_unlock(&vm_swap_data_lock);
 
                        thread_wakeup((event_t) &vm_num_swap_files);
-
                        break;
                } else {
 
@@ -903,15 +1061,13 @@ vm_swap_create_file()
 
 
 kern_return_t
-vm_swap_get(vm_offset_t addr, uint64_t f_offset, uint64_t size)
+vm_swap_get(c_segment_t c_seg, uint64_t f_offset, uint64_t size)
 {
        struct swapfile *swf = NULL;
        uint64_t        file_offset = 0;
        int             retval = 0;
 
-       if (addr == 0) {
-               return KERN_FAILURE;
-       }
+       assert(c_seg->c_store.c_buffer);
 
        lck_mtx_lock(&vm_swap_data_lock);
 
@@ -925,9 +1081,15 @@ vm_swap_get(vm_offset_t addr, uint64_t f_offset, uint64_t size)
 
        lck_mtx_unlock(&vm_swap_data_lock);
 
+#if DEVELOPMENT || DEBUG
+       C_SEG_MAKE_WRITEABLE(c_seg);
+#endif
        file_offset = (f_offset & SWAP_SLOT_MASK);
-       retval = vm_swapfile_io(swf->swp_vp, file_offset, addr, (int)(size / PAGE_SIZE_64), SWAP_READ);
+       retval = vm_swapfile_io(swf->swp_vp, file_offset, c_seg->c_store.c_buffer, (int)(size / PAGE_SIZE_64), SWAP_READ);
 
+#if DEVELOPMENT || DEBUG
+       C_SEG_WRITE_PROTECT(c_seg);
+#endif
        if (retval == 0)
                VM_STAT_INCR_BY(swapins, size >> PAGE_SHIFT);
        else
@@ -1056,6 +1218,7 @@ retry:
                        goto retry;
                }
        }
+       vm_swap_put_failures++;
 
        return KERN_FAILURE;
 
@@ -1081,6 +1244,8 @@ done:
        if (error) {
                vm_swap_free(*f_offset);
 
+               vm_swap_put_failures++;
+
                return KERN_FAILURE;
        }
        return KERN_SUCCESS;
@@ -1317,7 +1482,7 @@ vm_swap_reclaim(void)
 
        c_segment_t     c_seg = NULL;
        
-       if (kernel_memory_allocate(kernel_map, (vm_offset_t *)(&addr), C_SEG_BUFSIZE, 0, KMA_KOBJECT) != KERN_SUCCESS) {
+       if (kernel_memory_allocate(compressor_map, (vm_offset_t *)(&addr), C_SEG_BUFSIZE, 0, KMA_KOBJECT, VM_KERN_MEMORY_COMPRESSOR) != KERN_SUCCESS) {
                panic("vm_swap_reclaim: kernel_memory_allocate failed\n");
        }
 
@@ -1402,13 +1567,20 @@ ReTry_for_cseg:
                }
 
                c_seg = swf->swp_csegs[segidx];
+               assert(c_seg);
 
                lck_mtx_lock_spin_always(&c_seg->c_lock);
 
-               assert(c_seg->c_ondisk);
-
                if (c_seg->c_busy) {
-
+                       /*
+                        * a swapped out c_segment in the process of being freed will remain in the
+                        * busy state until after the vm_swap_free is called on it... vm_swap_free
+                        * takes the vm_swap_data_lock, so can't change the swap state until after
+                        * we drop the vm_swap_data_lock... once we do, vm_swap_free will complete
+                        * which will allow c_seg_free_locked to clear busy and wake up this thread...
+                        * at that point, we re-look up the swap state which will now indicate that
+                        * this c_segment no longer exists.
+                        */
                        c_seg->c_wanted = 1;
                        
                        assert_wait((event_t) (c_seg), THREAD_UNINT);
@@ -1425,88 +1597,86 @@ ReTry_for_cseg:
                (swf->swp_bitmap)[byte_for_segidx] &= ~(1 << offset_within_byte);
 
                f_offset = segidx * COMPRESSED_SWAP_CHUNK_SIZE;
-               
+
+               assert(c_seg == swf->swp_csegs[segidx]);
                swf->swp_csegs[segidx] = NULL;
                swf->swp_nseginuse--;
 
                vm_swapfile_total_segs_used--;
                        
                lck_mtx_unlock(&vm_swap_data_lock);
-       
-               if (c_seg->c_must_free) {
-                       C_SEG_BUSY(c_seg);
-                       c_seg_free(c_seg);
-               } else {
 
-                       C_SEG_BUSY(c_seg);
-                       c_seg->c_busy_swapping = 1;
+               assert(C_SEG_IS_ONDISK(c_seg)); 
+
+               C_SEG_BUSY(c_seg);
+               c_seg->c_busy_swapping = 1;
 #if !CHECKSUM_THE_SWAP
-                       c_seg_trim_tail(c_seg);
+               c_seg_trim_tail(c_seg);
 #endif
-                       c_size = round_page_32(C_SEG_OFFSET_TO_BYTES(c_seg->c_populated_offset));
+               c_size = round_page_32(C_SEG_OFFSET_TO_BYTES(c_seg->c_populated_offset));
                
-                       assert(c_size <= C_SEG_BUFSIZE);
+               assert(c_size <= C_SEG_BUFSIZE && c_size);
 
-                       lck_mtx_unlock_always(&c_seg->c_lock);
+               lck_mtx_unlock_always(&c_seg->c_lock);
 
-                       if (vm_swapfile_io(swf->swp_vp, f_offset, addr, (int)(c_size / PAGE_SIZE_64), SWAP_READ)) {
+               if (vm_swapfile_io(swf->swp_vp, f_offset, addr, (int)(c_size / PAGE_SIZE_64), SWAP_READ)) {
 
-                               /*
-                                * reading the data back in failed, so convert c_seg
-                                * to a swapped in c_segment that contains no data
-                                */
-                               c_seg->c_store.c_buffer = (int32_t *)NULL;
-                               c_seg_swapin_requeue(c_seg);
+                       /*
+                        * reading the data back in failed, so convert c_seg
+                        * to a swapped in c_segment that contains no data
+                        */
+                       c_seg_swapin_requeue(c_seg, FALSE, TRUE, FALSE);
+                       /*
+                        * returns with c_busy_swapping cleared
+                        */
 
-                               goto swap_io_failed;
-                       }
-                       VM_STAT_INCR_BY(swapins, c_size >> PAGE_SHIFT);
+                       vm_swap_get_failures++;
+                       goto swap_io_failed;
+               }
+               VM_STAT_INCR_BY(swapins, c_size >> PAGE_SHIFT);
 
-                       if (vm_swap_put(addr, &f_offset, c_size, c_seg)) {
-                               vm_offset_t     c_buffer;
+               if (vm_swap_put(addr, &f_offset, c_size, c_seg)) {
+                       vm_offset_t     c_buffer;
 
-                               /*
-                                * the put failed, so convert c_seg to a fully swapped in c_segment
-                                * with valid data
-                                */
-                               if (kernel_memory_allocate(kernel_map, &c_buffer, C_SEG_ALLOCSIZE, 0, KMA_COMPRESSOR | KMA_VAONLY) != KERN_SUCCESS)
-                                       panic("vm_swap_reclaim: kernel_memory_allocate failed\n");
-                               OSAddAtomic64(C_SEG_ALLOCSIZE, &compressor_kvspace_used);
+                       /*
+                        * the put failed, so convert c_seg to a fully swapped in c_segment
+                        * with valid data
+                        */
+                       c_buffer = (vm_offset_t)C_SEG_BUFFER_ADDRESS(c_seg->c_mysegno);
 
-                               kernel_memory_populate(kernel_map, c_buffer, c_size, KMA_COMPRESSOR);
+                       kernel_memory_populate(compressor_map, c_buffer, c_size, KMA_COMPRESSOR, VM_KERN_MEMORY_COMPRESSOR);
 
-                               memcpy((char *)c_buffer, (char *)addr, c_size);
+                       memcpy((char *)c_buffer, (char *)addr, c_size);
 
-                               c_seg->c_store.c_buffer = (int32_t *)c_buffer;
+                       c_seg->c_store.c_buffer = (int32_t *)c_buffer;
 #if ENCRYPTED_SWAP
-                               vm_swap_decrypt(c_seg);
+                       vm_swap_decrypt(c_seg);
 #endif /* ENCRYPTED_SWAP */
-                               c_seg_swapin_requeue(c_seg);
-
-                               OSAddAtomic64(c_seg->c_bytes_used, &compressor_bytes_used);
+                       c_seg_swapin_requeue(c_seg, TRUE, TRUE, FALSE);
+                       /*
+                        * returns with c_busy_swapping cleared
+                        */
+                       OSAddAtomic64(c_seg->c_bytes_used, &compressor_bytes_used);
 
-                               goto swap_io_failed;
-                       }
-                       VM_STAT_INCR_BY(swapouts, c_size >> PAGE_SHIFT);
+                       goto swap_io_failed;
+               }
+               VM_STAT_INCR_BY(swapouts, c_size >> PAGE_SHIFT);
 
-                       lck_mtx_lock_spin_always(&c_seg->c_lock);
+               lck_mtx_lock_spin_always(&c_seg->c_lock);
                                
-                       assert(c_seg->c_ondisk);
-                       /*
-                        * The c_seg will now know about the new location on disk.
-                        */
-                       c_seg->c_store.c_swap_handle = f_offset;
+               assert(C_SEG_IS_ONDISK(c_seg));
+               /*
+                * The c_seg will now know about the new location on disk.
+                */
+               c_seg->c_store.c_swap_handle = f_offset;
+
+               assert(c_seg->c_busy_swapping);
+               c_seg->c_busy_swapping = 0;
 swap_io_failed:
-                       c_seg->c_busy_swapping = 0;
-               
-                       if (c_seg->c_must_free)
-                               c_seg_free(c_seg);
-                       else {
-                               C_SEG_WAKEUP_DONE(c_seg);
+               assert(c_seg->c_busy);
+               C_SEG_WAKEUP_DONE(c_seg);
                                
-                               lck_mtx_unlock_always(&c_seg->c_lock);
-                       }
-               }
+               lck_mtx_unlock_always(&c_seg->c_lock);
                lck_mtx_lock(&vm_swap_data_lock);
        }
 
@@ -1538,6 +1708,11 @@ swap_io_failed:
        
        lck_mtx_lock(&vm_swap_data_lock);
 
+       if (swf->swp_flags & SWAP_PINNED) {
+               vm_num_pinned_swap_files--;
+               vm_swappin_avail += swf->swp_size;
+       }
+
        swf->swp_vp = NULL;     
        swf->swp_size = 0;
        swf->swp_free_hint = 0;
@@ -1548,7 +1723,7 @@ done:
        thread_wakeup((event_t) &swf->swp_flags);
        lck_mtx_unlock(&vm_swap_data_lock);
 
-       kmem_free(kernel_map, (vm_offset_t) addr, C_SEG_BUFSIZE);
+       kmem_free(compressor_map, (vm_offset_t) addr, C_SEG_BUFSIZE);
 }
 
 
@@ -1596,3 +1771,16 @@ vm_swap_low_on_space(void)
        }
        return (0);
 }
+
+boolean_t
+vm_swap_files_pinned(void)
+{
+        boolean_t result;
+
+       if (vm_swappin_enabled == FALSE)
+               return(TRUE);
+
+        result = (vm_num_pinned_swap_files == vm_num_swap_files);
+
+        return (result);
+}