xnu-4570.41.2.tar.gz

[apple/xnu.git] / osfmk / i386 / pmap_common.c

diff --git a/osfmk/i386/pmap_common.c b/osfmk/i386/pmap_common.c
index 6fe3641c392b76d25619ebe018660cd4c700d9dd..9436719d4b0dfb9d15ab3c133bc96a9f3f372ea7 100644 (file)
--- a/osfmk/i386/pmap_common.c
+++ b/osfmk/i386/pmap_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -61,6 +61,9 @@ event_t       mapping_replenish_event, pmap_user_pv_throttle_event;
 
 uint64_t pmap_pv_throttle_stat, pmap_pv_throttled_waiters;
 
+int pmap_asserts_enabled = (DEBUG);
+int pmap_asserts_traced = 0;
+
 unsigned int pmap_cache_attributes(ppnum_t pn) {
        if (pmap_get_cache_attributes(pn, FALSE) & INTEL_PTE_NCACHE)
                return (VM_WIMG_IO);
@@ -142,8 +145,17 @@ unsigned   pmap_get_cache_attributes(ppnum_t pn, boolean_t is_ept) {
 boolean_t 
 pmap_has_managed_page(ppnum_t first, ppnum_t last)
 {
-       ppnum_t   pn;
-    boolean_t result;
+       ppnum_t     pn, kdata_start, kdata_end;
+       boolean_t   result;
+       boot_args * args;
+
+       args        = (boot_args *) PE_state.bootArgs;
+
+       // Allow pages that the booter added to the end of the kernel.
+       // We may miss reporting some pages in this range that were freed
+       // with ml_static_free()
+       kdata_start = atop_32(args->kaddr);
+       kdata_end   = atop_32(args->kaddr + args->ksize);
 
     assert(last_managed_page);
     assert(first <= last);
@@ -154,6 +166,7 @@ pmap_has_managed_page(ppnum_t first, ppnum_t last)
          && (pn <= last_managed_page); 
         pn++)
     {
+               if ((pn >= kdata_start) && (pn < kdata_end)) continue;
        result = (0 != (pmap_phys_attributes[pn] & PHYS_MANAGED));
     }
 
@@ -341,7 +354,9 @@ unsigned pmap_kernel_reserve_replenish_stat;
 unsigned pmap_user_reserve_replenish_stat;
 unsigned pmap_kern_reserve_alloc_stat;
 
-void mapping_replenish(void)
+__attribute__((noreturn))
+void
+mapping_replenish(void)
 {
        pv_hashed_entry_t       pvh_e;
        pv_hashed_entry_t       pvh_eh;