xnu-4570.20.62.tar.gz

[apple/xnu.git] / osfmk / vm / vm_map_store.c

diff --git a/osfmk/vm/vm_map_store.c b/osfmk/vm/vm_map_store.c
index 288bafba1d7c4e1818a68e369d9bec6712106dd7..26b3477a4671e079a9b6a5d828ee298d0096fefe 100644 (file)
--- a/osfmk/vm/vm_map_store.c
+++ b/osfmk/vm/vm_map_store.c
@@ -26,7 +26,10 @@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 

+#include <kern/backtrace.h>
+#include <mach/sdt.h>

 #include <vm/vm_map_store.h>
 #include <vm/vm_map_store.h>

+#include <vm/vm_pageout.h> /* for vm_debug_events */

 
 #if MACH_ASSERT
 boolean_t
 
 #if MACH_ASSERT
 boolean_t


@@ -58,8 +61,8 @@ vm_map_store_init( struct vm_map_header *hdr )
 
 boolean_t
 vm_map_store_lookup_entry(
 
 boolean_t
 vm_map_store_lookup_entry(

-       register vm_map_t               map,
-       register vm_map_offset_t        address,
+       vm_map_t                map,
+       vm_map_offset_t         address,

        vm_map_entry_t          *entry)         /* OUT */
 {
 #ifdef VM_MAP_STORE_USE_LL
        vm_map_entry_t          *entry)         /* OUT */
 {
 #ifdef VM_MAP_STORE_USE_LL


@@ -81,7 +84,7 @@ vm_map_store_update( vm_map_t map, vm_map_entry_t entry, int update_type )
                case VM_MAP_ENTRY_CREATE:
                        break;
                case VM_MAP_ENTRY_DELETE:
                case VM_MAP_ENTRY_CREATE:
                        break;
                case VM_MAP_ENTRY_DELETE:

-                       if((entry) == (map)->first_free) {
+                       if((map->holelistenabled == FALSE) && ((entry) == (map)->first_free)) {

                                (map)->first_free = vm_map_to_entry(map);
                        }
                        if((entry) == (map)->hint) {
                                (map)->first_free = vm_map_to_entry(map);
                        }
                        if((entry) == (map)->hint) {


@@ -95,6 +98,23 @@ vm_map_store_update( vm_map_t map, vm_map_entry_t entry, int update_type )
 
 void   vm_map_store_copy_insert( vm_map_t map, vm_map_entry_t after_where, vm_map_copy_t copy)
 {
 
 void   vm_map_store_copy_insert( vm_map_t map, vm_map_entry_t after_where, vm_map_copy_t copy)
 {

+       if (__improbable(vm_debug_events)) {
+               vm_map_entry_t entry;
+               for (entry = vm_map_copy_first_entry(copy); entry != vm_map_copy_to_entry(copy); entry = entry->vme_next) {
+                       DTRACE_VM4(map_entry_link_copy, vm_map_t, map, vm_map_entry_t, entry, vm_address_t, entry->links.start, vm_address_t, entry->links.end);
+               }
+       }
+
+       if (map->holelistenabled) {
+               vm_map_entry_t entry = NULL;
+
+               entry = vm_map_copy_first_entry(copy);
+               while (entry != vm_map_copy_to_entry(copy)) {
+                       vm_map_store_update_first_free(map, entry, TRUE);
+                       entry = entry->vme_next;
+               }
+       }
+

        vm_map_store_copy_insert_ll(map, after_where, copy);
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( &map->hdr )) {
        vm_map_store_copy_insert_ll(map, after_where, copy);
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( &map->hdr )) {


@@ -120,6 +140,9 @@ void
 _vm_map_store_entry_link( struct vm_map_header * mapHdr, vm_map_entry_t after_where, vm_map_entry_t entry)
 {
        assert(entry->vme_start < entry->vme_end);
 _vm_map_store_entry_link( struct vm_map_header * mapHdr, vm_map_entry_t after_where, vm_map_entry_t entry)
 {
        assert(entry->vme_start < entry->vme_end);

+       if (__improbable(vm_debug_events))
+               DTRACE_VM4(map_entry_link, vm_map_t, (char *)mapHdr - sizeof (lck_rw_t), vm_map_entry_t, entry, vm_address_t, entry->links.start, vm_address_t, entry->links.end);
+

        vm_map_store_entry_link_ll(mapHdr, after_where, entry);
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( mapHdr )) {
        vm_map_store_entry_link_ll(mapHdr, after_where, entry);
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( mapHdr )) {


@@ -127,8 +150,8 @@ _vm_map_store_entry_link( struct vm_map_header * mapHdr, vm_map_entry_t after_wh
        }
 #endif
 #if MAP_ENTRY_INSERTION_DEBUG
        }
 #endif
 #if MAP_ENTRY_INSERTION_DEBUG

-       fastbacktrace(&entry->vme_insertion_bt[0],
-                     (sizeof (entry->vme_insertion_bt) / sizeof (uintptr_t)));
+       backtrace(&entry->vme_insertion_bt[0],
+                 (sizeof (entry->vme_insertion_bt) / sizeof (uintptr_t)));

 #endif
 }
 
 #endif
 }
 


@@ -147,7 +170,7 @@ vm_map_store_entry_link( vm_map_t map, vm_map_entry_t after_where, vm_map_entry_
                update_first_free_ll(VMEL_map, VMEL_map->first_free);
 #ifdef VM_MAP_STORE_USE_RB
                if (vm_map_store_has_RB_support( &VMEL_map->hdr )) {
                update_first_free_ll(VMEL_map, VMEL_map->first_free);
 #ifdef VM_MAP_STORE_USE_RB
                if (vm_map_store_has_RB_support( &VMEL_map->hdr )) {

-                       update_first_free_rb(VMEL_map, VMEL_map->first_free);
+                       update_first_free_rb(VMEL_map, entry, TRUE);

                }
 #endif
        }
                }
 #endif
        }


@@ -156,6 +179,9 @@ vm_map_store_entry_link( vm_map_t map, vm_map_entry_t after_where, vm_map_entry_
 void
 _vm_map_store_entry_unlink( struct vm_map_header * mapHdr, vm_map_entry_t entry)
 {
 void
 _vm_map_store_entry_unlink( struct vm_map_header * mapHdr, vm_map_entry_t entry)
 {

+       if (__improbable(vm_debug_events))
+               DTRACE_VM4(map_entry_unlink, vm_map_t, (char *)mapHdr - sizeof (lck_rw_t), vm_map_entry_t, entry, vm_address_t, entry->links.start, vm_address_t, entry->links.end);
+

        vm_map_store_entry_unlink_ll(mapHdr, entry);
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( mapHdr )) {
        vm_map_store_entry_unlink_ll(mapHdr, entry);
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( mapHdr )) {


@@ -168,22 +194,24 @@ void
 vm_map_store_entry_unlink( vm_map_t map, vm_map_entry_t entry)
 {
        vm_map_t VMEU_map;
 vm_map_store_entry_unlink( vm_map_t map, vm_map_entry_t entry)
 {
        vm_map_t VMEU_map;

-       vm_map_entry_t VMEU_entry;
-       vm_map_entry_t VMEU_first_free;
+       vm_map_entry_t VMEU_entry = NULL;
+       vm_map_entry_t VMEU_first_free = NULL;

        VMEU_map = (map);
        VMEU_entry = (entry);
        VMEU_map = (map);
        VMEU_entry = (entry);

-       if (VMEU_entry->vme_start <= VMEU_map->first_free->vme_start){
-               VMEU_first_free = VMEU_entry->vme_prev;         
-       } else  {
-               VMEU_first_free = VMEU_map->first_free;
+
+       if (map->holelistenabled == FALSE) {
+               if (VMEU_entry->vme_start <= VMEU_map->first_free->vme_start){
+                       VMEU_first_free = VMEU_entry->vme_prev;
+               } else  {
+                       VMEU_first_free = VMEU_map->first_free;
+               }

        }
        }

-       

        _vm_map_store_entry_unlink(&VMEU_map->hdr, VMEU_entry);
        vm_map_store_update( map, entry, VM_MAP_ENTRY_DELETE);
        update_first_free_ll(VMEU_map, VMEU_first_free);
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( &VMEU_map->hdr )) {
        _vm_map_store_entry_unlink(&VMEU_map->hdr, VMEU_entry);
        vm_map_store_update( map, entry, VM_MAP_ENTRY_DELETE);
        update_first_free_ll(VMEU_map, VMEU_first_free);
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( &VMEU_map->hdr )) {

-               update_first_free_rb(VMEU_map, VMEU_first_free);
+               update_first_free_rb(VMEU_map, entry, FALSE);

        }
 #endif
 }
        }
 #endif
 }


@@ -201,12 +229,12 @@ vm_map_store_copy_reset( vm_map_copy_t copy,vm_map_entry_t entry)
 }
 
 void
 }
 
 void

-vm_map_store_update_first_free( vm_map_t map, vm_map_entry_t first_free)
+vm_map_store_update_first_free( vm_map_t map, vm_map_entry_t first_free_entry, boolean_t new_entry_creation)

 {
 {

-       update_first_free_ll(map, first_free);
+       update_first_free_ll(map, first_free_entry);

 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( &map->hdr )) {
 #ifdef VM_MAP_STORE_USE_RB
        if (vm_map_store_has_RB_support( &map->hdr )) {

-               update_first_free_rb(map, first_free);
+               update_first_free_rb(map, first_free_entry, new_entry_creation);

        }
 #endif
 }
        }
 #endif
 }