xnu-6153.41.3.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 26b3477a4671e079a9b6a5d828ee298d0096fefe..df03e1ca0c2818249299c9f8a48104e24850b9e7 100644 (file)
--- a/osfmk/vm/vm_map_store.c
+++ b/osfmk/vm/vm_map_store.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2009 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2009 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

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


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

- * 
+ *

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

- * 
+ *

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


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

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 


@@ -35,7 +35,7 @@
 boolean_t
 first_free_is_valid_store( vm_map_t map )
 {
 boolean_t
 first_free_is_valid_store( vm_map_t map )
 {

-       return(first_free_is_valid_ll( map ));
+       return first_free_is_valid_ll( map );

 }
 #endif
 
 }
 #endif
 


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

-       vm_map_t                map,
-       vm_map_offset_t         address,
-       vm_map_entry_t          *entry)         /* OUT */
+       vm_map_t                map,
+       vm_map_offset_t         address,
+       vm_map_entry_t          *entry)         /* OUT */

 {
 #ifdef VM_MAP_STORE_USE_LL
 {
 #ifdef VM_MAP_STORE_USE_LL

-       return (vm_map_store_lookup_entry_ll( map, address, entry ));
+       return vm_map_store_lookup_entry_ll( map, address, entry );

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

-               return (vm_map_store_lookup_entry_rb( map, address, entry ));
+               return vm_map_store_lookup_entry_rb( map, address, entry );

        } else {
                panic("VM map lookups need RB tree support.\n");
                return FALSE; /* For compiler warning.*/
        } else {
                panic("VM map lookups need RB tree support.\n");
                return FALSE; /* For compiler warning.*/


@@ -81,46 +81,19 @@ void
 vm_map_store_update( vm_map_t map, vm_map_entry_t entry, int update_type )
 {
        switch (update_type) {
 vm_map_store_update( vm_map_t map, vm_map_entry_t entry, int update_type )
 {
        switch (update_type) {

-               case VM_MAP_ENTRY_CREATE:
-                       break;
-               case VM_MAP_ENTRY_DELETE:
-                       if((map->holelistenabled == FALSE) && ((entry) == (map)->first_free)) {
-                               (map)->first_free = vm_map_to_entry(map);
-                       }
-                       if((entry) == (map)->hint) {
-                               (map)->hint = vm_map_to_entry(map);
-                       }
-                       break;
-               default:
-                       break;
-       }
-}
-
-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);
+       case VM_MAP_ENTRY_CREATE:
+               break;
+       case VM_MAP_ENTRY_DELETE:
+               if ((map->holelistenabled == FALSE) && ((entry) == (map)->first_free)) {
+                       (map)->first_free = vm_map_to_entry(map);

                }
                }

-       }
-
-       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;
+               if ((entry) == (map)->hint) {
+                       (map)->hint = vm_map_to_entry(map);

                }
                }

+               break;
+       default:
+               break;

        }
        }

-
-       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_rb(map, after_where, copy);
-       }
-#endif

 }
 
 /*
 }
 
 /*


@@ -131,7 +104,7 @@ void        vm_map_store_copy_insert( vm_map_t map, vm_map_entry_t after_where, vm_map_
  *     some places where updating first_free is not needed &
  *     copy maps are being modified. Also note the first argument
  *     is the map header.
  *     some places where updating first_free is not needed &
  *     copy maps are being modified. Also note the first argument
  *     is the map header.

- *     Modifying the vm_map_store_entry_{un,}link functions to 
+ *     Modifying the vm_map_store_entry_{un,}link functions to

  *     deal with these call sites made the interface confusing
  *     and clunky.
  */
  *     deal with these call sites made the interface confusing
  *     and clunky.
  */


@@ -140,8 +113,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);
+       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
 
        vm_map_store_entry_link_ll(mapHdr, after_where, entry);
 #ifdef VM_MAP_STORE_USE_RB


@@ -151,20 +125,24 @@ _vm_map_store_entry_link( struct vm_map_header * mapHdr, vm_map_entry_t after_wh
 #endif
 #if MAP_ENTRY_INSERTION_DEBUG
        backtrace(&entry->vme_insertion_bt[0],
 #endif
 #if MAP_ENTRY_INSERTION_DEBUG
        backtrace(&entry->vme_insertion_bt[0],

-                 (sizeof (entry->vme_insertion_bt) / sizeof (uintptr_t)));
+           (sizeof(entry->vme_insertion_bt) / sizeof(uintptr_t)), NULL);

 #endif
 }
 
 void
 #endif
 }
 
 void

-vm_map_store_entry_link( vm_map_t map, vm_map_entry_t after_where, vm_map_entry_t entry)
+vm_map_store_entry_link(
+       vm_map_t                map,
+       vm_map_entry_t          after_where,
+       vm_map_entry_t          entry,
+       vm_map_kernel_flags_t   vmk_flags)

 {
        vm_map_t VMEL_map;
        vm_map_entry_t VMEL_entry;
        VMEL_map = (map);
        VMEL_entry = (entry);
 {
        vm_map_t VMEL_map;
        vm_map_entry_t VMEL_entry;
        VMEL_map = (map);
        VMEL_entry = (entry);

-       
+

        _vm_map_store_entry_link(&VMEL_map->hdr, after_where, VMEL_entry);
        _vm_map_store_entry_link(&VMEL_map->hdr, after_where, VMEL_entry);

-       if( VMEL_map->disable_vmentry_reuse == TRUE ) {
+       if (VMEL_map->disable_vmentry_reuse == TRUE) {

                UPDATE_HIGHEST_ENTRY_END( VMEL_map, VMEL_entry);
        } else {
                update_first_free_ll(VMEL_map, VMEL_map->first_free);
                UPDATE_HIGHEST_ENTRY_END( VMEL_map, VMEL_entry);
        } else {
                update_first_free_ll(VMEL_map, VMEL_map->first_free);


@@ -174,13 +152,19 @@ vm_map_store_entry_link( vm_map_t map, vm_map_entry_t after_where, vm_map_entry_
                }
 #endif
        }
                }
 #endif
        }

+#if PMAP_CS
+       (void) vm_map_entry_cs_associate(map, entry, vmk_flags);
+#else /* PMAP_CS */
+       (void) vmk_flags;
+#endif /* PMAP_CS */

 }
 
 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);
+       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
 
        vm_map_store_entry_unlink_ll(mapHdr, entry);
 #ifdef VM_MAP_STORE_USE_RB


@@ -200,9 +184,9 @@ vm_map_store_entry_unlink( vm_map_t map, vm_map_entry_t entry)
        VMEU_entry = (entry);
 
        if (map->holelistenabled == FALSE) {
        VMEU_entry = (entry);
 
        if (map->holelistenabled == FALSE) {

-               if (VMEU_entry->vme_start <= VMEU_map->first_free->vme_start){
+               if (VMEU_entry->vme_start <= VMEU_map->first_free->vme_start) {

                        VMEU_first_free = VMEU_entry->vme_prev;
                        VMEU_first_free = VMEU_entry->vme_prev;

-               } else  {
+               } else {

                        VMEU_first_free = VMEU_map->first_free;
                }
        }
                        VMEU_first_free = VMEU_map->first_free;
                }
        }


@@ -217,7 +201,7 @@ vm_map_store_entry_unlink( vm_map_t map, vm_map_entry_t entry)
 }
 
 void
 }
 
 void

-vm_map_store_copy_reset( vm_map_copy_t copy,vm_map_entry_t entry)
+vm_map_store_copy_reset( vm_map_copy_t copy, vm_map_entry_t entry)

 {
        int nentries = copy->cpy_hdr.nentries;
        vm_map_store_copy_reset_ll(copy, entry, nentries);
 {
        int nentries = copy->cpy_hdr.nentries;
        vm_map_store_copy_reset_ll(copy, entry, nentries);