xnu-792.24.17.tar.gz

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

diff --git a/osfmk/vm/vm_fault.c b/osfmk/vm/vm_fault.c
index ef81f0886ad21a979b5a7047dd254c7b273d5d2b..e2aa4851f127e8a20928e1af2ce14a61fa1b5bfd 100644 (file)
--- a/osfmk/vm/vm_fault.c
+++ b/osfmk/vm/vm_fault.c
@@ -1675,7 +1675,7 @@ no_clustering:
                         */     
 
                        vm_object_paging_end(object); 
                         */     
 
                        vm_object_paging_end(object); 

-                       vm_object_collapse(object, offset, TRUE);
+                       vm_object_collapse(object, offset);

                        vm_object_paging_begin(object);
 
                }
                        vm_object_paging_begin(object);
 
                }


@@ -2151,8 +2151,10 @@ vm_fault(
        unsigned int            cache_attr;
        int                     write_startup_file = 0;
        boolean_t               need_activation;
        unsigned int            cache_attr;
        int                     write_startup_file = 0;
        boolean_t               need_activation;

-       vm_prot_t               original_fault_type;
+       vm_prot_t               full_fault_type;

 
 

+       if (get_preemption_level() != 0)
+               return (KERN_FAILURE);

 
        KERNEL_DEBUG_CONSTANT((MACHDBG_CODE(DBG_MACH_VM, 0)) | DBG_FUNC_START,
                              vaddr,
 
        KERNEL_DEBUG_CONSTANT((MACHDBG_CODE(DBG_MACH_VM, 0)) | DBG_FUNC_START,
                              vaddr,


@@ -2161,15 +2163,13 @@ vm_fault(
                              0,
                              0);
 
                              0,
                              0);
 

-       if (get_preemption_level() != 0) {
-               KERNEL_DEBUG_CONSTANT((MACHDBG_CODE(DBG_MACH_VM, 0)) | DBG_FUNC_END,
-                                     vaddr,
-                                     0,
-                                     KERN_FAILURE,
-                                     0,
-                                     0);
-
-               return (KERN_FAILURE);
+       /* at present we do not fully check for execute permission */
+       /* we generally treat it is read except in certain device  */
+       /* memory settings */
+       full_fault_type = fault_type;
+       if(fault_type & VM_PROT_EXECUTE) {
+               fault_type &= ~VM_PROT_EXECUTE;
+               fault_type |= VM_PROT_READ;

        }
 
        interruptible_state = thread_interrupt_level(interruptible);
        }
 
        interruptible_state = thread_interrupt_level(interruptible);


@@ -2184,15 +2184,12 @@ vm_fault(
        VM_STAT(faults++);
        current_task()->faults++;
 
        VM_STAT(faults++);
        current_task()->faults++;
 

-       original_fault_type = fault_type;
-

     RetryFault: ;
 
        /*
         *      Find the backing store object and offset into
         *      it to begin the search.
         */
     RetryFault: ;
 
        /*
         *      Find the backing store object and offset into
         *      it to begin the search.
         */

-       fault_type = original_fault_type;

        map = original_map;
        vm_map_lock_read(map);
        kr = vm_map_lookup_locked(&map, vaddr, fault_type, &version,
        map = original_map;
        vm_map_lock_read(map);
        kr = vm_map_lookup_locked(&map, vaddr, fault_type, &version,


@@ -2370,6 +2367,8 @@ vm_fault(
 FastMapInFault:
                                m->busy = TRUE;
 
 FastMapInFault:
                                m->busy = TRUE;
 

+                               vm_object_paging_begin(object);
+

 FastPmapEnter:
                                /*
                                 *      Check a couple of global reasons to
 FastPmapEnter:
                                /*
                                 *      Check a couple of global reasons to


@@ -2439,27 +2438,35 @@ FastPmapEnter:
                                 *      move active page to back of active
                                 *      queue.  This code doesn't.
                                 */
                                 *      move active page to back of active
                                 *      queue.  This code doesn't.
                                 */

+                               vm_page_lock_queues();
+

                                if (m->clustered) {
                                        vm_pagein_cluster_used++;
                                        m->clustered = FALSE;
                                }
                                if (m->clustered) {
                                        vm_pagein_cluster_used++;
                                        m->clustered = FALSE;
                                }

-                               if (change_wiring) {
-                                       vm_page_lock_queues();
+                               m->reference = TRUE;

 
 

+                               if (change_wiring) {

                                        if (wired)
                                                vm_page_wire(m);
                                        else
                                                vm_page_unwire(m);
                                        if (wired)
                                                vm_page_wire(m);
                                        else
                                                vm_page_unwire(m);

-
-                                       vm_page_unlock_queues();

                                }
                                }

+#if VM_FAULT_STATIC_CONFIG

                                else {
                                else {

-                                       if ((!m->active && !m->inactive) || ((need_activation == TRUE) && !m->active)) {
-                                               vm_page_lock_queues();
+                                       if ((!m->active && !m->inactive) || ((need_activation == TRUE) && !m->active))

                                                vm_page_activate(m);
                                                vm_page_activate(m);

-                                               vm_page_unlock_queues();
-                                       }

                                }
                                }

+#else                          
+                               else if (software_reference_bits) {
+                                       if (!m->active && !m->inactive)
+                                               vm_page_activate(m);
+                               }
+                               else if (!m->active) {
+                                       vm_page_activate(m);
+                               }
+#endif
+                               vm_page_unlock_queues();

 
                                /*
                                 *      That's it, clean up and return.
 
                                /*
                                 *      That's it, clean up and return.


@@ -2476,14 +2483,12 @@ FastPmapEnter:
                                 * normal clustering behavior.
                                 */
                                if (!sequential && !object->private) {
                                 * normal clustering behavior.
                                 */
                                if (!sequential && !object->private) {

-                                       vm_object_paging_begin(object);
-

                                        write_startup_file = 
                                                vm_fault_tws_insert(map, real_map, vaddr, 
                                                                object, cur_offset);
                                        write_startup_file = 
                                                vm_fault_tws_insert(map, real_map, vaddr, 
                                                                object, cur_offset);

-
-                                       vm_object_paging_end(object);

                                }
                                }

+
+                               vm_object_paging_end(object);

                                vm_object_unlock(object);
 
                                vm_map_unlock_read(map);
                                vm_object_unlock(object);
 
                                vm_map_unlock_read(map);


@@ -2575,7 +2580,8 @@ FastPmapEnter:
                         */     
  
                        vm_object_paging_end(object); 
                         */     
  
                        vm_object_paging_end(object); 

-                       vm_object_collapse(object, offset, TRUE);
+                       vm_object_collapse(object, offset);
+                       vm_object_paging_begin(object);

 
                        goto FastPmapEnter;
                }
 
                        goto FastPmapEnter;
                }


@@ -2652,6 +2658,9 @@ FastPmapEnter:
                                if (cur_object != object)
                                        vm_object_unlock(cur_object);
 
                                if (cur_object != object)
                                        vm_object_unlock(cur_object);
 

+                               vm_object_paging_begin(object);
+                               vm_object_unlock(object);
+

                                /*
                                 *      Now zero fill page and map it.
                                 *      the page is probably going to 
                                /*
                                 *      Now zero fill page and map it.
                                 *      the page is probably going to 


@@ -2700,6 +2709,7 @@ FastPmapEnter:
                                m->inactive = TRUE;
                                vm_page_inactive_count++;
                                vm_page_unlock_queues();
                                m->inactive = TRUE;
                                vm_page_inactive_count++;
                                vm_page_unlock_queues();

+                               vm_object_lock(object);

 
                                goto FastPmapEnter;
                        }
 
                                goto FastPmapEnter;
                        }


@@ -2992,6 +3002,7 @@ FastPmapEnter:
                }
        } else {
 
                }
        } else {
 

+#ifndef i386

                vm_map_entry_t          entry;
                vm_map_offset_t         laddr;
                vm_map_offset_t         ldelta, hdelta;
                vm_map_entry_t          entry;
                vm_map_offset_t         laddr;
                vm_map_offset_t         ldelta, hdelta;


@@ -3001,13 +3012,12 @@ FastPmapEnter:
                 * in the object 
                 */
 
                 * in the object 
                 */
 

-#ifndef i386

                /* While we do not worry about execution protection in   */
                /* general, certian pages may have instruction execution */
                /* disallowed.  We will check here, and if not allowed   */
                /* to execute, we return with a protection failure.      */
 
                /* While we do not worry about execution protection in   */
                /* general, certian pages may have instruction execution */
                /* disallowed.  We will check here, and if not allowed   */
                /* to execute, we return with a protection failure.      */
 

-               if((fault_type & VM_PROT_EXECUTE) &&
+               if((full_fault_type & VM_PROT_EXECUTE) &&

                        (!pmap_eligible_for_execute((ppnum_t)
                                (object->shadow_offset >> 12)))) {
 
                        (!pmap_eligible_for_execute((ppnum_t)
                                (object->shadow_offset >> 12)))) {
 


@@ -3019,7 +3029,6 @@ FastPmapEnter:
                        kr = KERN_PROTECTION_FAILURE;
                        goto done;
                }
                        kr = KERN_PROTECTION_FAILURE;
                        goto done;
                }

-#endif /* !i386 */

 
                if(real_map != map) {
                        vm_map_unlock(real_map);
 
                if(real_map != map) {
                        vm_map_unlock(real_map);


@@ -3060,38 +3069,45 @@ FastPmapEnter:
                }
 
                if(vm_map_lookup_entry(map, laddr, &entry) && 
                }
 
                if(vm_map_lookup_entry(map, laddr, &entry) && 

-                  (entry->object.vm_object != NULL) &&
-                  (entry->object.vm_object == object)) {
+                                       (entry->object.vm_object != NULL) &&
+                                       (entry->object.vm_object == object)) {

 
 

-                       vm_map_offset_t phys_offset;

 
 

-                       phys_offset = (entry->object.vm_object->shadow_offset
-                                      + entry->offset
-                                      + laddr
-                                      - entry->vme_start);
-                       phys_offset -= ldelta;

                        if(caller_pmap) {
                                /* Set up a block mapped area */
                        if(caller_pmap) {
                                /* Set up a block mapped area */

-                               pmap_map_block(
-                                       caller_pmap, 
+                               pmap_map_block(caller_pmap, 

                                        (addr64_t)(caller_pmap_addr - ldelta), 
                                        (addr64_t)(caller_pmap_addr - ldelta), 

-                                       phys_offset >> 12,
-                                       (ldelta + hdelta) >> 12,
-                                       prot,
-                                       (VM_WIMG_MASK & (int)object->wimg_bits),
-                                       0);
+                                       (((vm_map_offset_t)
+                                   (entry->object.vm_object->shadow_offset)) 
+                                       + entry->offset + 
+                                       (laddr - entry->vme_start) 
+                                                       - ldelta) >> 12,
+                               ((ldelta + hdelta) >> 12), prot, 
+                               (VM_WIMG_MASK & (int)object->wimg_bits), 0);

                        } else { 
                                /* Set up a block mapped area */
                        } else { 
                                /* Set up a block mapped area */

-                               pmap_map_block(
-                                       real_map->pmap, 
-                                       (addr64_t)(vaddr - ldelta), 
-                                       phys_offset >> 12,
-                                       (ldelta + hdelta) >> 12,
-                                       prot,
-                                       (VM_WIMG_MASK & (int)object->wimg_bits),
-                                       0);
+                               pmap_map_block(real_map->pmap, 
+                                  (addr64_t)(vaddr - ldelta), 
+                                  (((vm_map_offset_t)
+                                   (entry->object.vm_object->shadow_offset)) 
+                                      + entry->offset + 
+                                      (laddr - entry->vme_start) - ldelta) >> 12,
+                                  ((ldelta + hdelta) >> 12), prot, 
+                                  (VM_WIMG_MASK & (int)object->wimg_bits), 0);

                        }
                }
                        }
                }

+#else
+#ifdef notyet
+               if(caller_pmap) {
+                               pmap_enter(caller_pmap, caller_pmap_addr, 
+                               object->shadow_offset>>12, prot, 0, TRUE);
+               } else {
+                               pmap_enter(pmap, vaddr, 
+                               object->shadow_offset>>12, prot, 0, TRUE);
+               }
+                       /* Map it in */
+#endif
+#endif

 
        }
 
 
        }