]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/vm/vm_object.c
xnu-1504.7.4.tar.gz
[apple/xnu.git] / osfmk / vm / vm_object.c
index 5effdae7faf63a6e27484f4b71257ce7113a0f61..7f48b127e1cf6cce597b596fc6e9c1deecf70c05 100644 (file)
@@ -1,23 +1,29 @@
 /*
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -56,6 +62,7 @@
  *     Virtual memory object module.
  */
 
  *     Virtual memory object module.
  */
 
+#include <debug.h>
 #include <mach_pagemap.h>
 #include <task_swapper.h>
 
 #include <mach_pagemap.h>
 #include <task_swapper.h>
 
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_protos.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_protos.h>
+#include <vm/vm_purgeable_internal.h>
+
+#if CONFIG_EMBEDDED
+#include <sys/kern_memorystatus.h>
+#endif
 
 /*
  *     Virtual memory objects maintain the actual data
 
 /*
  *     Virtual memory objects maintain the actual data
@@ -167,12 +179,6 @@ static kern_return_t       vm_object_terminate(
 extern void            vm_object_remove(
                                vm_object_t     object);
 
 extern void            vm_object_remove(
                                vm_object_t     object);
 
-static vm_object_t     vm_object_cache_trim(
-                               boolean_t called_from_vm_object_deallocate);
-
-static void            vm_object_deactivate_all_pages(
-                               vm_object_t     object);
-
 static kern_return_t   vm_object_copy_call(
                                vm_object_t             src_object,
                                vm_object_offset_t      src_offset,
 static kern_return_t   vm_object_copy_call(
                                vm_object_t             src_object,
                                vm_object_offset_t      src_offset,
@@ -188,7 +194,8 @@ static void         vm_object_do_bypass(
                                vm_object_t     backing_object);
 
 static void            vm_object_release_pager(
                                vm_object_t     backing_object);
 
 static void            vm_object_release_pager(
-                               memory_object_t pager);
+                               memory_object_t pager,
+                               boolean_t       hashed);
 
 static zone_t          vm_object_zone;         /* vm backing store zone */
 
 
 static zone_t          vm_object_zone;         /* vm backing store zone */
 
@@ -197,7 +204,8 @@ static zone_t               vm_object_zone;         /* vm backing store zone */
  *     memory object (kernel_object) to avoid wasting data structures.
  */
 static struct vm_object                        kernel_object_store;
  *     memory object (kernel_object) to avoid wasting data structures.
  */
 static struct vm_object                        kernel_object_store;
-__private_extern__ vm_object_t         kernel_object = &kernel_object_store;
+vm_object_t                                            kernel_object;
+
 
 /*
  *     The submap object is used as a placeholder for vm_map_submap
 
 /*
  *     The submap object is used as a placeholder for vm_map_submap
@@ -217,6 +225,11 @@ static struct vm_object                    vm_submap_object_store;
  */
 static struct vm_object                        vm_object_template;
 
  */
 static struct vm_object                        vm_object_template;
 
+unsigned int vm_page_purged_wired = 0;
+unsigned int vm_page_purged_busy = 0;
+unsigned int vm_page_purged_others = 0;
+
+#if VM_OBJECT_CACHE
 /*
  *     Virtual memory objects that are not referenced by
  *     any address maps, but that are allowed to persist
 /*
  *     Virtual memory objects that are not referenced by
  *     any address maps, but that are allowed to persist
@@ -245,23 +258,41 @@ static struct vm_object                   vm_object_template;
  *     from the reference mechanism, so that the lock need
  *     not be held to make simple references.
  */
  *     from the reference mechanism, so that the lock need
  *     not be held to make simple references.
  */
+static vm_object_t     vm_object_cache_trim(
+                               boolean_t called_from_vm_object_deallocate);
+
 static queue_head_t    vm_object_cached_list;
 static int             vm_object_cached_count=0;
 static int             vm_object_cached_high;  /* highest # cached objects */
 static int             vm_object_cached_max = 512;     /* may be patched*/
 
 static queue_head_t    vm_object_cached_list;
 static int             vm_object_cached_count=0;
 static int             vm_object_cached_high;  /* highest # cached objects */
 static int             vm_object_cached_max = 512;     /* may be patched*/
 
-static decl_mutex_data(,vm_object_cached_lock_data)
+static lck_mtx_t       vm_object_cached_lock_data;
+static lck_mtx_ext_t   vm_object_cached_lock_data_ext;
 
 #define vm_object_cache_lock()         \
 
 #define vm_object_cache_lock()         \
-               mutex_lock(&vm_object_cached_lock_data)
-#define vm_object_cache_lock_try()     \
-               mutex_try(&vm_object_cached_lock_data)
+               lck_mtx_lock(&vm_object_cached_lock_data)
+#define vm_object_cache_lock_try()             \
+               lck_mtx_try_lock(&vm_object_cached_lock_data)
+#define vm_object_cache_lock_spin()            \
+               lck_mtx_lock_spin(&vm_object_cached_lock_data)
 #define vm_object_cache_unlock()       \
 #define vm_object_cache_unlock()       \
-               mutex_unlock(&vm_object_cached_lock_data)
+               lck_mtx_unlock(&vm_object_cached_lock_data)
+
+#endif /* VM_OBJECT_CACHE */
+
+
+static void            vm_object_deactivate_all_pages(
+                               vm_object_t     object);
+
 
 #define        VM_OBJECT_HASH_COUNT            1024
 
 #define        VM_OBJECT_HASH_COUNT            1024
+#define        VM_OBJECT_HASH_LOCK_COUNT       512
+
+static lck_mtx_t       vm_object_hashed_lock_data[VM_OBJECT_HASH_LOCK_COUNT];
+static lck_mtx_ext_t   vm_object_hashed_lock_data_ext[VM_OBJECT_HASH_LOCK_COUNT];
+
 static queue_head_t    vm_object_hashtable[VM_OBJECT_HASH_COUNT];
 static queue_head_t    vm_object_hashtable[VM_OBJECT_HASH_COUNT];
-static struct zone             *vm_object_hash_zone;
+static struct zone     *vm_object_hash_zone;
 
 struct vm_object_hash_entry {
        queue_chain_t           hash_link;      /* hash chain link */
 
 struct vm_object_hash_entry {
        queue_chain_t           hash_link;      /* hash chain link */
@@ -274,41 +305,81 @@ struct vm_object_hash_entry {
 typedef struct vm_object_hash_entry    *vm_object_hash_entry_t;
 #define VM_OBJECT_HASH_ENTRY_NULL      ((vm_object_hash_entry_t) 0)
 
 typedef struct vm_object_hash_entry    *vm_object_hash_entry_t;
 #define VM_OBJECT_HASH_ENTRY_NULL      ((vm_object_hash_entry_t) 0)
 
-#define VM_OBJECT_HASH_SHIFT   8
+#define VM_OBJECT_HASH_SHIFT   5
 #define vm_object_hash(pager) \
 #define vm_object_hash(pager) \
-       ((((unsigned)pager) >> VM_OBJECT_HASH_SHIFT) % VM_OBJECT_HASH_COUNT)
+       ((int)((((uintptr_t)pager) >> VM_OBJECT_HASH_SHIFT) % VM_OBJECT_HASH_COUNT))
+
+#define vm_object_lock_hash(pager) \
+       ((int)((((uintptr_t)pager) >> VM_OBJECT_HASH_SHIFT) % VM_OBJECT_HASH_LOCK_COUNT))
 
 void vm_object_hash_entry_free(
        vm_object_hash_entry_t  entry);
 
 
 void vm_object_hash_entry_free(
        vm_object_hash_entry_t  entry);
 
+static void vm_object_reap(vm_object_t object);
+static void vm_object_reap_async(vm_object_t object);
+static void vm_object_reaper_thread(void);
+
+static lck_mtx_t       vm_object_reaper_lock_data;
+static lck_mtx_ext_t   vm_object_reaper_lock_data_ext;
+
+static queue_head_t vm_object_reaper_queue; /* protected by vm_object_reaper_lock() */
+unsigned int vm_object_reap_count = 0;
+unsigned int vm_object_reap_count_async = 0;
+
+#define vm_object_reaper_lock()                \
+               lck_mtx_lock(&vm_object_reaper_lock_data)
+#define vm_object_reaper_lock_spin()           \
+               lck_mtx_lock_spin(&vm_object_reaper_lock_data)
+#define vm_object_reaper_unlock()      \
+               lck_mtx_unlock(&vm_object_reaper_lock_data)
+
+
+
+static lck_mtx_t *
+vm_object_hash_lock_spin(
+       memory_object_t pager)
+{
+       int     index;
+
+       index = vm_object_lock_hash(pager);
+
+       lck_mtx_lock_spin(&vm_object_hashed_lock_data[index]);
+
+       return (&vm_object_hashed_lock_data[index]);
+}
+
+static void
+vm_object_hash_unlock(lck_mtx_t *lck)
+{
+       lck_mtx_unlock(lck);
+}
+
+
 /*
  *     vm_object_hash_lookup looks up a pager in the hashtable
  *     and returns the corresponding entry, with optional removal.
  */
 /*
  *     vm_object_hash_lookup looks up a pager in the hashtable
  *     and returns the corresponding entry, with optional removal.
  */
-
 static vm_object_hash_entry_t
 vm_object_hash_lookup(
        memory_object_t pager,
        boolean_t       remove_entry)
 {
 static vm_object_hash_entry_t
 vm_object_hash_lookup(
        memory_object_t pager,
        boolean_t       remove_entry)
 {
-       register queue_t                bucket;
-       register vm_object_hash_entry_t entry;
+       queue_t                 bucket;
+       vm_object_hash_entry_t  entry;
 
        bucket = &vm_object_hashtable[vm_object_hash(pager)];
 
        entry = (vm_object_hash_entry_t)queue_first(bucket);
        while (!queue_end(bucket, (queue_entry_t)entry)) {
 
        bucket = &vm_object_hashtable[vm_object_hash(pager)];
 
        entry = (vm_object_hash_entry_t)queue_first(bucket);
        while (!queue_end(bucket, (queue_entry_t)entry)) {
-               if (entry->pager == pager && !remove_entry)
-                       return(entry);
-               else if (entry->pager == pager) {
-                       queue_remove(bucket, entry,
-                                       vm_object_hash_entry_t, hash_link);
+               if (entry->pager == pager) {
+                       if (remove_entry) {
+                               queue_remove(bucket, entry,
+                                            vm_object_hash_entry_t, hash_link);
+                       }
                        return(entry);
                }
                        return(entry);
                }
-
                entry = (vm_object_hash_entry_t)queue_next(&entry->hash_link);
        }
                entry = (vm_object_hash_entry_t)queue_next(&entry->hash_link);
        }
-
        return(VM_OBJECT_HASH_ENTRY_NULL);
 }
 
        return(VM_OBJECT_HASH_ENTRY_NULL);
 }
 
@@ -319,13 +390,17 @@ vm_object_hash_lookup(
 
 static void
 vm_object_hash_insert(
 
 static void
 vm_object_hash_insert(
-       vm_object_hash_entry_t  entry)
+       vm_object_hash_entry_t  entry,
+       vm_object_t             object)
 {
 {
-       register queue_t                bucket;
+       queue_t         bucket;
 
        bucket = &vm_object_hashtable[vm_object_hash(entry->pager)];
 
        queue_enter(bucket, entry, vm_object_hash_entry_t, hash_link);
 
        bucket = &vm_object_hashtable[vm_object_hash(entry->pager)];
 
        queue_enter(bucket, entry, vm_object_hash_entry_t, hash_link);
+
+       entry->object = object;
+       object->hashed = TRUE;
 }
 
 static vm_object_hash_entry_t
 }
 
 static vm_object_hash_entry_t
@@ -362,12 +437,12 @@ _vm_object_allocate(
 {
        XPR(XPR_VM_OBJECT,
                "vm_object_allocate, object 0x%X size 0x%X\n",
 {
        XPR(XPR_VM_OBJECT,
                "vm_object_allocate, object 0x%X size 0x%X\n",
-               (integer_t)object, size, 0,0,0);
+               object, size, 0,0,0);
 
        *object = vm_object_template;
        queue_init(&object->memq);
        queue_init(&object->msr_q);
 
        *object = vm_object_template;
        queue_init(&object->memq);
        queue_init(&object->msr_q);
-#ifdef UPL_DEBUG
+#if UPL_DEBUG
        queue_init(&object->uplq);
 #endif /* UPL_DEBUG */
        vm_object_lock_init(object);
        queue_init(&object->uplq);
 #endif /* UPL_DEBUG */
        vm_object_lock_init(object);
@@ -390,6 +465,12 @@ vm_object_allocate(
        return object;
 }
 
        return object;
 }
 
+
+lck_grp_t              vm_object_lck_grp;
+lck_grp_attr_t vm_object_lck_grp_attr;
+lck_attr_t             vm_object_lck_attr;
+lck_attr_t             kernel_object_lck_attr;
+
 /*
  *     vm_object_bootstrap:
  *
 /*
  *     vm_object_bootstrap:
  *
@@ -401,27 +482,60 @@ vm_object_bootstrap(void)
        register int    i;
 
        vm_object_zone = zinit((vm_size_t) sizeof(struct vm_object),
        register int    i;
 
        vm_object_zone = zinit((vm_size_t) sizeof(struct vm_object),
-                               round_page_32(512*1024),
-                               round_page_32(12*1024),
+                               round_page(512*1024),
+                               round_page(12*1024),
                                "vm objects");
 
                                "vm objects");
 
+       vm_object_init_lck_grp();
+
+#if VM_OBJECT_CACHE
        queue_init(&vm_object_cached_list);
        queue_init(&vm_object_cached_list);
-       mutex_init(&vm_object_cached_lock_data, 0);
+
+       lck_mtx_init_ext(&vm_object_cached_lock_data,
+               &vm_object_cached_lock_data_ext,
+               &vm_object_lck_grp,
+               &vm_object_lck_attr);
+#endif
+       queue_init(&vm_object_reaper_queue);
+
+       for (i = 0; i < VM_OBJECT_HASH_LOCK_COUNT; i++) {
+               lck_mtx_init_ext(&vm_object_hashed_lock_data[i],
+                                &vm_object_hashed_lock_data_ext[i],
+                                &vm_object_lck_grp,
+                                &vm_object_lck_attr);
+       }
+       lck_mtx_init_ext(&vm_object_reaper_lock_data,
+               &vm_object_reaper_lock_data_ext,
+               &vm_object_lck_grp,
+               &vm_object_lck_attr);
 
        vm_object_hash_zone =
                        zinit((vm_size_t) sizeof (struct vm_object_hash_entry),
 
        vm_object_hash_zone =
                        zinit((vm_size_t) sizeof (struct vm_object_hash_entry),
-                             round_page_32(512*1024),
-                             round_page_32(12*1024),
+                             round_page(512*1024),
+                             round_page(12*1024),
                              "vm object hash entries");
 
        for (i = 0; i < VM_OBJECT_HASH_COUNT; i++)
                queue_init(&vm_object_hashtable[i]);
 
                              "vm object hash entries");
 
        for (i = 0; i < VM_OBJECT_HASH_COUNT; i++)
                queue_init(&vm_object_hashtable[i]);
 
+
        /*
         *      Fill in a template object, for quick initialization
         */
 
        /* memq; Lock; init after allocation */
        /*
         *      Fill in a template object, for quick initialization
         */
 
        /* memq; Lock; init after allocation */
+       vm_object_template.memq.prev = NULL;
+       vm_object_template.memq.next = NULL;
+#if 0
+       /*
+        * We can't call vm_object_lock_init() here because that will
+        * allocate some memory and VM is not fully initialized yet.
+        * The lock will be initialized for each allocated object in
+        * _vm_object_allocate(), so we don't need to initialize it in
+        * the vm_object_template.
+        */
+       vm_object_lock_init(&vm_object_template);
+#endif
        vm_object_template.size = 0;
        vm_object_template.memq_hint = VM_PAGE_NULL;
        vm_object_template.ref_count = 1;
        vm_object_template.size = 0;
        vm_object_template.memq_hint = VM_PAGE_NULL;
        vm_object_template.ref_count = 1;
@@ -429,20 +543,17 @@ vm_object_bootstrap(void)
        vm_object_template.res_count = 1;
 #endif /* TASK_SWAPPER */
        vm_object_template.resident_page_count = 0;
        vm_object_template.res_count = 1;
 #endif /* TASK_SWAPPER */
        vm_object_template.resident_page_count = 0;
+       vm_object_template.wired_page_count = 0;
+       vm_object_template.reusable_page_count = 0;
        vm_object_template.copy = VM_OBJECT_NULL;
        vm_object_template.shadow = VM_OBJECT_NULL;
        vm_object_template.shadow_offset = (vm_object_offset_t) 0;
        vm_object_template.copy = VM_OBJECT_NULL;
        vm_object_template.shadow = VM_OBJECT_NULL;
        vm_object_template.shadow_offset = (vm_object_offset_t) 0;
-       vm_object_template.cow_hint = ~(vm_offset_t)0;
-       vm_object_template.true_share = FALSE;
-
        vm_object_template.pager = MEMORY_OBJECT_NULL;
        vm_object_template.paging_offset = 0;
        vm_object_template.pager_control = MEMORY_OBJECT_CONTROL_NULL;
        vm_object_template.pager = MEMORY_OBJECT_NULL;
        vm_object_template.paging_offset = 0;
        vm_object_template.pager_control = MEMORY_OBJECT_CONTROL_NULL;
-       /* msr_q; init after allocation */
-
        vm_object_template.copy_strategy = MEMORY_OBJECT_COPY_SYMMETRIC;
        vm_object_template.copy_strategy = MEMORY_OBJECT_COPY_SYMMETRIC;
-       vm_object_template.absent_count = 0;
        vm_object_template.paging_in_progress = 0;
        vm_object_template.paging_in_progress = 0;
+       vm_object_template.activity_in_progress = 0;
 
        /* Begin bitfields */
        vm_object_template.all_wanted = 0; /* all bits FALSE */
 
        /* Begin bitfields */
        vm_object_template.all_wanted = 0; /* all bits FALSE */
@@ -456,29 +567,60 @@ vm_object_bootstrap(void)
        vm_object_template.private = FALSE;
        vm_object_template.pageout = FALSE;
        vm_object_template.alive = TRUE;
        vm_object_template.private = FALSE;
        vm_object_template.pageout = FALSE;
        vm_object_template.alive = TRUE;
-       vm_object_template.purgable = VM_OBJECT_NONPURGABLE;
+       vm_object_template.purgable = VM_PURGABLE_DENY;
+       vm_object_template.shadowed = FALSE;
        vm_object_template.silent_overwrite = FALSE;
        vm_object_template.advisory_pageout = FALSE;
        vm_object_template.silent_overwrite = FALSE;
        vm_object_template.advisory_pageout = FALSE;
-       vm_object_template.shadowed = FALSE;
+       vm_object_template.true_share = FALSE;
        vm_object_template.terminating = FALSE;
        vm_object_template.terminating = FALSE;
+       vm_object_template.named = FALSE;
        vm_object_template.shadow_severed = FALSE;
        vm_object_template.phys_contiguous = FALSE;
        vm_object_template.nophyscache = FALSE;
        /* End bitfields */
 
        vm_object_template.shadow_severed = FALSE;
        vm_object_template.phys_contiguous = FALSE;
        vm_object_template.nophyscache = FALSE;
        /* End bitfields */
 
-       /* cache bitfields */
-       vm_object_template.wimg_bits = VM_WIMG_DEFAULT;
-
-       /* cached_list; init after allocation */
+       vm_object_template.cached_list.prev = NULL;
+       vm_object_template.cached_list.next = NULL;
+       vm_object_template.msr_q.prev = NULL;
+       vm_object_template.msr_q.next = NULL;
+       
        vm_object_template.last_alloc = (vm_object_offset_t) 0;
        vm_object_template.last_alloc = (vm_object_offset_t) 0;
-       vm_object_template.cluster_size = 0;
+       vm_object_template.sequential = (vm_object_offset_t) 0;
+       vm_object_template.pages_created = 0;
+       vm_object_template.pages_used = 0;
+
 #if    MACH_PAGEMAP
        vm_object_template.existence_map = VM_EXTERNAL_NULL;
 #endif /* MACH_PAGEMAP */
 #if    MACH_PAGEMAP
        vm_object_template.existence_map = VM_EXTERNAL_NULL;
 #endif /* MACH_PAGEMAP */
+       vm_object_template.cow_hint = ~(vm_offset_t)0;
 #if    MACH_ASSERT
        vm_object_template.paging_object = VM_OBJECT_NULL;
 #endif /* MACH_ASSERT */
 
 #if    MACH_ASSERT
        vm_object_template.paging_object = VM_OBJECT_NULL;
 #endif /* MACH_ASSERT */
 
+       /* cache bitfields */
+       vm_object_template.wimg_bits = VM_WIMG_DEFAULT;
+       vm_object_template.code_signed = FALSE;
+       vm_object_template.hashed = FALSE;
+       vm_object_template.transposed = FALSE;
+       vm_object_template.mapping_in_progress = FALSE;
+       vm_object_template.volatile_empty = FALSE;
+       vm_object_template.volatile_fault = FALSE;
+       vm_object_template.all_reusable = FALSE;
+       vm_object_template.blocked_access = FALSE;
+       vm_object_template.__object2_unused_bits = 0;
+#if UPL_DEBUG
+       vm_object_template.uplq.prev = NULL;
+       vm_object_template.uplq.next = NULL;
+#endif /* UPL_DEBUG */
+#ifdef VM_PIP_DEBUG
+       bzero(&vm_object_template.pip_holders,
+             sizeof (vm_object_template.pip_holders));
+#endif /* VM_PIP_DEBUG */
+
+       vm_object_template.objq.next=NULL;
+       vm_object_template.objq.prev=NULL;
+
+       
        /*
         *      Initialize the "kernel object"
         */
        /*
         *      Initialize the "kernel object"
         */
@@ -491,11 +633,11 @@ vm_object_bootstrap(void)
  */
 
 #ifdef ppc
  */
 
 #ifdef ppc
-       _vm_object_allocate((vm_last_addr - VM_MIN_KERNEL_ADDRESS) + 1,
-                       kernel_object);
+       _vm_object_allocate(vm_last_addr + 1,
+                           kernel_object);
 #else
 #else
-       _vm_object_allocate((VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) + 1,
-                       kernel_object);
+       _vm_object_allocate(VM_MAX_KERNEL_ADDRESS + 1,
+                           kernel_object);
 #endif
        kernel_object->copy_strategy = MEMORY_OBJECT_COPY_NONE;
 
 #endif
        kernel_object->copy_strategy = MEMORY_OBJECT_COPY_NONE;
 
@@ -506,11 +648,11 @@ vm_object_bootstrap(void)
 
        vm_submap_object = &vm_submap_object_store;
 #ifdef ppc
 
        vm_submap_object = &vm_submap_object_store;
 #ifdef ppc
-       _vm_object_allocate((vm_last_addr - VM_MIN_KERNEL_ADDRESS) + 1,
-                       vm_submap_object);
+       _vm_object_allocate(vm_last_addr + 1,
+                           vm_submap_object);
 #else
 #else
-       _vm_object_allocate((VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) + 1,
-                       vm_submap_object);
+       _vm_object_allocate(VM_MAX_KERNEL_ADDRESS + 1,
+                           vm_submap_object);
 #endif
        vm_submap_object->copy_strategy = MEMORY_OBJECT_COPY_NONE;
 
 #endif
        vm_submap_object->copy_strategy = MEMORY_OBJECT_COPY_NONE;
 
@@ -526,6 +668,23 @@ vm_object_bootstrap(void)
 #endif /* MACH_PAGEMAP */
 }
 
 #endif /* MACH_PAGEMAP */
 }
 
+void
+vm_object_reaper_init(void)
+{
+       kern_return_t   kr;
+       thread_t        thread;
+
+       kr = kernel_thread_start_priority(
+               (thread_continue_t) vm_object_reaper_thread,
+               NULL,
+               BASEPRI_PREEMPT - 1,
+               &thread);
+       if (kr != KERN_SUCCESS) {
+               panic("failed to launch vm_object_reaper_thread kr=0x%x", kr);
+       }
+       thread_deallocate(thread);
+}
+
 __private_extern__ void
 vm_object_init(void)
 {
 __private_extern__ void
 vm_object_init(void)
 {
@@ -534,18 +693,26 @@ vm_object_init(void)
         */
 }
 
         */
 }
 
-/* remove the typedef below when emergency work-around is taken out */
-typedef struct vnode_pager {
-       memory_object_t pager;
-       memory_object_t pager_handle;   /* pager */
-       memory_object_control_t         control_handle; /* memory object's control handle */
-       void            *vnode_handle;  /* vnode handle */
-} *vnode_pager_t;
 
 
+__private_extern__ void
+vm_object_init_lck_grp(void)
+{
+       /*
+        * initialze the vm_object lock world
+        */
+       lck_grp_attr_setdefault(&vm_object_lck_grp_attr);
+       lck_grp_init(&vm_object_lck_grp, "vm_object", &vm_object_lck_grp_attr);
+       lck_attr_setdefault(&vm_object_lck_attr);
+       lck_attr_setdefault(&kernel_object_lck_attr);
+       lck_attr_cleardebug(&kernel_object_lck_attr);
+}
+
+#if VM_OBJECT_CACHE
 #define        MIGHT_NOT_CACHE_SHADOWS         1
 #if    MIGHT_NOT_CACHE_SHADOWS
 static int cache_shadows = TRUE;
 #endif /* MIGHT_NOT_CACHE_SHADOWS */
 #define        MIGHT_NOT_CACHE_SHADOWS         1
 #if    MIGHT_NOT_CACHE_SHADOWS
 static int cache_shadows = TRUE;
 #endif /* MIGHT_NOT_CACHE_SHADOWS */
+#endif
 
 /*
  *     vm_object_deallocate:
 
 /*
  *     vm_object_deallocate:
@@ -558,39 +725,94 @@ static int cache_shadows = TRUE;
  *
  *     No object may be locked.
  */
  *
  *     No object may be locked.
  */
+unsigned long vm_object_deallocate_shared_successes = 0;
+unsigned long vm_object_deallocate_shared_failures = 0;
+unsigned long vm_object_deallocate_shared_swap_failures = 0;
 __private_extern__ void
 vm_object_deallocate(
        register vm_object_t    object)
 {
 __private_extern__ void
 vm_object_deallocate(
        register vm_object_t    object)
 {
-       boolean_t retry_cache_trim = FALSE;
-       vm_object_t shadow = VM_OBJECT_NULL;
+#if VM_OBJECT_CACHE
+       boolean_t       retry_cache_trim = FALSE;
+       uint32_t        try_failed_count = 0;
+#endif
+       vm_object_t     shadow = VM_OBJECT_NULL;
        
 //     if(object)dbgLog(object, object->ref_count, object->can_persist, 3);    /* (TEST/DEBUG) */
 //     else dbgLog(object, 0, 0, 3);   /* (TEST/DEBUG) */
 
        
 //     if(object)dbgLog(object, object->ref_count, object->can_persist, 3);    /* (TEST/DEBUG) */
 //     else dbgLog(object, 0, 0, 3);   /* (TEST/DEBUG) */
 
+       if (object == VM_OBJECT_NULL)
+               return;
+
+       if (object == kernel_object) {
+               vm_object_lock_shared(object);
 
 
-       while (object != VM_OBJECT_NULL) {
+               OSAddAtomic(-1, &object->ref_count);
+
+               if (object->ref_count == 0) {
+                       panic("vm_object_deallocate: losing kernel_object\n");
+               }
+               vm_object_unlock(object);
+               return;
+       }
 
 
+       if (object->ref_count > 2 ||
+           (!object->named && object->ref_count > 1)) {
+               UInt32          original_ref_count;
+               volatile UInt32 *ref_count_p;
+               Boolean         atomic_swap;
+
+               /*
+                * The object currently looks like it is not being
+                * kept alive solely by the reference we're about to release.
+                * Let's try and release our reference without taking
+                * all the locks we would need if we had to terminate the
+                * object (cache lock + exclusive object lock).
+                * Lock the object "shared" to make sure we don't race with
+                * anyone holding it "exclusive".
+                */
+               vm_object_lock_shared(object);
+               ref_count_p = (volatile UInt32 *) &object->ref_count;
+               original_ref_count = object->ref_count;
                /*
                /*
-                *      The cache holds a reference (uncounted) to
-                *      the object; we must lock it before removing
-                *      the object.
+                * Test again as "ref_count" could have changed.
+                * "named" shouldn't change.
                 */
                 */
-               for (;;) {
-                       vm_object_cache_lock();
+               if (original_ref_count > 2 ||
+                   (!object->named && original_ref_count > 1)) {
+                       atomic_swap = OSCompareAndSwap(
+                               original_ref_count,
+                               original_ref_count - 1,
+                               (UInt32 *) &object->ref_count);
+                       if (atomic_swap == FALSE) {
+                               vm_object_deallocate_shared_swap_failures++;
+                       }
 
 
+               } else {
+                       atomic_swap = FALSE;
+               }
+               vm_object_unlock(object);
+
+               if (atomic_swap) {
                        /*
                        /*
-                        * if we try to take a regular lock here
-                        * we risk deadlocking against someone
-                        * holding a lock on this object while
-                        * trying to vm_object_deallocate a different
-                        * object
+                        * ref_count was updated atomically !
                         */
                         */
-                       if (vm_object_lock_try(object))
-                               break;
-                       vm_object_cache_unlock();
-                       mutex_pause();  /* wait a bit */
+                       vm_object_deallocate_shared_successes++;
+                       return;
                }
                }
+
+               /*
+                * Someone else updated the ref_count at the same
+                * time and we lost the race.  Fall back to the usual
+                * slow but safe path...
+                */
+               vm_object_deallocate_shared_failures++;
+       }
+
+       while (object != VM_OBJECT_NULL) {
+
+               vm_object_lock(object);
+
                assert(object->ref_count > 0);
 
                /*
                assert(object->ref_count > 0);
 
                /*
@@ -605,28 +827,27 @@ vm_object_deallocate(
                        /* more mappers for this object */
 
                        if (pager != MEMORY_OBJECT_NULL) {
                        /* more mappers for this object */
 
                        if (pager != MEMORY_OBJECT_NULL) {
+                               vm_object_mapping_wait(object, THREAD_UNINT);
+                               vm_object_mapping_begin(object);
                                vm_object_unlock(object);
                                vm_object_unlock(object);
-                               vm_object_cache_unlock();
-                                       
-                               memory_object_unmap(pager);
 
 
-                               for (;;) {
-                                       vm_object_cache_lock();
+                               memory_object_last_unmap(pager);
 
 
-                                       /*
-                                        * if we try to take a regular lock here
-                                        * we risk deadlocking against someone
-                                        * holding a lock on this object while
-                                        * trying to vm_object_deallocate a different
-                                        * object
-                                        */
-                                       if (vm_object_lock_try(object))
-                                               break;
-                                       vm_object_cache_unlock();
-                                       mutex_pause();  /* wait a bit */
-                               }
-                               assert(object->ref_count > 0);
+                               vm_object_lock(object);
+                               vm_object_mapping_end(object);
                        }
                        }
+                       /*
+                        * recheck the ref_count since we dropped the object lock
+                        * to call 'memory_object_last_unmap'... it's possible
+                        * additional references got taken and we only want
+                        * to deactivate the pages if this 'named' object will only
+                        * referenced by the backing pager once we drop our reference
+                        * below
+                        */
+                       if (!object->terminating && object->ref_count == 2)
+                               vm_object_deactivate_all_pages(object);
+
+                       assert(object->ref_count > 0);
                }
 
                /*
                }
 
                /*
@@ -642,30 +863,38 @@ vm_object_deallocate(
                /* terminate again.  */
 
                if ((object->ref_count > 1) || object->terminating) {
                /* terminate again.  */
 
                if ((object->ref_count > 1) || object->terminating) {
+                       vm_object_lock_assert_exclusive(object);
                        object->ref_count--;
                        vm_object_res_deallocate(object);
                        object->ref_count--;
                        vm_object_res_deallocate(object);
-                       vm_object_cache_unlock();
 
                        if (object->ref_count == 1 &&
                            object->shadow != VM_OBJECT_NULL) {
                                /*
 
                        if (object->ref_count == 1 &&
                            object->shadow != VM_OBJECT_NULL) {
                                /*
-                                * We don't use this VM object anymore.  We
-                                * would like to collapse it into its parent(s),
-                                * but we don't have any pointers back to these
-                                * parent object(s).
+                                * There's only one reference left on this
+                                * VM object.  We can't tell if it's a valid
+                                * one (from a mapping for example) or if this
+                                * object is just part of a possibly stale and
+                                * useless shadow chain.
+                                * We would like to try and collapse it into
+                                * its parent, but we don't have any pointers
+                                * back to this parent object.
                                 * But we can try and collapse this object with
                                 * its own shadows, in case these are useless
                                 * too...
                                 * But we can try and collapse this object with
                                 * its own shadows, in case these are useless
                                 * too...
+                                * We can't bypass this object though, since we
+                                * don't know if this last reference on it is
+                                * meaningful or not.
                                 */
                                 */
-                               vm_object_collapse(object, 0);
+                               vm_object_collapse(object, 0, FALSE);
                        }
                        }
-
                        vm_object_unlock(object); 
                        vm_object_unlock(object); 
+#if VM_OBJECT_CACHE
                        if (retry_cache_trim &&
                            ((object = vm_object_cache_trim(TRUE)) !=
                             VM_OBJECT_NULL)) {
                                continue;
                        }
                        if (retry_cache_trim &&
                            ((object = vm_object_cache_trim(TRUE)) !=
                             VM_OBJECT_NULL)) {
                                continue;
                        }
+#endif
                        return;
                }
 
                        return;
                }
 
@@ -680,11 +909,12 @@ vm_object_deallocate(
                                              VM_OBJECT_EVENT_INITIALIZED,
                                              THREAD_UNINT);
                        vm_object_unlock(object);
                                              VM_OBJECT_EVENT_INITIALIZED,
                                              THREAD_UNINT);
                        vm_object_unlock(object);
-                       vm_object_cache_unlock();
+
                        thread_block(THREAD_CONTINUE_NULL);
                        continue;
                }
 
                        thread_block(THREAD_CONTINUE_NULL);
                        continue;
                }
 
+#if VM_OBJECT_CACHE
                /*
                 *      If this object can persist, then enter it in
                 *      the cache. Otherwise, terminate it.
                /*
                 *      If this object can persist, then enter it in
                 *      the cache. Otherwise, terminate it.
@@ -700,10 +930,12 @@ vm_object_deallocate(
                         *      Now it is safe to decrement reference count,
                         *      and to return if reference count is > 0.
                         */
                         *      Now it is safe to decrement reference count,
                         *      and to return if reference count is > 0.
                         */
+
+                       vm_object_lock_assert_exclusive(object);
                        if (--object->ref_count > 0) {
                                vm_object_res_deallocate(object);
                                vm_object_unlock(object);
                        if (--object->ref_count > 0) {
                                vm_object_res_deallocate(object);
                                vm_object_unlock(object);
-                               vm_object_cache_unlock();
+
                                if (retry_cache_trim &&
                                    ((object = vm_object_cache_trim(TRUE)) !=
                                     VM_OBJECT_NULL)) {
                                if (retry_cache_trim &&
                                    ((object = vm_object_cache_trim(TRUE)) !=
                                     VM_OBJECT_NULL)) {
@@ -732,16 +964,38 @@ vm_object_deallocate(
                        VM_OBJ_RES_DECR(object);
                        XPR(XPR_VM_OBJECT,
                      "vm_o_deallocate: adding %x to cache, queue = (%x, %x)\n",
                        VM_OBJ_RES_DECR(object);
                        XPR(XPR_VM_OBJECT,
                      "vm_o_deallocate: adding %x to cache, queue = (%x, %x)\n",
-                               (integer_t)object,
-                               (integer_t)vm_object_cached_list.next,
-                               (integer_t)vm_object_cached_list.prev,0,0);
+                               object,
+                               vm_object_cached_list.next,
+                               vm_object_cached_list.prev,0,0);
 
 
+
+                       vm_object_unlock(object);
+
+                       try_failed_count = 0;
+                       for (;;) {
+                               vm_object_cache_lock();
+
+                               /*
+                                * if we try to take a regular lock here
+                                * we risk deadlocking against someone
+                                * holding a lock on this object while
+                                * trying to vm_object_deallocate a different
+                                * object
+                                */
+                               if (vm_object_lock_try(object))
+                                       break;
+                               vm_object_cache_unlock();
+                               try_failed_count++;
+
+                               mutex_pause(try_failed_count);  /* wait a bit */
+                       }
                        vm_object_cached_count++;
                        if (vm_object_cached_count > vm_object_cached_high)
                                vm_object_cached_high = vm_object_cached_count;
                        queue_enter(&vm_object_cached_list, object,
                                vm_object_t, cached_list);
                        vm_object_cache_unlock();
                        vm_object_cached_count++;
                        if (vm_object_cached_count > vm_object_cached_high)
                                vm_object_cached_high = vm_object_cached_count;
                        queue_enter(&vm_object_cached_list, object,
                                vm_object_t, cached_list);
                        vm_object_cache_unlock();
+
                        vm_object_deactivate_all_pages(object);
                        vm_object_unlock(object);
 
                        vm_object_deactivate_all_pages(object);
                        vm_object_unlock(object);
 
@@ -771,14 +1025,15 @@ vm_object_deallocate(
                                return;
                        }
                        retry_cache_trim = TRUE;
                                return;
                        }
                        retry_cache_trim = TRUE;
-
-               } else {
+               } else
+#endif /* VM_OBJECT_CACHE */
+               {
                        /*
                         *      This object is not cachable; terminate it.
                         */
                        XPR(XPR_VM_OBJECT,
         "vm_o_deallocate: !cacheable 0x%X res %d paging_ops %d thread 0x%p ref %d\n",
                        /*
                         *      This object is not cachable; terminate it.
                         */
                        XPR(XPR_VM_OBJECT,
         "vm_o_deallocate: !cacheable 0x%X res %d paging_ops %d thread 0x%p ref %d\n",
-                           (integer_t)object, object->resident_page_count,
+                           object, object->resident_page_count,
                            object->paging_in_progress,
                            (void *)current_thread(),object->ref_count);
 
                            object->paging_in_progress,
                            (void *)current_thread(),object->ref_count);
 
@@ -792,24 +1047,31 @@ vm_object_deallocate(
                         *      a normal reference.
                         */
                        shadow = object->pageout?VM_OBJECT_NULL:object->shadow;
                         *      a normal reference.
                         */
                        shadow = object->pageout?VM_OBJECT_NULL:object->shadow;
-                       if(vm_object_terminate(object) != KERN_SUCCESS) {
+
+                       if (vm_object_terminate(object) != KERN_SUCCESS) {
                                return;
                        }
                        if (shadow != VM_OBJECT_NULL) {
                                object = shadow;
                                continue;
                        }
                                return;
                        }
                        if (shadow != VM_OBJECT_NULL) {
                                object = shadow;
                                continue;
                        }
+#if VM_OBJECT_CACHE
                        if (retry_cache_trim &&
                            ((object = vm_object_cache_trim(TRUE)) !=
                             VM_OBJECT_NULL)) {
                                continue;
                        }
                        if (retry_cache_trim &&
                            ((object = vm_object_cache_trim(TRUE)) !=
                             VM_OBJECT_NULL)) {
                                continue;
                        }
+#endif
                        return;
                }
        }
                        return;
                }
        }
+#if VM_OBJECT_CACHE
        assert(! retry_cache_trim);
        assert(! retry_cache_trim);
+#endif
 }
 
 }
 
+
+#if VM_OBJECT_CACHE
 /*
  *     Check to see whether we really need to trim
  *     down the cache. If so, remove an object from
 /*
  *     Check to see whether we really need to trim
  *     down the cache. If so, remove an object from
@@ -830,6 +1092,8 @@ vm_object_cache_trim(
                 *      If we no longer need to trim the cache,
                 *      then we are done.
                 */
                 *      If we no longer need to trim the cache,
                 *      then we are done.
                 */
+               if (vm_object_cached_count <= vm_object_cached_max)
+                       return VM_OBJECT_NULL;
 
                vm_object_cache_lock();
                if (vm_object_cached_count <= vm_object_cached_max) {
 
                vm_object_cache_lock();
                if (vm_object_cached_count <= vm_object_cached_max) {
@@ -843,8 +1107,8 @@ vm_object_cache_trim(
                 */
                XPR(XPR_VM_OBJECT,
                "vm_object_cache_trim: removing from front of cache (%x, %x)\n",
                 */
                XPR(XPR_VM_OBJECT,
                "vm_object_cache_trim: removing from front of cache (%x, %x)\n",
-                       (integer_t)vm_object_cached_list.next,
-                       (integer_t)vm_object_cached_list.prev, 0, 0, 0);
+                       vm_object_cached_list.next,
+                       vm_object_cached_list.prev, 0, 0, 0);
 
                object = (vm_object_t) queue_first(&vm_object_cached_list);
                if(object == (vm_object_t) &vm_object_cached_list) {
 
                object = (vm_object_t) queue_first(&vm_object_cached_list);
                if(object == (vm_object_t) &vm_object_cached_list) {
@@ -862,6 +1126,7 @@ vm_object_cache_trim(
                             cached_list);
                vm_object_cached_count--;
 
                             cached_list);
                vm_object_cached_count--;
 
+               vm_object_cache_unlock();
                /*
                 *      Since this object is in the cache, we know
                 *      that it is initialized and has no references.
                /*
                 *      Since this object is in the cache, we know
                 *      that it is initialized and has no references.
@@ -870,6 +1135,7 @@ vm_object_cache_trim(
 
                assert(object->pager_initialized);
                assert(object->ref_count == 0);
 
                assert(object->pager_initialized);
                assert(object->ref_count == 0);
+               vm_object_lock_assert_exclusive(object);
                object->ref_count++;
 
                /*
                object->ref_count++;
 
                /*
@@ -881,8 +1147,10 @@ vm_object_cache_trim(
                 *      (We are careful here to limit recursion.)
                 */
                shadow = object->pageout?VM_OBJECT_NULL:object->shadow;
                 *      (We are careful here to limit recursion.)
                 */
                shadow = object->pageout?VM_OBJECT_NULL:object->shadow;
+
                if(vm_object_terminate(object) != KERN_SUCCESS)
                        continue;
                if(vm_object_terminate(object) != KERN_SUCCESS)
                        continue;
+
                if (shadow != VM_OBJECT_NULL) {
                        if (called_from_vm_object_deallocate) {
                                return shadow;
                if (shadow != VM_OBJECT_NULL) {
                        if (called_from_vm_object_deallocate) {
                                return shadow;
@@ -892,8 +1160,8 @@ vm_object_cache_trim(
                }
        }
 }
                }
        }
 }
+#endif
 
 
-boolean_t      vm_object_terminate_remove_all = FALSE;
 
 /*
  *     Routine:        vm_object_terminate
 
 /*
  *     Routine:        vm_object_terminate
@@ -914,19 +1182,15 @@ boolean_t        vm_object_terminate_remove_all = FALSE;
  */
 static kern_return_t
 vm_object_terminate(
  */
 static kern_return_t
 vm_object_terminate(
-       register vm_object_t    object)
+       vm_object_t     object)
 {
 {
-       memory_object_t         pager;
-       register vm_page_t      p;
-       vm_object_t             shadow_object;
+       vm_object_t     shadow_object;
 
        XPR(XPR_VM_OBJECT, "vm_object_terminate, object 0x%X ref %d\n",
 
        XPR(XPR_VM_OBJECT, "vm_object_terminate, object 0x%X ref %d\n",
-               (integer_t)object, object->ref_count, 0, 0, 0);
+               object, object->ref_count, 0, 0, 0);
 
 
-       if (!object->pageout && (!object->temporary || object->can_persist)
-                       && (object->pager != NULL || object->shadow_severed)) {
-          vm_object_cache_unlock();
-          while (!queue_empty(&object->memq)) {
+       if (!object->pageout && (!object->temporary || object->can_persist) &&
+           (object->pager != NULL || object->shadow_severed)) {
                /*
                 * Clear pager_trusted bit so that the pages get yanked
                 * out of the object instead of cleaned in place.  This
                /*
                 * Clear pager_trusted bit so that the pages get yanked
                 * out of the object instead of cleaned in place.  This
@@ -934,66 +1198,15 @@ vm_object_terminate(
                 */
                object->pager_trusted = FALSE;
 
                 */
                object->pager_trusted = FALSE;
 
-               p = (vm_page_t) queue_first(&object->memq);
-
-               VM_PAGE_CHECK(p);
-
-               if (p->busy || p->cleaning) {
-                       if(p->cleaning || p->absent) {
-                               vm_object_paging_wait(object, THREAD_UNINT);
-                               continue;
-                       } else {
-                          panic("vm_object_terminate.3 0x%x 0x%x", object, p);
-                       }
-               }
-
-               vm_page_lock_queues();
-               p->busy = TRUE;
-               VM_PAGE_QUEUES_REMOVE(p);
-               vm_page_unlock_queues();
-
-               if (p->absent || p->private) {
-
-                       /*
-                        *      For private pages, VM_PAGE_FREE just
-                        *      leaves the page structure around for
-                        *      its owner to clean up.  For absent
-                        *      pages, the structure is returned to
-                        *      the appropriate pool.
-                        */
-
-                       goto free_page;
-               }
-
-               if (p->fictitious)
-                       panic("vm_object_terminate.4 0x%x 0x%x", object, p);
-
-               if (!p->dirty)
-                       p->dirty = pmap_is_modified(p->phys_page);
-
-               if ((p->dirty || p->precious) && !p->error && object->alive) {
-                       vm_pageout_cluster(p); /* flush page */
-                       vm_object_paging_wait(object, THREAD_UNINT);
-                       XPR(XPR_VM_OBJECT,
-                           "vm_object_terminate restart, object 0x%X ref %d\n",
-                           (integer_t)object, object->ref_count, 0, 0, 0);
-               } else {
-                   free_page:
-                       VM_PAGE_FREE(p);
-               }
-          }
-          vm_object_unlock(object);
-          vm_object_cache_lock();
-          vm_object_lock(object);
+               vm_object_reap_pages(object, REAP_TERMINATE);
        }
        }
-
        /*
         *      Make sure the object isn't already being terminated
         */
        /*
         *      Make sure the object isn't already being terminated
         */
-       if(object->terminating) {
-               object->ref_count -= 1;
+       if (object->terminating) {
+               vm_object_lock_assert_exclusive(object);
+               object->ref_count--;
                assert(object->ref_count > 0);
                assert(object->ref_count > 0);
-               vm_object_cache_unlock();
                vm_object_unlock(object);
                return KERN_FAILURE;
        }
                vm_object_unlock(object);
                return KERN_FAILURE;
        }
@@ -1002,11 +1215,11 @@ vm_object_terminate(
         * Did somebody get a reference to the object while we were
         * cleaning it?
         */
         * Did somebody get a reference to the object while we were
         * cleaning it?
         */
-       if(object->ref_count != 1) {
-               object->ref_count -= 1;
+       if (object->ref_count != 1) {
+               vm_object_lock_assert_exclusive(object);
+               object->ref_count--;
                assert(object->ref_count > 0);
                vm_object_res_deallocate(object);
                assert(object->ref_count > 0);
                vm_object_res_deallocate(object);
-               vm_object_cache_unlock();
                vm_object_unlock(object);
                return KERN_FAILURE;
        }
                vm_object_unlock(object);
                return KERN_FAILURE;
        }
@@ -1017,8 +1230,14 @@ vm_object_terminate(
 
        object->terminating = TRUE;
        object->alive = FALSE;
 
        object->terminating = TRUE;
        object->alive = FALSE;
-       vm_object_remove(object);
 
 
+       if (object->hashed) {
+               lck_mtx_t       *lck;
+
+               lck = vm_object_hash_lock_spin(object->pager);
+               vm_object_remove(object);
+               vm_object_hash_unlock(lck);
+       }
        /*
         *      Detach the object from its shadow if we are the shadow's
         *      copy. The reference we hold on the shadow must be dropped
        /*
         *      Detach the object from its shadow if we are the shadow's
         *      copy. The reference we hold on the shadow must be dropped
@@ -1032,28 +1251,86 @@ vm_object_terminate(
                vm_object_unlock(shadow_object);
        }
 
                vm_object_unlock(shadow_object);
        }
 
+       if (object->paging_in_progress != 0 ||
+           object->activity_in_progress != 0) {
+               /*
+                * There are still some paging_in_progress references
+                * on this object, meaning that there are some paging
+                * or other I/O operations in progress for this VM object.
+                * Such operations take some paging_in_progress references
+                * up front to ensure that the object doesn't go away, but
+                * they may also need to acquire a reference on the VM object,
+                * to map it in kernel space, for example.  That means that
+                * they may end up releasing the last reference on the VM
+                * object, triggering its termination, while still holding
+                * paging_in_progress references.  Waiting for these
+                * pending paging_in_progress references to go away here would
+                * deadlock.
+                *
+                * To avoid deadlocking, we'll let the vm_object_reaper_thread
+                * complete the VM object termination if it still holds
+                * paging_in_progress references at this point.
+                *
+                * No new paging_in_progress should appear now that the
+                * VM object is "terminating" and not "alive".
+                */
+               vm_object_reap_async(object);
+               vm_object_unlock(object);
+               /*
+                * Return KERN_FAILURE to let the caller know that we
+                * haven't completed the termination and it can't drop this
+                * object's reference on its shadow object yet.
+                * The reaper thread will take care of that once it has
+                * completed this object's termination.
+                */
+               return KERN_FAILURE;
+       }
+       /*
+        * complete the VM object termination
+        */
+       vm_object_reap(object);
+       object = VM_OBJECT_NULL;
+
        /*
        /*
-        *      The pageout daemon might be playing with our pages.
-        *      Now that the object is dead, it won't touch any more
-        *      pages, but some pages might already be on their way out.
-        *      Hence, we wait until the active paging activities have ceased
-        *      before we break the association with the pager itself.
+        * the object lock was released by vm_object_reap()
+        *
+        * KERN_SUCCESS means that this object has been terminated
+        * and no longer needs its shadow object but still holds a
+        * reference on it.
+        * The caller is responsible for dropping that reference.
+        * We can't call vm_object_deallocate() here because that
+        * would create a recursion.
         */
         */
-       while (object->paging_in_progress != 0) {
-               vm_object_cache_unlock();
-               vm_object_wait(object,
-                              VM_OBJECT_EVENT_PAGING_IN_PROGRESS,
-                              THREAD_UNINT);
-               vm_object_cache_lock();
-               vm_object_lock(object);
-       }
+       return KERN_SUCCESS;
+}
+
+
+/*
+ * vm_object_reap():
+ *
+ * Complete the termination of a VM object after it's been marked
+ * as "terminating" and "!alive" by vm_object_terminate().
+ *
+ * The VM object must be locked by caller.
+ * The lock will be released on return and the VM object is no longer valid.
+ */
+void
+vm_object_reap(
+       vm_object_t object)
+{
+       memory_object_t         pager;
+
+       vm_object_lock_assert_exclusive(object);
+       assert(object->paging_in_progress == 0);
+       assert(object->activity_in_progress == 0);
+
+       vm_object_reap_count++;
 
        pager = object->pager;
        object->pager = MEMORY_OBJECT_NULL;
 
        if (pager != MEMORY_OBJECT_NULL)
                memory_object_control_disable(object->pager_control);
 
        pager = object->pager;
        object->pager = MEMORY_OBJECT_NULL;
 
        if (pager != MEMORY_OBJECT_NULL)
                memory_object_control_disable(object->pager_control);
-       vm_object_cache_unlock();
 
        object->ref_count--;
 #if    TASK_SWAPPER
 
        object->ref_count--;
 #if    TASK_SWAPPER
@@ -1062,30 +1339,38 @@ vm_object_terminate(
 
        assert (object->ref_count == 0);
 
 
        assert (object->ref_count == 0);
 
+       /*
+        * remove from purgeable queue if it's on
+        */
+       if (object->objq.next || object->objq.prev) {
+               purgeable_q_t queue = vm_purgeable_object_remove(object);
+               assert(queue);
+
+               /* Must take page lock for this - using it to protect token queue */
+               vm_page_lock_queues();
+               vm_purgeable_token_delete_first(queue);
+        
+               assert(queue->debug_count_objects>=0);
+               vm_page_unlock_queues();
+       }
+    
        /*
         *      Clean or free the pages, as appropriate.
         *      It is possible for us to find busy/absent pages,
         *      if some faults on this object were aborted.
         */
        if (object->pageout) {
        /*
         *      Clean or free the pages, as appropriate.
         *      It is possible for us to find busy/absent pages,
         *      if some faults on this object were aborted.
         */
        if (object->pageout) {
-               assert(shadow_object != VM_OBJECT_NULL);
-               assert(shadow_object == object->shadow);
+               assert(object->shadow != VM_OBJECT_NULL);
 
                vm_pageout_object_terminate(object);
 
 
                vm_pageout_object_terminate(object);
 
-       } else if ((object->temporary && !object->can_persist) ||
-                  (pager == MEMORY_OBJECT_NULL)) {
-               while (!queue_empty(&object->memq)) {
-                       p = (vm_page_t) queue_first(&object->memq);
+       } else if (((object->temporary && !object->can_persist) || (pager == MEMORY_OBJECT_NULL))) {
 
 
-                       VM_PAGE_CHECK(p);
-                       VM_PAGE_FREE(p);
-               }
-       } else if (!queue_empty(&object->memq)) {
-               panic("vm_object_terminate: queue just emptied isn't");
+               vm_object_reap_pages(object, REAP_REAP);
        }
        }
-
+       assert(queue_empty(&object->memq));
        assert(object->paging_in_progress == 0);
        assert(object->paging_in_progress == 0);
+       assert(object->activity_in_progress == 0);
        assert(object->ref_count == 0);
 
        /*
        assert(object->ref_count == 0);
 
        /*
@@ -1095,7 +1380,7 @@ vm_object_terminate(
         */
        if (pager != MEMORY_OBJECT_NULL) {
                vm_object_unlock(object);
         */
        if (pager != MEMORY_OBJECT_NULL) {
                vm_object_unlock(object);
-               vm_object_release_pager(pager);
+               vm_object_release_pager(pager, object->hashed);
                vm_object_lock(object);
        }
 
                vm_object_lock(object);
        }
 
@@ -1109,34 +1394,379 @@ vm_object_terminate(
        vm_external_destroy(object->existence_map, object->size);
 #endif /* MACH_PAGEMAP */
 
        vm_external_destroy(object->existence_map, object->size);
 #endif /* MACH_PAGEMAP */
 
+       object->shadow = VM_OBJECT_NULL;
+
+       vm_object_lock_destroy(object);
        /*
         *      Free the space for the object.
         */
        zfree(vm_object_zone, object);
        /*
         *      Free the space for the object.
         */
        zfree(vm_object_zone, object);
-       return KERN_SUCCESS;
+       object = VM_OBJECT_NULL;
 }
 
 }
 
-/*
- *     Routine:        vm_object_pager_wakeup
- *     Purpose:        Wake up anyone waiting for termination of a pager.
- */
 
 
-static void
-vm_object_pager_wakeup(
-       memory_object_t pager)
-{
-       vm_object_hash_entry_t  entry;
-       boolean_t               waiting = FALSE;
+
+#define V_O_R_MAX_BATCH 128
+
+
+#define VM_OBJ_REAP_FREELIST(_local_free_q, do_disconnect)             \
+       MACRO_BEGIN                                                     \
+       if (_local_free_q) {                                            \
+               if (do_disconnect) {                                    \
+                       vm_page_t m;                                    \
+                       for (m = _local_free_q;                         \
+                            m != VM_PAGE_NULL;                         \
+                            m = (vm_page_t) m->pageq.next) {           \
+                               if (m->pmapped) {                       \
+                                       pmap_disconnect(m->phys_page);  \
+                               }                                       \
+                       }                                               \
+               }                                                       \
+               vm_page_free_list(_local_free_q, TRUE);                 \
+               _local_free_q = VM_PAGE_NULL;                           \
+       }                                                               \
+       MACRO_END
+
+
+void
+vm_object_reap_pages(
+       vm_object_t     object,
+       int             reap_type)
+{
+       vm_page_t       p;
+       vm_page_t       next;
+       vm_page_t       local_free_q = VM_PAGE_NULL;
+       int             loop_count;
+       boolean_t       disconnect_on_release;
+
+       if (reap_type == REAP_DATA_FLUSH) {
+               /*
+                * We need to disconnect pages from all pmaps before
+                * releasing them to the free list
+                */
+               disconnect_on_release = TRUE;
+       } else {
+               /*
+                * Either the caller has already disconnected the pages
+                * from all pmaps, or we disconnect them here as we add
+                * them to out local list of pages to be released.
+                * No need to re-disconnect them when we release the pages
+                * to the free list.
+                */
+               disconnect_on_release = FALSE;
+       }
+               
+restart_after_sleep:
+       if (queue_empty(&object->memq))
+               return;
+       loop_count = V_O_R_MAX_BATCH + 1;
+
+       vm_page_lockspin_queues();
+
+       next = (vm_page_t)queue_first(&object->memq);
+
+       while (!queue_end(&object->memq, (queue_entry_t)next)) {
+
+               p = next;
+               next = (vm_page_t)queue_next(&next->listq);
+
+               if (--loop_count == 0) {
+                                       
+                       vm_page_unlock_queues();
+
+                       if (local_free_q) {
+                               /*
+                                * Free the pages we reclaimed so far
+                                * and take a little break to avoid
+                                * hogging the page queue lock too long
+                                */
+                               VM_OBJ_REAP_FREELIST(local_free_q,
+                                                    disconnect_on_release);
+                       } else
+                               mutex_pause(0);
+
+                       loop_count = V_O_R_MAX_BATCH + 1;
+
+                       vm_page_lockspin_queues();
+               }
+               if (reap_type == REAP_DATA_FLUSH || reap_type == REAP_TERMINATE) {
+
+                       if (reap_type == REAP_DATA_FLUSH && (p->pageout == TRUE && p->list_req_pending == TRUE)) {
+                               p->list_req_pending = FALSE;
+                               p->cleaning = FALSE;
+                               p->pageout = FALSE;
+                               /*
+                                * need to drop the laundry count...
+                                * we may also need to remove it
+                                * from the I/O paging queue...
+                                * vm_pageout_throttle_up handles both cases
+                                *
+                                * the laundry and pageout_queue flags are cleared...
+                                */
+#if CONFIG_EMBEDDED
+                               if (p->laundry) 
+                                       vm_pageout_throttle_up(p);
+#else
+                               vm_pageout_throttle_up(p);
+#endif
+
+                               /*
+                                * toss the wire count we picked up
+                                * when we intially set this page up
+                                * to be cleaned...
+                                */
+                               vm_page_unwire(p);
+                               PAGE_WAKEUP(p);
+
+                       } else if (p->busy || p->cleaning) {
+
+                               vm_page_unlock_queues();
+                               /*
+                                * free the pages reclaimed so far
+                                */
+                               VM_OBJ_REAP_FREELIST(local_free_q,
+                                                    disconnect_on_release);
+
+                               PAGE_SLEEP(object, p, THREAD_UNINT);
+
+                               goto restart_after_sleep;
+                       }
+               }
+               switch (reap_type) {
+
+               case REAP_DATA_FLUSH:
+                       if (VM_PAGE_WIRED(p)) {
+                               /*
+                                * this is an odd case... perhaps we should
+                                * zero-fill this page since we're conceptually
+                                * tossing its data at this point, but leaving
+                                * it on the object to honor the 'wire' contract
+                                */
+                               continue;
+                       }
+                       break;
+                       
+               case REAP_PURGEABLE:
+                       if (VM_PAGE_WIRED(p)) {
+                               /* can't purge a wired page */
+                               vm_page_purged_wired++;
+                               continue;
+                       }
+
+                       if (p->busy) {
+                               /*
+                                * We can't reclaim a busy page but we can
+                                * make it pageable (it's not wired) to make
+                                * sure that it gets considered by
+                                * vm_pageout_scan() later.
+                                */
+                               vm_page_deactivate(p);
+                               vm_page_purged_busy++;
+                               continue;
+                       }
+
+                       if (p->cleaning || p->laundry || p->list_req_pending) {
+                               /*
+                                * page is being acted upon,
+                                * so don't mess with it
+                                */
+                               vm_page_purged_others++;
+                               continue;
+                       }
+                       assert(p->object != kernel_object);
+
+                       /*
+                        * we can discard this page...
+                        */
+                       if (p->pmapped == TRUE) {
+                               int refmod_state;
+                               /*
+                                * unmap the page
+                                */
+                               refmod_state = pmap_disconnect(p->phys_page);
+                               if (refmod_state & VM_MEM_MODIFIED) {
+                                       p->dirty = TRUE;
+                               }
+                       }
+                       if (p->dirty || p->precious) {
+                               /*
+                                * we saved the cost of cleaning this page !
+                                */
+                               vm_page_purged_count++;
+                       }
+
+                       break;
+
+               case REAP_TERMINATE:
+                       if (p->absent || p->private) {
+                               /*
+                                *      For private pages, VM_PAGE_FREE just
+                                *      leaves the page structure around for
+                                *      its owner to clean up.  For absent
+                                *      pages, the structure is returned to
+                                *      the appropriate pool.
+                                */
+                               break;
+                       }
+                       if (p->fictitious) {
+                               assert (p->phys_page == vm_page_guard_addr);
+                               break;
+                       }
+                       if (!p->dirty && p->wpmapped)
+                               p->dirty = pmap_is_modified(p->phys_page);
+
+                       if ((p->dirty || p->precious) && !p->error && object->alive) {
+
+                               p->busy = TRUE;
+
+                               VM_PAGE_QUEUES_REMOVE(p);
+
+                               vm_page_unlock_queues();
+                               /*
+                                * free the pages reclaimed so far
+                                */
+                               VM_OBJ_REAP_FREELIST(local_free_q,
+                                                    disconnect_on_release);
+
+                               /*
+                                * flush page... page will be freed
+                                * upon completion of I/O
+                                */
+                               vm_pageout_cluster(p);
+                               vm_object_paging_wait(object, THREAD_UNINT);
+
+                               goto restart_after_sleep;
+                       }
+                       break;
+
+               case REAP_REAP:
+                       break;
+               }
+               vm_page_free_prepare_queues(p);
+               assert(p->pageq.next == NULL && p->pageq.prev == NULL);
+               /*
+                * Add this page to our list of reclaimed pages,
+                * to be freed later.
+                */
+               p->pageq.next = (queue_entry_t) local_free_q;
+               local_free_q = p;
+       }
+       vm_page_unlock_queues();
+
+       /*
+        * Free the remaining reclaimed pages
+        */
+       VM_OBJ_REAP_FREELIST(local_free_q,
+                            disconnect_on_release);
+}
+
+
+void
+vm_object_reap_async(
+       vm_object_t     object)
+{
+       vm_object_lock_assert_exclusive(object);
+
+       vm_object_reaper_lock_spin();
+
+       vm_object_reap_count_async++;
+
+       /* enqueue the VM object... */
+       queue_enter(&vm_object_reaper_queue, object,
+                   vm_object_t, cached_list);
+
+       vm_object_reaper_unlock();
+
+       /* ... and wake up the reaper thread */
+       thread_wakeup((event_t) &vm_object_reaper_queue);
+}
+
+
+void
+vm_object_reaper_thread(void)
+{
+       vm_object_t     object, shadow_object;
+
+       vm_object_reaper_lock_spin();
+
+       while (!queue_empty(&vm_object_reaper_queue)) {
+               queue_remove_first(&vm_object_reaper_queue,
+                                  object,
+                                  vm_object_t,
+                                  cached_list);
+
+               vm_object_reaper_unlock();
+               vm_object_lock(object);
+
+               assert(object->terminating);
+               assert(!object->alive);
+               
+               /*
+                * The pageout daemon might be playing with our pages.
+                * Now that the object is dead, it won't touch any more
+                * pages, but some pages might already be on their way out.
+                * Hence, we wait until the active paging activities have
+                * ceased before we break the association with the pager
+                * itself.
+                */
+               while (object->paging_in_progress != 0 ||
+                       object->activity_in_progress != 0) {
+                       vm_object_wait(object,
+                                      VM_OBJECT_EVENT_PAGING_IN_PROGRESS,
+                                      THREAD_UNINT);
+                       vm_object_lock(object);
+               }
+
+               shadow_object =
+                       object->pageout ? VM_OBJECT_NULL : object->shadow;
+
+               vm_object_reap(object);
+               /* cache is unlocked and object is no longer valid */
+               object = VM_OBJECT_NULL;
+
+               if (shadow_object != VM_OBJECT_NULL) {
+                       /*
+                        * Drop the reference "object" was holding on
+                        * its shadow object.
+                        */
+                       vm_object_deallocate(shadow_object);
+                       shadow_object = VM_OBJECT_NULL;
+               }
+               vm_object_reaper_lock_spin();
+       }
+
+       /* wait for more work... */
+       assert_wait((event_t) &vm_object_reaper_queue, THREAD_UNINT);
+
+       vm_object_reaper_unlock();
+
+       thread_block((thread_continue_t) vm_object_reaper_thread);
+       /*NOTREACHED*/
+}
+
+/*
+ *     Routine:        vm_object_pager_wakeup
+ *     Purpose:        Wake up anyone waiting for termination of a pager.
+ */
+
+static void
+vm_object_pager_wakeup(
+       memory_object_t pager)
+{
+       vm_object_hash_entry_t  entry;
+       boolean_t               waiting = FALSE;
+       lck_mtx_t               *lck;
 
        /*
         *      If anyone was waiting for the memory_object_terminate
         *      to be queued, wake them up now.
         */
 
        /*
         *      If anyone was waiting for the memory_object_terminate
         *      to be queued, wake them up now.
         */
-       vm_object_cache_lock();
+       lck = vm_object_hash_lock_spin(pager);
        entry = vm_object_hash_lookup(pager, TRUE);
        if (entry != VM_OBJECT_HASH_ENTRY_NULL)
                waiting = entry->waiting;
        entry = vm_object_hash_lookup(pager, TRUE);
        if (entry != VM_OBJECT_HASH_ENTRY_NULL)
                waiting = entry->waiting;
-       vm_object_cache_unlock();
+       vm_object_hash_unlock(lck);
+
        if (entry != VM_OBJECT_HASH_ENTRY_NULL) {
                if (waiting)
                        thread_wakeup((event_t) pager);
        if (entry != VM_OBJECT_HASH_ENTRY_NULL) {
                if (waiting)
                        thread_wakeup((event_t) pager);
@@ -1155,7 +1785,8 @@ vm_object_pager_wakeup(
  */
 static void
 vm_object_release_pager(
  */
 static void
 vm_object_release_pager(
-       memory_object_t pager)
+       memory_object_t pager,
+       boolean_t       hashed)
 {
 
        /*
 {
 
        /*
@@ -1164,11 +1795,13 @@ vm_object_release_pager(
 
        (void) memory_object_terminate(pager);
 
 
        (void) memory_object_terminate(pager);
 
-       /*
-        *      Wakeup anyone waiting for this terminate
-        */
-       vm_object_pager_wakeup(pager);
-
+       if (hashed == TRUE) {
+               /*
+                *      Wakeup anyone waiting for this terminate
+                *      and remove the entry from the hash
+                */
+               vm_object_pager_wakeup(pager);
+       }
        /*
         *      Release reference to pager.
         */
        /*
         *      Release reference to pager.
         */
@@ -1201,22 +1834,24 @@ vm_object_destroy(
         *      the destroy call.]
         */
 
         *      the destroy call.]
         */
 
-       vm_object_cache_lock();
        vm_object_lock(object);
        object->can_persist = FALSE;
        object->named = FALSE;
        object->alive = FALSE;
 
        vm_object_lock(object);
        object->can_persist = FALSE;
        object->named = FALSE;
        object->alive = FALSE;
 
-       /*
-        *      Rip out the pager from the vm_object now...
-        */
-
-       vm_object_remove(object);
+       if (object->hashed) {
+               lck_mtx_t       *lck;
+               /*
+                *      Rip out the pager from the vm_object now...
+                */
+               lck = vm_object_hash_lock_spin(object->pager);
+               vm_object_remove(object);
+               vm_object_hash_unlock(lck);
+       }
        old_pager = object->pager;
        object->pager = MEMORY_OBJECT_NULL;
        if (old_pager != MEMORY_OBJECT_NULL)
                memory_object_control_disable(object->pager_control);
        old_pager = object->pager;
        object->pager = MEMORY_OBJECT_NULL;
        if (old_pager != MEMORY_OBJECT_NULL)
                memory_object_control_disable(object->pager_control);
-       vm_object_cache_unlock();
 
        /*
         * Wait for the existing paging activity (that got
 
        /*
         * Wait for the existing paging activity (that got
@@ -1230,7 +1865,7 @@ vm_object_destroy(
         *      Terminate the object now.
         */
        if (old_pager != MEMORY_OBJECT_NULL) {
         *      Terminate the object now.
         */
        if (old_pager != MEMORY_OBJECT_NULL) {
-               vm_object_release_pager(old_pager);
+               vm_object_release_pager(old_pager, object->hashed);
 
                /* 
                 * JMM - Release the caller's reference.  This assumes the
 
                /* 
                 * JMM - Release the caller's reference.  This assumes the
@@ -1245,8 +1880,14 @@ vm_object_destroy(
        return(KERN_SUCCESS);
 }
 
        return(KERN_SUCCESS);
 }
 
+
+#define VM_OBJ_DEACT_ALL_STATS DEBUG
+#if VM_OBJ_DEACT_ALL_STATS
+uint32_t vm_object_deactivate_all_pages_batches = 0;
+uint32_t vm_object_deactivate_all_pages_pages = 0;
+#endif /* VM_OBJ_DEACT_ALL_STATS */
 /*
 /*
- *     vm_object_deactivate_pages
+ *     vm_object_deactivate_all_pages
  *
  *     Deactivate all pages in the specified object.  (Keep its pages
  *     in memory even though it is no longer referenced.)
  *
  *     Deactivate all pages in the specified object.  (Keep its pages
  *     in memory even though it is no longer referenced.)
@@ -1258,121 +1899,732 @@ vm_object_deactivate_all_pages(
        register vm_object_t    object)
 {
        register vm_page_t      p;
        register vm_object_t    object)
 {
        register vm_page_t      p;
-
+       int                     loop_count;
+#if VM_OBJ_DEACT_ALL_STATS
+       int                     pages_count;
+#endif /* VM_OBJ_DEACT_ALL_STATS */
+#define V_O_D_A_P_MAX_BATCH    256
+
+       loop_count = V_O_D_A_P_MAX_BATCH;
+#if VM_OBJ_DEACT_ALL_STATS
+       pages_count = 0;
+#endif /* VM_OBJ_DEACT_ALL_STATS */
+       vm_page_lock_queues();
        queue_iterate(&object->memq, p, vm_page_t, listq) {
        queue_iterate(&object->memq, p, vm_page_t, listq) {
-               vm_page_lock_queues();
-               if (!p->busy)
+               if (--loop_count == 0) {
+#if VM_OBJ_DEACT_ALL_STATS
+                       hw_atomic_add(&vm_object_deactivate_all_pages_batches,
+                                     1);
+                       hw_atomic_add(&vm_object_deactivate_all_pages_pages,
+                                     pages_count);
+                       pages_count = 0;
+#endif /* VM_OBJ_DEACT_ALL_STATS */
+                       lck_mtx_yield(&vm_page_queue_lock);
+                       loop_count = V_O_D_A_P_MAX_BATCH;
+               }
+               if (!p->busy && !p->throttled) {
+#if VM_OBJ_DEACT_ALL_STATS
+                       pages_count++;
+#endif /* VM_OBJ_DEACT_ALL_STATS */
                        vm_page_deactivate(p);
                        vm_page_deactivate(p);
-               vm_page_unlock_queues();
+               }
        }
        }
+#if VM_OBJ_DEACT_ALL_STATS
+       if (pages_count) {
+               hw_atomic_add(&vm_object_deactivate_all_pages_batches, 1);
+               hw_atomic_add(&vm_object_deactivate_all_pages_pages,
+                             pages_count);
+               pages_count = 0;
+       }
+#endif /* VM_OBJ_DEACT_ALL_STATS */
+       vm_page_unlock_queues();
 }
 
 }
 
-__private_extern__ void
-vm_object_deactivate_pages(
-       vm_object_t             object,
-       vm_object_offset_t      offset,
-       vm_object_size_t        size,
-       boolean_t               kill_page)
-{
-       vm_object_t             orig_object;
-       int pages_moved = 0;
-       int pages_found = 0;
 
 
-       /*
-        * entered with object lock held, acquire a paging reference to
-        * prevent the memory_object and control ports from
-        * being destroyed.
-        */
-       orig_object = object;
 
 
-       for (;;) {
-               register vm_page_t      m;
-               vm_object_offset_t      toffset;
-               vm_object_size_t        tsize;
+/*
+ * when deallocating pages it is necessary to hold 
+ * the vm_page_queue_lock (a hot global lock) for certain operations
+ * on the page... however, the majority of the work can be done
+ * while merely holding the object lock... to mitigate the time spent behind the
+ * global lock, go to a 2 pass algorithm... collect pages up to DELAYED_WORK_LIMIT
+ * while doing all of the work that doesn't require the vm_page_queue_lock...
+ * them call dw_do_work to acquire the vm_page_queue_lock and do the
+ * necessary work for each page... we will grab the busy bit on the page
+ * so that dw_do_work can drop the object lock if it can't immediately take the
+ * vm_page_queue_lock in order to compete for the locks in the same order that
+ * vm_pageout_scan takes them.
+ */
 
 
-               vm_object_paging_begin(object);
-               vm_page_lock_queues();
+#define DELAYED_WORK_LIMIT     32
 
 
-               for (tsize = size, toffset = offset; tsize; tsize -= PAGE_SIZE, toffset += PAGE_SIZE) {
+#define DW_clear_reference     0x01
+#define DW_move_page           0x02
+#define DW_clear_busy          0x04
+#define DW_PAGE_WAKEUP         0x08
 
 
-                       if ((m = vm_page_lookup(object, toffset)) != VM_PAGE_NULL) {
 
 
-                               pages_found++;
+struct dw {
+       vm_page_t       dw_m;
+       int             dw_mask;
+};
 
 
-                               if ((m->wire_count == 0) && (!m->private) && (!m->gobbled) && (!m->busy)) {
+static void dw_do_work(vm_object_t object, struct dw *dwp, int dw_count);
 
 
-                                       assert(!m->laundry);
 
 
-                                       m->reference = FALSE;
-                                       pmap_clear_reference(m->phys_page);
+static void
+dw_do_work(
+       vm_object_t     object,
+       struct dw       *dwp,
+       int             dw_count)
+{
+       vm_page_t       m;
+       int             j;
 
 
-                                       if ((kill_page) && (object->internal)) {
-                                               m->precious = FALSE;
-                                               m->dirty = FALSE;
-                                               pmap_clear_modify(m->phys_page);
-                                               vm_external_state_clr(object->existence_map, offset);
-                                       }
-                                       VM_PAGE_QUEUES_REMOVE(m);
-
-                                       assert(!m->laundry);
-                                       assert(m->object != kernel_object);
-                                       assert(m->pageq.next == NULL &&
-                                              m->pageq.prev == NULL);
-                                       if(m->zero_fill) {
-                                               queue_enter_first(
-                                                       &vm_page_queue_zf, 
-                                                       m, vm_page_t, pageq);
-                                       } else {
-                                               queue_enter_first(
-                                                       &vm_page_queue_inactive, 
-                                                       m, vm_page_t, pageq);
-                                       }
+       /*
+        * pageout_scan takes the vm_page_lock_queues first
+        * then tries for the object lock... to avoid what
+        * is effectively a lock inversion, we'll go to the
+        * trouble of taking them in that same order... otherwise
+        * if this object contains the majority of the pages resident
+        * in the UBC (or a small set of large objects actively being
+        * worked on contain the majority of the pages), we could
+        * cause the pageout_scan thread to 'starve' in its attempt
+        * to find pages to move to the free queue, since it has to
+        * successfully acquire the object lock of any candidate page
+        * before it can steal/clean it.
+        */
+       if (!vm_page_trylockspin_queues()) {
+               vm_object_unlock(object);
 
 
-                                       m->inactive = TRUE;
-                                       if (!m->fictitious)  
-                                               vm_page_inactive_count++;
+               vm_page_lockspin_queues();
 
 
-                                       pages_moved++;
-                               }
-                       }
+               for (j = 0; ; j++) {
+                       if (!vm_object_lock_avoid(object) &&
+                           _vm_object_lock_try(object))
+                               break;
+                       vm_page_unlock_queues();
+                       mutex_pause(j);
+                       vm_page_lockspin_queues();
                }
                }
-               vm_page_unlock_queues();
-               vm_object_paging_end(object);
+       }
+       for (j = 0; j < dw_count; j++, dwp++) {
 
 
-               if (object->shadow) {
-                       vm_object_t     tmp_object;
+               m = dwp->dw_m;
 
 
-                       kill_page = 0;
+               if (dwp->dw_mask & DW_clear_reference)
+                       m->reference = FALSE;
 
 
-                       offset += object->shadow_offset;
+               if (dwp->dw_mask & DW_move_page) {
+                       VM_PAGE_QUEUES_REMOVE(m);
 
 
-                       tmp_object = object->shadow;
-                       vm_object_lock(tmp_object);
+                       assert(!m->laundry);
+                       assert(m->object != kernel_object);
+                       assert(m->pageq.next == NULL &&
+                              m->pageq.prev == NULL);
+                                       
+                       if (m->zero_fill) {
+                               queue_enter_first(&vm_page_queue_zf, m, vm_page_t, pageq);
+                               vm_zf_queue_count++;
+                       } else {
+                               queue_enter_first(&vm_page_queue_inactive, m, vm_page_t, pageq);
+                       }
+                       m->inactive = TRUE;
 
 
-                       if (object != orig_object)
-                               vm_object_unlock(object);
-                       object = tmp_object;
-               } else
-                       break;
+                       if (!m->fictitious) {
+                               vm_page_inactive_count++;
+                               token_new_pagecount++;
+                       } else {
+                               assert(m->phys_page == vm_page_fictitious_addr);
+                       }
+               }
+               if (dwp->dw_mask & DW_clear_busy)
+                       dwp->dw_m->busy = FALSE;
+
+               if (dwp->dw_mask & DW_PAGE_WAKEUP)
+                       PAGE_WAKEUP(dwp->dw_m);
        }
        }
-       if (object != orig_object)
-               vm_object_unlock(object);
+       vm_page_unlock_queues();
+
+#if CONFIG_EMBEDDED
+       {
+       int percent_avail;
+
+       /*
+        * Decide if we need to send a memory status notification.
+        */
+       percent_avail = 
+               (vm_page_active_count + vm_page_inactive_count + 
+                vm_page_speculative_count + vm_page_free_count +
+                (IP_VALID(memory_manager_default)?0:vm_page_purgeable_count) ) * 100 /
+               atop_64(max_mem);
+       if (percent_avail >= (kern_memorystatus_level + 5) || 
+           percent_avail <= (kern_memorystatus_level - 5)) {
+               kern_memorystatus_level = percent_avail;
+               thread_wakeup((event_t)&kern_memorystatus_wakeup);
+       }
+       }
+#endif
 }
 
 }
 
+
+
 /*
 /*
- *     Routine:        vm_object_pmap_protect
- *
- *     Purpose:
- *             Reduces the permission for all physical
- *             pages in the specified object range.
+ * The "chunk" macros are used by routines below when looking for pages to deactivate.  These
+ * exist because of the need to handle shadow chains.  When deactivating pages, we only
+ * want to deactive the ones at the top most level in the object chain.  In order to do
+ * this efficiently, the specified address range is divided up into "chunks" and we use
+ * a bit map to keep track of which pages have already been processed as we descend down
+ * the shadow chain.  These chunk macros hide the details of the bit map implementation
+ * as much as we can.
  *
  *
- *             If removing write permission only, it is
- *             sufficient to protect only the pages in
- *             the top-level object; only those pages may
- *             have write permission.
+ * For convenience, we use a 64-bit data type as the bit map, and therefore a chunk is
+ * set to 64 pages.  The bit map is indexed from the low-order end, so that the lowest
+ * order bit represents page 0 in the current range and highest order bit represents
+ * page 63.
  *
  *
- *             If removing all access, we must follow the
- *             shadow chain from the top-level object to
+ * For further convenience, we also use negative logic for the page state in the bit map.
+ * The bit is set to 1 to indicate it has not yet been seen, and to 0 to indicate it has
+ * been processed.  This way we can simply test the 64-bit long word to see if it's zero
+ * to easily tell if the whole range has been processed.  Therefore, the bit map starts
+ * out with all the bits set.  The macros below hide all these details from the caller.
+ */
+
+#define PAGES_IN_A_CHUNK       64      /* The number of pages in the chunk must */
+                                       /* be the same as the number of bits in  */
+                                       /* the chunk_state_t type. We use 64     */
+                                       /* just for convenience.                 */
+
+#define CHUNK_SIZE     (PAGES_IN_A_CHUNK * PAGE_SIZE_64)       /* Size of a chunk in bytes */
+
+typedef uint64_t       chunk_state_t;
+
+/*
+ * The bit map uses negative logic, so we start out with all 64 bits set to indicate
+ * that no pages have been processed yet.  Also, if len is less than the full CHUNK_SIZE,
+ * then we mark pages beyond the len as having been "processed" so that we don't waste time
+ * looking at pages in that range.  This can save us from unnecessarily chasing down the 
+ * shadow chain.
+ */
+
+#define CHUNK_INIT(c, len)                                             \
+       MACRO_BEGIN                                                     \
+       uint64_t p;                                                     \
+                                                                       \
+       (c) = 0xffffffffffffffffLL;                                     \
+                                                                       \
+       for (p = (len) / PAGE_SIZE_64; p < PAGES_IN_A_CHUNK; p++)       \
+               MARK_PAGE_HANDLED(c, p);                                \
+       MACRO_END
+
+/*
+ * Return true if all pages in the chunk have not yet been processed.
+ */
+
+#define CHUNK_NOT_COMPLETE(c)  ((c) != 0)
+
+/*
+ * Return true if the page at offset 'p' in the bit map has already been handled
+ * while processing a higher level object in the shadow chain.
+ */
+
+#define PAGE_ALREADY_HANDLED(c, p)     (((c) & (1LL << (p))) == 0)
+
+/*
+ * Mark the page at offset 'p' in the bit map as having been processed.
+ */
+
+#define MARK_PAGE_HANDLED(c, p) \
+MACRO_BEGIN \
+       (c) = (c) & ~(1LL << (p)); \
+MACRO_END
+
+
+/*
+ * Return true if the page at the given offset has been paged out.  Object is
+ * locked upon entry and returned locked.
+ */
+
+static boolean_t
+page_is_paged_out(
+       vm_object_t             object,
+       vm_object_offset_t      offset)
+{
+       kern_return_t   kr;
+       memory_object_t pager;
+
+       /*
+        * Check the existence map for the page if we have one, otherwise
+        * ask the pager about this page.
+        */
+
+#if MACH_PAGEMAP
+       if (object->existence_map) {
+               if (vm_external_state_get(object->existence_map, offset)
+                   == VM_EXTERNAL_STATE_EXISTS) {
+                       /*
+                        * We found the page
+                        */
+
+                       return TRUE;
+               }
+       } else
+#endif
+               if (object->internal &&
+                  object->alive &&
+                  !object->terminating &&
+                  object->pager_ready) {
+
+               /*
+                * We're already holding a "paging in progress" reference
+                * so the object can't disappear when we release the lock.
+                */
+
+               assert(object->paging_in_progress);
+               pager = object->pager;
+               vm_object_unlock(object);
+
+               kr = memory_object_data_request(
+                       pager,
+                       offset + object->paging_offset,
+                       0,      /* just poke the pager */
+                       VM_PROT_READ,
+                       NULL);
+
+               vm_object_lock(object);
+
+               if (kr == KERN_SUCCESS) {
+
+                       /*
+                        * We found the page
+                        */
+
+                       return TRUE;
+               }
+       }
+
+       return FALSE;
+}
+
+
+/*
+ * Deactivate the pages in the specified object and range.  If kill_page is set, also discard any
+ * page modified state from the pmap.  Update the chunk_state as we go along.  The caller must specify
+ * a size that is less than or equal to the CHUNK_SIZE.
+ */
+
+static void
+deactivate_pages_in_object(
+       vm_object_t             object,
+       vm_object_offset_t      offset,
+       vm_object_size_t        size,
+       boolean_t               kill_page,
+       boolean_t               reusable_page,
+#if !MACH_ASSERT
+       __unused
+#endif
+       boolean_t               all_reusable,
+       chunk_state_t           *chunk_state)
+{
+       vm_page_t       m;
+       int             p;
+       struct  dw      dw_array[DELAYED_WORK_LIMIT];
+       struct  dw      *dwp;
+       int             dw_count;
+       unsigned int    reusable = 0;
+
+
+       /*
+        * Examine each page in the chunk.  The variable 'p' is the page number relative to the start of the
+        * chunk.  Since this routine is called once for each level in the shadow chain, the chunk_state may
+        * have pages marked as having been processed already.  We stop the loop early if we find we've handled
+        * all the pages in the chunk.
+        */
+
+       dwp = &dw_array[0];
+       dw_count = 0;
+
+       for(p = 0; size && CHUNK_NOT_COMPLETE(*chunk_state); p++, size -= PAGE_SIZE_64, offset += PAGE_SIZE_64) {
+
+               /*
+                * If this offset has already been found and handled in a higher level object, then don't
+                * do anything with it in the current shadow object.
+                */
+
+               if (PAGE_ALREADY_HANDLED(*chunk_state, p))
+                       continue;
+       
+               /*
+                * See if the page at this offset is around.  First check to see if the page is resident,
+                * then if not, check the existence map or with the pager.
+                */
+
+               if ((m = vm_page_lookup(object, offset)) != VM_PAGE_NULL) {
+
+                       /*
+                        * We found a page we were looking for.  Mark it as "handled" now in the chunk_state
+                        * so that we won't bother looking for a page at this offset again if there are more
+                        * shadow objects.  Then deactivate the page.
+                        */
+
+                       MARK_PAGE_HANDLED(*chunk_state, p);
+       
+                       if (( !VM_PAGE_WIRED(m)) && (!m->private) && (!m->gobbled) && (!m->busy)) {
+                               int     clear_refmod;
+       
+                               assert(!m->laundry);
+       
+                               clear_refmod = VM_MEM_REFERENCED;
+                               dwp->dw_mask = DW_clear_reference;
+
+                               if ((kill_page) && (object->internal)) {
+                                       m->precious = FALSE;
+                                       m->dirty = FALSE;
+
+                                       clear_refmod |= VM_MEM_MODIFIED;
+                                       if (m->throttled) {
+                                               /*
+                                                * This page is now clean and
+                                                * reclaimable.  Move it out
+                                                * of the throttled queue, so
+                                                * that vm_pageout_scan() can
+                                                * find it.
+                                                */
+                                               dwp->dw_mask |= DW_move_page;
+                                       }
+#if    MACH_PAGEMAP
+                                       vm_external_state_clr(object->existence_map, offset);
+#endif /* MACH_PAGEMAP */
+
+                                       if (reusable_page && !m->reusable) {
+                                               assert(!all_reusable);
+                                               assert(!object->all_reusable);
+                                               m->reusable = TRUE;
+                                               object->reusable_page_count++;
+                                               assert(object->resident_page_count >= object->reusable_page_count);
+                                               reusable++;
+#if CONFIG_EMBEDDED
+                                       } else {
+                                               if (m->reusable) {
+                                                       m->reusable = FALSE;
+                                                       object->reusable_page_count--;
+                                               }
+#endif
+                                       }
+                               }
+                               pmap_clear_refmod(m->phys_page, clear_refmod);
+
+                               if (!m->throttled && !(reusable_page || all_reusable))
+                                       dwp->dw_mask |= DW_move_page;
+                               /*
+                                * dw_do_work may need to drop the object lock
+                                * if it does, we need the pages its looking at to
+                                * be held stable via the busy bit.
+                                */
+                               m->busy = TRUE;
+                               dwp->dw_mask |= (DW_clear_busy | DW_PAGE_WAKEUP);
+
+                               dwp->dw_m = m;
+                               dwp++;
+                               dw_count++;
+
+                               if (dw_count >= DELAYED_WORK_LIMIT) {
+                                       if (reusable) {
+                                               OSAddAtomic(reusable,
+                                                           &vm_page_stats_reusable.reusable_count);
+                                               vm_page_stats_reusable.reusable += reusable;
+                                               reusable = 0;
+                                       }
+                                       dw_do_work(object, &dw_array[0], dw_count);
+
+                                       dwp = &dw_array[0];
+                                       dw_count = 0;
+                               }
+                       }
+
+               } else {
+
+                       /*
+                        * The page at this offset isn't memory resident, check to see if it's
+                        * been paged out.  If so, mark it as handled so we don't bother looking
+                        * for it in the shadow chain.
+                        */
+
+                       if (page_is_paged_out(object, offset)) {
+                               MARK_PAGE_HANDLED(*chunk_state, p);
+
+                               /*
+                                * If we're killing a non-resident page, then clear the page in the existence 
+                                * map so we don't bother paging it back in if it's touched again in the future.
+                                */
+
+                               if ((kill_page) && (object->internal)) {
+#if    MACH_PAGEMAP
+                                       vm_external_state_clr(object->existence_map, offset);
+#endif /* MACH_PAGEMAP */
+                               }
+                       }
+               }
+       }
+
+       if (reusable) {
+               OSAddAtomic(reusable, &vm_page_stats_reusable.reusable_count);
+               vm_page_stats_reusable.reusable += reusable;    
+               reusable = 0;
+       }
+               
+       if (dw_count)
+               dw_do_work(object, &dw_array[0], dw_count);
+}
+
+
+/*
+ * Deactive a "chunk" of the given range of the object starting at offset.  A "chunk"
+ * will always be less than or equal to the given size.  The total range is divided up
+ * into chunks for efficiency and performance related to the locks and handling the shadow
+ * chain.  This routine returns how much of the given "size" it actually processed.  It's
+ * up to the caler to loop and keep calling this routine until the entire range they want
+ * to process has been done.
+ */
+
+static vm_object_size_t
+deactivate_a_chunk(
+       vm_object_t             orig_object,
+       vm_object_offset_t      offset,
+       vm_object_size_t        size,
+       boolean_t               kill_page,
+       boolean_t               reusable_page,
+       boolean_t               all_reusable)
+{
+       vm_object_t             object;
+       vm_object_t             tmp_object;
+       vm_object_size_t        length;
+       chunk_state_t           chunk_state;
+
+
+       /*
+        * Get set to do a chunk.  We'll do up to CHUNK_SIZE, but no more than the
+        * remaining size the caller asked for.
+        */
+
+       length = MIN(size, CHUNK_SIZE);
+
+       /*
+        * The chunk_state keeps track of which pages we've already processed if there's
+        * a shadow chain on this object.  At this point, we haven't done anything with this
+        * range of pages yet, so initialize the state to indicate no pages processed yet.
+        */
+
+       CHUNK_INIT(chunk_state, length);
+       object = orig_object;
+
+       /*
+        * Start at the top level object and iterate around the loop once for each object
+        * in the shadow chain.  We stop processing early if we've already found all the pages
+        * in the range.  Otherwise we stop when we run out of shadow objects.
+        */
+
+       while (object && CHUNK_NOT_COMPLETE(chunk_state)) {
+               vm_object_paging_begin(object);
+
+               deactivate_pages_in_object(object, offset, length, kill_page, reusable_page, all_reusable, &chunk_state);
+
+               vm_object_paging_end(object);
+
+               /*
+                * We've finished with this object, see if there's a shadow object.  If
+                * there is, update the offset and lock the new object.  We also turn off
+                * kill_page at this point since we only kill pages in the top most object.
+                */
+
+               tmp_object = object->shadow;
+
+               if (tmp_object) {
+                       kill_page = FALSE;
+                       reusable_page = FALSE;
+                       all_reusable = FALSE;
+                       offset += object->shadow_offset;
+                       vm_object_lock(tmp_object);
+               }
+
+               if (object != orig_object)
+                       vm_object_unlock(object);
+
+               object = tmp_object;
+       }
+
+       if (object && object != orig_object)
+               vm_object_unlock(object);
+
+       return length;
+}
+
+
+
+/*
+ * Move any resident pages in the specified range to the inactive queue.  If kill_page is set,
+ * we also clear the modified status of the page and "forget" any changes that have been made
+ * to the page.
+ */
+
+__private_extern__ void
+vm_object_deactivate_pages(
+       vm_object_t             object,
+       vm_object_offset_t      offset,
+       vm_object_size_t        size,
+       boolean_t               kill_page,
+       boolean_t               reusable_page)
+{
+       vm_object_size_t        length;
+       boolean_t               all_reusable;
+
+       /*
+        * We break the range up into chunks and do one chunk at a time.  This is for
+        * efficiency and performance while handling the shadow chains and the locks.   
+        * The deactivate_a_chunk() function returns how much of the range it processed.
+        * We keep calling this routine until the given size is exhausted.
+        */
+
+
+       all_reusable = FALSE;
+       if (reusable_page &&
+           object->size != 0 &&
+           object->size == size &&
+           object->reusable_page_count == 0) {
+               all_reusable = TRUE;
+               reusable_page = FALSE;
+       }
+
+#if CONFIG_EMBEDDED
+       if ((reusable_page || all_reusable) && object->all_reusable) {
+               /* This means MADV_FREE_REUSABLE has been called twice, which 
+                * is probably illegal. */
+               return;
+       }
+#endif
+
+       while (size) {
+               length = deactivate_a_chunk(object, offset, size, kill_page, reusable_page, all_reusable);
+
+               size -= length;
+               offset += length;
+       }
+
+       if (all_reusable) {
+               if (!object->all_reusable) {
+                       unsigned int reusable;
+
+                       object->all_reusable = TRUE;
+                       assert(object->reusable_page_count == 0);
+                       /* update global stats */
+                       reusable = object->resident_page_count;
+                       OSAddAtomic(reusable,
+                                   &vm_page_stats_reusable.reusable_count);
+                       vm_page_stats_reusable.reusable += reusable;
+                       vm_page_stats_reusable.all_reusable_calls++;
+               }
+       } else if (reusable_page) {
+               vm_page_stats_reusable.partial_reusable_calls++;
+       }
+}
+
+void
+vm_object_reuse_pages(
+       vm_object_t             object,
+       vm_object_offset_t      start_offset,
+       vm_object_offset_t      end_offset,
+       boolean_t               allow_partial_reuse)
+{
+       vm_object_offset_t      cur_offset;
+       vm_page_t               m;
+       unsigned int            reused, reusable;
+
+#define VM_OBJECT_REUSE_PAGE(object, m, reused)                                \
+       MACRO_BEGIN                                                     \
+               if ((m) != VM_PAGE_NULL &&                              \
+                   (m)->reusable) {                                    \
+                       assert((object)->reusable_page_count <=         \
+                              (object)->resident_page_count);          \
+                       assert((object)->reusable_page_count > 0);      \
+                       (object)->reusable_page_count--;                \
+                       (m)->reusable = FALSE;                          \
+                       (reused)++;                                     \
+               }                                                       \
+       MACRO_END
+
+       reused = 0;
+       reusable = 0;
+
+       vm_object_lock_assert_exclusive(object);
+
+       if (object->all_reusable) {
+               assert(object->reusable_page_count == 0);
+               object->all_reusable = FALSE;
+               if (end_offset - start_offset == object->size ||
+                   !allow_partial_reuse) {
+                       vm_page_stats_reusable.all_reuse_calls++;
+                       reused = object->resident_page_count;
+               } else {
+                       vm_page_stats_reusable.partial_reuse_calls++;
+                       queue_iterate(&object->memq, m, vm_page_t, listq) {
+                               if (m->offset < start_offset ||
+                                   m->offset >= end_offset) {
+                                       m->reusable = TRUE;
+                                       object->reusable_page_count++;
+                                       assert(object->resident_page_count >= object->reusable_page_count);
+                                       continue;
+                               } else {
+                                       assert(!m->reusable);
+                                       reused++;
+                               }
+                       }
+               }
+       } else if (object->resident_page_count >
+                  ((end_offset - start_offset) >> PAGE_SHIFT)) {
+               vm_page_stats_reusable.partial_reuse_calls++;
+               for (cur_offset = start_offset;
+                    cur_offset < end_offset;
+                    cur_offset += PAGE_SIZE_64) {
+                       if (object->reusable_page_count == 0) {
+                               break;
+                       }
+                       m = vm_page_lookup(object, cur_offset);
+                       VM_OBJECT_REUSE_PAGE(object, m, reused);
+               }
+       } else {
+               vm_page_stats_reusable.partial_reuse_calls++;
+               queue_iterate(&object->memq, m, vm_page_t, listq) {
+                       if (object->reusable_page_count == 0) {
+                               break;
+                       }
+                       if (m->offset < start_offset ||
+                           m->offset >= end_offset) {
+                               continue;
+                       }
+                       VM_OBJECT_REUSE_PAGE(object, m, reused);
+               }
+       }
+
+       /* update global stats */
+       OSAddAtomic(reusable-reused, &vm_page_stats_reusable.reusable_count);
+       vm_page_stats_reusable.reused += reused;
+       vm_page_stats_reusable.reusable += reusable;
+}
+
+/*
+ *     Routine:        vm_object_pmap_protect
+ *
+ *     Purpose:
+ *             Reduces the permission for all physical
+ *             pages in the specified object range.
+ *
+ *             If removing write permission only, it is
+ *             sufficient to protect only the pages in
+ *             the top-level object; only those pages may
+ *             have write permission.
+ *
+ *             If removing all access, we must follow the
+ *             shadow chain from the top-level object to
  *             remove access to all pages in shadowed objects.
  *
  *             The object must *not* be locked.  The object must
  *             remove access to all pages in shadowed objects.
  *
  *             The object must *not* be locked.  The object must
@@ -1399,6 +2651,28 @@ vm_object_pmap_protect(
 
        vm_object_lock(object);
 
 
        vm_object_lock(object);
 
+       if (object->phys_contiguous) {
+               if (pmap != NULL) {
+                       vm_object_unlock(object);
+                       pmap_protect(pmap, pmap_start, pmap_start + size, prot);
+               } else {
+                       vm_object_offset_t phys_start, phys_end, phys_addr;
+
+                       phys_start = object->shadow_offset + offset;
+                       phys_end = phys_start + size;
+                       assert(phys_start <= phys_end);
+                       assert(phys_end <= object->shadow_offset + object->size);
+                       vm_object_unlock(object);
+
+                       for (phys_addr = phys_start;
+                            phys_addr < phys_end;
+                            phys_addr += PAGE_SIZE_64) {
+                               pmap_page_protect((ppnum_t) (phys_addr >> PAGE_SHIFT), prot);
+                       }
+               }
+               return;
+       }
+
        assert(object->internal);
 
        while (TRUE) {
        assert(object->internal);
 
        while (TRUE) {
@@ -1432,8 +2706,7 @@ vm_object_pmap_protect(
                    if (!p->fictitious &&
                        (offset <= p->offset) && (p->offset < end)) {
 
                    if (!p->fictitious &&
                        (offset <= p->offset) && (p->offset < end)) {
 
-                           pmap_page_protect(p->phys_page,
-                                             prot & ~p->page_lock);
+                       pmap_page_protect(p->phys_page, prot);
                    }
                  }
                }
                    }
                  }
                }
@@ -1450,11 +2723,11 @@ vm_object_pmap_protect(
                            target_off += PAGE_SIZE) {
                                p = vm_page_lookup(object, target_off);
                                if (p != VM_PAGE_NULL) {
                            target_off += PAGE_SIZE) {
                                p = vm_page_lookup(object, target_off);
                                if (p != VM_PAGE_NULL) {
-                                       vm_offset_t start;
+                                       vm_object_offset_t start;
                                        start = pmap_start + 
                                        start = pmap_start + 
-                                               (vm_offset_t)(p->offset - offset);
+                                               (p->offset - offset);
                                        pmap_protect(pmap, start, 
                                        pmap_protect(pmap, start, 
-                                                       start + PAGE_SIZE, prot);
+                                                    start + PAGE_SIZE, prot);
                                }
                        }
                } else {
                                }
                        }
                } else {
@@ -1462,8 +2735,7 @@ vm_object_pmap_protect(
                                target_off < end; target_off += PAGE_SIZE) {
                                p = vm_page_lookup(object, target_off);
                                if (p != VM_PAGE_NULL) {
                                target_off < end; target_off += PAGE_SIZE) {
                                p = vm_page_lookup(object, target_off);
                                if (p != VM_PAGE_NULL) {
-                                       pmap_page_protect(p->phys_page,
-                                                     prot & ~p->page_lock);
+                                       pmap_page_protect(p->phys_page, prot);
                                }
                        }
                }
                                }
                        }
                }
@@ -1543,8 +2815,7 @@ vm_object_copy_slowly(
        vm_object_t             new_object;
        vm_object_offset_t      new_offset;
 
        vm_object_t             new_object;
        vm_object_offset_t      new_offset;
 
-       vm_object_offset_t      src_lo_offset = src_offset;
-       vm_object_offset_t      src_hi_offset = src_offset + size;
+       struct vm_object_fault_info fault_info;
 
        XPR(XPR_VM_OBJECT, "v_o_c_slowly obj 0x%x off 0x%x size 0x%x\n",
            src_object, src_offset, size, 0, 0);
 
        XPR(XPR_VM_OBJECT, "v_o_c_slowly obj 0x%x off 0x%x size 0x%x\n",
            src_object, src_offset, size, 0, 0);
@@ -1559,9 +2830,7 @@ vm_object_copy_slowly(
         *      Prevent destruction of the source object while we copy.
         */
 
         *      Prevent destruction of the source object while we copy.
         */
 
-       assert(src_object->ref_count > 0);
-       src_object->ref_count++;
-       VM_OBJ_RES_INCR(src_object);
+       vm_object_reference_locked(src_object);
        vm_object_unlock(src_object);
 
        /*
        vm_object_unlock(src_object);
 
        /*
@@ -1575,10 +2844,17 @@ vm_object_copy_slowly(
 
        new_object = vm_object_allocate(size);
        new_offset = 0;
 
        new_object = vm_object_allocate(size);
        new_offset = 0;
-       vm_object_lock(new_object);
 
        assert(size == trunc_page_64(size));    /* Will the loop terminate? */
 
 
        assert(size == trunc_page_64(size));    /* Will the loop terminate? */
 
+       fault_info.interruptible = interruptible;
+       fault_info.behavior  = VM_BEHAVIOR_SEQUENTIAL;
+       fault_info.user_tag  = 0;
+       fault_info.lo_offset = src_offset;
+       fault_info.hi_offset = src_offset + size;
+       fault_info.no_cache  = FALSE;
+       fault_info.stealth = TRUE;
+
        for ( ;
            size != 0 ;
            src_offset += PAGE_SIZE_64, 
        for ( ;
            size != 0 ;
            src_offset += PAGE_SIZE_64, 
@@ -1587,16 +2863,22 @@ vm_object_copy_slowly(
                vm_page_t       new_page;
                vm_fault_return_t result;
 
                vm_page_t       new_page;
                vm_fault_return_t result;
 
+               vm_object_lock(new_object);
+
                while ((new_page = vm_page_alloc(new_object, new_offset))
                                == VM_PAGE_NULL) {
                while ((new_page = vm_page_alloc(new_object, new_offset))
                                == VM_PAGE_NULL) {
+
+                       vm_object_unlock(new_object);
+
                        if (!vm_page_wait(interruptible)) {
                        if (!vm_page_wait(interruptible)) {
-                               vm_object_unlock(new_object);
                                vm_object_deallocate(new_object);
                                vm_object_deallocate(src_object);
                                *_result_object = VM_OBJECT_NULL;
                                return(MACH_SEND_INTERRUPTED);
                        }
                                vm_object_deallocate(new_object);
                                vm_object_deallocate(src_object);
                                *_result_object = VM_OBJECT_NULL;
                                return(MACH_SEND_INTERRUPTED);
                        }
+                       vm_object_lock(new_object);
                }
                }
+               vm_object_unlock(new_object);
 
                do {
                        vm_prot_t       prot = VM_PROT_READ;
 
                do {
                        vm_prot_t       prot = VM_PROT_READ;
@@ -1609,101 +2891,121 @@ vm_object_copy_slowly(
                        vm_object_lock(src_object);
                        vm_object_paging_begin(src_object);
 
                        vm_object_lock(src_object);
                        vm_object_paging_begin(src_object);
 
-                       XPR(XPR_VM_FAULT,"vm_object_copy_slowly -> vm_fault_page",0,0,0,0,0);
+                       if (size > (vm_size_t) -1) {
+                               /* 32-bit overflow */
+                               fault_info.cluster_size = (vm_size_t) (0 - PAGE_SIZE);
+                       } else {
+                               fault_info.cluster_size = (vm_size_t) size;
+                               assert(fault_info.cluster_size == size);
+                       }
+
+                       XPR(XPR_VM_FAULT,"vm_object_copy_slowly -> vm_fault_page",0,0,0,0,0);
                        result = vm_fault_page(src_object, src_offset,
                        result = vm_fault_page(src_object, src_offset,
-                               VM_PROT_READ, FALSE, interruptible,
-                               src_lo_offset, src_hi_offset,
-                               VM_BEHAVIOR_SEQUENTIAL,
+                               VM_PROT_READ, FALSE,
                                &prot, &_result_page, &top_page,
                                (int *)0,
                                &prot, &_result_page, &top_page,
                                (int *)0,
-                               &error_code, FALSE, FALSE, NULL, 0);
+                               &error_code, FALSE, FALSE, &fault_info);
 
                        switch(result) {
 
                        switch(result) {
-                               case VM_FAULT_SUCCESS:
-                                       result_page = _result_page;
+                       case VM_FAULT_SUCCESS:
+                               result_page = _result_page;
 
 
-                                       /*
-                                        *      We don't need to hold the object
-                                        *      lock -- the busy page will be enough.
-                                        *      [We don't care about picking up any
-                                        *      new modifications.]
-                                        *
-                                        *      Copy the page to the new object.
-                                        *
-                                        *      POLICY DECISION:
-                                        *              If result_page is clean,
-                                        *              we could steal it instead
-                                        *              of copying.
-                                        */
+                               /*
+                                *      We don't need to hold the object
+                                *      lock -- the busy page will be enough.
+                                *      [We don't care about picking up any
+                                *      new modifications.]
+                                *
+                                *      Copy the page to the new object.
+                                *
+                                *      POLICY DECISION:
+                                *              If result_page is clean,
+                                *              we could steal it instead
+                                *              of copying.
+                                */
 
 
-                                       vm_object_unlock(result_page->object);
-                                       vm_page_copy(result_page, new_page);
+                               vm_object_unlock(result_page->object);
+                               vm_page_copy(result_page, new_page);
 
 
-                                       /*
-                                        *      Let go of both pages (make them
-                                        *      not busy, perform wakeup, activate).
-                                        */
+                               /*
+                                *      Let go of both pages (make them
+                                *      not busy, perform wakeup, activate).
+                                */
+                               vm_object_lock(new_object);
+                               new_page->dirty = TRUE;
+                               PAGE_WAKEUP_DONE(new_page);
+                               vm_object_unlock(new_object);
+
+                               vm_object_lock(result_page->object);
+                               PAGE_WAKEUP_DONE(result_page);
+
+                               vm_page_lockspin_queues();
+                               if (!result_page->active &&
+                                   !result_page->inactive &&
+                                   !result_page->throttled)
+                                       vm_page_activate(result_page);
+                               vm_page_activate(new_page);
+                               vm_page_unlock_queues();
 
 
-                                       new_page->busy = FALSE;
-                                       new_page->dirty = TRUE;
-                                       vm_object_lock(result_page->object);
-                                       PAGE_WAKEUP_DONE(result_page);
+                               /*
+                                *      Release paging references and
+                                *      top-level placeholder page, if any.
+                                */
 
 
-                                       vm_page_lock_queues();
-                                       if (!result_page->active &&
-                                           !result_page->inactive)
-                                               vm_page_activate(result_page);
-                                       vm_page_activate(new_page);
-                                       vm_page_unlock_queues();
+                               vm_fault_cleanup(result_page->object,
+                                                top_page);
 
 
-                                       /*
-                                        *      Release paging references and
-                                        *      top-level placeholder page, if any.
-                                        */
+                               break;
+                               
+                       case VM_FAULT_RETRY:
+                               break;
 
 
-                                       vm_fault_cleanup(result_page->object,
-                                                       top_page);
+                       case VM_FAULT_FICTITIOUS_SHORTAGE:
+                               vm_page_more_fictitious();
+                               break;
 
 
+                       case VM_FAULT_MEMORY_SHORTAGE:
+                               if (vm_page_wait(interruptible))
                                        break;
                                        break;
-                               
-                               case VM_FAULT_RETRY:
-                                       break;
+                               /* fall thru */
 
 
-                               case VM_FAULT_FICTITIOUS_SHORTAGE:
-                                       vm_page_more_fictitious();
-                                       break;
+                       case VM_FAULT_INTERRUPTED:
+                               vm_object_lock(new_object);
+                               VM_PAGE_FREE(new_page);
+                               vm_object_unlock(new_object);
+                                       
+                               vm_object_deallocate(new_object);
+                               vm_object_deallocate(src_object);
+                               *_result_object = VM_OBJECT_NULL;
+                               return(MACH_SEND_INTERRUPTED);
 
 
-                               case VM_FAULT_MEMORY_SHORTAGE:
-                                       if (vm_page_wait(interruptible))
-                                               break;
-                                       /* fall thru */
+                       case VM_FAULT_SUCCESS_NO_VM_PAGE:
+                               /* success but no VM page: fail */
+                               vm_object_paging_end(src_object);
+                               vm_object_unlock(src_object);
+                               /*FALLTHROUGH*/
+                       case VM_FAULT_MEMORY_ERROR:
+                               /*
+                                * A policy choice:
+                                *      (a) ignore pages that we can't
+                                *          copy
+                                *      (b) return the null object if
+                                *          any page fails [chosen]
+                                */
 
 
-                               case VM_FAULT_INTERRUPTED:
-                                       vm_page_free(new_page);
-                                       vm_object_unlock(new_object);
-                                       vm_object_deallocate(new_object);
-                                       vm_object_deallocate(src_object);
-                                       *_result_object = VM_OBJECT_NULL;
-                                       return(MACH_SEND_INTERRUPTED);
+                               vm_object_lock(new_object);
+                               VM_PAGE_FREE(new_page);
+                               vm_object_unlock(new_object);
 
 
-                               case VM_FAULT_MEMORY_ERROR:
-                                       /*
-                                        * A policy choice:
-                                        *      (a) ignore pages that we can't
-                                        *          copy
-                                        *      (b) return the null object if
-                                        *          any page fails [chosen]
-                                        */
+                               vm_object_deallocate(new_object);
+                               vm_object_deallocate(src_object);
+                               *_result_object = VM_OBJECT_NULL;
+                               return(error_code ? error_code:
+                                      KERN_MEMORY_ERROR);
 
 
-                                       vm_page_lock_queues();
-                                       vm_page_free(new_page);
-                                       vm_page_unlock_queues();
-                                       vm_object_unlock(new_object);
-                                       vm_object_deallocate(new_object);
-                                       vm_object_deallocate(src_object);
-                                       *_result_object = VM_OBJECT_NULL;
-                                       return(error_code ? error_code:
-                                               KERN_MEMORY_ERROR);
+                       default:
+                               panic("vm_object_copy_slowly: unexpected error"
+                                     " 0x%x from vm_fault_page()\n", result);
                        }
                } while (result != VM_FAULT_SUCCESS);
        }
                        }
                } while (result != VM_FAULT_SUCCESS);
        }
@@ -1711,8 +3013,6 @@ vm_object_copy_slowly(
        /*
         *      Lose the extra reference, and return our object.
         */
        /*
         *      Lose the extra reference, and return our object.
         */
-
-        vm_object_unlock(new_object);
        vm_object_deallocate(src_object);
        *_result_object = new_object;
        return(KERN_SUCCESS);
        vm_object_deallocate(src_object);
        *_result_object = new_object;
        return(KERN_SUCCESS);
@@ -1768,9 +3068,7 @@ vm_object_copy_quickly(
                 *      Leave object/offset unchanged.
                 */
 
                 *      Leave object/offset unchanged.
                 */
 
-               assert(object->ref_count > 0);
-               object->ref_count++;
-               vm_object_res_reference(object);
+               vm_object_reference_locked(object);
                object->shadowed = TRUE;
                vm_object_unlock(object);
 
                object->shadowed = TRUE;
                vm_object_unlock(object);
 
@@ -1828,6 +3126,7 @@ vm_object_copy_call(
        kern_return_t   kr;
        vm_object_t     copy;
        boolean_t       check_ready = FALSE;
        kern_return_t   kr;
        vm_object_t     copy;
        boolean_t       check_ready = FALSE;
+       uint32_t        try_failed_count = 0;
 
        /*
         *      If a copy is already in progress, wait and retry.
 
        /*
         *      If a copy is already in progress, wait and retry.
@@ -1887,7 +3186,10 @@ Retry:
        copy = src_object->copy;
        if (!vm_object_lock_try(copy)) {
                vm_object_unlock(src_object);
        copy = src_object->copy;
        if (!vm_object_lock_try(copy)) {
                vm_object_unlock(src_object);
-               mutex_pause();  /* wait a bit */
+
+               try_failed_count++;
+               mutex_pause(try_failed_count);  /* wait a bit */
+
                vm_object_lock(src_object);
                goto Retry;
        }
                vm_object_lock(src_object);
                goto Retry;
        }
@@ -1939,13 +3241,15 @@ __private_extern__ vm_object_t
 vm_object_copy_delayed(
        vm_object_t             src_object,
        vm_object_offset_t      src_offset,
 vm_object_copy_delayed(
        vm_object_t             src_object,
        vm_object_offset_t      src_offset,
-       vm_object_size_t        size)
+       vm_object_size_t        size,
+       boolean_t               src_object_shared)
 {
        vm_object_t             new_copy = VM_OBJECT_NULL;
        vm_object_t             old_copy;
        vm_page_t               p;
        vm_object_size_t        copy_size = src_offset + size;
 
 {
        vm_object_t             new_copy = VM_OBJECT_NULL;
        vm_object_t             old_copy;
        vm_page_t               p;
        vm_object_size_t        copy_size = src_offset + size;
 
+
        int collisions = 0;
        /*
         *      The user-level memory manager wants to see all of the changes
        int collisions = 0;
        /*
         *      The user-level memory manager wants to see all of the changes
@@ -1991,9 +3295,17 @@ vm_object_copy_delayed(
        /*
         * Wait for paging in progress.
         */
        /*
         * Wait for paging in progress.
         */
-       if (!src_object->true_share)
+       if (!src_object->true_share &&
+           (src_object->paging_in_progress != 0 ||
+            src_object->activity_in_progress != 0)) {
+               if (src_object_shared == TRUE) {
+                       vm_object_unlock(src_object);
+                       vm_object_lock(src_object);
+                       src_object_shared = FALSE;
+                       goto Retry;
+               }
                vm_object_paging_wait(src_object, THREAD_UNINT);
                vm_object_paging_wait(src_object, THREAD_UNINT);
-
+       }
        /*
         *      See whether we can reuse the result of a previous
         *      copy operation.
        /*
         *      See whether we can reuse the result of a previous
         *      copy operation.
@@ -2001,22 +3313,34 @@ vm_object_copy_delayed(
 
        old_copy = src_object->copy;
        if (old_copy != VM_OBJECT_NULL) {
 
        old_copy = src_object->copy;
        if (old_copy != VM_OBJECT_NULL) {
+               int lock_granted;
+
                /*
                 *      Try to get the locks (out of order)
                 */
                /*
                 *      Try to get the locks (out of order)
                 */
-               if (!vm_object_lock_try(old_copy)) {
+               if (src_object_shared == TRUE)
+                       lock_granted = vm_object_lock_try_shared(old_copy);
+               else
+                       lock_granted = vm_object_lock_try(old_copy);
+
+               if (!lock_granted) {
                        vm_object_unlock(src_object);
                        vm_object_unlock(src_object);
-                       mutex_pause();
 
 
-                       /* Heisenberg Rules */
-                       copy_delayed_lock_collisions++;
                        if (collisions++ == 0)
                                copy_delayed_lock_contention++;
                        if (collisions++ == 0)
                                copy_delayed_lock_contention++;
+                       mutex_pause(collisions);
+
+                       /* Heisenberg Rules */
+                       copy_delayed_lock_collisions++;
 
                        if (collisions > copy_delayed_max_collisions)
                                copy_delayed_max_collisions = collisions;
 
 
                        if (collisions > copy_delayed_max_collisions)
                                copy_delayed_max_collisions = collisions;
 
-                       vm_object_lock(src_object);
+                       if (src_object_shared == TRUE)
+                               vm_object_lock_shared(src_object);
+                       else
+                               vm_object_lock(src_object);
+
                        goto Retry;
                }
 
                        goto Retry;
                }
 
@@ -2037,6 +3361,14 @@ vm_object_copy_delayed(
                         */
 
                        if (old_copy->size < copy_size) {
                         */
 
                        if (old_copy->size < copy_size) {
+                               if (src_object_shared == TRUE) {
+                                       vm_object_unlock(old_copy);
+                                       vm_object_unlock(src_object);
+                               
+                                       vm_object_lock(src_object);
+                                       src_object_shared = FALSE;
+                                       goto Retry;
+                               }
                                /*
                                 * We can't perform a delayed copy if any of the
                                 * pages in the extended range are wired (because
                                /*
                                 * We can't perform a delayed copy if any of the
                                 * pages in the extended range are wired (because
@@ -2045,11 +3377,12 @@ vm_object_copy_delayed(
                                 * go ahead and protect them.
                                 */
                                copy_delayed_protect_iterate++;
                                 * go ahead and protect them.
                                 */
                                copy_delayed_protect_iterate++;
+
                                queue_iterate(&src_object->memq, p, vm_page_t, listq) {
                                        if (!p->fictitious && 
                                            p->offset >= old_copy->size && 
                                            p->offset < copy_size) {
                                queue_iterate(&src_object->memq, p, vm_page_t, listq) {
                                        if (!p->fictitious && 
                                            p->offset >= old_copy->size && 
                                            p->offset < copy_size) {
-                                               if (p->wire_count > 0) {
+                                               if (VM_PAGE_WIRED(p)) {
                                                        vm_object_unlock(old_copy);
                                                        vm_object_unlock(src_object);
 
                                                        vm_object_unlock(old_copy);
                                                        vm_object_unlock(src_object);
 
@@ -2061,15 +3394,16 @@ vm_object_copy_delayed(
                                                        return VM_OBJECT_NULL;
                                                } else {
                                                        pmap_page_protect(p->phys_page, 
                                                        return VM_OBJECT_NULL;
                                                } else {
                                                        pmap_page_protect(p->phys_page, 
-                                                               (VM_PROT_ALL & ~VM_PROT_WRITE &
-                                                                ~p->page_lock));
+                                                                         (VM_PROT_ALL & ~VM_PROT_WRITE));
                                                }
                                        }
                                }
                                old_copy->size = copy_size;
                        }
                                                }
                                        }
                                }
                                old_copy->size = copy_size;
                        }
-                               
-                       vm_object_reference_locked(old_copy);
+                       if (src_object_shared == TRUE)
+                               vm_object_reference_shared(old_copy);
+                       else
+                               vm_object_reference_locked(old_copy);
                        vm_object_unlock(old_copy);
                        vm_object_unlock(src_object);
 
                        vm_object_unlock(old_copy);
                        vm_object_unlock(src_object);
 
@@ -2077,9 +3411,10 @@ vm_object_copy_delayed(
                                vm_object_unlock(new_copy);
                                vm_object_deallocate(new_copy);
                        }
                                vm_object_unlock(new_copy);
                                vm_object_deallocate(new_copy);
                        }
-
                        return(old_copy);
                }
                        return(old_copy);
                }
+               
+               
 
                /*
                 * Adjust the size argument so that the newly-created 
 
                /*
                 * Adjust the size argument so that the newly-created 
@@ -2095,6 +3430,8 @@ vm_object_copy_delayed(
                        new_copy = vm_object_allocate(copy_size);
                        vm_object_lock(src_object);
                        vm_object_lock(new_copy);
                        new_copy = vm_object_allocate(copy_size);
                        vm_object_lock(src_object);
                        vm_object_lock(new_copy);
+
+                       src_object_shared = FALSE;
                        goto Retry;
                }
                new_copy->size = copy_size;     
                        goto Retry;
                }
                new_copy->size = copy_size;     
@@ -2114,6 +3451,8 @@ vm_object_copy_delayed(
                new_copy = vm_object_allocate(copy_size);
                vm_object_lock(src_object);
                vm_object_lock(new_copy);
                new_copy = vm_object_allocate(copy_size);
                vm_object_lock(src_object);
                vm_object_lock(new_copy);
+
+               src_object_shared = FALSE;
                goto Retry;
        }
 
                goto Retry;
        }
 
@@ -2129,9 +3468,10 @@ vm_object_copy_delayed(
         * wired, then go ahead and protect them.
         */
        copy_delayed_protect_iterate++;
         * wired, then go ahead and protect them.
         */
        copy_delayed_protect_iterate++;
+
        queue_iterate(&src_object->memq, p, vm_page_t, listq) {
                if (!p->fictitious && p->offset < copy_size) {
        queue_iterate(&src_object->memq, p, vm_page_t, listq) {
                if (!p->fictitious && p->offset < copy_size) {
-                       if (p->wire_count > 0) {
+                       if (VM_PAGE_WIRED(p)) {
                                if (old_copy)
                                        vm_object_unlock(old_copy);
                                vm_object_unlock(src_object);
                                if (old_copy)
                                        vm_object_unlock(old_copy);
                                vm_object_unlock(src_object);
@@ -2140,12 +3480,10 @@ vm_object_copy_delayed(
                                return VM_OBJECT_NULL;
                        } else {
                                pmap_page_protect(p->phys_page, 
                                return VM_OBJECT_NULL;
                        } else {
                                pmap_page_protect(p->phys_page, 
-                                       (VM_PROT_ALL & ~VM_PROT_WRITE &
-                                        ~p->page_lock));
+                                                 (VM_PROT_ALL & ~VM_PROT_WRITE));
                        }
                }
        }
                        }
                }
        }
-
        if (old_copy != VM_OBJECT_NULL) {
                /*
                 *      Make the old copy-object shadow the new one.
        if (old_copy != VM_OBJECT_NULL) {
                /*
                 *      Make the old copy-object shadow the new one.
@@ -2153,9 +3491,13 @@ vm_object_copy_delayed(
                 *      object.
                 */
 
                 *      object.
                 */
 
-               src_object->ref_count--;        /* remove ref. from old_copy */
+               /* remove ref. from old_copy */
+               vm_object_lock_assert_exclusive(src_object);
+               src_object->ref_count--;
                assert(src_object->ref_count > 0);
                assert(src_object->ref_count > 0);
+               vm_object_lock_assert_exclusive(old_copy);
                old_copy->shadow = new_copy;
                old_copy->shadow = new_copy;
+               vm_object_lock_assert_exclusive(new_copy);
                assert(new_copy->ref_count > 0);
                new_copy->ref_count++;          /* for old_copy->shadow ref. */
 
                assert(new_copy->ref_count > 0);
                new_copy->ref_count++;          /* for old_copy->shadow ref. */
 
@@ -2172,21 +3514,22 @@ vm_object_copy_delayed(
        /*
         *      Point the new copy at the existing object.
         */
        /*
         *      Point the new copy at the existing object.
         */
+       vm_object_lock_assert_exclusive(new_copy);
        new_copy->shadow = src_object;
        new_copy->shadow_offset = 0;
        new_copy->shadowed = TRUE;      /* caller must set needs_copy */
        new_copy->shadow = src_object;
        new_copy->shadow_offset = 0;
        new_copy->shadowed = TRUE;      /* caller must set needs_copy */
-       assert(src_object->ref_count > 0);
-       src_object->ref_count++;
-       VM_OBJ_RES_INCR(src_object);
+
+       vm_object_lock_assert_exclusive(src_object);
+       vm_object_reference_locked(src_object);
        src_object->copy = new_copy;
        vm_object_unlock(src_object);
        vm_object_unlock(new_copy);
 
        XPR(XPR_VM_OBJECT,
                "vm_object_copy_delayed: used copy object %X for source %X\n",
        src_object->copy = new_copy;
        vm_object_unlock(src_object);
        vm_object_unlock(new_copy);
 
        XPR(XPR_VM_OBJECT,
                "vm_object_copy_delayed: used copy object %X for source %X\n",
-               (integer_t)new_copy, (integer_t)src_object, 0, 0, 0);
+               new_copy, src_object, 0, 0, 0);
 
 
-       return(new_copy);
+       return new_copy;
 }
 
 /*
 }
 
 /*
@@ -2208,11 +3551,18 @@ vm_object_copy_strategically(
 {
        boolean_t       result;
        boolean_t       interruptible = THREAD_ABORTSAFE; /* XXX */
 {
        boolean_t       result;
        boolean_t       interruptible = THREAD_ABORTSAFE; /* XXX */
+       boolean_t       object_lock_shared = FALSE;
        memory_object_copy_strategy_t copy_strategy;
 
        assert(src_object != VM_OBJECT_NULL);
 
        memory_object_copy_strategy_t copy_strategy;
 
        assert(src_object != VM_OBJECT_NULL);
 
-       vm_object_lock(src_object);
+       copy_strategy = src_object->copy_strategy;
+
+       if (copy_strategy == MEMORY_OBJECT_COPY_DELAY) {
+               vm_object_lock_shared(src_object);
+               object_lock_shared = TRUE;
+       } else
+               vm_object_lock(src_object);
 
        /*
         *      The copy strategy is only valid if the memory manager
 
        /*
         *      The copy strategy is only valid if the memory manager
@@ -2222,6 +3572,12 @@ vm_object_copy_strategically(
        while (!src_object->internal && !src_object->pager_ready) {
                wait_result_t wait_result;
 
        while (!src_object->internal && !src_object->pager_ready) {
                wait_result_t wait_result;
 
+               if (object_lock_shared == TRUE) {
+                       vm_object_unlock(src_object);
+                       vm_object_lock(src_object);
+                       object_lock_shared = FALSE;
+                       continue;
+               }
                wait_result = vm_object_sleep(  src_object,
                                                VM_OBJECT_EVENT_PAGER_READY,
                                                interruptible);
                wait_result = vm_object_sleep(  src_object,
                                                VM_OBJECT_EVENT_PAGER_READY,
                                                interruptible);
@@ -2234,8 +3590,6 @@ vm_object_copy_strategically(
                }
        }
 
                }
        }
 
-       copy_strategy = src_object->copy_strategy;
-
        /*
         *      Use the appropriate copy strategy.
         */
        /*
         *      Use the appropriate copy strategy.
         */
@@ -2243,7 +3597,7 @@ vm_object_copy_strategically(
        switch (copy_strategy) {
            case MEMORY_OBJECT_COPY_DELAY:
                *dst_object = vm_object_copy_delayed(src_object,
        switch (copy_strategy) {
            case MEMORY_OBJECT_COPY_DELAY:
                *dst_object = vm_object_copy_delayed(src_object,
-                                                    src_offset, size);
+                                                    src_offset, size, object_lock_shared);
                if (*dst_object != VM_OBJECT_NULL) {
                        *dst_offset = src_offset;
                        *dst_needs_copy = TRUE;
                if (*dst_object != VM_OBJECT_NULL) {
                        *dst_offset = src_offset;
                        *dst_needs_copy = TRUE;
@@ -2272,7 +3626,7 @@ vm_object_copy_strategically(
                break;
 
            case MEMORY_OBJECT_COPY_SYMMETRIC:
                break;
 
            case MEMORY_OBJECT_COPY_SYMMETRIC:
-               XPR(XPR_VM_OBJECT, "v_o_c_strategically obj 0x%x off 0x%x size 0x%x\n",(natural_t)src_object, src_offset, size, 0, 0);
+               XPR(XPR_VM_OBJECT, "v_o_c_strategically obj 0x%x off 0x%x size 0x%x\n", src_object, src_offset, size, 0, 0);
                vm_object_unlock(src_object);
                result = KERN_MEMORY_RESTART_COPY;
                break;
                vm_object_unlock(src_object);
                result = KERN_MEMORY_RESTART_COPY;
                break;
@@ -2306,7 +3660,22 @@ vm_object_shadow(
        register vm_object_t    result;
 
        source = *object;
        register vm_object_t    result;
 
        source = *object;
+#if 0
+       /*
+        * XXX FBDP
+        * This assertion is valid but it gets triggered by Rosetta for example
+        * due to a combination of vm_remap() that changes a VM object's
+        * copy_strategy from SYMMETRIC to DELAY and vm_protect(VM_PROT_COPY)
+        * that then sets "needs_copy" on its map entry.  This creates a
+        * mapping situation that VM should never see and doesn't know how to
+        * handle.
+        * It's not clear if this can create any real problem but we should
+        * look into fixing this, probably by having vm_protect(VM_PROT_COPY)
+        * do more than just set "needs_copy" to handle the copy-on-write...
+        * In the meantime, let's disable the assertion.
+        */
        assert(source->copy_strategy == MEMORY_OBJECT_COPY_SYMMETRIC);
        assert(source->copy_strategy == MEMORY_OBJECT_COPY_SYMMETRIC);
+#endif
 
        /*
         *      Determine if we really need a shadow.
 
        /*
         *      Determine if we really need a shadow.
@@ -2411,9 +3780,9 @@ vm_object_shadow(
  *     [Furthermore, each routine must cope with the simultaneous
  *     or previous operations of the others.]
  *
  *     [Furthermore, each routine must cope with the simultaneous
  *     or previous operations of the others.]
  *
- *     In addition to the lock on the object, the vm_object_cache_lock
+ *     In addition to the lock on the object, the vm_object_hash_lock
  *     governs the associations.  References gained through the
  *     governs the associations.  References gained through the
- *     association require use of the cache lock.
+ *     association require use of the hash lock.
  *
  *     Because the pager field may be cleared spontaneously, it
  *     cannot be used to determine whether a memory object has
  *
  *     Because the pager field may be cleared spontaneously, it
  *     cannot be used to determine whether a memory object has
@@ -2431,162 +3800,6 @@ vm_object_shadow(
  *     termination routines and vm_object_collapse.]
  */
 
  *     termination routines and vm_object_collapse.]
  */
 
-#if 0
-static void            vm_object_abort_activity(
-                               vm_object_t     object);
-
-/*
- *     Routine:        vm_object_abort_activity [internal use only]
- *     Purpose:
- *             Abort paging requests pending on this object.
- *     In/out conditions:
- *             The object is locked on entry and exit.
- */
-static void
-vm_object_abort_activity(
-       vm_object_t     object)
-{
-       register
-       vm_page_t       p;
-       vm_page_t       next;
-
-       XPR(XPR_VM_OBJECT, "vm_object_abort_activity, object 0x%X\n",
-               (integer_t)object, 0, 0, 0, 0);
-
-       /*
-        *      Abort all activity that would be waiting
-        *      for a result on this memory object.
-        *
-        *      We could also choose to destroy all pages
-        *      that we have in memory for this object, but
-        *      we don't.
-        */
-
-       p = (vm_page_t) queue_first(&object->memq);
-       while (!queue_end(&object->memq, (queue_entry_t) p)) {
-               next = (vm_page_t) queue_next(&p->listq);
-
-               /*
-                *      If it's being paged in, destroy it.
-                *      If an unlock has been requested, start it again.
-                */
-
-               if (p->busy && p->absent) {
-                       VM_PAGE_FREE(p);
-               }
-                else {
-                       if (p->unlock_request != VM_PROT_NONE)
-                               p->unlock_request = VM_PROT_NONE;
-                       PAGE_WAKEUP(p);
-               }
-               
-               p = next;
-       }
-
-       /*
-        *      Wake up threads waiting for the memory object to
-        *      become ready.
-        */
-
-       object->pager_ready = TRUE;
-       vm_object_wakeup(object, VM_OBJECT_EVENT_PAGER_READY);
-}
-
-/*
- *     Routine:        vm_object_pager_dead
- *
- *     Purpose:
- *             A port is being destroy, and the IPC kobject code
- *             can't tell if it represents a pager port or not.
- *             So this function is called each time it sees a port
- *             die.
- *             THIS IS HORRIBLY INEFFICIENT.  We should only call
- *             this routine if we had requested a notification on
- *             the port.
- */
-
-__private_extern__ void
-vm_object_pager_dead(
-       ipc_port_t      pager)
-{
-       vm_object_t             object;
-       vm_object_hash_entry_t  entry;
-
-       /*
-        *      Perform essentially the same operations as in vm_object_lookup,
-        *      except that this time we look up based on the memory_object
-        *      port, not the control port.
-        */
-       vm_object_cache_lock();
-       entry = vm_object_hash_lookup(pager, FALSE);
-       if (entry == VM_OBJECT_HASH_ENTRY_NULL ||
-                       entry->object == VM_OBJECT_NULL) {
-               vm_object_cache_unlock();
-               return;
-       }
-
-       object = entry->object;
-       entry->object = VM_OBJECT_NULL;
-
-       vm_object_lock(object);
-       if (object->ref_count == 0) {
-               XPR(XPR_VM_OBJECT_CACHE,
-                  "vm_object_destroy: removing %x from cache, head (%x, %x)\n",
-                       (integer_t)object,
-                       (integer_t)vm_object_cached_list.next,
-                       (integer_t)vm_object_cached_list.prev, 0,0);
-
-               queue_remove(&vm_object_cached_list, object,
-                               vm_object_t, cached_list);
-               vm_object_cached_count--;
-       }
-       object->ref_count++;
-       vm_object_res_reference(object);
-
-       object->can_persist = FALSE;
-
-       assert(object->pager == pager);
-
-       /*
-        *      Remove the pager association.
-        *
-        *      Note that the memory_object itself is dead, so
-        *      we don't bother with it.
-        */
-
-       object->pager = MEMORY_OBJECT_NULL;
-
-       vm_object_unlock(object);
-       vm_object_cache_unlock();
-
-       vm_object_pager_wakeup(pager);
-
-       /*
-        *      Release the pager reference.  Note that there's no
-        *      point in trying the memory_object_terminate call
-        *      because the memory_object itself is dead.  Also
-        *      release the memory_object_control reference, since
-        *      the pager didn't do that either.
-        */
-
-       memory_object_deallocate(pager);
-       memory_object_control_deallocate(object->pager_request);
-       
-
-       /*
-        *      Restart pending page requests
-        */
-       vm_object_lock(object);
-       vm_object_abort_activity(object);
-       vm_object_unlock(object);
-
-       /*
-        *      Lose the object reference.
-        */
-
-       vm_object_deallocate(object);
-}
-#endif
 
 /*
  *     Routine:        vm_object_enter
 
 /*
  *     Routine:        vm_object_enter
@@ -2607,6 +3820,8 @@ vm_object_enter(
        vm_object_t             new_object;
        boolean_t               must_init;
        vm_object_hash_entry_t  entry, new_entry;
        vm_object_t             new_object;
        boolean_t               must_init;
        vm_object_hash_entry_t  entry, new_entry;
+       uint32_t        try_failed_count = 0;
+       lck_mtx_t       *lck;
 
        if (pager == MEMORY_OBJECT_NULL)
                return(vm_object_allocate(size));
 
        if (pager == MEMORY_OBJECT_NULL)
                return(vm_object_allocate(size));
@@ -2618,8 +3833,8 @@ vm_object_enter(
        /*
         *      Look for an object associated with this port.
         */
        /*
         *      Look for an object associated with this port.
         */
-
-       vm_object_cache_lock();
+Retry:
+       lck = vm_object_hash_lock_spin(pager);
        do {
                entry = vm_object_hash_lookup(pager, FALSE);
 
        do {
                entry = vm_object_hash_lookup(pager, FALSE);
 
@@ -2629,19 +3844,18 @@ vm_object_enter(
                                 *      We must unlock to create a new object;
                                 *      if we do so, we must try the lookup again.
                                 */
                                 *      We must unlock to create a new object;
                                 *      if we do so, we must try the lookup again.
                                 */
-                               vm_object_cache_unlock();
+                               vm_object_hash_unlock(lck);
                                assert(new_entry == VM_OBJECT_HASH_ENTRY_NULL);
                                new_entry = vm_object_hash_entry_alloc(pager);
                                new_object = vm_object_allocate(size);
                                assert(new_entry == VM_OBJECT_HASH_ENTRY_NULL);
                                new_entry = vm_object_hash_entry_alloc(pager);
                                new_object = vm_object_allocate(size);
-                               vm_object_cache_lock();
+                               lck = vm_object_hash_lock_spin(pager);
                        } else {
                                /*
                                 *      Lookup failed twice, and we have something
                                 *      to insert; set the object.
                                 */
                        } else {
                                /*
                                 *      Lookup failed twice, and we have something
                                 *      to insert; set the object.
                                 */
-                               vm_object_hash_insert(new_entry);
+                               vm_object_hash_insert(new_entry, new_object);
                                entry = new_entry;
                                entry = new_entry;
-                               entry->object = new_object;
                                new_entry = VM_OBJECT_HASH_ENTRY_NULL;
                                new_object = VM_OBJECT_NULL;
                                must_init = TRUE;
                                new_entry = VM_OBJECT_HASH_ENTRY_NULL;
                                new_object = VM_OBJECT_NULL;
                                must_init = TRUE;
@@ -2655,9 +3869,10 @@ vm_object_enter(
                        entry->waiting = TRUE;
                        entry = VM_OBJECT_HASH_ENTRY_NULL;
                        assert_wait((event_t) pager, THREAD_UNINT);
                        entry->waiting = TRUE;
                        entry = VM_OBJECT_HASH_ENTRY_NULL;
                        assert_wait((event_t) pager, THREAD_UNINT);
-                       vm_object_cache_unlock();
+                       vm_object_hash_unlock(lck);
+
                        thread_block(THREAD_CONTINUE_NULL);
                        thread_block(THREAD_CONTINUE_NULL);
-                       vm_object_cache_lock();
+                       lck = vm_object_hash_lock_spin(pager);
                }
        } while (entry == VM_OBJECT_HASH_ENTRY_NULL);
 
                }
        } while (entry == VM_OBJECT_HASH_ENTRY_NULL);
 
@@ -2665,37 +3880,60 @@ vm_object_enter(
        assert(object != VM_OBJECT_NULL);
 
        if (!must_init) {
        assert(object != VM_OBJECT_NULL);
 
        if (!must_init) {
-               vm_object_lock(object);
-               assert(!internal || object->internal);
-               if (named) {
-                       assert(!object->named);
-                       object->named = TRUE;
+               if ( !vm_object_lock_try(object)) {
+
+                       vm_object_hash_unlock(lck);
+
+                       try_failed_count++;
+                       mutex_pause(try_failed_count);  /* wait a bit */
+                       goto Retry;
                }
                }
+               assert(!internal || object->internal);
+#if VM_OBJECT_CACHE
                if (object->ref_count == 0) {
                if (object->ref_count == 0) {
+                       if ( !vm_object_cache_lock_try()) {
+
+                               vm_object_hash_unlock(lck);
+                               vm_object_unlock(object);
+
+                               try_failed_count++;
+                               mutex_pause(try_failed_count);  /* wait a bit */
+                               goto Retry;
+                       }
                        XPR(XPR_VM_OBJECT_CACHE,
                        XPR(XPR_VM_OBJECT_CACHE,
-                   "vm_object_enter: removing %x from cache, head (%x, %x)\n",
-                               (integer_t)object,
-                               (integer_t)vm_object_cached_list.next,
-                               (integer_t)vm_object_cached_list.prev, 0,0);
+                           "vm_object_enter: removing %x from cache, head (%x, %x)\n",
+                               object,
+                               vm_object_cached_list.next,
+                               vm_object_cached_list.prev, 0,0);
                        queue_remove(&vm_object_cached_list, object,
                                     vm_object_t, cached_list);
                        vm_object_cached_count--;
                        queue_remove(&vm_object_cached_list, object,
                                     vm_object_t, cached_list);
                        vm_object_cached_count--;
+
+                       vm_object_cache_unlock();
+               }
+#endif
+               if (named) {
+                       assert(!object->named);
+                       object->named = TRUE;
                }
                }
+               vm_object_lock_assert_exclusive(object);
                object->ref_count++;
                vm_object_res_reference(object);
                object->ref_count++;
                vm_object_res_reference(object);
+
+               vm_object_hash_unlock(lck);
                vm_object_unlock(object);
 
                vm_object_unlock(object);
 
-               VM_STAT(hits++);
-       } 
-       assert(object->ref_count > 0);
+               VM_STAT_INCR(hits);
+       } else
+               vm_object_hash_unlock(lck);
 
 
-       VM_STAT(lookups++);
+       assert(object->ref_count > 0);
 
 
-       vm_object_cache_unlock();
+       VM_STAT_INCR(lookups);
 
        XPR(XPR_VM_OBJECT,
                "vm_o_enter: pager 0x%x obj 0x%x must_init %d\n",
 
        XPR(XPR_VM_OBJECT,
                "vm_o_enter: pager 0x%x obj 0x%x must_init %d\n",
-               (integer_t)pager, (integer_t)object, must_init, 0, 0);
+               pager, object, must_init, 0, 0);
 
        /*
         *      If we raced to create a vm_object but lost, let's
 
        /*
         *      If we raced to create a vm_object but lost, let's
@@ -2779,7 +4017,7 @@ vm_object_enter(
 
        XPR(XPR_VM_OBJECT,
            "vm_object_enter: vm_object %x, memory_object %x, internal %d\n",
 
        XPR(XPR_VM_OBJECT,
            "vm_object_enter: vm_object %x, memory_object %x, internal %d\n",
-           (integer_t)object, (integer_t)object->pager, internal, 0,0);
+           object, object->pager, internal, 0,0);
        return(object);
 }
 
        return(object);
 }
 
@@ -2803,13 +4041,14 @@ vm_object_pager_create(
 {
        memory_object_t         pager;
        vm_object_hash_entry_t  entry;
 {
        memory_object_t         pager;
        vm_object_hash_entry_t  entry;
+       lck_mtx_t               *lck;
 #if    MACH_PAGEMAP
        vm_object_size_t        size;
        vm_external_map_t       map;
 #endif /* MACH_PAGEMAP */
 
        XPR(XPR_VM_OBJECT, "vm_object_pager_create, object 0x%X\n",
 #if    MACH_PAGEMAP
        vm_object_size_t        size;
        vm_external_map_t       map;
 #endif /* MACH_PAGEMAP */
 
        XPR(XPR_VM_OBJECT, "vm_object_pager_create, object 0x%X\n",
-               (integer_t)object, 0,0,0,0);
+               object, 0,0,0,0);
 
        assert(object != kernel_object);
 
 
        assert(object != kernel_object);
 
@@ -2856,6 +4095,11 @@ vm_object_pager_create(
        vm_object_unlock(object);
 #endif /* MACH_PAGEMAP */
 
        vm_object_unlock(object);
 #endif /* MACH_PAGEMAP */
 
+       if ((uint32_t) object->size != object->size) {
+               panic("vm_object_pager_create(): object size 0x%llx >= 4GB\n",
+                     (uint64_t) object->size);
+       }
+
        /*
         *      Create the [internal] pager, and associate it with this object.
         *
        /*
         *      Create the [internal] pager, and associate it with this object.
         *
@@ -2865,28 +4109,25 @@ vm_object_pager_create(
         */
        {
                memory_object_default_t         dmm;
         */
        {
                memory_object_default_t         dmm;
-               vm_size_t       cluster_size;
 
                /* acquire a reference for the default memory manager */
 
                /* acquire a reference for the default memory manager */
-               dmm = memory_manager_default_reference(&cluster_size);
-               assert(cluster_size >= PAGE_SIZE);
+               dmm = memory_manager_default_reference();
 
 
-               object->cluster_size = cluster_size; /* XXX ??? */
                assert(object->temporary);
 
                /* create our new memory object */
                assert(object->temporary);
 
                /* create our new memory object */
-               (void) memory_object_create(dmm, object->size, &pager);
+               assert((vm_size_t) object->size == object->size);
+               (void) memory_object_create(dmm, (vm_size_t) object->size,
+                                           &pager);
 
                memory_object_default_deallocate(dmm);
        }
 
        entry = vm_object_hash_entry_alloc(pager);
 
 
                memory_object_default_deallocate(dmm);
        }
 
        entry = vm_object_hash_entry_alloc(pager);
 
-       vm_object_cache_lock();
-       vm_object_hash_insert(entry);
-
-       entry->object = object;
-       vm_object_cache_unlock();
+       lck = vm_object_hash_lock_spin(pager);
+       vm_object_hash_insert(entry, object);
+       vm_object_hash_unlock(lck);
 
        /*
         *      A reference was returned by
 
        /*
         *      A reference was returned by
@@ -2946,8 +4187,10 @@ static long      object_bypasses  = 0;
 static boolean_t       vm_object_collapse_allowed = TRUE;
 static boolean_t       vm_object_bypass_allowed = TRUE;
 
 static boolean_t       vm_object_collapse_allowed = TRUE;
 static boolean_t       vm_object_bypass_allowed = TRUE;
 
+#if MACH_PAGEMAP
 static int     vm_external_discarded;
 static int     vm_external_collapsed;
 static int     vm_external_discarded;
 static int     vm_external_collapsed;
+#endif
 
 unsigned long vm_object_collapse_encrypted = 0;
 
 
 unsigned long vm_object_collapse_encrypted = 0;
 
@@ -2971,6 +4214,9 @@ vm_object_do_collapse(
        vm_object_offset_t new_offset, backing_offset;
        vm_object_size_t size;
 
        vm_object_offset_t new_offset, backing_offset;
        vm_object_size_t size;
 
+       vm_object_lock_assert_exclusive(object);
+       vm_object_lock_assert_exclusive(backing_object);
+
        backing_offset = object->shadow_offset;
        size = object->size;
 
        backing_offset = object->shadow_offset;
        size = object->size;
 
@@ -3003,16 +4249,15 @@ vm_object_do_collapse(
                        /*
                         * ENCRYPTED SWAP:
                         * The encryption key includes the "pager" and the
                        /*
                         * ENCRYPTED SWAP:
                         * The encryption key includes the "pager" and the
-                        * "paging_offset".  These might not be the same in
-                        * the new object, so we can't just move an encrypted
-                        * page from one object to the other.  We can't just
-                        * decrypt the page here either, because that would drop
+                        * "paging_offset".  These will not change during the 
+                        * object collapse, so we can just move an encrypted
+                        * page from one object to the other in this case.
+                        * We can't decrypt the page here, since we can't drop
                         * the object lock.
                         * the object lock.
-                        * The caller should check for encrypted pages before
-                        * attempting to collapse.
                         */
                         */
-                       ASSERT_PAGE_DECRYPTED(p);
-
+                       if (p->encrypted) {
+                               vm_object_collapse_encrypted++;
+                       }
                        pp = vm_page_lookup(object, new_offset);
                        if (pp == VM_PAGE_NULL) {
 
                        pp = vm_page_lookup(object, new_offset);
                        if (pp == VM_PAGE_NULL) {
 
@@ -3021,7 +4266,7 @@ vm_object_do_collapse(
                                 *      Move the backing object's page up.
                                 */
 
                                 *      Move the backing object's page up.
                                 */
 
-                               vm_page_rename(p, object, new_offset);
+                               vm_page_rename(p, object, new_offset, TRUE);
 #if    MACH_PAGEMAP
                        } else if (pp->absent) {
 
 #if    MACH_PAGEMAP
                        } else if (pp->absent) {
 
@@ -3038,7 +4283,7 @@ vm_object_do_collapse(
                                 */
 
                                VM_PAGE_FREE(pp);
                                 */
 
                                VM_PAGE_FREE(pp);
-                               vm_page_rename(p, object, new_offset);
+                               vm_page_rename(p, object, new_offset, TRUE);
 #endif /* MACH_PAGEMAP */
                        } else {
                                assert(! pp->absent);
 #endif /* MACH_PAGEMAP */
                        } else {
                                assert(! pp->absent);
@@ -3054,9 +4299,9 @@ vm_object_do_collapse(
        }
        
 #if    !MACH_PAGEMAP
        }
        
 #if    !MACH_PAGEMAP
-       assert(!object->pager_created && object->pager == MEMORY_OBJECT_NULL
+       assert((!object->pager_created && (object->pager == MEMORY_OBJECT_NULL))
                || (!backing_object->pager_created
                || (!backing_object->pager_created
-               &&  backing_object->pager == MEMORY_OBJECT_NULL));
+               &&  (backing_object->pager == MEMORY_OBJECT_NULL)));
 #else 
         assert(!object->pager_created && object->pager == MEMORY_OBJECT_NULL);
 #endif /* !MACH_PAGEMAP */
 #else 
         assert(!object->pager_created && object->pager == MEMORY_OBJECT_NULL);
 #endif /* !MACH_PAGEMAP */
@@ -3073,15 +4318,24 @@ vm_object_do_collapse(
                 */
 
                assert(!object->paging_in_progress);
                 */
 
                assert(!object->paging_in_progress);
+               assert(!object->activity_in_progress);
                object->pager = backing_object->pager;
                object->pager = backing_object->pager;
-               entry = vm_object_hash_lookup(object->pager, FALSE);
-               assert(entry != VM_OBJECT_HASH_ENTRY_NULL);
-               entry->object = object;
+
+               if (backing_object->hashed) {
+                       lck_mtx_t       *lck;
+
+                       lck = vm_object_hash_lock_spin(backing_object->pager);
+                       entry = vm_object_hash_lookup(object->pager, FALSE);
+                       assert(entry != VM_OBJECT_HASH_ENTRY_NULL);
+                       entry->object = object;
+                       vm_object_hash_unlock(lck);
+
+                       object->hashed = TRUE;
+               }
                object->pager_created = backing_object->pager_created;
                object->pager_control = backing_object->pager_control;
                object->pager_ready = backing_object->pager_ready;
                object->pager_initialized = backing_object->pager_initialized;
                object->pager_created = backing_object->pager_created;
                object->pager_control = backing_object->pager_control;
                object->pager_ready = backing_object->pager_ready;
                object->pager_initialized = backing_object->pager_initialized;
-               object->cluster_size = backing_object->cluster_size;
                object->paging_offset =
                    backing_object->paging_offset + backing_offset;
                if (object->pager_control != MEMORY_OBJECT_CONTROL_NULL) {
                object->paging_offset =
                    backing_object->paging_offset + backing_offset;
                if (object->pager_control != MEMORY_OBJECT_CONTROL_NULL) {
@@ -3090,8 +4344,6 @@ vm_object_do_collapse(
                }
        }
 
                }
        }
 
-       vm_object_cache_unlock();
-
 #if    MACH_PAGEMAP
        /*
         *      If the shadow offset is 0, the use the existence map from
 #if    MACH_PAGEMAP
        /*
         *      If the shadow offset is 0, the use the existence map from
@@ -3146,13 +4398,16 @@ vm_object_do_collapse(
        
        assert((backing_object->ref_count == 1) &&
               (backing_object->resident_page_count == 0) &&
        
        assert((backing_object->ref_count == 1) &&
               (backing_object->resident_page_count == 0) &&
-              (backing_object->paging_in_progress == 0));
+              (backing_object->paging_in_progress == 0) &&
+              (backing_object->activity_in_progress == 0));
 
        backing_object->alive = FALSE;
        vm_object_unlock(backing_object);
 
        XPR(XPR_VM_OBJECT, "vm_object_collapse, collapsed 0x%X\n",
 
        backing_object->alive = FALSE;
        vm_object_unlock(backing_object);
 
        XPR(XPR_VM_OBJECT, "vm_object_collapse, collapsed 0x%X\n",
-               (integer_t)backing_object, 0,0,0,0);
+               backing_object, 0,0,0,0);
+
+       vm_object_lock_destroy(backing_object);
 
        zfree(vm_object_zone, backing_object);
        
 
        zfree(vm_object_zone, backing_object);
        
@@ -3169,6 +4424,9 @@ vm_object_do_bypass(
         *      in the chain.
         */
        
         *      in the chain.
         */
        
+       vm_object_lock_assert_exclusive(object);
+       vm_object_lock_assert_exclusive(backing_object);
+
 #if    TASK_SWAPPER
        /*
         *      Do object reference in-line to 
 #if    TASK_SWAPPER
        /*
         *      Do object reference in-line to 
@@ -3179,6 +4437,7 @@ vm_object_do_bypass(
         */
        if (backing_object->shadow != VM_OBJECT_NULL) {
                vm_object_lock(backing_object->shadow);
         */
        if (backing_object->shadow != VM_OBJECT_NULL) {
                vm_object_lock(backing_object->shadow);
+               vm_object_lock_assert_exclusive(backing_object->shadow);
                backing_object->shadow->ref_count++;
                if (object->res_count != 0)
                        vm_object_res_reference(backing_object->shadow);
                backing_object->shadow->ref_count++;
                if (object->res_count != 0)
                        vm_object_res_reference(backing_object->shadow);
@@ -3212,7 +4471,7 @@ vm_object_do_bypass(
         *      Since its ref_count was at least 2, it
         *      will not vanish; so we don't need to call
         *      vm_object_deallocate.
         *      Since its ref_count was at least 2, it
         *      will not vanish; so we don't need to call
         *      vm_object_deallocate.
-        *      [FBDP: that doesn't seem to be true any more]
+        *      [with a caveat for "named" objects]
         * 
         *      The res_count on the backing object is
         *      conditionally decremented.  It's possible
         * 
         *      The res_count on the backing object is
         *      conditionally decremented.  It's possible
@@ -3230,7 +4489,9 @@ vm_object_do_bypass(
         *      is temporary and cachable.
 #endif
         */
         *      is temporary and cachable.
 #endif
         */
-       if (backing_object->ref_count > 1) {
+       if (backing_object->ref_count > 2 ||
+           (!backing_object->named && backing_object->ref_count > 1)) {
+               vm_object_lock_assert_exclusive(backing_object);
                backing_object->ref_count--;
 #if    TASK_SWAPPER
                if (object->res_count != 0)
                backing_object->ref_count--;
 #if    TASK_SWAPPER
                if (object->res_count != 0)
@@ -3283,33 +4544,48 @@ static unsigned long vm_object_collapse_calls = 0;
 static unsigned long vm_object_collapse_objects = 0;
 static unsigned long vm_object_collapse_do_collapse = 0;
 static unsigned long vm_object_collapse_do_bypass = 0;
 static unsigned long vm_object_collapse_objects = 0;
 static unsigned long vm_object_collapse_do_collapse = 0;
 static unsigned long vm_object_collapse_do_bypass = 0;
+static unsigned long vm_object_collapse_delays = 0;
 __private_extern__ void
 vm_object_collapse(
        register vm_object_t                    object,
 __private_extern__ void
 vm_object_collapse(
        register vm_object_t                    object,
-       register vm_object_offset_t             hint_offset)
+       register vm_object_offset_t             hint_offset,
+       boolean_t                               can_bypass)
 {
        register vm_object_t                    backing_object;
        register unsigned int                   rcount;
        register unsigned int                   size;
 {
        register vm_object_t                    backing_object;
        register unsigned int                   rcount;
        register unsigned int                   size;
-       vm_object_offset_t                      collapse_min_offset;
-       vm_object_offset_t                      collapse_max_offset;
-       vm_page_t                               page;
        vm_object_t                             original_object;
        vm_object_t                             original_object;
+       int                                     object_lock_type;
+       int                                     backing_object_lock_type;
 
        vm_object_collapse_calls++;
 
 
        vm_object_collapse_calls++;
 
-       if (! vm_object_collapse_allowed && ! vm_object_bypass_allowed) {
+       if (! vm_object_collapse_allowed &&
+           ! (can_bypass && vm_object_bypass_allowed)) {
                return;
        }
 
        XPR(XPR_VM_OBJECT, "vm_object_collapse, obj 0x%X\n", 
                return;
        }
 
        XPR(XPR_VM_OBJECT, "vm_object_collapse, obj 0x%X\n", 
-               (integer_t)object, 0,0,0,0);
+               object, 0,0,0,0);
 
        if (object == VM_OBJECT_NULL)
                return;
 
        original_object = object;
 
 
        if (object == VM_OBJECT_NULL)
                return;
 
        original_object = object;
 
+       /*
+        * The top object was locked "exclusive" by the caller.
+        * In the first pass, to determine if we can collapse the shadow chain,
+        * take a "shared" lock on the shadow objects.  If we can collapse,
+        * we'll have to go down the chain again with exclusive locks.
+        */
+       object_lock_type = OBJECT_LOCK_EXCLUSIVE;
+       backing_object_lock_type = OBJECT_LOCK_SHARED;
+
+retry:
+       object = original_object;
+       vm_object_lock_assert_exclusive(object);
+
        while (TRUE) {
                vm_object_collapse_objects++;
                /*
        while (TRUE) {
                vm_object_collapse_objects++;
                /*
@@ -3328,24 +4604,27 @@ vm_object_collapse(
                        }
                        return;
                }
                        }
                        return;
                }
-       
+               if (backing_object_lock_type == OBJECT_LOCK_SHARED) {
+                       vm_object_lock_shared(backing_object);
+               } else {
+                       vm_object_lock(backing_object);
+               }
+
                /*
                 *      No pages in the object are currently
                 *      being paged out, and
                 */
                if (object->paging_in_progress != 0 ||
                /*
                 *      No pages in the object are currently
                 *      being paged out, and
                 */
                if (object->paging_in_progress != 0 ||
-                   object->absent_count != 0) {
+                   object->activity_in_progress != 0) {
                        /* try and collapse the rest of the shadow chain */
                        /* try and collapse the rest of the shadow chain */
-                       vm_object_lock(backing_object);
                        if (object != original_object) {
                                vm_object_unlock(object);
                        }
                        object = backing_object;
                        if (object != original_object) {
                                vm_object_unlock(object);
                        }
                        object = backing_object;
+                       object_lock_type = backing_object_lock_type;
                        continue;
                }
 
                        continue;
                }
 
-               vm_object_lock(backing_object);
-
                /*
                 *      ...
                 *              The backing object is not read_only,
                /*
                 *      ...
                 *              The backing object is not read_only,
@@ -3356,12 +4635,14 @@ vm_object_collapse(
                 */
        
                if (!backing_object->internal ||
                 */
        
                if (!backing_object->internal ||
-                   backing_object->paging_in_progress != 0) {
+                   backing_object->paging_in_progress != 0 ||
+                   backing_object->activity_in_progress != 0) {
                        /* try and collapse the rest of the shadow chain */
                        if (object != original_object) {
                                vm_object_unlock(object);
                        }
                        object = backing_object;
                        /* try and collapse the rest of the shadow chain */
                        if (object != original_object) {
                                vm_object_unlock(object);
                        }
                        object = backing_object;
+                       object_lock_type = backing_object_lock_type;
                        continue;
                }
        
                        continue;
                }
        
@@ -3382,6 +4663,7 @@ vm_object_collapse(
                                vm_object_unlock(object);
                        }
                        object = backing_object;
                                vm_object_unlock(object);
                        }
                        object = backing_object;
+                       object_lock_type = backing_object_lock_type;
                        continue;
                }
 
                        continue;
                }
 
@@ -3412,58 +4694,37 @@ vm_object_collapse(
 #endif /*!MACH_PAGEMAP */
                    ) && vm_object_collapse_allowed) {
 
 #endif /*!MACH_PAGEMAP */
                    ) && vm_object_collapse_allowed) {
 
-                       XPR(XPR_VM_OBJECT, 
-                  "vm_object_collapse: %x to %x, pager %x, pager_control %x\n",
-                               (integer_t)backing_object, (integer_t)object,
-                               (integer_t)backing_object->pager, 
-                               (integer_t)backing_object->pager_control, 0);
-
                        /*
                        /*
-                        *      We need the cache lock for collapsing,
-                        *      but we must not deadlock.
+                        * We need the exclusive lock on the VM objects.
                         */
                         */
-                       
-                       if (! vm_object_cache_lock_try()) {
-                               if (object != original_object) {
-                                       vm_object_unlock(object);
-                               }
+                       if (backing_object_lock_type != OBJECT_LOCK_EXCLUSIVE) {
+                               /*
+                                * We have an object and its shadow locked 
+                                * "shared".  We can't just upgrade the locks
+                                * to "exclusive", as some other thread might
+                                * also have these objects locked "shared" and
+                                * attempt to upgrade one or the other to 
+                                * "exclusive".  The upgrades would block
+                                * forever waiting for the other "shared" locks
+                                * to get released.
+                                * So we have to release the locks and go
+                                * down the shadow chain again (since it could
+                                * have changed) with "exclusive" locking.
+                                */
                                vm_object_unlock(backing_object);
                                vm_object_unlock(backing_object);
-                               return;
+                               if (object != original_object)
+                                       vm_object_unlock(object);
+                               object_lock_type = OBJECT_LOCK_EXCLUSIVE;
+                               backing_object_lock_type = OBJECT_LOCK_EXCLUSIVE;
+                               goto retry;
                        }
 
                        }
 
-                       /*
-                        * ENCRYPTED SWAP
-                        * We can't collapse the object if it contains
-                        * any encypted page, because the encryption key
-                        * includes the <object,offset> info.  We can't
-                        * drop the object lock in vm_object_do_collapse()
-                        * so we can't decrypt the page there either.
-                        */
-                       if (vm_pages_encrypted) {
-                               collapse_min_offset = object->shadow_offset;
-                               collapse_max_offset =
-                                       object->shadow_offset + object->size;
-                               queue_iterate(&backing_object->memq,
-                                             page, vm_page_t, listq) {
-                                       if (page->encrypted &&
-                                           (page->offset >=
-                                            collapse_min_offset) &&
-                                           (page->offset <
-                                            collapse_max_offset)) {
-                                               /*
-                                                * We found an encrypted page
-                                                * in the backing object,
-                                                * within the range covered 
-                                                * by the parent object: we can
-                                                * not collapse them.
-                                                */
-                                               vm_object_collapse_encrypted++;
-                                               vm_object_cache_unlock();
-                                               goto try_bypass;
-                                       }
-                               }
-                       }
-                      
+                       XPR(XPR_VM_OBJECT, 
+                  "vm_object_collapse: %x to %x, pager %x, pager_control %x\n",
+                               backing_object, object,
+                               backing_object->pager, 
+                               backing_object->pager_control, 0);
+
                        /*
                         *      Collapse the object with its backing
                         *      object, and try again with the object's
                        /*
                         *      Collapse the object with its backing
                         *      object, and try again with the object's
@@ -3475,18 +4736,18 @@ vm_object_collapse(
                        continue;
                }
 
                        continue;
                }
 
-       try_bypass:
                /*
                 *      Collapsing the backing object was not possible
                 *      or permitted, so let's try bypassing it.
                 */
 
                /*
                 *      Collapsing the backing object was not possible
                 *      or permitted, so let's try bypassing it.
                 */
 
-               if (! vm_object_bypass_allowed) {
+               if (! (can_bypass && vm_object_bypass_allowed)) {
                        /* try and collapse the rest of the shadow chain */
                        if (object != original_object) {
                                vm_object_unlock(object);
                        }
                        object = backing_object;
                        /* try and collapse the rest of the shadow chain */
                        if (object != original_object) {
                                vm_object_unlock(object);
                        }
                        object = backing_object;
+                       object_lock_type = backing_object_lock_type;
                        continue;
                }
 
                        continue;
                }
 
@@ -3511,7 +4772,7 @@ vm_object_collapse(
                         */
                        if (backing_object->pager_created
 #if    MACH_PAGEMAP
                         */
                        if (backing_object->pager_created
 #if    MACH_PAGEMAP
-                               && (backing_object->existence_map == VM_EXTERNAL_NULL)
+                           && (backing_object->existence_map == VM_EXTERNAL_NULL)
 #endif /* MACH_PAGEMAP */
                                ) {
                                /* try and collapse the rest of the shadow chain */
 #endif /* MACH_PAGEMAP */
                                ) {
                                /* try and collapse the rest of the shadow chain */
@@ -3519,6 +4780,7 @@ vm_object_collapse(
                                        vm_object_unlock(object);
                                }
                                object = backing_object;
                                        vm_object_unlock(object);
                                }
                                object = backing_object;
+                               object_lock_type = backing_object_lock_type;
                                continue;
                        }
 
                                continue;
                        }
 
@@ -3529,7 +4791,7 @@ vm_object_collapse(
                         */
                        if (object->pager_created
 #if    MACH_PAGEMAP
                         */
                        if (object->pager_created
 #if    MACH_PAGEMAP
-                               && (object->existence_map == VM_EXTERNAL_NULL)
+                           && (object->existence_map == VM_EXTERNAL_NULL)
 #endif /* MACH_PAGEMAP */
                                ) {
                                /* try and collapse the rest of the shadow chain */
 #endif /* MACH_PAGEMAP */
                                ) {
                                /* try and collapse the rest of the shadow chain */
@@ -3537,6 +4799,7 @@ vm_object_collapse(
                                        vm_object_unlock(object);
                                }
                                object = backing_object;
                                        vm_object_unlock(object);
                                }
                                object = backing_object;
+                               object_lock_type = backing_object_lock_type;
                                continue;
                        }
 
                                continue;
                        }
 
@@ -3556,10 +4819,15 @@ vm_object_collapse(
                        backing_offset = object->shadow_offset;
                        backing_rcount = backing_object->resident_page_count;
 
                        backing_offset = object->shadow_offset;
                        backing_rcount = backing_object->resident_page_count;
 
+#if    MACH_PAGEMAP
 #define EXISTS_IN_OBJECT(obj, off, rc) \
        (vm_external_state_get((obj)->existence_map, \
         (vm_offset_t)(off)) == VM_EXTERNAL_STATE_EXISTS || \
         ((rc) && ++lookups && vm_page_lookup((obj), (off)) != VM_PAGE_NULL && (rc)--))
 #define EXISTS_IN_OBJECT(obj, off, rc) \
        (vm_external_state_get((obj)->existence_map, \
         (vm_offset_t)(off)) == VM_EXTERNAL_STATE_EXISTS || \
         ((rc) && ++lookups && vm_page_lookup((obj), (off)) != VM_PAGE_NULL && (rc)--))
+#else
+#define EXISTS_IN_OBJECT(obj, off, rc) \
+       (((rc) && ++lookups && vm_page_lookup((obj), (off)) != VM_PAGE_NULL && (rc)--))
+#endif /* MACH_PAGEMAP */
 
                        /*
                         * Check the hint location first
 
                        /*
                         * Check the hint location first
@@ -3575,12 +4843,13 @@ vm_object_collapse(
                                             backing_offset, backing_rcount) &&
                            !EXISTS_IN_OBJECT(object, hint_offset, rcount)) {
                                /* dependency right at the hint */
                                             backing_offset, backing_rcount) &&
                            !EXISTS_IN_OBJECT(object, hint_offset, rcount)) {
                                /* dependency right at the hint */
-                               object->cow_hint = (vm_offset_t)hint_offset;
+                               object->cow_hint = (vm_offset_t) hint_offset; /* atomic */
                                /* try and collapse the rest of the shadow chain */
                                if (object != original_object) {
                                        vm_object_unlock(object);
                                }
                                object = backing_object;
                                /* try and collapse the rest of the shadow chain */
                                if (object != original_object) {
                                        vm_object_unlock(object);
                                }
                                object = backing_object;
+                               object_lock_type = backing_object_lock_type;
                                continue;
                        }
 
                                continue;
                        }
 
@@ -3598,9 +4867,14 @@ vm_object_collapse(
                         * double-decrement the rcount.  We also may or
                         * may not have found the 
                         */
                         * double-decrement the rcount.  We also may or
                         * may not have found the 
                         */
-                       if (backing_rcount && size >
-                           ((backing_object->existence_map) ?
-                            backing_rcount : (backing_rcount >> 1))) {
+                       if (backing_rcount && 
+#if    MACH_PAGEMAP
+                           size > ((backing_object->existence_map) ?
+                            backing_rcount : (backing_rcount >> 1))
+#else
+                           size > (backing_rcount >> 1)
+#endif /* MACH_PAGEMAP */
+                               ) {
                                unsigned int rc = rcount;
                                vm_page_t p;
 
                                unsigned int rc = rcount;
                                vm_page_t p;
 
@@ -3609,8 +4883,9 @@ vm_object_collapse(
                                do {
                                        /* Until we get more than one lookup lock */
                                        if (lookups > 256) {
                                do {
                                        /* Until we get more than one lookup lock */
                                        if (lookups > 256) {
+                                               vm_object_collapse_delays++;
                                                lookups = 0;
                                                lookups = 0;
-                                               delay(1);
+                                               mutex_pause(0);
                                        }
 
                                        offset = (p->offset - backing_offset);
                                        }
 
                                        offset = (p->offset - backing_offset);
@@ -3618,7 +4893,8 @@ vm_object_collapse(
                                            offset != hint_offset &&
                                            !EXISTS_IN_OBJECT(object, offset, rc)) {
                                                /* found a dependency */
                                            offset != hint_offset &&
                                            !EXISTS_IN_OBJECT(object, offset, rc)) {
                                                /* found a dependency */
-                                               object->cow_hint = (vm_offset_t)offset;
+                                               object->cow_hint = (vm_offset_t) offset; /* atomic */
+                                               
                                                break;
                                        }
                                        p = (vm_page_t) queue_next(&p->listq);
                                                break;
                                        }
                                        p = (vm_page_t) queue_next(&p->listq);
@@ -3630,6 +4906,7 @@ vm_object_collapse(
                                                vm_object_unlock(object);
                                        }
                                        object = backing_object;
                                                vm_object_unlock(object);
                                        }
                                        object = backing_object;
+                                       object_lock_type = backing_object_lock_type;
                                        continue;
                                }
                        }
                                        continue;
                                }
                        }
@@ -3638,7 +4915,11 @@ vm_object_collapse(
                         * Walk through the offsets looking for pages in the
                         * backing object that show through to the object.
                         */
                         * Walk through the offsets looking for pages in the
                         * backing object that show through to the object.
                         */
-                       if (backing_rcount || backing_object->existence_map) {
+                       if (backing_rcount
+#if MACH_PAGEMAP
+                           || backing_object->existence_map
+#endif /* MACH_PAGEMAP */
+                               ) {
                                offset = hint_offset;
                                
                                while((offset =
                                offset = hint_offset;
                                
                                while((offset =
@@ -3647,15 +4928,16 @@ vm_object_collapse(
 
                                        /* Until we get more than one lookup lock */
                                        if (lookups > 256) {
 
                                        /* Until we get more than one lookup lock */
                                        if (lookups > 256) {
+                                               vm_object_collapse_delays++;
                                                lookups = 0;
                                                lookups = 0;
-                                               delay(1);
+                                               mutex_pause(0);
                                        }
 
                                        if (EXISTS_IN_OBJECT(backing_object, offset +
                                            backing_offset, backing_rcount) &&
                                            !EXISTS_IN_OBJECT(object, offset, rcount)) {
                                                /* found a dependency */
                                        }
 
                                        if (EXISTS_IN_OBJECT(backing_object, offset +
                                            backing_offset, backing_rcount) &&
                                            !EXISTS_IN_OBJECT(object, offset, rcount)) {
                                                /* found a dependency */
-                                               object->cow_hint = (vm_offset_t)offset;
+                                               object->cow_hint = (vm_offset_t) offset; /* atomic */
                                                break;
                                        }
                                }
                                                break;
                                        }
                                }
@@ -3665,11 +4947,24 @@ vm_object_collapse(
                                                vm_object_unlock(object);
                                        }
                                        object = backing_object;
                                                vm_object_unlock(object);
                                        }
                                        object = backing_object;
+                                       object_lock_type = backing_object_lock_type;
                                        continue;
                                }
                        }
                }
 
                                        continue;
                                }
                        }
                }
 
+               /*
+                * We need "exclusive" locks on the 2 VM objects.
+                */
+               if (backing_object_lock_type != OBJECT_LOCK_EXCLUSIVE) {
+                       vm_object_unlock(backing_object);
+                       if (object != original_object)
+                               vm_object_unlock(object);
+                       object_lock_type = OBJECT_LOCK_EXCLUSIVE;
+                       backing_object_lock_type = OBJECT_LOCK_EXCLUSIVE;
+                       goto retry;
+               }
+
                /* reset the offset hint for any objects deeper in the chain */
                object->cow_hint = (vm_offset_t)0;
 
                /* reset the offset hint for any objects deeper in the chain */
                object->cow_hint = (vm_offset_t)0;
 
@@ -3729,7 +5024,7 @@ vm_object_page_remove(
                        p = vm_page_lookup(object, start);
                        if (p != VM_PAGE_NULL) {
                                assert(!p->cleaning && !p->pageout);
                        p = vm_page_lookup(object, start);
                        if (p != VM_PAGE_NULL) {
                                assert(!p->cleaning && !p->pageout);
-                               if (!p->fictitious)
+                               if (!p->fictitious && p->pmapped)
                                        pmap_disconnect(p->phys_page);
                                VM_PAGE_FREE(p);
                        }
                                        pmap_disconnect(p->phys_page);
                                VM_PAGE_FREE(p);
                        }
@@ -3742,7 +5037,7 @@ vm_object_page_remove(
                        next = (vm_page_t) queue_next(&p->listq);
                        if ((start <= p->offset) && (p->offset < end)) {
                                assert(!p->cleaning && !p->pageout);
                        next = (vm_page_t) queue_next(&p->listq);
                        if ((start <= p->offset) && (p->offset < end)) {
                                assert(!p->cleaning && !p->pageout);
-                               if (!p->fictitious)
+                               if (!p->fictitious && p->pmapped)
                                        pmap_disconnect(p->phys_page);
                                VM_PAGE_FREE(p);
                        }
                                        pmap_disconnect(p->phys_page);
                                VM_PAGE_FREE(p);
                        }
@@ -3802,14 +5097,14 @@ vm_object_coalesce(
 
        XPR(XPR_VM_OBJECT,
        "vm_object_coalesce: 0x%X prev_off 0x%X prev_size 0x%X next_size 0x%X\n",
 
        XPR(XPR_VM_OBJECT,
        "vm_object_coalesce: 0x%X prev_off 0x%X prev_size 0x%X next_size 0x%X\n",
-               (integer_t)prev_object, prev_offset, prev_size, next_size, 0);
+               prev_object, prev_offset, prev_size, next_size, 0);
 
        vm_object_lock(prev_object);
 
        /*
         *      Try to collapse the object first
         */
 
        vm_object_lock(prev_object);
 
        /*
         *      Try to collapse the object first
         */
-       vm_object_collapse(prev_object, prev_offset);
+       vm_object_collapse(prev_object, prev_offset, TRUE);
 
        /*
         *      Can't coalesce if pages not mapped to
 
        /*
         *      Can't coalesce if pages not mapped to
@@ -3818,7 +5113,7 @@ vm_object_coalesce(
         *      . paged out
         *      . shadows another object
         *      . has a copy elsewhere
         *      . paged out
         *      . shadows another object
         *      . has a copy elsewhere
-        *      . is purgable
+        *      . is purgeable
         *      . paging references (pages might be in page-list)
         */
 
         *      . paging references (pages might be in page-list)
         */
 
@@ -3827,8 +5122,9 @@ vm_object_coalesce(
            (prev_object->shadow != VM_OBJECT_NULL) ||
            (prev_object->copy != VM_OBJECT_NULL) ||
            (prev_object->true_share != FALSE) ||
            (prev_object->shadow != VM_OBJECT_NULL) ||
            (prev_object->copy != VM_OBJECT_NULL) ||
            (prev_object->true_share != FALSE) ||
-           (prev_object->purgable != VM_OBJECT_NONPURGABLE) ||
-           (prev_object->paging_in_progress != 0)) {
+           (prev_object->purgable != VM_PURGABLE_DENY) ||
+           (prev_object->paging_in_progress != 0) ||
+           (prev_object->activity_in_progress != 0)) {
                vm_object_unlock(prev_object);
                return(FALSE);
        }
                vm_object_unlock(prev_object);
                return(FALSE);
        }
@@ -3883,7 +5179,7 @@ vm_object_page_map(
                vm_object_offset_t offset),
                void            *map_fn_data)   /* private to map_fn */
 {
                vm_object_offset_t offset),
                void            *map_fn_data)   /* private to map_fn */
 {
-       int     num_pages;
+       int64_t num_pages;
        int     i;
        vm_page_t       m;
        vm_page_t       old_page;
        int     i;
        vm_page_t       m;
        vm_page_t       old_page;
@@ -3902,14 +5198,15 @@ vm_object_page_map(
            if ((old_page = vm_page_lookup(object, offset))
                        != VM_PAGE_NULL)
            {
            if ((old_page = vm_page_lookup(object, offset))
                        != VM_PAGE_NULL)
            {
-               vm_page_lock_queues();
-               vm_page_free(old_page);
-               vm_page_unlock_queues();
+                   VM_PAGE_FREE(old_page);
            }
 
            }
 
-           vm_page_init(m, addr);
-           /* private normally requires lock_queues but since we */
-           /* are initializing the page, its not necessary here  */
+           assert((ppnum_t) addr == addr);
+           vm_page_init(m, (ppnum_t) addr);
+           /*
+            * private normally requires lock_queues but since we
+            * are initializing the page, its not necessary here
+            */
            m->private = TRUE;          /* don`t free page */
            m->wire_count = 1;
            vm_page_insert(m, object, offset);
            m->private = TRUE;          /* don`t free page */
            m->wire_count = 1;
            vm_page_insert(m, object, offset);
@@ -3952,8 +5249,9 @@ print_bitstring(
 
 boolean_t
 vm_object_cached(
 
 boolean_t
 vm_object_cached(
-       register vm_object_t object)
+       __unused register vm_object_t object)
 {
 {
+#if VM_OBJECT_CACHE
        register vm_object_t o;
 
        queue_iterate(&vm_object_cached_list, o, vm_object_t, cached_list) {
        register vm_object_t o;
 
        queue_iterate(&vm_object_cached_list, o, vm_object_t, cached_list) {
@@ -3961,6 +5259,7 @@ vm_object_cached(
                        return TRUE;
                }
        }
                        return TRUE;
                }
        }
+#endif
        return FALSE;
 }
 
        return FALSE;
 }
 
@@ -3971,13 +5270,13 @@ vm_object_cached(
 void
 vm_external_print(
        vm_external_map_t       emap,
 void
 vm_external_print(
        vm_external_map_t       emap,
-       vm_size_t               size)
+       vm_object_size_t        size)
 {
        if (emap == VM_EXTERNAL_NULL) {
                printf("0  ");
        } else {
 {
        if (emap == VM_EXTERNAL_NULL) {
                printf("0  ");
        } else {
-               vm_size_t existence_size = stob(size);
-               printf("{ size=%d, map=[", existence_size);
+               vm_object_size_t existence_size = stob(size);
+               printf("{ size=%lld, map=[", (uint64_t) existence_size);
                if (existence_size > 0) {
                        print_bitstring(emap[0]);
                }
                if (existence_size > 0) {
                        print_bitstring(emap[0]);
                }
@@ -4025,11 +5324,8 @@ vm_follow_object(
  *     vm_object_print:        [ debug ]
  */
 void
  *     vm_object_print:        [ debug ]
  */
 void
-vm_object_print(
-       db_addr_t       db_addr,
-       __unused boolean_t      have_addr,
-       __unused int            arg_count,
-       __unused char           *modif)
+vm_object_print(db_expr_t db_addr, __unused boolean_t have_addr,
+               __unused db_expr_t arg_count, __unused char *modif)
 {
        vm_object_t     object;
        register vm_page_t p;
 {
        vm_object_t     object;
        register vm_page_t p;
@@ -4046,7 +5342,6 @@ vm_object_print(
        db_indent += 2;
 
        iprintf("size=0x%x", object->size);
        db_indent += 2;
 
        iprintf("size=0x%x", object->size);
-       printf(", cluster=0x%x", object->cluster_size);
        printf(", memq_hint=%p", object->memq_hint);
        printf(", ref_count=%d\n", object->ref_count);
        iprintf("");
        printf(", memq_hint=%p", object->memq_hint);
        printf(", ref_count=%d\n", object->ref_count);
        iprintf("");
@@ -4097,7 +5392,6 @@ vm_object_print(
                printf("?");
        }
        printf("]");
                printf("?");
        }
        printf("]");
-       printf(", absent_count=%d\n", object->absent_count);
 
        iprintf("all_wanted=0x%x<", object->all_wanted);
        s = "";
 
        iprintf("all_wanted=0x%x<", object->all_wanted);
        s = "";
@@ -4113,10 +5407,6 @@ vm_object_print(
                printf("%spaging", s);
                s = ",";
        }
                printf("%spaging", s);
                s = ",";
        }
-       if (vm_object_wanted(object, VM_OBJECT_EVENT_ABSENT_COUNT)) {
-               printf("%sabsent", s);
-               s = ",";
-       }
        if (vm_object_wanted(object, VM_OBJECT_EVENT_LOCK_IN_PROGRESS)) {
                printf("%slock", s);
                s = ",";
        if (vm_object_wanted(object, VM_OBJECT_EVENT_LOCK_IN_PROGRESS)) {
                printf("%slock", s);
                s = ",";
@@ -4135,6 +5425,7 @@ vm_object_print(
        }
        printf(">");
        printf(", paging_in_progress=%d\n", object->paging_in_progress);
        }
        printf(">");
        printf(", paging_in_progress=%d\n", object->paging_in_progress);
+       printf(", activity_in_progress=%d\n", object->activity_in_progress);
 
        iprintf("%screated, %sinit, %sready, %spersist, %strusted, %spageout, %s, %s\n",
                (object->pager_created ? "" : "!"),
 
        iprintf("%screated, %sinit, %sready, %spersist, %strusted, %spageout, %s, %s\n",
                (object->pager_created ? "" : "!"),
@@ -4145,11 +5436,11 @@ vm_object_print(
                (object->pageout ? "" : "!"),
                (object->internal ? "internal" : "external"),
                (object->temporary ? "temporary" : "permanent"));
                (object->pageout ? "" : "!"),
                (object->internal ? "internal" : "external"),
                (object->temporary ? "temporary" : "permanent"));
-       iprintf("%salive, %spurgable, %spurgable_volatile, %spurgable_empty, %sshadowed, %scached, %sprivate\n",
+       iprintf("%salive, %spurgeable, %spurgeable_volatile, %spurgeable_empty, %sshadowed, %scached, %sprivate\n",
                (object->alive ? "" : "!"),
                (object->alive ? "" : "!"),
-               ((object->purgable != VM_OBJECT_NONPURGABLE) ? "" : "!"),
-               ((object->purgable == VM_OBJECT_PURGABLE_VOLATILE) ? "" : "!"),
-               ((object->purgable == VM_OBJECT_PURGABLE_EMPTY) ? "" : "!"),
+               ((object->purgable != VM_PURGABLE_DENY) ? "" : "!"),
+               ((object->purgable == VM_PURGABLE_VOLATILE) ? "" : "!"),
+               ((object->purgable == VM_PURGABLE_EMPTY) ? "" : "!"),
                (object->shadowed ? "" : "!"),
                (vm_object_cached(object) ? "" : "!"),
                (object->private ? "" : "!"));
                (object->shadowed ? "" : "!"),
                (vm_object_cached(object) ? "" : "!"),
                (object->private ? "" : "!"));
@@ -4207,10 +5498,9 @@ vm_object_find(
         task_t task;
        vm_map_t map;
        vm_map_entry_t entry;
         task_t task;
        vm_map_t map;
        vm_map_entry_t entry;
-       processor_set_t pset = &default_pset;
        boolean_t found = FALSE;
 
        boolean_t found = FALSE;
 
-       queue_iterate(&pset->tasks, task, task_t, pset_tasks) {
+       queue_iterate(&tasks, task, task_t, tasks) {
                map = task->map;
                for (entry = vm_map_first_entry(map);
                         entry && entry != vm_map_to_entry(map);
                map = task->map;
                for (entry = vm_map_first_entry(map);
                         entry && entry != vm_map_to_entry(map);
@@ -4280,22 +5570,29 @@ vm_object_populate_with_private(
                        m = vm_page_lookup(object, base_offset);
                        if(m != VM_PAGE_NULL) {
                                if(m->fictitious) {
                        m = vm_page_lookup(object, base_offset);
                        if(m != VM_PAGE_NULL) {
                                if(m->fictitious) {
-                                       vm_page_lock_queues();
-                                       m->fictitious = FALSE;
-                                       m->private = TRUE;
-                                       m->phys_page = base_page;
-                                       if(!m->busy) {
-                                               m->busy = TRUE;
-                                       }
-                                       if(!m->absent) {
-                                               m->absent = TRUE;
-                                               object->absent_count++;
+                                       if (m->phys_page != vm_page_guard_addr) {
+
+                                               vm_page_lockspin_queues();
+                                               m->private = TRUE;
+                                               vm_page_unlock_queues();
+
+                                               m->fictitious = FALSE;
+                                               m->phys_page = base_page;
+                                               if(!m->busy) {
+                                                       m->busy = TRUE;
+                                               }
+                                               if(!m->absent) {
+                                                       m->absent = TRUE;
+                                               }
+                                               m->list_req_pending = TRUE;
                                        }
                                        }
-                                       m->list_req_pending = TRUE;
-                                       vm_page_unlock_queues();
                                } else if (m->phys_page != base_page) {
                                } else if (m->phys_page != base_page) {
-                                       /* pmap call to clear old mapping */
-                                       pmap_disconnect(m->phys_page);
+                                       if (m->pmapped) {
+                                               /*
+                                                * pmap call to clear old mapping
+                                                */
+                                               pmap_disconnect(m->phys_page);
+                                       }
                                        m->phys_page = base_page;
                                }
 
                                        m->phys_page = base_page;
                                }
 
@@ -4311,18 +5608,20 @@ vm_object_populate_with_private(
                                m->encrypted = FALSE;
 
                        } else {
                                m->encrypted = FALSE;
 
                        } else {
-                               while ((m = vm_page_grab_fictitious()) 
-                                                        == VM_PAGE_NULL)
+                               while ((m = vm_page_grab_fictitious()) == VM_PAGE_NULL)
                                        vm_page_more_fictitious();      
                                        vm_page_more_fictitious();      
-                               vm_page_lock_queues();
-                               m->fictitious = FALSE;
+
+                               /*
+                                * private normally requires lock_queues but since we
+                                * are initializing the page, its not necessary here
+                                */
                                m->private = TRUE;
                                m->private = TRUE;
+                               m->fictitious = FALSE;
                                m->phys_page = base_page;
                                m->list_req_pending = TRUE;
                                m->absent = TRUE;
                                m->unusual = TRUE;
                                m->phys_page = base_page;
                                m->list_req_pending = TRUE;
                                m->absent = TRUE;
                                m->unusual = TRUE;
-                               object->absent_count++;
-                               vm_page_unlock_queues();
+
                                vm_page_insert(m, object, base_offset);
                        }
                        base_page++;                                                                    /* Go to the next physical page */
                                vm_page_insert(m, object, base_offset);
                        }
                        base_page++;                                                                    /* Go to the next physical page */
@@ -4338,7 +5637,7 @@ vm_object_populate_with_private(
                
                /* shadows on contiguous memory are not allowed */
                /* we therefore can use the offset field */
                
                /* shadows on contiguous memory are not allowed */
                /* we therefore can use the offset field */
-               object->shadow_offset = (vm_object_offset_t)(phys_page << 12);
+               object->shadow_offset = (vm_object_offset_t)phys_page << PAGE_SHIFT;
                object->size = size;
        }
        vm_object_unlock(object);
                object->size = size;
        }
        vm_object_unlock(object);
@@ -4349,7 +5648,7 @@ vm_object_populate_with_private(
  *     memory_object_free_from_cache:
  *
  *     Walk the vm_object cache list, removing and freeing vm_objects 
  *     memory_object_free_from_cache:
  *
  *     Walk the vm_object cache list, removing and freeing vm_objects 
- *     which are backed by the pager identified by the caller, (pager_id).  
+ *     which are backed by the pager identified by the caller, (pager_ops).  
  *     Remove up to "count" objects, if there are that may available
  *     in the cache.
  *
  *     Remove up to "count" objects, if there are that may available
  *     in the cache.
  *
@@ -4360,10 +5659,10 @@ vm_object_populate_with_private(
 __private_extern__ kern_return_t
 memory_object_free_from_cache(
        __unused host_t         host,
 __private_extern__ kern_return_t
 memory_object_free_from_cache(
        __unused host_t         host,
-       int             *pager_id,
+       __unused memory_object_pager_ops_t pager_ops,
        int             *count)
 {
        int             *count)
 {
-
+#if VM_OBJECT_CACHE
        int     object_released = 0;
 
        register vm_object_t object = VM_OBJECT_NULL;
        int     object_released = 0;
 
        register vm_object_t object = VM_OBJECT_NULL;
@@ -4379,12 +5678,14 @@ memory_object_free_from_cache(
 
        queue_iterate(&vm_object_cached_list, object, 
                                        vm_object_t, cached_list) {
 
        queue_iterate(&vm_object_cached_list, object, 
                                        vm_object_t, cached_list) {
-               if (object->pager && (pager_id == object->pager->pager)) {
+               if (object->pager &&
+                   (pager_ops == object->pager->mo_pager_ops)) {
                        vm_object_lock(object);
                        queue_remove(&vm_object_cached_list, object, 
                                        vm_object_t, cached_list);
                        vm_object_cached_count--;
 
                        vm_object_lock(object);
                        queue_remove(&vm_object_cached_list, object, 
                                        vm_object_t, cached_list);
                        vm_object_cached_count--;
 
+                       vm_object_cache_unlock();
                        /*
                        *       Since this object is in the cache, we know
                        *       that it is initialized and has only a pager's
                        /*
                        *       Since this object is in the cache, we know
                        *       that it is initialized and has only a pager's
@@ -4394,6 +5695,7 @@ memory_object_free_from_cache(
 
                        assert(object->pager_initialized);
                        assert(object->ref_count == 0);
 
                        assert(object->pager_initialized);
                        assert(object->ref_count == 0);
+                       vm_object_lock_assert_exclusive(object);
                        object->ref_count++;
 
                        /*
                        object->ref_count++;
 
                        /*
@@ -4406,6 +5708,7 @@ memory_object_free_from_cache(
                        *       (We are careful here to limit recursion.)
                        */
                        shadow = object->pageout?VM_OBJECT_NULL:object->shadow;
                        *       (We are careful here to limit recursion.)
                        */
                        shadow = object->pageout?VM_OBJECT_NULL:object->shadow;
+
                        if ((vm_object_terminate(object) == KERN_SUCCESS)
                                        && (shadow != VM_OBJECT_NULL)) {
                                vm_object_deallocate(shadow);
                        if ((vm_object_terminate(object) == KERN_SUCCESS)
                                        && (shadow != VM_OBJECT_NULL)) {
                                vm_object_deallocate(shadow);
@@ -4418,6 +5721,9 @@ memory_object_free_from_cache(
        }
        vm_object_cache_unlock();
        *count  = object_released;
        }
        vm_object_cache_unlock();
        *count  = object_released;
+#else
+       *count = 0;
+#endif
        return KERN_SUCCESS;
 }
 
        return KERN_SUCCESS;
 }
 
@@ -4431,21 +5737,22 @@ memory_object_create_named(
 {
        vm_object_t             object;
        vm_object_hash_entry_t  entry;
 {
        vm_object_t             object;
        vm_object_hash_entry_t  entry;
+       lck_mtx_t               *lck;
 
        *control = MEMORY_OBJECT_CONTROL_NULL;
        if (pager == MEMORY_OBJECT_NULL)
                return KERN_INVALID_ARGUMENT;
 
 
        *control = MEMORY_OBJECT_CONTROL_NULL;
        if (pager == MEMORY_OBJECT_NULL)
                return KERN_INVALID_ARGUMENT;
 
-       vm_object_cache_lock();
+       lck = vm_object_hash_lock_spin(pager);
        entry = vm_object_hash_lookup(pager, FALSE);
        entry = vm_object_hash_lookup(pager, FALSE);
+
        if ((entry != VM_OBJECT_HASH_ENTRY_NULL) &&
                        (entry->object != VM_OBJECT_NULL)) {
                if (entry->object->named == TRUE)
                        panic("memory_object_create_named: caller already holds the right");    }
        if ((entry != VM_OBJECT_HASH_ENTRY_NULL) &&
                        (entry->object != VM_OBJECT_NULL)) {
                if (entry->object->named == TRUE)
                        panic("memory_object_create_named: caller already holds the right");    }
+       vm_object_hash_unlock(lck);
 
 
-       vm_object_cache_unlock();
-       if ((object = vm_object_enter(pager, size, FALSE, FALSE, TRUE))
-           == VM_OBJECT_NULL) {
+       if ((object = vm_object_enter(pager, size, FALSE, FALSE, TRUE)) == VM_OBJECT_NULL) {
                return(KERN_INVALID_OBJECT);
        }
        
                return(KERN_INVALID_OBJECT);
        }
        
@@ -4484,51 +5791,49 @@ memory_object_recover_named(
 {
        vm_object_t             object;
 
 {
        vm_object_t             object;
 
-       vm_object_cache_lock();
        object = memory_object_control_to_vm_object(control);
        if (object == VM_OBJECT_NULL) {
        object = memory_object_control_to_vm_object(control);
        if (object == VM_OBJECT_NULL) {
-               vm_object_cache_unlock();
                return (KERN_INVALID_ARGUMENT);
        }
                return (KERN_INVALID_ARGUMENT);
        }
-
 restart:
        vm_object_lock(object);
 
        if (object->terminating && wait_on_terminating) {
 restart:
        vm_object_lock(object);
 
        if (object->terminating && wait_on_terminating) {
-               vm_object_cache_unlock();
                vm_object_wait(object, 
                        VM_OBJECT_EVENT_PAGING_IN_PROGRESS, 
                        THREAD_UNINT);
                vm_object_wait(object, 
                        VM_OBJECT_EVENT_PAGING_IN_PROGRESS, 
                        THREAD_UNINT);
-               vm_object_cache_lock();
                goto restart;
        }
 
        if (!object->alive) {
                goto restart;
        }
 
        if (!object->alive) {
-               vm_object_cache_unlock();
                vm_object_unlock(object);
                return KERN_FAILURE;
        }
 
        if (object->named == TRUE) {
                vm_object_unlock(object);
                return KERN_FAILURE;
        }
 
        if (object->named == TRUE) {
-               vm_object_cache_unlock();
                vm_object_unlock(object);
                return KERN_SUCCESS;
        }
                vm_object_unlock(object);
                return KERN_SUCCESS;
        }
-
-       if((object->ref_count == 0) && (!object->terminating)){
+#if VM_OBJECT_CACHE
+       if ((object->ref_count == 0) && (!object->terminating)) {
+               if (!vm_object_cache_lock_try()) {
+                       vm_object_unlock(object);
+                       goto restart;
+               }
                queue_remove(&vm_object_cached_list, object,
                                     vm_object_t, cached_list);
                queue_remove(&vm_object_cached_list, object,
                                     vm_object_t, cached_list);
-                       vm_object_cached_count--;
-                       XPR(XPR_VM_OBJECT_CACHE,
-                      "memory_object_recover_named: removing %X, head (%X, %X)\n",
-                           (integer_t)object, 
-                           (integer_t)vm_object_cached_list.next,
-                           (integer_t)vm_object_cached_list.prev, 0,0);
+               vm_object_cached_count--;
+               XPR(XPR_VM_OBJECT_CACHE,
+                   "memory_object_recover_named: removing %X, head (%X, %X)\n",
+                   object, 
+                   vm_object_cached_list.next,
+                   vm_object_cached_list.prev, 0,0);
+               
+               vm_object_cache_unlock();
        }
        }
-
-       vm_object_cache_unlock();
-
+#endif
        object->named = TRUE;
        object->named = TRUE;
+       vm_object_lock_assert_exclusive(object);
        object->ref_count++;
        vm_object_res_reference(object);
        while (!object->pager_ready) {
        object->ref_count++;
        vm_object_res_reference(object);
        while (!object->pager_ready) {
@@ -4568,17 +5873,10 @@ vm_object_release_name(
 
        while (object != VM_OBJECT_NULL) {
 
 
        while (object != VM_OBJECT_NULL) {
 
-               /*
-                *      The cache holds a reference (uncounted) to
-                *      the object.  We must locke it before removing
-                *      the object.
-                *
-                */
-               
-               vm_object_cache_lock();
                vm_object_lock(object);
                vm_object_lock(object);
+
                assert(object->alive);
                assert(object->alive);
-               if(original_object)
+               if (original_object)
                        assert(object->named);
                assert(object->ref_count > 0);
 
                        assert(object->named);
                assert(object->ref_count > 0);
 
@@ -4593,7 +5891,6 @@ vm_object_release_name(
                                        VM_OBJECT_EVENT_INITIALIZED,
                                        THREAD_UNINT);
                        vm_object_unlock(object);
                                        VM_OBJECT_EVENT_INITIALIZED,
                                        THREAD_UNINT);
                        vm_object_unlock(object);
-                       vm_object_cache_unlock();
                        thread_block(THREAD_CONTINUE_NULL);
                        continue;
                }
                        thread_block(THREAD_CONTINUE_NULL);
                        continue;
                }
@@ -4602,22 +5899,19 @@ vm_object_release_name(
                        && (flags & MEMORY_OBJECT_TERMINATE_IDLE))
                        || (object->terminating)) {
                        vm_object_unlock(object);
                        && (flags & MEMORY_OBJECT_TERMINATE_IDLE))
                        || (object->terminating)) {
                        vm_object_unlock(object);
-                       vm_object_cache_unlock();
                        return KERN_FAILURE;
                } else {
                        if (flags & MEMORY_OBJECT_RELEASE_NO_OP) {
                                vm_object_unlock(object);
                        return KERN_FAILURE;
                } else {
                        if (flags & MEMORY_OBJECT_RELEASE_NO_OP) {
                                vm_object_unlock(object);
-                               vm_object_cache_unlock();
                                return KERN_SUCCESS;
                        }
                }
                
                if ((flags & MEMORY_OBJECT_RESPECT_CACHE) &&
                                        (object->ref_count == 1)) {
                                return KERN_SUCCESS;
                        }
                }
                
                if ((flags & MEMORY_OBJECT_RESPECT_CACHE) &&
                                        (object->ref_count == 1)) {
-                       if(original_object)
+                       if (original_object)
                                object->named = FALSE;
                        vm_object_unlock(object);
                                object->named = FALSE;
                        vm_object_unlock(object);
-                       vm_object_cache_unlock();
                        /* let vm_object_deallocate push this thing into */
                        /* the cache, if that it is where it is bound */
                        vm_object_deallocate(object);
                        /* let vm_object_deallocate push this thing into */
                        /* the cache, if that it is where it is bound */
                        vm_object_deallocate(object);
@@ -4625,9 +5919,10 @@ vm_object_release_name(
                }
                VM_OBJ_RES_DECR(object);
                shadow = object->pageout?VM_OBJECT_NULL:object->shadow;
                }
                VM_OBJ_RES_DECR(object);
                shadow = object->pageout?VM_OBJECT_NULL:object->shadow;
-               if(object->ref_count == 1) {
-                       if(vm_object_terminate(object) != KERN_SUCCESS) {
-                               if(original_object) {
+
+               if (object->ref_count == 1) {
+                       if (vm_object_terminate(object) != KERN_SUCCESS) {
+                               if (original_object) {
                                        return KERN_FAILURE;
                                } else {
                                        return KERN_SUCCESS;
                                        return KERN_FAILURE;
                                } else {
                                        return KERN_SUCCESS;
@@ -4640,12 +5935,12 @@ vm_object_release_name(
                        }
                        return KERN_SUCCESS;
                } else {
                        }
                        return KERN_SUCCESS;
                } else {
+                       vm_object_lock_assert_exclusive(object);
                        object->ref_count--;
                        assert(object->ref_count > 0);
                        if(original_object)
                                object->named = FALSE;
                        vm_object_unlock(object);
                        object->ref_count--;
                        assert(object->ref_count > 0);
                        if(original_object)
                                object->named = FALSE;
                        vm_object_unlock(object);
-                       vm_object_cache_unlock();
                        return KERN_SUCCESS;
                }
        }
                        return KERN_SUCCESS;
                }
        }
@@ -4670,7 +5965,7 @@ vm_object_lock_request(
 
         XPR(XPR_MEMORY_OBJECT,
            "vm_o_lock_request, obj 0x%X off 0x%X size 0x%X flags %X prot %X\n",
 
         XPR(XPR_MEMORY_OBJECT,
            "vm_o_lock_request, obj 0x%X off 0x%X size 0x%X flags %X prot %X\n",
-           (integer_t)object, offset, size, 
+           object, offset, size, 
            (((should_return&1)<<1)|should_flush), prot);
 
        /*
            (((should_return&1)<<1)|should_flush), prot);
 
        /*
@@ -4701,214 +5996,120 @@ vm_object_lock_request(
 }
 
 /*
 }
 
 /*
- * Empty a purgable object by grabbing the physical pages assigned to it and
+ * Empty a purgeable object by grabbing the physical pages assigned to it and
  * putting them on the free queue without writing them to backing store, etc.
  * When the pages are next touched they will be demand zero-fill pages.  We
  * skip pages which are busy, being paged in/out, wired, etc.  We do _not_
  * skip referenced/dirty pages, pages on the active queue, etc.  We're more
  * putting them on the free queue without writing them to backing store, etc.
  * When the pages are next touched they will be demand zero-fill pages.  We
  * skip pages which are busy, being paged in/out, wired, etc.  We do _not_
  * skip referenced/dirty pages, pages on the active queue, etc.  We're more
- * than happy to grab these since this is a purgable object.  We mark the
+ * than happy to grab these since this is a purgeable object.  We mark the
  * object as "empty" after reaping its pages.
  *
  * object as "empty" after reaping its pages.
  *
- * On entry the object and page queues are locked, the object must be a
- * purgable object with no delayed copies pending.
+ * On entry the object must be locked and it must be
+ * purgeable with no delayed copies pending.
  */
  */
-unsigned int
+void
 vm_object_purge(vm_object_t object)
 {
 vm_object_purge(vm_object_t object)
 {
-       vm_page_t       p, next;
-       unsigned int    num_purged_pages;
-       vm_page_t       local_freeq;
-       unsigned long   local_freed;
-       int             purge_loop_quota;
-/* free pages as soon as we gather PURGE_BATCH_FREE_LIMIT pages to free */
-#define PURGE_BATCH_FREE_LIMIT 50
-/* release page queues lock every PURGE_LOOP_QUOTA iterations */
-#define PURGE_LOOP_QUOTA       100
-
-       num_purged_pages = 0;
-       if (object->purgable == VM_OBJECT_NONPURGABLE)
-               return num_purged_pages;
-
-       object->purgable = VM_OBJECT_PURGABLE_EMPTY;
+        vm_object_lock_assert_exclusive(object);
+
+       if (object->purgable == VM_PURGABLE_DENY)
+               return;
 
        assert(object->copy == VM_OBJECT_NULL);
        assert(object->copy_strategy == MEMORY_OBJECT_COPY_NONE);
 
        assert(object->copy == VM_OBJECT_NULL);
        assert(object->copy_strategy == MEMORY_OBJECT_COPY_NONE);
-       purge_loop_quota = PURGE_LOOP_QUOTA;
-
-       local_freeq = VM_PAGE_NULL;
-       local_freed = 0;
-
-       /*
-        * Go through the object's resident pages and try and discard them.
-        */
-       next = (vm_page_t)queue_first(&object->memq);
-       while (!queue_end(&object->memq, (queue_entry_t)next)) {
-               p = next;
-               next = (vm_page_t)queue_next(&next->listq);
-
-               if (purge_loop_quota-- == 0) {
-                       /*
-                        * Avoid holding the page queues lock for too long.
-                        * Let someone else take it for a while if needed.
-                        * Keep holding the object's lock to guarantee that
-                        * the object's page list doesn't change under us
-                        * while we yield.
-                        */
-                       if (local_freeq != VM_PAGE_NULL) {
-                               /*
-                                * Flush our queue of pages to free.
-                                */
-                               vm_page_free_list(local_freeq);
-                               local_freeq = VM_PAGE_NULL;
-                               local_freed = 0;
-                       }
-                       vm_page_unlock_queues();
-                       mutex_pause();
-                       vm_page_lock_queues();
 
 
-                       /* resume with the current page and a new quota */
-                       purge_loop_quota = PURGE_LOOP_QUOTA;
-               }
-                               
-                      
-               if (p->busy || p->cleaning || p->laundry ||
-                   p->list_req_pending) {
-                       /* page is being acted upon, so don't mess with it */
-                       continue;
-               }
-               if (p->wire_count) {
-                       /* don't discard a wired page */
-                       continue;
-               }
-
-               if (p->tabled) {
-                       /* clean up the object/offset table */
-                       vm_page_remove(p);
-               }
-               if (p->absent) {
-                       /* update the object's count of absent pages */
-                       vm_object_absent_release(object);
-               }
-
-               /* we can discard this page */
-
-               /* advertize that this page is in a transition state */
-               p->busy = TRUE;
-
-               if (p->no_isync == TRUE) {
-                       /* the page hasn't been mapped yet */
-                       /* (optimization to delay the i-cache sync) */
-               } else {
-                       /* unmap the page */
-                       int refmod_state;
-
-                       refmod_state = pmap_disconnect(p->phys_page);
-                       if (refmod_state & VM_MEM_MODIFIED) {
-                               p->dirty = TRUE;
-                       }
-               }
-
-               if (p->dirty || p->precious) {
-                       /* we saved the cost of cleaning this page ! */
-                       num_purged_pages++;
-                       vm_page_purged_count++;
+       if(object->purgable == VM_PURGABLE_VOLATILE) {
+               unsigned int delta;
+               assert(object->resident_page_count >=
+                      object->wired_page_count);
+               delta = (object->resident_page_count -
+                        object->wired_page_count);
+               if (delta != 0) {
+                       assert(vm_page_purgeable_count >=
+                              delta);
+                       OSAddAtomic(-delta,
+                                   (SInt32 *)&vm_page_purgeable_count);
                }
                }
-
-               /* remove page from active or inactive queue... */
-               VM_PAGE_QUEUES_REMOVE(p);
-
-               /* ... and put it on our queue of pages to free */
-               assert(!p->laundry);
-               assert(p->object != kernel_object);
-               assert(p->pageq.next == NULL &&
-                      p->pageq.prev == NULL);
-               p->pageq.next = (queue_entry_t) local_freeq;
-               local_freeq = p;
-               if (++local_freed >= PURGE_BATCH_FREE_LIMIT) {
-                       /* flush our queue of pages to free */
-                       vm_page_free_list(local_freeq);
-                       local_freeq = VM_PAGE_NULL;
-                       local_freed = 0;
+               if (object->wired_page_count != 0) {
+                       assert(vm_page_purgeable_wired_count >=
+                              object->wired_page_count);
+                       OSAddAtomic(-object->wired_page_count,
+                                   (SInt32 *)&vm_page_purgeable_wired_count);
                }
        }
                }
        }
-
-       /* flush our local queue of pages to free one last time */
-       if (local_freeq != VM_PAGE_NULL) {
-               vm_page_free_list(local_freeq);
-               local_freeq = VM_PAGE_NULL;
-               local_freed = 0;
-       }
-
-       return num_purged_pages;
+       object->purgable = VM_PURGABLE_EMPTY;
+       
+       vm_object_reap_pages(object, REAP_PURGEABLE);
 }
 }
+                               
 
 /*
 
 /*
- * vm_object_purgable_control() allows the caller to control and investigate the
- * state of a purgable object.  A purgable object is created via a call to
- * vm_allocate() with VM_FLAGS_PURGABLE specified.  A purgable object will
- * never be coalesced with any other object -- even other purgable objects --
- * and will thus always remain a distinct object.  A purgable object has
+ * vm_object_purgeable_control() allows the caller to control and investigate the
+ * state of a purgeable object.  A purgeable object is created via a call to
+ * vm_allocate() with VM_FLAGS_PURGABLE specified.  A purgeable object will
+ * never be coalesced with any other object -- even other purgeable objects --
+ * and will thus always remain a distinct object.  A purgeable object has
  * special semantics when its reference count is exactly 1.  If its reference
  * special semantics when its reference count is exactly 1.  If its reference
- * count is greater than 1, then a purgable object will behave like a normal
+ * count is greater than 1, then a purgeable object will behave like a normal
  * object and attempts to use this interface will result in an error return
  * of KERN_INVALID_ARGUMENT.
  *
  * object and attempts to use this interface will result in an error return
  * of KERN_INVALID_ARGUMENT.
  *
- * A purgable object may be put into a "volatile" state which will make the
+ * A purgeable object may be put into a "volatile" state which will make the
  * object's pages elligable for being reclaimed without paging to backing
  * store if the system runs low on memory.  If the pages in a volatile
  * object's pages elligable for being reclaimed without paging to backing
  * store if the system runs low on memory.  If the pages in a volatile
- * purgable object are reclaimed, the purgable object is said to have been
- * "emptied."  When a purgable object is emptied the system will reclaim as
+ * purgeable object are reclaimed, the purgeable object is said to have been
+ * "emptied."  When a purgeable object is emptied the system will reclaim as
  * many pages from the object as it can in a convenient manner (pages already
  * en route to backing store or busy for other reasons are left as is).  When
  * many pages from the object as it can in a convenient manner (pages already
  * en route to backing store or busy for other reasons are left as is).  When
- * a purgable object is made volatile, its pages will generally be reclaimed
+ * a purgeable object is made volatile, its pages will generally be reclaimed
  * before other pages in the application's working set.  This semantic is
  * generally used by applications which can recreate the data in the object
  * faster than it can be paged in.  One such example might be media assets
  * which can be reread from a much faster RAID volume.
  *
  * before other pages in the application's working set.  This semantic is
  * generally used by applications which can recreate the data in the object
  * faster than it can be paged in.  One such example might be media assets
  * which can be reread from a much faster RAID volume.
  *
- * A purgable object may be designated as "non-volatile" which means it will
+ * A purgeable object may be designated as "non-volatile" which means it will
  * behave like all other objects in the system with pages being written to and
  * read from backing store as needed to satisfy system memory needs.  If the
  * object was emptied before the object was made non-volatile, that fact will
  * behave like all other objects in the system with pages being written to and
  * read from backing store as needed to satisfy system memory needs.  If the
  * object was emptied before the object was made non-volatile, that fact will
- * be returned as the old state of the purgable object (see
+ * be returned as the old state of the purgeable object (see
  * VM_PURGABLE_SET_STATE below).  In this case, any pages of the object which
  * were reclaimed as part of emptying the object will be refaulted in as
  * zero-fill on demand.  It is up to the application to note that an object
  * was emptied and recreate the objects contents if necessary.  When a
  * VM_PURGABLE_SET_STATE below).  In this case, any pages of the object which
  * were reclaimed as part of emptying the object will be refaulted in as
  * zero-fill on demand.  It is up to the application to note that an object
  * was emptied and recreate the objects contents if necessary.  When a
- * purgable object is made non-volatile, its pages will generally not be paged
- * out to backing store in the immediate future.  A purgable object may also
+ * purgeable object is made non-volatile, its pages will generally not be paged
+ * out to backing store in the immediate future.  A purgeable object may also
  * be manually emptied.
  *
  * Finally, the current state (non-volatile, volatile, volatile & empty) of a
  * be manually emptied.
  *
  * Finally, the current state (non-volatile, volatile, volatile & empty) of a
- * volatile purgable object may be queried at any time.  This information may
+ * volatile purgeable object may be queried at any time.  This information may
  * be used as a control input to let the application know when the system is
  * experiencing memory pressure and is reclaiming memory.
  *
  * be used as a control input to let the application know when the system is
  * experiencing memory pressure and is reclaiming memory.
  *
- * The specified address may be any address within the purgable object.  If
+ * The specified address may be any address within the purgeable object.  If
  * the specified address does not represent any object in the target task's
  * virtual address space, then KERN_INVALID_ADDRESS will be returned.  If the
  * the specified address does not represent any object in the target task's
  * virtual address space, then KERN_INVALID_ADDRESS will be returned.  If the
- * object containing the specified address is not a purgable object, then
+ * object containing the specified address is not a purgeable object, then
  * KERN_INVALID_ARGUMENT will be returned.  Otherwise, KERN_SUCCESS will be
  * returned.
  *
  * The control parameter may be any one of VM_PURGABLE_SET_STATE or
  * VM_PURGABLE_GET_STATE.  For VM_PURGABLE_SET_STATE, the in/out parameter
  * KERN_INVALID_ARGUMENT will be returned.  Otherwise, KERN_SUCCESS will be
  * returned.
  *
  * The control parameter may be any one of VM_PURGABLE_SET_STATE or
  * VM_PURGABLE_GET_STATE.  For VM_PURGABLE_SET_STATE, the in/out parameter
- * state is used to set the new state of the purgable object and return its
- * old state.  For VM_PURGABLE_GET_STATE, the current state of the purgable
+ * state is used to set the new state of the purgeable object and return its
+ * old state.  For VM_PURGABLE_GET_STATE, the current state of the purgeable
  * object is returned in the parameter state.
  *
  * The in/out parameter state may be one of VM_PURGABLE_NONVOLATILE,
  * VM_PURGABLE_VOLATILE or VM_PURGABLE_EMPTY.  These, respectively, represent
  * the non-volatile, volatile and volatile/empty states described above.
  * object is returned in the parameter state.
  *
  * The in/out parameter state may be one of VM_PURGABLE_NONVOLATILE,
  * VM_PURGABLE_VOLATILE or VM_PURGABLE_EMPTY.  These, respectively, represent
  * the non-volatile, volatile and volatile/empty states described above.
- * Setting the state of a purgable object to VM_PURGABLE_EMPTY will
+ * Setting the state of a purgeable object to VM_PURGABLE_EMPTY will
  * immediately reclaim as many pages in the object as can be conveniently
  * collected (some may have already been written to backing store or be
  * otherwise busy).
  *
  * immediately reclaim as many pages in the object as can be conveniently
  * collected (some may have already been written to backing store or be
  * otherwise busy).
  *
- * The process of making a purgable object non-volatile and determining its
- * previous state is atomic.  Thus, if a purgable object is made
+ * The process of making a purgeable object non-volatile and determining its
+ * previous state is atomic.  Thus, if a purgeable object is made
  * VM_PURGABLE_NONVOLATILE and the old state is returned as
  * VM_PURGABLE_NONVOLATILE and the old state is returned as
- * VM_PURGABLE_VOLATILE, then the purgable object's previous contents are
+ * VM_PURGABLE_VOLATILE, then the purgeable object's previous contents are
  * completely intact and will remain so until the object is made volatile
  * again.  If the old state is returned as VM_PURGABLE_EMPTY then the object
  * was reclaimed while it was in a volatile state and its previous contents
  * completely intact and will remain so until the object is made volatile
  * again.  If the old state is returned as VM_PURGABLE_EMPTY then the object
  * was reclaimed while it was in a volatile state and its previous contents
@@ -4924,42 +6125,23 @@ vm_object_purgable_control(
        int             *state)
 {
        int             old_state;
        int             *state)
 {
        int             old_state;
-       vm_page_t       p;
+       int             new_state;
 
        if (object == VM_OBJECT_NULL) {
                /*
 
        if (object == VM_OBJECT_NULL) {
                /*
-                * Object must already be present or it can't be purgable.
+                * Object must already be present or it can't be purgeable.
                 */
                return KERN_INVALID_ARGUMENT;
        }
 
        /*
                 */
                return KERN_INVALID_ARGUMENT;
        }
 
        /*
-        * Get current state of the purgable object.
+        * Get current state of the purgeable object.
         */
         */
-       switch (object->purgable) {
-           case VM_OBJECT_NONPURGABLE:
+       old_state = object->purgable;
+       if (old_state == VM_PURGABLE_DENY)
                return KERN_INVALID_ARGUMENT;
     
                return KERN_INVALID_ARGUMENT;
     
-           case VM_OBJECT_PURGABLE_NONVOLATILE:
-               old_state = VM_PURGABLE_NONVOLATILE;
-               break;
-
-           case VM_OBJECT_PURGABLE_VOLATILE:
-               old_state = VM_PURGABLE_VOLATILE;
-               break;
-
-           case VM_OBJECT_PURGABLE_EMPTY:
-               old_state = VM_PURGABLE_EMPTY;
-               break;
-
-           default:
-               old_state = VM_PURGABLE_NONVOLATILE;
-               panic("Bad state (%d) for purgable object!\n",
-                     object->purgable);
-               /*NOTREACHED*/
-       }
-
-       /* purgable cant have delayed copies - now or in the future */
+       /* purgeable cant have delayed copies - now or in the future */
        assert(object->copy == VM_OBJECT_NULL); 
        assert(object->copy_strategy == MEMORY_OBJECT_COPY_NONE);
 
        assert(object->copy == VM_OBJECT_NULL); 
        assert(object->copy_strategy == MEMORY_OBJECT_COPY_NONE);
 
@@ -4971,86 +6153,195 @@ vm_object_purgable_control(
                return KERN_SUCCESS;
        }
 
                return KERN_SUCCESS;
        }
 
-       switch (*state) {
+       if ((*state) & VM_PURGABLE_DEBUG_EMPTY) {
+               object->volatile_empty = TRUE;
+       }
+       if ((*state) & VM_PURGABLE_DEBUG_FAULT) {
+               object->volatile_fault = TRUE;
+       }
+
+       new_state = *state & VM_PURGABLE_STATE_MASK;
+       if (new_state == VM_PURGABLE_VOLATILE &&
+           object->volatile_empty) {
+               new_state = VM_PURGABLE_EMPTY;
+       }
+
+       switch (new_state) {
+       case VM_PURGABLE_DENY:
        case VM_PURGABLE_NONVOLATILE:
        case VM_PURGABLE_NONVOLATILE:
-               vm_page_lock_queues();
-               if (object->purgable != VM_OBJECT_PURGABLE_NONVOLATILE) {
-                       assert(vm_page_purgeable_count >=
-                              object->resident_page_count);
-                       vm_page_purgeable_count -= object->resident_page_count;
-               }
+               object->purgable = new_state;
 
 
-               object->purgable = VM_OBJECT_PURGABLE_NONVOLATILE;
+               if (old_state == VM_PURGABLE_VOLATILE) {
+                       unsigned int delta;
 
 
-               /*
-                * If the object wasn't emptied, then mark all pages of the
-                * object as referenced in order to give them a complete turn
-                * of the virtual memory "clock" before becoming candidates
-                * for paging out (if the system is suffering from memory
-                * pressure).  We don't really need to set the pmap reference
-                * bits (which would be expensive) since the software copies
-                * are believed if they're set to true ...
-                */
-               if (old_state != VM_PURGABLE_EMPTY) {
-                       for (p = (vm_page_t)queue_first(&object->memq);
-                            !queue_end(&object->memq, (queue_entry_t)p);
-                            p = (vm_page_t)queue_next(&p->listq))
-                               p->reference = TRUE;
-               }
+                       assert(object->resident_page_count >=
+                              object->wired_page_count);
+                       delta = (object->resident_page_count -
+                                object->wired_page_count);
 
 
-               vm_page_unlock_queues();
+                       assert(vm_page_purgeable_count >= delta);
+
+                       if (delta != 0) {
+                               OSAddAtomic(-delta,
+                                           (SInt32 *)&vm_page_purgeable_count);
+                       }
+                       if (object->wired_page_count != 0) {
+                               assert(vm_page_purgeable_wired_count >=
+                                      object->wired_page_count);
+                               OSAddAtomic(-object->wired_page_count,
+                                           (SInt32 *)&vm_page_purgeable_wired_count);
+                       }
+
+                       vm_page_lock_queues();
+
+                       assert(object->objq.next != NULL && object->objq.prev != NULL); /* object should be on a queue */
+                       purgeable_q_t queue = vm_purgeable_object_remove(object);
+                       assert(queue);
 
 
+                       vm_purgeable_token_delete_first(queue);
+                       assert(queue->debug_count_objects>=0);
+
+                       vm_page_unlock_queues();
+               }
                break;
 
        case VM_PURGABLE_VOLATILE:
                break;
 
        case VM_PURGABLE_VOLATILE:
-               vm_page_lock_queues();
+               if (object->volatile_fault) {
+                       vm_page_t       p;
+                       int             refmod;
+
+                       queue_iterate(&object->memq, p, vm_page_t, listq) {
+                               if (p->busy ||
+                                   VM_PAGE_WIRED(p) ||
+                                   p->fictitious) {
+                                       continue;
+                               }
+                               refmod = pmap_disconnect(p->phys_page);
+                               if ((refmod & VM_MEM_MODIFIED) &&
+                                   !p->dirty) {
+                                       p->dirty = TRUE;
+                               }
+                       }
+               }
+                                              
+               if (old_state == VM_PURGABLE_EMPTY &&
+                   object->resident_page_count == 0)
+                       break;
 
 
-               if (object->purgable != VM_OBJECT_PURGABLE_VOLATILE &&
-                   object->purgable != VM_OBJECT_PURGABLE_EMPTY) {
-                       vm_page_purgeable_count += object->resident_page_count;
+               purgeable_q_t queue;
+        
+               /* find the correct queue */
+               if ((*state&VM_PURGABLE_ORDERING_MASK) == VM_PURGABLE_ORDERING_OBSOLETE)
+                       queue = &purgeable_queues[PURGEABLE_Q_TYPE_OBSOLETE];
+               else {
+                       if ((*state&VM_PURGABLE_BEHAVIOR_MASK) == VM_PURGABLE_BEHAVIOR_FIFO)
+                               queue = &purgeable_queues[PURGEABLE_Q_TYPE_FIFO];
+                       else
+                               queue = &purgeable_queues[PURGEABLE_Q_TYPE_LIFO];
                }
                }
+        
+               if (old_state == VM_PURGABLE_NONVOLATILE ||
+                   old_state == VM_PURGABLE_EMPTY) {
+                       unsigned int delta;
+
+                       /* try to add token... this can fail */
+                       vm_page_lock_queues();
+
+                       kern_return_t result = vm_purgeable_token_add(queue);
+                       if (result != KERN_SUCCESS) {
+                               vm_page_unlock_queues();
+                               return result;
+                       }
+                       vm_page_unlock_queues();
 
 
-               object->purgable = VM_OBJECT_PURGABLE_VOLATILE;
+                       assert(object->resident_page_count >=
+                              object->wired_page_count);
+                       delta = (object->resident_page_count -
+                                object->wired_page_count);
 
 
-               /*
-                * We want the newly volatile purgable object to be a
-                * candidate for the pageout scan before other pages in the
-                * application if the system is suffering from memory
-                * pressure.  To do this, we move a page of the object from
-                * the active queue onto the inactive queue in order to
-                * promote the object for early reclaim.  We only need to move
-                * a single page since the pageout scan will reap the entire
-                * purgable object if it finds a single page in a volatile
-                * state.  Obviously we don't do this if there are no pages
-                * associated with the object or we find a page of the object
-                * already on the inactive queue.
-                */
-               for (p = (vm_page_t)queue_first(&object->memq);
-                    !queue_end(&object->memq, (queue_entry_t)p);
-                    p = (vm_page_t)queue_next(&p->listq)) {
-                       if (p->inactive) {
-                               /* already a page on the inactive queue */
-                               break;
+                       if (delta != 0) {
+                               OSAddAtomic(delta,
+                                           &vm_page_purgeable_count);
                        }
                        }
-                       if (p->active && !p->busy) {
-                               /* found one we can move */
-                               vm_page_deactivate(p);
-                               break;
+                       if (object->wired_page_count != 0) {
+                               OSAddAtomic(object->wired_page_count,
+                                           &vm_page_purgeable_wired_count);
                        }
                        }
+
+                       object->purgable = new_state;
+
+                       /* object should not be on a queue */
+                       assert(object->objq.next == NULL && object->objq.prev == NULL);
                }
                }
-               vm_page_unlock_queues();
+               else if (old_state == VM_PURGABLE_VOLATILE) {
+                       /*
+                        * if reassigning priorities / purgeable groups, we don't change the
+                        * token queue. So moving priorities will not make pages stay around longer.
+                        * Reasoning is that the algorithm gives most priority to the most important
+                        * object. If a new token is added, the most important object' priority is boosted.
+                        * This biases the system already for purgeable queues that move a lot.
+                        * It doesn't seem more biasing is neccessary in this case, where no new object is added.
+                        */
+                       assert(object->objq.next != NULL && object->objq.prev != NULL); /* object should be on a queue */
+            
+                       purgeable_q_t old_queue=vm_purgeable_object_remove(object);
+                       assert(old_queue);
+            
+                       if (old_queue != queue) {
+                               kern_return_t result;
+
+                               /* Changing queue. Have to move token. */
+                               vm_page_lock_queues();
+                               vm_purgeable_token_delete_first(old_queue);
+                               result = vm_purgeable_token_add(queue);
+                               vm_page_unlock_queues();
+
+                               assert(result==KERN_SUCCESS);   /* this should never fail since we just freed a token */
+                       }
+               };
+               vm_purgeable_object_add(object, queue, (*state&VM_VOLATILE_GROUP_MASK)>>VM_VOLATILE_GROUP_SHIFT );
 
 
+               assert(queue->debug_count_objects>=0);
+        
                break;
 
 
        case VM_PURGABLE_EMPTY:
                break;
 
 
        case VM_PURGABLE_EMPTY:
-               vm_page_lock_queues();
-               if (object->purgable != VM_OBJECT_PURGABLE_VOLATILE &&
-                   object->purgable != VM_OBJECT_PURGABLE_EMPTY) {
-                       vm_page_purgeable_count += object->resident_page_count;
+               if (object->volatile_fault) {
+                       vm_page_t       p;
+                       int             refmod;
+
+                       queue_iterate(&object->memq, p, vm_page_t, listq) {
+                               if (p->busy ||
+                                   VM_PAGE_WIRED(p) ||
+                                   p->fictitious) {
+                                       continue;
+                               }
+                               refmod = pmap_disconnect(p->phys_page);
+                               if ((refmod & VM_MEM_MODIFIED) &&
+                                   !p->dirty) {
+                                       p->dirty = TRUE;
+                               }
+                       }
+               }
+
+               if (old_state != new_state) {
+                       assert(old_state == VM_PURGABLE_NONVOLATILE ||
+                              old_state == VM_PURGABLE_VOLATILE);
+                       if (old_state == VM_PURGABLE_VOLATILE) {
+                               purgeable_q_t old_queue;
+
+                               /* object should be on a queue */
+                               assert(object->objq.next != NULL &&
+                                      object->objq.prev != NULL);
+                               old_queue = vm_purgeable_object_remove(object);
+                               assert(old_queue);
+                               vm_page_lock_queues();
+                               vm_purgeable_token_delete_first(old_queue);
+                               vm_page_unlock_queues();
+                       }
+                       (void) vm_object_purge(object);
                }
                }
-               (void) vm_object_purge(object);
-               vm_page_unlock_queues();
                break;
 
        }
                break;
 
        }
@@ -5176,10 +6467,12 @@ vm_object_reference(
 kern_return_t
 adjust_vm_object_cache(
        __unused vm_size_t oval,
 kern_return_t
 adjust_vm_object_cache(
        __unused vm_size_t oval,
-       vm_size_t nval)
+       __unused vm_size_t nval)
 {
 {
+#if VM_OBJECT_CACHE
        vm_object_cached_max = nval;
        vm_object_cache_trim(FALSE);
        vm_object_cached_max = nval;
        vm_object_cache_trim(FALSE);
+#endif
        return (KERN_SUCCESS);
 }
 #endif /* MACH_BSD */
        return (KERN_SUCCESS);
 }
 #endif /* MACH_BSD */
@@ -5195,6 +6488,7 @@ adjust_vm_object_cache(
  *
  * The VM objects must not be locked by caller.
  */
  *
  * The VM objects must not be locked by caller.
  */
+unsigned int vm_object_transpose_count = 0;
 kern_return_t
 vm_object_transpose(
        vm_object_t             object1,
 kern_return_t
 vm_object_transpose(
        vm_object_t             object1,
@@ -5204,13 +6498,13 @@ vm_object_transpose(
        vm_object_t             tmp_object;
        kern_return_t           retval;
        boolean_t               object1_locked, object2_locked;
        vm_object_t             tmp_object;
        kern_return_t           retval;
        boolean_t               object1_locked, object2_locked;
-       boolean_t               object1_paging, object2_paging;
        vm_page_t               page;
        vm_object_offset_t      page_offset;
        vm_page_t               page;
        vm_object_offset_t      page_offset;
+       lck_mtx_t               *hash_lck;
+       vm_object_hash_entry_t  hash_entry;
 
        tmp_object = VM_OBJECT_NULL;
        object1_locked = FALSE; object2_locked = FALSE;
 
        tmp_object = VM_OBJECT_NULL;
        object1_locked = FALSE; object2_locked = FALSE;
-       object1_paging = FALSE; object2_paging = FALSE;
 
        if (object1 == object2 ||
            object1 == VM_OBJECT_NULL ||
 
        if (object1 == object2 ||
            object1 == VM_OBJECT_NULL ||
@@ -5223,10 +6517,34 @@ vm_object_transpose(
                goto done;
        }
 
                goto done;
        }
 
+       /*
+        * Since we need to lock both objects at the same time,
+        * make sure we always lock them in the same order to
+        * avoid deadlocks.
+        */
+       if (object1 >  object2) {
+               tmp_object = object1;
+               object1 = object2;
+               object2 = tmp_object;
+       }
+
+       /*
+        * Allocate a temporary VM object to hold object1's contents
+        * while we copy object2 to object1.
+        */
+       tmp_object = vm_object_allocate(transpose_size);
+       vm_object_lock(tmp_object);
+       tmp_object->can_persist = FALSE;
+
+
+       /*
+        * Grab control of the 1st VM object.
+        */
        vm_object_lock(object1);
        object1_locked = TRUE;
        vm_object_lock(object1);
        object1_locked = TRUE;
-       if (object1->copy || object1->shadow || object1->shadowed ||
-           object1->purgable != VM_OBJECT_NONPURGABLE) {
+       if (!object1->alive || object1->terminating ||
+           object1->copy || object1->shadow || object1->shadowed ||
+           object1->purgable != VM_PURGABLE_DENY) {
                /*
                 * We don't deal with copy or shadow objects (yet).
                 */
                /*
                 * We don't deal with copy or shadow objects (yet).
                 */
@@ -5234,56 +6552,33 @@ vm_object_transpose(
                goto done;
        }
        /*
                goto done;
        }
        /*
-        * Since we're about to mess with the object's backing store,
-        * mark it as "paging_in_progress".  Note that this is not enough
+        * We're about to mess with the object's backing store and 
+        * taking a "paging_in_progress" reference wouldn't be enough
         * to prevent any paging activity on this object, so the caller should
         * have "quiesced" the objects beforehand, via a UPL operation with
         * UPL_SET_IO_WIRE (to make sure all the pages are there and wired)
         * and UPL_BLOCK_ACCESS (to mark the pages "busy").
         * to prevent any paging activity on this object, so the caller should
         * have "quiesced" the objects beforehand, via a UPL operation with
         * UPL_SET_IO_WIRE (to make sure all the pages are there and wired)
         * and UPL_BLOCK_ACCESS (to mark the pages "busy").
+        * 
+        * Wait for any paging operation to complete (but only paging, not 
+        * other kind of activities not linked to the pager).  After we're
+        * statisfied that there's no more paging in progress, we keep the
+        * object locked, to guarantee that no one tries to access its pager.
         */
         */
-       vm_object_paging_begin(object1);
-       object1_paging = TRUE;
-       vm_object_unlock(object1);
-       object1_locked = FALSE;
+       vm_object_paging_only_wait(object1, THREAD_UNINT);
 
        /*
         * Same as above for the 2nd object...
         */
        vm_object_lock(object2);
        object2_locked = TRUE;
 
        /*
         * Same as above for the 2nd object...
         */
        vm_object_lock(object2);
        object2_locked = TRUE;
-       if (object2->copy || object2->shadow || object2->shadowed ||
-           object2->purgable != VM_OBJECT_NONPURGABLE) {
+       if (! object2->alive || object2->terminating ||
+           object2->copy || object2->shadow || object2->shadowed ||
+           object2->purgable != VM_PURGABLE_DENY) {
                retval = KERN_INVALID_VALUE;
                goto done;
        }
                retval = KERN_INVALID_VALUE;
                goto done;
        }
-       vm_object_paging_begin(object2);
-       object2_paging = TRUE;
-       vm_object_unlock(object2);
-       object2_locked = FALSE;
-
-       /*
-        * Allocate a temporary VM object to hold object1's contents
-        * while we copy object2 to object1.
-        */
-       tmp_object = vm_object_allocate(transpose_size);
-       vm_object_lock(tmp_object);
-       vm_object_paging_begin(tmp_object);
-       tmp_object->can_persist = FALSE;
+       vm_object_paging_only_wait(object2, THREAD_UNINT);
 
 
-       /*
-        * Since we need to lock both objects at the same time,
-        * make sure we always lock them in the same order to
-        * avoid deadlocks.
-        */
-       if (object1 < object2) {
-               vm_object_lock(object1);
-               vm_object_lock(object2);
-       } else {
-               vm_object_lock(object2);
-               vm_object_lock(object1);
-       }
-       object1_locked = TRUE;
-       object2_locked = TRUE;
 
        if (object1->size != object2->size ||
            object1->size != transpose_size) {
 
        if (object1->size != object2->size ||
            object1->size != transpose_size) {
@@ -5302,6 +6597,7 @@ vm_object_transpose(
 
        /*
         * Transpose the lists of resident pages.
 
        /*
         * Transpose the lists of resident pages.
+        * This also updates the resident_page_count and the memq_hint.
         */
        if (object1->phys_contiguous || queue_empty(&object1->memq)) {
                /*
         */
        if (object1->phys_contiguous || queue_empty(&object1->memq)) {
                /*
@@ -5311,7 +6607,7 @@ vm_object_transpose(
                 */
                while (!queue_empty(&object2->memq)) {
                        page = (vm_page_t) queue_first(&object2->memq);
                 */
                while (!queue_empty(&object2->memq)) {
                        page = (vm_page_t) queue_first(&object2->memq);
-                       vm_page_rename(page, object1, page->offset);
+                       vm_page_rename(page, object1, page->offset, FALSE);
                }
                assert(queue_empty(&object2->memq));
        } else if (object2->phys_contiguous || queue_empty(&object2->memq)) {
                }
                assert(queue_empty(&object2->memq));
        } else if (object2->phys_contiguous || queue_empty(&object2->memq)) {
@@ -5322,25 +6618,23 @@ vm_object_transpose(
                 */
                while (!queue_empty(&object1->memq)) {
                        page = (vm_page_t) queue_first(&object1->memq);
                 */
                while (!queue_empty(&object1->memq)) {
                        page = (vm_page_t) queue_first(&object1->memq);
-                       vm_page_rename(page, object2, page->offset);
+                       vm_page_rename(page, object2, page->offset, FALSE);
                }
                assert(queue_empty(&object1->memq));
        } else {
                /* transfer object1's pages to tmp_object */
                }
                assert(queue_empty(&object1->memq));
        } else {
                /* transfer object1's pages to tmp_object */
-               vm_page_lock_queues();
                while (!queue_empty(&object1->memq)) {
                        page = (vm_page_t) queue_first(&object1->memq);
                        page_offset = page->offset;
                while (!queue_empty(&object1->memq)) {
                        page = (vm_page_t) queue_first(&object1->memq);
                        page_offset = page->offset;
-                       vm_page_remove(page);
+                       vm_page_remove(page, TRUE);
                        page->offset = page_offset;
                        queue_enter(&tmp_object->memq, page, vm_page_t, listq);
                }
                        page->offset = page_offset;
                        queue_enter(&tmp_object->memq, page, vm_page_t, listq);
                }
-               vm_page_unlock_queues();
                assert(queue_empty(&object1->memq));
                /* transfer object2's pages to object1 */
                while (!queue_empty(&object2->memq)) {
                        page = (vm_page_t) queue_first(&object2->memq);
                assert(queue_empty(&object1->memq));
                /* transfer object2's pages to object1 */
                while (!queue_empty(&object2->memq)) {
                        page = (vm_page_t) queue_first(&object2->memq);
-                       vm_page_rename(page, object1, page->offset);
+                       vm_page_rename(page, object1, page->offset, FALSE);
                }
                assert(queue_empty(&object2->memq));
                /* transfer tmp_object's pages to object1 */
                }
                assert(queue_empty(&object2->memq));
                /* transfer tmp_object's pages to object1 */
@@ -5353,9 +6647,6 @@ vm_object_transpose(
                assert(queue_empty(&tmp_object->memq));
        }
 
                assert(queue_empty(&tmp_object->memq));
        }
 
-       /* no need to transpose the size: they should be identical */
-       assert(object1->size == object2->size);
-
 #define __TRANSPOSE_FIELD(field)                               \
 MACRO_BEGIN                                                    \
        tmp_object->field = object1->field;                     \
 #define __TRANSPOSE_FIELD(field)                               \
 MACRO_BEGIN                                                    \
        tmp_object->field = object1->field;                     \
@@ -5363,16 +6654,26 @@ MACRO_BEGIN                                                     \
        object2->field = tmp_object->field;                     \
 MACRO_END
 
        object2->field = tmp_object->field;                     \
 MACRO_END
 
+       /* "Lock" refers to the object not its contents */
+       /* "size" should be identical */
+       assert(object1->size == object2->size);
+       /* "memq_hint" was updated above when transposing pages */
+       /* "ref_count" refers to the object not its contents */
+#if TASK_SWAPPER
+       /* "res_count" refers to the object not its contents */
+#endif
+       /* "resident_page_count" was updated above when transposing pages */
+       /* "wired_page_count" was updated above when transposing pages */
+       /* "reusable_page_count" was updated above when transposing pages */
+       /* there should be no "copy" */
        assert(!object1->copy);
        assert(!object2->copy);
        assert(!object1->copy);
        assert(!object2->copy);
-
+       /* there should be no "shadow" */
        assert(!object1->shadow);
        assert(!object2->shadow);
        assert(!object1->shadow);
        assert(!object2->shadow);
-
        __TRANSPOSE_FIELD(shadow_offset); /* used by phys_contiguous objects */
        __TRANSPOSE_FIELD(pager);
        __TRANSPOSE_FIELD(paging_offset);
        __TRANSPOSE_FIELD(shadow_offset); /* used by phys_contiguous objects */
        __TRANSPOSE_FIELD(pager);
        __TRANSPOSE_FIELD(paging_offset);
-
        __TRANSPOSE_FIELD(pager_control);
        /* update the memory_objects' pointers back to the VM objects */
        if (object1->pager_control != MEMORY_OBJECT_CONTROL_NULL) {
        __TRANSPOSE_FIELD(pager_control);
        /* update the memory_objects' pointers back to the VM objects */
        if (object1->pager_control != MEMORY_OBJECT_CONTROL_NULL) {
@@ -5383,29 +6684,93 @@ MACRO_END
                memory_object_control_collapse(object2->pager_control,
                                               object2);
        }
                memory_object_control_collapse(object2->pager_control,
                                               object2);
        }
-               
-       __TRANSPOSE_FIELD(absent_count);
-
-       assert(object1->paging_in_progress);
-       assert(object2->paging_in_progress);
-
+       __TRANSPOSE_FIELD(copy_strategy);
+       /* "paging_in_progress" refers to the object not its contents */
+       assert(!object1->paging_in_progress);
+       assert(!object2->paging_in_progress);
+       assert(object1->activity_in_progress);
+       assert(object2->activity_in_progress);
+       /* "all_wanted" refers to the object not its contents */
        __TRANSPOSE_FIELD(pager_created);
        __TRANSPOSE_FIELD(pager_initialized);
        __TRANSPOSE_FIELD(pager_ready);
        __TRANSPOSE_FIELD(pager_trusted);
        __TRANSPOSE_FIELD(pager_created);
        __TRANSPOSE_FIELD(pager_initialized);
        __TRANSPOSE_FIELD(pager_ready);
        __TRANSPOSE_FIELD(pager_trusted);
+       __TRANSPOSE_FIELD(can_persist);
        __TRANSPOSE_FIELD(internal);
        __TRANSPOSE_FIELD(temporary);
        __TRANSPOSE_FIELD(private);
        __TRANSPOSE_FIELD(pageout);
        __TRANSPOSE_FIELD(internal);
        __TRANSPOSE_FIELD(temporary);
        __TRANSPOSE_FIELD(private);
        __TRANSPOSE_FIELD(pageout);
+       /* "alive" should be set */
+       assert(object1->alive);
+       assert(object2->alive);
+       /* "purgeable" should be non-purgeable */
+       assert(object1->purgable == VM_PURGABLE_DENY);
+       assert(object2->purgable == VM_PURGABLE_DENY);
+       /* "shadowed" refers to the the object not its contents */
+       __TRANSPOSE_FIELD(silent_overwrite);
+       __TRANSPOSE_FIELD(advisory_pageout);
        __TRANSPOSE_FIELD(true_share);
        __TRANSPOSE_FIELD(true_share);
+       /* "terminating" should not be set */
+       assert(!object1->terminating);
+       assert(!object2->terminating);
+       __TRANSPOSE_FIELD(named);
+       /* "shadow_severed" refers to the object not its contents */
        __TRANSPOSE_FIELD(phys_contiguous);
        __TRANSPOSE_FIELD(nophyscache);
        __TRANSPOSE_FIELD(phys_contiguous);
        __TRANSPOSE_FIELD(nophyscache);
+       /* "cached_list.next" points to transposed object */
+       object1->cached_list.next = (queue_entry_t) object2;
+       object2->cached_list.next = (queue_entry_t) object1;
+       /* "cached_list.prev" should be NULL */
+       assert(object1->cached_list.prev == NULL);
+       assert(object2->cached_list.prev == NULL);
+       /* "msr_q" is linked to the object not its contents */
+       assert(queue_empty(&object1->msr_q));
+       assert(queue_empty(&object2->msr_q));
        __TRANSPOSE_FIELD(last_alloc);
        __TRANSPOSE_FIELD(sequential);
        __TRANSPOSE_FIELD(last_alloc);
        __TRANSPOSE_FIELD(sequential);
-       __TRANSPOSE_FIELD(cluster_size);
+       __TRANSPOSE_FIELD(pages_created);
+       __TRANSPOSE_FIELD(pages_used);
+#if MACH_PAGEMAP
        __TRANSPOSE_FIELD(existence_map);
        __TRANSPOSE_FIELD(existence_map);
+#endif
        __TRANSPOSE_FIELD(cow_hint);
        __TRANSPOSE_FIELD(cow_hint);
+#if MACH_ASSERT
+       __TRANSPOSE_FIELD(paging_object);
+#endif
        __TRANSPOSE_FIELD(wimg_bits);
        __TRANSPOSE_FIELD(wimg_bits);
+       __TRANSPOSE_FIELD(code_signed);
+       if (object1->hashed) {
+               hash_lck = vm_object_hash_lock_spin(object2->pager);
+               hash_entry = vm_object_hash_lookup(object2->pager, FALSE);
+               assert(hash_entry != VM_OBJECT_HASH_ENTRY_NULL);
+               hash_entry->object = object2;
+               vm_object_hash_unlock(hash_lck);
+       }
+       if (object2->hashed) {
+               hash_lck = vm_object_hash_lock_spin(object1->pager);
+               hash_entry = vm_object_hash_lookup(object1->pager, FALSE);
+               assert(hash_entry != VM_OBJECT_HASH_ENTRY_NULL);
+               hash_entry->object = object1;
+               vm_object_hash_unlock(hash_lck);
+       }
+       __TRANSPOSE_FIELD(hashed);
+       object1->transposed = TRUE;
+       object2->transposed = TRUE;
+       __TRANSPOSE_FIELD(mapping_in_progress);
+       __TRANSPOSE_FIELD(volatile_empty);
+       __TRANSPOSE_FIELD(volatile_fault);
+       __TRANSPOSE_FIELD(all_reusable);
+       assert(object1->blocked_access);
+       assert(object2->blocked_access);
+       assert(object1->__object2_unused_bits == 0);
+       assert(object2->__object2_unused_bits == 0);
+#if UPL_DEBUG
+       /* "uplq" refers to the object not its contents (see upl_transpose()) */
+#endif
+       assert(object1->objq.next == NULL);
+       assert(object1->objq.prev == NULL);
+       assert(object2->objq.next == NULL);
+       assert(object2->objq.prev == NULL);
 
 #undef __TRANSPOSE_FIELD
 
 
 #undef __TRANSPOSE_FIELD
 
@@ -5416,7 +6781,6 @@ done:
         * Cleanup.
         */
        if (tmp_object != VM_OBJECT_NULL) {
         * Cleanup.
         */
        if (tmp_object != VM_OBJECT_NULL) {
-               vm_object_paging_end(tmp_object);
                vm_object_unlock(tmp_object);
                /*
                 * Re-initialize the temporary object to avoid
                vm_object_unlock(tmp_object);
                /*
                 * Re-initialize the temporary object to avoid
@@ -5435,18 +6799,634 @@ done:
                vm_object_unlock(object2);
                object2_locked = FALSE;
        }
                vm_object_unlock(object2);
                object2_locked = FALSE;
        }
-       if (object1_paging) {
-               vm_object_lock(object1);
-               vm_object_paging_end(object1);
-               vm_object_unlock(object1);
-               object1_paging = FALSE;
+
+       vm_object_transpose_count++;
+
+       return retval;
+}
+
+
+/*
+ *      vm_object_cluster_size
+ *
+ *      Determine how big a cluster we should issue an I/O for...
+ *
+ *     Inputs:   *start == offset of page needed
+ *               *length == maximum cluster pager can handle
+ *     Outputs:  *start == beginning offset of cluster
+ *               *length == length of cluster to try
+ *
+ *     The original *start will be encompassed by the cluster
+ *
+ */
+extern int speculative_reads_disabled;
+#if CONFIG_EMBEDDED
+unsigned int preheat_pages_max = MAX_UPL_TRANSFER;
+unsigned int preheat_pages_min = 8;
+unsigned int preheat_pages_mult = 4;
+#else
+unsigned int preheat_pages_max = MAX_UPL_TRANSFER;
+unsigned int preheat_pages_min = 8;
+unsigned int preheat_pages_mult = 4;
+#endif
+
+uint32_t pre_heat_scaling[MAX_UPL_TRANSFER + 1];
+uint32_t pre_heat_cluster[MAX_UPL_TRANSFER + 1];
+
+
+__private_extern__ void
+vm_object_cluster_size(vm_object_t object, vm_object_offset_t *start,
+                      vm_size_t *length, vm_object_fault_info_t fault_info, uint32_t *io_streaming)
+{
+       vm_size_t               pre_heat_size;
+       vm_size_t               tail_size;
+       vm_size_t               head_size;
+       vm_size_t               max_length;
+       vm_size_t               cluster_size;
+       vm_object_offset_t      object_size;
+       vm_object_offset_t      orig_start;
+       vm_object_offset_t      target_start;
+       vm_object_offset_t      offset;
+       vm_behavior_t           behavior;
+       boolean_t               look_behind = TRUE;
+       boolean_t               look_ahead  = TRUE;
+       uint32_t                throttle_limit;
+       int                     sequential_run;
+       int                     sequential_behavior = VM_BEHAVIOR_SEQUENTIAL;
+       unsigned int            max_ph_size;
+       unsigned int            min_ph_size;
+       unsigned int            ph_mult;
+
+       assert( !(*length & PAGE_MASK));
+       assert( !(*start & PAGE_MASK_64));
+
+       if ( (ph_mult = preheat_pages_mult) < 1 ) 
+               ph_mult = 1;
+       if ( (min_ph_size = preheat_pages_min) < 1 ) 
+               min_ph_size = 1;
+       if ( (max_ph_size = preheat_pages_max) > MAX_UPL_TRANSFER ) 
+               max_ph_size = MAX_UPL_TRANSFER;
+       
+       if ( (max_length = *length) > (max_ph_size * PAGE_SIZE) ) 
+               max_length = (max_ph_size * PAGE_SIZE);
+
+       /*
+        * we'll always return a cluster size of at least
+        * 1 page, since the original fault must always
+        * be processed
+        */
+       *length = PAGE_SIZE;
+       *io_streaming = 0;
+
+       if (speculative_reads_disabled || fault_info == NULL || max_length == 0) {
+               /*
+                * no cluster... just fault the page in
+                */
+               return;
        }
        }
-       if (object2_paging) {
-               vm_object_lock(object2);
-               vm_object_paging_end(object2);
-               vm_object_unlock(object2);
-               object2_paging = FALSE;
+       orig_start = *start;
+       target_start = orig_start;
+       cluster_size = round_page(fault_info->cluster_size);
+       behavior = fault_info->behavior;
+
+       vm_object_lock(object);
+
+       if (object->internal)
+               object_size = object->size;
+       else if (object->pager != MEMORY_OBJECT_NULL)
+               vnode_pager_get_object_size(object->pager, &object_size);
+       else
+               goto out;       /* pager is gone for this object, nothing more to do */
+
+       object_size = round_page_64(object_size);
+
+       if (orig_start >= object_size) {
+               /*
+                * fault occurred beyond the EOF...
+                * we need to punt w/o changing the
+                * starting offset
+                */
+               goto out;
+       }
+       if (object->pages_used > object->pages_created) {
+               /*
+                * must have wrapped our 32 bit counters
+                * so reset
+                */
+               object->pages_used = object->pages_created = 0;
        }
        }
+       if ((sequential_run = object->sequential)) {
+                 if (sequential_run < 0) {
+                         sequential_behavior = VM_BEHAVIOR_RSEQNTL;
+                         sequential_run = 0 - sequential_run;
+                 } else {
+                         sequential_behavior = VM_BEHAVIOR_SEQUENTIAL;
+                 }
 
 
-       return retval;
+       }
+       switch(behavior) {
+
+       default:
+               behavior = VM_BEHAVIOR_DEFAULT;
+
+       case VM_BEHAVIOR_DEFAULT:
+               if (object->internal && fault_info->user_tag == VM_MEMORY_STACK)
+                       goto out;
+
+               if (sequential_run >= (3 * PAGE_SIZE)) {
+                       pre_heat_size = sequential_run + PAGE_SIZE;
+
+                       if (sequential_behavior == VM_BEHAVIOR_SEQUENTIAL)
+                               look_behind = FALSE;
+                       else
+                               look_ahead = FALSE;
+
+                       *io_streaming = 1;
+               } else {
+
+                       if (object->pages_created < 32 * ph_mult) {
+                               /*
+                                * prime the pump
+                                */
+                               pre_heat_size = PAGE_SIZE * 8 * ph_mult;
+                               break;
+                       }
+                       /*
+                        * Linear growth in PH size: The maximum size is max_length...
+                        * this cacluation will result in a size that is neither a 
+                        * power of 2 nor a multiple of PAGE_SIZE... so round
+                        * it up to the nearest PAGE_SIZE boundary
+                        */
+                       pre_heat_size = (ph_mult * (max_length * object->pages_used) / object->pages_created);
+                       
+                       if (pre_heat_size < PAGE_SIZE * min_ph_size)
+                               pre_heat_size = PAGE_SIZE * min_ph_size;
+                       else
+                               pre_heat_size = round_page(pre_heat_size);
+               }
+               break;
+
+       case VM_BEHAVIOR_RANDOM:
+               if ((pre_heat_size = cluster_size) <= PAGE_SIZE)
+                       goto out;
+               break;
+
+       case VM_BEHAVIOR_SEQUENTIAL:
+               if ((pre_heat_size = cluster_size) == 0)
+                       pre_heat_size = sequential_run + PAGE_SIZE;
+               look_behind = FALSE;
+               *io_streaming = 1;
+
+               break;
+
+       case VM_BEHAVIOR_RSEQNTL:
+               if ((pre_heat_size = cluster_size) == 0)
+                       pre_heat_size = sequential_run + PAGE_SIZE;
+               look_ahead = FALSE;
+               *io_streaming = 1;
+
+               break;
+
+       }
+       throttle_limit = (uint32_t) max_length;
+       assert(throttle_limit == max_length);
+
+       if (vnode_pager_check_hard_throttle(object->pager, &throttle_limit, *io_streaming) == KERN_SUCCESS) {
+               if (max_length > throttle_limit)
+                       max_length = throttle_limit;
+       }
+       if (pre_heat_size > max_length)
+               pre_heat_size = max_length;
+
+       if (behavior == VM_BEHAVIOR_DEFAULT) {
+               if (vm_page_free_count < vm_page_throttle_limit)
+                       pre_heat_size = trunc_page(pre_heat_size / 8);
+               else if (vm_page_free_count < vm_page_free_target)
+                       pre_heat_size = trunc_page(pre_heat_size / 2);
+
+               if (pre_heat_size <= PAGE_SIZE)
+                       goto out;
+       }
+       if (look_ahead == TRUE) {
+               if (look_behind == TRUE) { 
+                       /*
+                        * if we get here its due to a random access... 
+                        * so we want to center the original fault address
+                        * within the cluster we will issue... make sure
+                        * to calculate 'head_size' as a multiple of PAGE_SIZE...
+                        * 'pre_heat_size' is a multiple of PAGE_SIZE but not
+                        * necessarily an even number of pages so we need to truncate
+                        * the result to a PAGE_SIZE boundary
+                        */
+                       head_size = trunc_page(pre_heat_size / 2);
+
+                       if (target_start > head_size)
+                               target_start -= head_size;
+                       else
+                               target_start = 0;
+
+                       /*
+                        * 'target_start' at this point represents the beginning offset
+                        * of the cluster we are considering... 'orig_start' will be in
+                        * the center of this cluster if we didn't have to clip the start
+                        * due to running into the start of the file
+                        */
+               }
+               if ((target_start + pre_heat_size) > object_size)
+                       pre_heat_size = (vm_size_t)(round_page_64(object_size - target_start));
+               /*
+                * at this point caclulate the number of pages beyond the original fault
+                * address that we want to consider... this is guaranteed not to extend beyond
+                * the current EOF...
+                */
+               assert((vm_size_t)(orig_start - target_start) == (orig_start - target_start));
+               tail_size = pre_heat_size - (vm_size_t)(orig_start - target_start) - PAGE_SIZE;
+       } else {
+               if (pre_heat_size > target_start)
+                       pre_heat_size = (vm_size_t) target_start; /* XXX: 32-bit vs 64-bit ? Joe ? */
+               tail_size = 0;
+       }
+       assert( !(target_start & PAGE_MASK_64));
+       assert( !(pre_heat_size & PAGE_MASK));
+
+       pre_heat_scaling[pre_heat_size / PAGE_SIZE]++;
+
+       if (pre_heat_size <= PAGE_SIZE)
+               goto out;
+
+       if (look_behind == TRUE) {
+               /*
+                * take a look at the pages before the original
+                * faulting offset... recalculate this in case
+                * we had to clip 'pre_heat_size' above to keep 
+                * from running past the EOF.
+                */
+               head_size = pre_heat_size - tail_size - PAGE_SIZE;
+
+               for (offset = orig_start - PAGE_SIZE_64; head_size; offset -= PAGE_SIZE_64, head_size -= PAGE_SIZE) {
+                       /*
+                        * don't poke below the lowest offset 
+                        */
+                       if (offset < fault_info->lo_offset)
+                               break;
+                       /*
+                        * for external objects and internal objects w/o an existence map
+                        * vm_externl_state_get will return VM_EXTERNAL_STATE_UNKNOWN
+                        */
+#if MACH_PAGEMAP
+                       if (vm_external_state_get(object->existence_map, offset) == VM_EXTERNAL_STATE_ABSENT) {
+                               /*
+                                * we know for a fact that the pager can't provide the page
+                                * so don't include it or any pages beyond it in this cluster
+                                */
+                               break;
+                       }
+#endif
+                       if (vm_page_lookup(object, offset) != VM_PAGE_NULL) {
+                               /*
+                                * don't bridge resident pages
+                                */
+                               break;
+                       }
+                       *start = offset;
+                       *length += PAGE_SIZE;
+               }
+       }
+       if (look_ahead == TRUE) {
+               for (offset = orig_start + PAGE_SIZE_64; tail_size; offset += PAGE_SIZE_64, tail_size -= PAGE_SIZE) {
+                       /*
+                        * don't poke above the highest offset 
+                        */
+                       if (offset >= fault_info->hi_offset)
+                               break;
+                       assert(offset < object_size);
+
+                       /*
+                        * for external objects and internal objects w/o an existence map
+                        * vm_externl_state_get will return VM_EXTERNAL_STATE_UNKNOWN
+                        */
+#if MACH_PAGEMAP
+                       if (vm_external_state_get(object->existence_map, offset) == VM_EXTERNAL_STATE_ABSENT) {
+                               /*
+                                * we know for a fact that the pager can't provide the page
+                                * so don't include it or any pages beyond it in this cluster
+                                */
+                               break;
+                       }
+#endif
+                       if (vm_page_lookup(object, offset) != VM_PAGE_NULL) {
+                               /*
+                                * don't bridge resident pages
+                                */
+                               break;
+                       }
+                       *length += PAGE_SIZE;
+               }
+       }
+out:
+       if (*length > max_length)
+               *length = max_length;
+
+       pre_heat_cluster[*length / PAGE_SIZE]++;
+
+       vm_object_unlock(object);
+}
+
+
+/*
+ * Allow manipulation of individual page state.  This is actually part of
+ * the UPL regimen but takes place on the VM object rather than on a UPL
+ */
+
+kern_return_t
+vm_object_page_op(
+       vm_object_t             object,
+       vm_object_offset_t      offset,
+       int                     ops,
+       ppnum_t                 *phys_entry,
+       int                     *flags)
+{
+       vm_page_t               dst_page;
+
+       vm_object_lock(object);
+
+       if(ops & UPL_POP_PHYSICAL) {
+               if(object->phys_contiguous) {
+                       if (phys_entry) {
+                               *phys_entry = (ppnum_t)
+                                       (object->shadow_offset >> PAGE_SHIFT);
+                       }
+                       vm_object_unlock(object);
+                       return KERN_SUCCESS;
+               } else {
+                       vm_object_unlock(object);
+                       return KERN_INVALID_OBJECT;
+               }
+       }
+       if(object->phys_contiguous) {
+               vm_object_unlock(object);
+               return KERN_INVALID_OBJECT;
+       }
+
+       while(TRUE) {
+               if((dst_page = vm_page_lookup(object,offset)) == VM_PAGE_NULL) {
+                       vm_object_unlock(object);
+                       return KERN_FAILURE;
+               }
+
+               /* Sync up on getting the busy bit */
+               if((dst_page->busy || dst_page->cleaning) && 
+                          (((ops & UPL_POP_SET) && 
+                          (ops & UPL_POP_BUSY)) || (ops & UPL_POP_DUMP))) {
+                       /* someone else is playing with the page, we will */
+                       /* have to wait */
+                       PAGE_SLEEP(object, dst_page, THREAD_UNINT);
+                       continue;
+               }
+
+               if (ops & UPL_POP_DUMP) {
+                       if (dst_page->pmapped == TRUE)
+                               pmap_disconnect(dst_page->phys_page);
+
+                       VM_PAGE_FREE(dst_page);
+                       break;
+               }
+
+               if (flags) {
+                       *flags = 0;
+
+                       /* Get the condition of flags before requested ops */
+                       /* are undertaken */
+
+                       if(dst_page->dirty) *flags |= UPL_POP_DIRTY;
+                       if(dst_page->pageout) *flags |= UPL_POP_PAGEOUT;
+                       if(dst_page->precious) *flags |= UPL_POP_PRECIOUS;
+                       if(dst_page->absent) *flags |= UPL_POP_ABSENT;
+                       if(dst_page->busy) *flags |= UPL_POP_BUSY;
+               }
+
+               /* The caller should have made a call either contingent with */
+               /* or prior to this call to set UPL_POP_BUSY */
+               if(ops & UPL_POP_SET) {
+                       /* The protection granted with this assert will */
+                       /* not be complete.  If the caller violates the */
+                       /* convention and attempts to change page state */
+                       /* without first setting busy we may not see it */
+                       /* because the page may already be busy.  However */
+                       /* if such violations occur we will assert sooner */
+                       /* or later. */
+                       assert(dst_page->busy || (ops & UPL_POP_BUSY));
+                       if (ops & UPL_POP_DIRTY) dst_page->dirty = TRUE;
+                       if (ops & UPL_POP_PAGEOUT) dst_page->pageout = TRUE;
+                       if (ops & UPL_POP_PRECIOUS) dst_page->precious = TRUE;
+                       if (ops & UPL_POP_ABSENT) dst_page->absent = TRUE;
+                       if (ops & UPL_POP_BUSY) dst_page->busy = TRUE;
+               }
+
+               if(ops & UPL_POP_CLR) {
+                       assert(dst_page->busy);
+                       if (ops & UPL_POP_DIRTY) dst_page->dirty = FALSE;
+                       if (ops & UPL_POP_PAGEOUT) dst_page->pageout = FALSE;
+                       if (ops & UPL_POP_PRECIOUS) dst_page->precious = FALSE;
+                       if (ops & UPL_POP_ABSENT) dst_page->absent = FALSE;
+                       if (ops & UPL_POP_BUSY) {
+                               dst_page->busy = FALSE;
+                               PAGE_WAKEUP(dst_page);
+                       }
+               }
+
+               if (dst_page->encrypted) {
+                       /*
+                        * ENCRYPTED SWAP:
+                        * We need to decrypt this encrypted page before the
+                        * caller can access its contents.
+                        * But if the caller really wants to access the page's
+                        * contents, they have to keep the page "busy".
+                        * Otherwise, the page could get recycled or re-encrypted
+                        * at any time.
+                        */
+                       if ((ops & UPL_POP_SET) && (ops & UPL_POP_BUSY) &&
+                           dst_page->busy) {
+                               /*
+                                * The page is stable enough to be accessed by
+                                * the caller, so make sure its contents are
+                                * not encrypted.
+                                */
+                               vm_page_decrypt(dst_page, 0);
+                       } else {
+                               /*
+                                * The page is not busy, so don't bother
+                                * decrypting it, since anything could
+                                * happen to it between now and when the
+                                * caller wants to access it.
+                                * We should not give the caller access
+                                * to this page.
+                                */
+                               assert(!phys_entry);
+                       }
+               }
+
+               if (phys_entry) {
+                       /*
+                        * The physical page number will remain valid
+                        * only if the page is kept busy.
+                        * ENCRYPTED SWAP: make sure we don't let the
+                        * caller access an encrypted page.
+                        */
+                       assert(dst_page->busy);
+                       assert(!dst_page->encrypted);
+                       *phys_entry = dst_page->phys_page;
+               }
+
+               break;
+       }
+
+       vm_object_unlock(object);
+       return KERN_SUCCESS;
+                               
+}
+
+/*
+ * vm_object_range_op offers performance enhancement over 
+ * vm_object_page_op for page_op functions which do not require page 
+ * level state to be returned from the call.  Page_op was created to provide 
+ * a low-cost alternative to page manipulation via UPLs when only a single 
+ * page was involved.  The range_op call establishes the ability in the _op 
+ * family of functions to work on multiple pages where the lack of page level
+ * state handling allows the caller to avoid the overhead of the upl structures.
+ */
+
+kern_return_t
+vm_object_range_op(
+       vm_object_t             object,
+       vm_object_offset_t      offset_beg,
+       vm_object_offset_t      offset_end,
+       int                     ops,
+       uint32_t                *range)
+{
+        vm_object_offset_t     offset;
+       vm_page_t               dst_page;
+
+       if (offset_end - offset_beg > (uint32_t) -1) {
+               /* range is too big and would overflow "*range" */
+               return KERN_INVALID_ARGUMENT;
+       } 
+       if (object->resident_page_count == 0) {
+               if (range) {
+                       if (ops & UPL_ROP_PRESENT) {
+                               *range = 0;
+                       } else {
+                               *range = (uint32_t) (offset_end - offset_beg);
+                               assert(*range == (offset_end - offset_beg));
+                       }
+               }
+               return KERN_SUCCESS;
+       }
+       vm_object_lock(object);
+
+       if (object->phys_contiguous) {
+               vm_object_unlock(object);
+               return KERN_INVALID_OBJECT;
+       }
+       
+       offset = offset_beg & ~PAGE_MASK_64;
+
+       while (offset < offset_end) {
+               dst_page = vm_page_lookup(object, offset);
+               if (dst_page != VM_PAGE_NULL) {
+                       if (ops & UPL_ROP_DUMP) {
+                               if (dst_page->busy || dst_page->cleaning) {
+                                       /*
+                                        * someone else is playing with the 
+                                        * page, we will have to wait
+                                        */
+                                       PAGE_SLEEP(object, dst_page, THREAD_UNINT);
+                                       /*
+                                        * need to relook the page up since it's
+                                        * state may have changed while we slept
+                                        * it might even belong to a different object
+                                        * at this point
+                                        */
+                                       continue;
+                               }
+                               if (dst_page->pmapped == TRUE)
+                                       pmap_disconnect(dst_page->phys_page);
+
+                               VM_PAGE_FREE(dst_page);
+
+                       } else if ((ops & UPL_ROP_ABSENT) && !dst_page->absent)
+                               break;
+               } else if (ops & UPL_ROP_PRESENT)
+                       break;
+
+               offset += PAGE_SIZE;
+       }
+       vm_object_unlock(object);
+
+       if (range) {
+               if (offset > offset_end)
+                       offset = offset_end;
+               if(offset > offset_beg) {
+                       *range = (uint32_t) (offset - offset_beg);
+                       assert(*range == (offset - offset_beg));
+               } else {
+                       *range = 0;
+               }
+       }
+       return KERN_SUCCESS;
+}
+
+
+uint32_t scan_object_collision = 0;
+
+void
+vm_object_lock(vm_object_t object)
+{
+        if (object == vm_pageout_scan_wants_object) {
+               scan_object_collision++;
+               mutex_pause(2);
+       }
+        lck_rw_lock_exclusive(&object->Lock);
+}
+
+boolean_t
+vm_object_lock_avoid(vm_object_t object)
+{
+        if (object == vm_pageout_scan_wants_object) {
+               scan_object_collision++;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+boolean_t
+_vm_object_lock_try(vm_object_t object)
+{
+       return (lck_rw_try_lock_exclusive(&object->Lock));
+}
+
+boolean_t
+vm_object_lock_try(vm_object_t object)
+{
+       if (vm_object_lock_avoid(object)) {
+               mutex_pause(2);
+       }
+       return _vm_object_lock_try(object);
+}
+void
+vm_object_lock_shared(vm_object_t object)
+{
+        if (vm_object_lock_avoid(object)) {
+               mutex_pause(2);
+       }
+       lck_rw_lock_shared(&object->Lock);
+}
+
+boolean_t
+vm_object_lock_try_shared(vm_object_t object)
+{
+        if (vm_object_lock_avoid(object)) {
+               mutex_pause(2);
+       }
+       return (lck_rw_try_lock_shared(&object->Lock));
 }
 }