xnu-6153.41.3.tar.gz

[apple/xnu.git] / osfmk / arm / pmap.h

diff --git a/osfmk/arm/pmap.h b/osfmk/arm/pmap.h
index 7653401cf7e68e4fb8cdb6583a985adc67990e03..92d4a167a1cc989d68c580d4c28a2fcdc165ee28 100644 (file)
--- a/osfmk/arm/pmap.h
+++ b/osfmk/arm/pmap.h
@@ -1,6 +1,5 @@
 /*
 /*

- *
- * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2007-2019 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *


@@ -27,7 +26,7 @@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #ifndef _ARM_PMAP_H_
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #ifndef _ARM_PMAP_H_

-#define _ARM_PMAP_H_   1
+#define _ARM_PMAP_H_    1

 
 #include <mach_assert.h>
 
 
 #include <mach_assert.h>
 


@@ -42,28 +41,54 @@
 
 #ifndef ASSEMBLER
 
 
 #ifndef ASSEMBLER
 

+#include <stdatomic.h>
+#include <stdbool.h>
+#include <libkern/section_keywords.h>

 #include <mach/kern_return.h>
 #include <mach/machine/vm_types.h>
 #include <mach/kern_return.h>
 #include <mach/machine/vm_types.h>

+#include <arm/pmap_public.h>
+#include <mach/arm/thread_status.h>
+#if defined(__arm64__)
+#include <arm64/tlb.h>
+#else
+#include <arm/tlb.h>
+#endif
+
+
+#define ASID_SHIFT                  (11)                            /* Shift for 2048 max virtual ASIDs (2048 pmaps) */
+#define MAX_ASID                    (1 << ASID_SHIFT)               /* Max supported ASIDs (can be virtual) */
+#ifndef ARM_ASID_SHIFT
+#define ARM_ASID_SHIFT              (8)                             /* Shift for the maximum ARM ASID value (256) */
+#endif
+#define ARM_MAX_ASID                (1 << ARM_ASID_SHIFT)           /* Max ASIDs supported by the hardware */
+#define NBBY                        8

 
 #if __ARM_KERNEL_PROTECT__
 
 #if __ARM_KERNEL_PROTECT__

-/*
- * For __ARM_KERNEL_PROTECT__, we need twice as many ASIDs to support having
- * unique EL0 and EL1 ASIDs for each pmap.
- */
-#define ASID_SHIFT                     (12)                            /* Shift for the maximum virtual ASID value (2048)*/
-#else /* __ARM_KERNEL_PROTECT__ */
-#define ASID_SHIFT                     (11)                            /* Shift for the maximum virtual ASID value (2048) */
-#endif /* __ARM_KERNEL_PROTECT__ */
-#define MAX_ASID                       (1 << ASID_SHIFT)               /* Max supported ASIDs (can be virtual) */
-#define ARM_ASID_SHIFT                 (8)                             /* Shift for the maximum ARM ASID value (256) */
-#define ARM_MAX_ASID                   (1 << ARM_ASID_SHIFT)           /* Max ASIDs supported by the hardware */
-#define ASID_VIRT_BITS                 (ASID_SHIFT - ARM_ASID_SHIFT)   /* The number of virtual bits in a virtaul ASID */
-#define NBBY                           8
+#define MAX_HW_ASID ((ARM_MAX_ASID >> 1) - 1)
+#else
+#define MAX_HW_ASID (ARM_MAX_ASID - 1)
+#endif
+
+#ifndef ARM_VMID_SHIFT
+#define ARM_VMID_SHIFT                  (8)
+#endif
+#define ARM_MAX_VMID                    (1 << ARM_VMID_SHIFT)
+
+/* XPRR virtual register map */
+
+#define CPUWINDOWS_MAX              4

 
 struct pmap_cpu_data {
 
 struct pmap_cpu_data {

+#if defined(__arm64__)
+       pmap_t cpu_nested_pmap;
+#else

        pmap_t cpu_user_pmap;
        pmap_t cpu_user_pmap;

-       unsigned int cpu_number;

        unsigned int cpu_user_pmap_stamp;
        unsigned int cpu_user_pmap_stamp;

+#endif
+       unsigned int cpu_number;
+       bool copywindow_strong_sync[CPUWINDOWS_MAX];
+
+#if MAX_ASID > MAX_HW_ASID

 
        /*
         * This supports overloading of ARM ASIDs by the pmap.  The field needs
 
        /*
         * This supports overloading of ARM ASIDs by the pmap.  The field needs


@@ -76,7 +101,8 @@ struct pmap_cpu_data {
         * memory by only having enough bits to support MAX_ASID.  However, such
         * an implementation would be more error prone.
         */
         * memory by only having enough bits to support MAX_ASID.  However, such
         * an implementation would be more error prone.
         */

-       uint8_t cpu_asid_high_bits[ARM_MAX_ASID];
+       uint8_t cpu_asid_high_bits[MAX_HW_ASID];
+#endif

 };
 typedef struct pmap_cpu_data pmap_cpu_data_t;
 
 };
 typedef struct pmap_cpu_data pmap_cpu_data_t;
 


@@ -87,6 +113,9 @@ typedef struct pmap_cpu_data pmap_cpu_data_t;
 #include <kern/thread.h>
 #include <kern/queue.h>
 
 #include <kern/thread.h>
 #include <kern/queue.h>
 

+
+#include <sys/cdefs.h>
+

 /* Base address for low globals. */
 #define LOW_GLOBAL_BASE_ADDRESS 0xfffffff000000000ULL
 
 /* Base address for low globals. */
 #define LOW_GLOBAL_BASE_ADDRESS 0xfffffff000000000ULL
 


@@ -102,31 +131,39 @@ typedef struct pmap_cpu_data pmap_cpu_data_t;
 
 #if defined(__arm64__)
 
 
 #if defined(__arm64__)
 

-typedef uint64_t       tt_entry_t;                                     /* translation table entry type */
-#define TT_ENTRY_NULL   ((tt_entry_t *) 0)
+#define BOOTSTRAP_TABLE_SIZE (ARM_PGBYTES * 8)

 
 

-typedef uint64_t       pt_entry_t;                                     /* page table entry type */
-#define PT_ENTRY_NULL   ((pt_entry_t *) 0)
+typedef uint64_t        tt_entry_t;                                     /* translation table entry type */
+#define TT_ENTRY_NULL    ((tt_entry_t *) 0)

 
 

-typedef        uint64_t        pmap_paddr_t;                           /* physical address (not ppnum_t) */
+typedef uint64_t        pt_entry_t;                                     /* page table entry type */
+#define PT_ENTRY_NULL    ((pt_entry_t *) 0)

 
 #elif defined(__arm__)
 
 
 #elif defined(__arm__)
 

-typedef uint32_t        tt_entry_t;                            /* translation table entry type */
-#define PT_ENTRY_NULL   ((pt_entry_t *) 0)
-
-typedef uint32_t       pt_entry_t;                                     /* page table entry type */
-#define TT_ENTRY_NULL   ((tt_entry_t *) 0)
+typedef uint32_t         tt_entry_t;                            /* translation table entry type */
+#define PT_ENTRY_NULL    ((pt_entry_t *) 0)

 
 

-typedef  uint32_t       pmap_paddr_t;                  /* physical address (not ppnum_t) */
+typedef uint32_t        pt_entry_t;                                     /* page table entry type */
+#define TT_ENTRY_NULL    ((tt_entry_t *) 0)

 
 #else
 #error unknown arch
 #endif
 
 
 #else
 #error unknown arch
 #endif
 

+struct page_table_level_info {
+       const uint64_t size;
+       const uint64_t offmask;
+       const uint64_t shift;
+       const uint64_t index_mask;
+       const uint64_t valid_mask;
+       const uint64_t type_mask;
+       const uint64_t type_block;
+};
+

 
 /* superpages */
 
 /* superpages */

-#define SUPERPAGE_NBASEPAGES 1 /* No superpages support */
+#define SUPERPAGE_NBASEPAGES 1  /* No superpages support */

 
 /*
  *      Convert addresses to pages and vice versa.
 
 /*
  *      Convert addresses to pages and vice versa.


@@ -153,35 +190,17 @@ typedef  uint32_t       pmap_paddr_t;                     /* physical address (not ppnum_t) */
  * the hardware page size), we will need to determine what the page
  * ratio is.
  */
  * the hardware page size), we will need to determine what the page
  * ratio is.
  */

-#define PAGE_RATIO                     ((1 << PAGE_SHIFT) >> ARM_PGSHIFT)
-#define TEST_PAGE_RATIO_4      (PAGE_RATIO == 4)
+#define PAGE_RATIO                      ((1 << PAGE_SHIFT) >> ARM_PGSHIFT)
+#define TEST_PAGE_RATIO_4       (PAGE_RATIO == 4)

 
 #if (__ARM_VMSA__ <= 7)
 
 #if (__ARM_VMSA__ <= 7)

-#define NTTES  (ARM_PGBYTES / sizeof(tt_entry_t))
-#define NPTES  ((ARM_PGBYTES/4) /sizeof(pt_entry_t))
+#define NTTES   (ARM_PGBYTES / sizeof(tt_entry_t))
+#define NPTES   ((ARM_PGBYTES/4) /sizeof(pt_entry_t))

 #else
 #else

-#define NTTES  (ARM_PGBYTES / sizeof(tt_entry_t))
-#define NPTES  (ARM_PGBYTES / sizeof(pt_entry_t))
+#define NTTES   (ARM_PGBYTES / sizeof(tt_entry_t))
+#define NPTES   (ARM_PGBYTES / sizeof(pt_entry_t))

 #endif
 
 #endif
 

-extern void flush_mmu_tlb(void);
-extern void flush_core_tlb(void);
-#if defined(__arm64__)
-extern void flush_mmu_tlb_allentries(uint64_t, uint64_t);
-extern void flush_mmu_tlb_entry(uint64_t);
-extern void flush_mmu_tlb_entries(uint64_t, uint64_t);
-extern void flush_mmu_tlb_asid(uint64_t);
-extern void flush_core_tlb_asid(uint64_t);
-
-#define tlbi_addr(x) (((x) >> TLBI_ADDR_SHIFT) & TLBI_ADDR_MASK)
-#define tlbi_asid(x) (((uint64_t)x << TLBI_ASID_SHIFT) & TLBI_ASID_MASK)
-#else
-extern void flush_mmu_tlb_entry(uint32_t);
-extern void flush_mmu_tlb_entries(uint32_t, uint32_t);
-extern void flush_mmu_tlb_mva_entries(uint32_t);
-extern void flush_mmu_tlb_asid(uint32_t);
-extern void flush_core_tlb_asid(uint32_t);
-#endif

 extern void flush_mmu_tlb_region(vm_offset_t va, unsigned length);
 
 #if defined(__arm64__)
 extern void flush_mmu_tlb_region(vm_offset_t va, unsigned length);
 
 #if defined(__arm64__)


@@ -192,6 +211,7 @@ extern void set_mmu_ttb(uint64_t);
 extern void set_mmu_ttb_alternate(uint64_t);
 extern uint64_t get_tcr(void);
 extern void set_tcr(uint64_t);
 extern void set_mmu_ttb_alternate(uint64_t);
 extern uint64_t get_tcr(void);
 extern void set_tcr(uint64_t);

+extern uint64_t pmap_get_arm64_prot(pmap_t, vm_offset_t);

 #else
 extern uint32_t get_mmu_control(void);
 extern void set_mmu_control(uint32_t);
 #else
 extern uint32_t get_mmu_control(void);
 extern void set_mmu_control(uint32_t);


@@ -203,57 +223,72 @@ extern void set_context_id(uint32_t);
 #endif
 
 extern pmap_paddr_t get_mmu_ttb(void);
 #endif
 
 extern pmap_paddr_t get_mmu_ttb(void);

-extern pmap_paddr_t mmu_kvtop(vm_offset_t va); 
-extern pmap_paddr_t mmu_kvtop_wpreflight(vm_offset_t va); 
-extern pmap_paddr_t mmu_uvtop(vm_offset_t va); 
+extern pmap_paddr_t mmu_kvtop(vm_offset_t va);
+extern pmap_paddr_t mmu_kvtop_wpreflight(vm_offset_t va);
+extern pmap_paddr_t mmu_uvtop(vm_offset_t va);

 
 #if (__ARM_VMSA__ <= 7)
 /* Convert address offset to translation table index */
 
 #if (__ARM_VMSA__ <= 7)
 /* Convert address offset to translation table index */

-#define ttenum(a)              ((a) >> ARM_TT_L1_SHIFT)
+#define ttenum(a)               ((a) >>        ARM_TT_L1_SHIFT)

 
 /* Convert translation table index to user virtual address */
 
 /* Convert translation table index to user virtual address */

-#define tteitova(a)            ((a) << ARM_TT_L1_SHIFT)
+#define tteitova(a)             ((a) << ARM_TT_L1_SHIFT)

 
 

-#define pa_to_suptte(a)                ((a) & ARM_TTE_SUPER_L1_MASK)
-#define suptte_to_pa(p)                ((p) & ARM_TTE_SUPER_L1_MASK)
+#define pa_to_suptte(a)         ((a) & ARM_TTE_SUPER_L1_MASK)
+#define suptte_to_pa(p)         ((p) & ARM_TTE_SUPER_L1_MASK)

 
 

-#define pa_to_sectte(a)                ((a) & ARM_TTE_BLOCK_L1_MASK)
-#define sectte_to_pa(p)                ((p) & ARM_TTE_BLOCK_L1_MASK)
+#define pa_to_sectte(a)         ((a) & ARM_TTE_BLOCK_L1_MASK)
+#define sectte_to_pa(p)         ((p) & ARM_TTE_BLOCK_L1_MASK)

 
 

-#define pa_to_tte(a)           ((a) & ARM_TTE_TABLE_MASK)
-#define tte_to_pa(p)           ((p) & ARM_TTE_TABLE_MASK)
+#define pa_to_tte(a)            ((a) & ARM_TTE_TABLE_MASK)
+#define tte_to_pa(p)            ((p) & ARM_TTE_TABLE_MASK)

 
 

-#define pa_to_pte(a)           ((a) & ARM_PTE_PAGE_MASK)
-#define pte_to_pa(p)           ((p) & ARM_PTE_PAGE_MASK)
-#define pte_increment_pa(p)    ((p) += ptoa(1))
+#define pa_to_pte(a)            ((a) & ARM_PTE_PAGE_MASK)
+#define pte_to_pa(p)            ((p) & ARM_PTE_PAGE_MASK)
+#define pte_increment_pa(p)     ((p) += ptoa(1))

 
 

-#define        ARM_NESTING_SIZE_MIN    ((PAGE_SIZE/0x1000)*4*ARM_TT_L1_SIZE)
-#define        ARM_NESTING_SIZE_MAX    ((256*ARM_TT_L1_SIZE))
+#define ARM_NESTING_SIZE_MIN    ((PAGE_SIZE/0x1000)*4*ARM_TT_L1_SIZE)
+#define ARM_NESTING_SIZE_MAX    ((256*ARM_TT_L1_SIZE))

 
 #else
 
 /* Convert address offset to translation table index */
 
 #else
 
 /* Convert address offset to translation table index */

-#define ttel0num(a)    ((a & ARM_TTE_L0_MASK) >> ARM_TT_L0_SHIFT)
-#define ttel1num(a)    ((a & ARM_TTE_L1_MASK) >> ARM_TT_L1_SHIFT)
-#define ttel2num(a)    ((a & ARM_TTE_L2_MASK) >> ARM_TT_L2_SHIFT)
+#define ttel0num(a)     ((a & ARM_TTE_L0_MASK) >> ARM_TT_L0_SHIFT)
+#define ttel1num(a)     ((a & ARM_TTE_L1_MASK) >> ARM_TT_L1_SHIFT)
+#define ttel2num(a)     ((a & ARM_TTE_L2_MASK) >> ARM_TT_L2_SHIFT)
+
+#define pa_to_tte(a)            ((a) & ARM_TTE_TABLE_MASK)
+#define tte_to_pa(p)            ((p) & ARM_TTE_TABLE_MASK)
+
+#define pa_to_pte(a)            ((a) & ARM_PTE_MASK)
+#define pte_to_pa(p)            ((p) & ARM_PTE_MASK)
+#define pte_to_ap(p)            (((p) & ARM_PTE_APMASK) >> ARM_PTE_APSHIFT)
+#define pte_increment_pa(p)     ((p) += ptoa(1))

 
 

-#define pa_to_tte(a)           ((a) & ARM_TTE_TABLE_MASK)
-#define tte_to_pa(p)           ((p) & ARM_TTE_TABLE_MASK)
+#define ARM_NESTING_SIZE_MIN    ((PAGE_SIZE/ARM_PGBYTES)*ARM_TT_L2_SIZE)
+#define ARM_NESTING_SIZE_MAX    (0x0000000010000000ULL)

 
 

-#define pa_to_pte(a)           ((a) & ARM_PTE_MASK)
-#define pte_to_pa(p)           ((p) & ARM_PTE_MASK)
-#define pte_to_ap(p)           (((p) & ARM_PTE_APMASK) >> ARM_PTE_APSHIFT)
-#define pte_increment_pa(p)    ((p) += ptoa(1))
+#define TLBFLUSH_SIZE   (ARM_TTE_MAX/((sizeof(unsigned int))*BYTE_SIZE))

 
 

-#define        ARM_NESTING_SIZE_MIN    ((PAGE_SIZE/ARM_PGBYTES)*ARM_TT_L2_SIZE)
-#define        ARM_NESTING_SIZE_MAX    (0x0000000010000000ULL)
+#endif  /* __ARM_VMSA__ <= 7 */

 
 

-#define TLBFLUSH_SIZE  (ARM_TTE_MAX/((sizeof(unsigned int))*BYTE_SIZE))
+#define PMAP_GC_INFLIGHT        1
+#define PMAP_GC_WAIT            2

 
 

-#endif /* __ARM_VMSA__ <= 7 */
+#if DEVELOPMENT || DEBUG
+#define pmap_cs_log_h(msg, args...) { if(pmap_cs_log_hacks) printf("PMAP_CS: " msg "\n", args); }
+#define pmap_cs_log pmap_cs_log_h
+
+#define PMAP_CS_EXCEPTION_LIST_HACK 1

 
 

-#define        PMAP_GC_INFLIGHT        1
-#define        PMAP_GC_WAIT            2
+#else
+#define pmap_cs_log(msg, args...)
+#define pmap_cs_log_h(msg, args...)
+#endif /* DEVELOPMENT || DEBUG */
+
+
+/* Forward struct declarations for the pmap data structure */
+struct page_table_attr;

 
 /*
  *     Convert translation/page table entry to kernel virtual address
 
 /*
  *     Convert translation/page table entry to kernel virtual address


@@ -262,73 +297,66 @@ extern pmap_paddr_t mmu_uvtop(vm_offset_t va);
 #define ptetokv(a)      (phystokv(pte_to_pa(a)))
 
 struct pmap {
 #define ptetokv(a)      (phystokv(pte_to_pa(a)))
 
 struct pmap {

-       tt_entry_t                      *tte;                   /* translation table entries */
-       pmap_paddr_t            ttep;                   /* translation table physical */
-       vm_map_address_t        min;                    /* min address in pmap */
-       vm_map_address_t        max;                    /* max address in pmap */
-       unsigned int            asid;                   /* address space id */
-       unsigned int            vasid;                  /* Virtual address space id */
-       unsigned int            stamp;                  /* creation stamp */
-       unsigned int            wired;                  /* wired bits */
-       volatile uint32_t       ref_count;              /* pmap reference count */
-       unsigned int            cpu_ref;                /* number of cpus using pmap */
-       unsigned int            gc_status;              /* gc status */
-       ledger_t                        ledger;                 /* ledger tracking phys mappings */
-       decl_simple_lock_data(,lock)            /* lock on map */
-       struct pmap_statistics  stats;          /* map statistics */
-       queue_chain_t           pmaps;                  /* global list of pmaps */
-       tt_entry_t                      *tt_entry_free; /* free translation table entries */
-       tt_entry_t                      *prev_tte;              /* previous translation table */
-       unsigned int            tte_index_max;  /* max tte index in translation table entries */
-       boolean_t                       nx_enabled;             /* no execute */
-       boolean_t                       nested;                 /* is nested */
-       boolean_t                       is_64bit;               /* is 64bit */
-       struct pmap                     *nested_pmap;   /* nested pmap */
-       vm_map_address_t        nested_region_grand_addr;
-       vm_map_address_t        nested_region_subord_addr;
-       vm_map_offset_t         nested_region_size;
-       unsigned int            *nested_region_asid_bitmap;
-       unsigned int            nested_region_asid_bitmap_size;
+       tt_entry_t              *tte;                   /* translation table entries */
+       pmap_paddr_t            ttep;                   /* translation table physical */
+       vm_map_address_t        min;                    /* min address in pmap */
+       vm_map_address_t        max;                    /* max address in pmap */
+#if ARM_PARAMETERIZED_PMAP
+       const struct page_table_attr * pmap_pt_attr;    /* details about page table layout */
+#endif /* ARM_PARAMETERIZED_PMAP */
+       ledger_t                ledger;                 /* ledger tracking phys mappings */
+       decl_simple_lock_data(, lock);           /* lock on map */
+       struct pmap_statistics  stats;          /* map statistics */
+       queue_chain_t           pmaps;                  /* global list of pmaps */
+       tt_entry_t                      *tt_entry_free; /* free translation table entries */
+       struct pmap                     *nested_pmap;   /* nested pmap */
+       vm_map_address_t        nested_region_grand_addr;
+       vm_map_address_t        nested_region_subord_addr;
+       vm_map_offset_t         nested_region_size;
+       vm_map_offset_t         nested_region_true_start;
+       vm_map_offset_t         nested_region_true_end;
+       unsigned int            *nested_region_asid_bitmap;

 
 #if (__ARM_VMSA__ <= 7)
 
 #if (__ARM_VMSA__ <= 7)

-       decl_simple_lock_data(,tt1_lock)        /* lock on tt1 */
+       unsigned int            tte_index_max;          /* max tte index in translation table entries */

 #endif
 #endif

+
+
+       unsigned int            stamp;                  /* creation stamp */
+       _Atomic int32_t         ref_count;              /* pmap reference count */
+       unsigned int            gc_status;              /* gc status */
+       unsigned int            nested_region_asid_bitmap_size;
+       uint32_t                nested_no_bounds_refcnt;/* number of pmaps that nested this pmap without bounds set */
+       uint16_t                hw_asid;
+       uint8_t                 sw_asid;
+

 #if MACH_ASSERT
 #if MACH_ASSERT

-       boolean_t               pmap_stats_assert;
-       int                     pmap_pid;
-       char                    pmap_procname[17];
+       int                     pmap_pid;
+       char                    pmap_procname[17];
+       bool            pmap_stats_assert;

 #endif /* MACH_ASSERT */
 #if DEVELOPMENT || DEBUG
 #endif /* MACH_ASSERT */
 #if DEVELOPMENT || DEBUG

-       boolean_t               footprint_suspended;
-       boolean_t               footprint_was_suspended;
+       bool            footprint_suspended;
+       bool            footprint_was_suspended;

 #endif /* DEVELOPMENT || DEBUG */
 #endif /* DEVELOPMENT || DEBUG */

+       bool            nx_enabled;                             /* no execute */
+       bool            nested;                                 /* is nested */
+       bool            is_64bit;                               /* is 64bit */
+       bool            nested_has_no_bounds_ref;       /* nested a pmap when the bounds were not set */
+       bool            nested_bounds_set;                      /* The nesting bounds have been set */
+#if HAS_APPLE_PAC
+       bool            disable_jop;
+#endif /* HAS_APPLE_PAC */

 };
 
 };
 

-/* typedef struct pmap *pmap_t; */
-#define PMAP_NULL       ((pmap_t) 0)
-
-
-/*
- * WIMG control
- */
-#define        VM_MEM_INNER            0x10
-#define VM_MEM_EARLY_ACK       0x20
-
-#define        VM_WIMG_DEFAULT         (VM_MEM_COHERENT)
-#define        VM_WIMG_COPYBACK        (VM_MEM_COHERENT)
-#define        VM_WIMG_INNERWBACK      (VM_MEM_COHERENT | VM_MEM_INNER)
-#define VM_WIMG_IO             (VM_MEM_COHERENT | VM_MEM_NOT_CACHEABLE | VM_MEM_GUARDED)
-#define VM_WIMG_POSTED         (VM_MEM_COHERENT | VM_MEM_NOT_CACHEABLE | VM_MEM_GUARDED | VM_MEM_EARLY_ACK)
-#define VM_WIMG_WTHRU          (VM_MEM_WRITE_THROUGH | VM_MEM_COHERENT | VM_MEM_GUARDED)
-#define VM_WIMG_WCOMB          (VM_MEM_NOT_CACHEABLE | VM_MEM_COHERENT) 
-
+#define PMAP_VASID(pmap) (((uint32_t)((pmap)->sw_asid) << 16) | pmap->hw_asid)

 
 #if VM_DEBUG
 extern int      pmap_list_resident_pages(
 
 #if VM_DEBUG
 extern int      pmap_list_resident_pages(

-                        pmap_t          pmap,
-                        vm_offset_t  *listp,
-                        int             space
-                );
+       pmap_t          pmap,
+       vm_offset_t  *listp,
+       int             space
+       );

 #else /* #if VM_DEBUG */
 #define pmap_list_resident_pages(pmap, listp, space) (0)
 #endif /* #if VM_DEBUG */
 #else /* #if VM_DEBUG */
 #define pmap_list_resident_pages(pmap, listp, space) (0)
 #endif /* #if VM_DEBUG */


@@ -336,7 +364,7 @@ extern int      pmap_list_resident_pages(
 extern int copysafe(vm_map_address_t from, vm_map_address_t to, uint32_t cnt, int type, uint32_t *bytes_copied);
 
 /* globals shared between arm_vm_init and pmap */
 extern int copysafe(vm_map_address_t from, vm_map_address_t to, uint32_t cnt, int type, uint32_t *bytes_copied);
 
 /* globals shared between arm_vm_init and pmap */

-extern tt_entry_t *cpu_tte;    /* first CPUs translation table (shared with kernel pmap) */
+extern tt_entry_t *cpu_tte;     /* first CPUs translation table (shared with kernel pmap) */

 extern pmap_paddr_t cpu_ttep;  /* physical translation table addr */
 
 #if __arm64__
 extern pmap_paddr_t cpu_ttep;  /* physical translation table addr */
 
 #if __arm64__


@@ -345,7 +373,7 @@ extern void *ropagetable_end;
 #endif
 
 #if __arm64__
 #endif
 
 #if __arm64__

-extern tt_entry_t *invalid_tte;        /* global invalid translation table  */
+extern tt_entry_t *invalid_tte; /* global invalid translation table  */

 extern pmap_paddr_t invalid_ttep;  /* physical invalid translation table addr */
 #endif
 
 extern pmap_paddr_t invalid_ttep;  /* physical invalid translation table addr */
 #endif
 


@@ -355,74 +383,78 @@ extern pmap_paddr_t invalid_ttep;  /* physical invalid translation table addr */
  * platform dependent Prototypes
  */
 extern void pmap_switch_user_ttb(pmap_t pmap);
  * platform dependent Prototypes
  */
 extern void pmap_switch_user_ttb(pmap_t pmap);

+extern void pmap_clear_user_ttb(void);

 extern void pmap_bootstrap(vm_offset_t);
 extern void pmap_bootstrap(vm_offset_t);

-extern vm_map_address_t        pmap_ptov(pmap_t, ppnum_t);
+extern vm_map_address_t pmap_ptov(pmap_t, ppnum_t);

 extern ppnum_t pmap_find_phys(pmap_t map, addr64_t va);
 extern void pmap_set_pmap(pmap_t pmap, thread_t thread);
 extern void pmap_collect(pmap_t pmap);
 extern ppnum_t pmap_find_phys(pmap_t map, addr64_t va);
 extern void pmap_set_pmap(pmap_t pmap, thread_t thread);
 extern void pmap_collect(pmap_t pmap);

-extern void pmap_gc(void);
+extern  void pmap_gc(void);

 #if defined(__arm64__)
 #if defined(__arm64__)

-extern vm_offset_t     pmap_extract(pmap_t pmap, vm_map_offset_t va);
+extern vm_offset_t pmap_extract(pmap_t pmap, vm_map_offset_t va);

 #endif
 
 /*
  * Interfaces implemented as macros.
  */
 
 #endif
 
 /*
  * Interfaces implemented as macros.
  */
 

-#define        PMAP_SWITCH_USER(th, new_map, my_cpu) {                         \
-       th->map = new_map;                                                                              \
-       pmap_set_pmap(vm_map_pmap(new_map), th);                                \
+#define PMAP_SWITCH_USER(th, new_map, my_cpu) {                         \
+       th->map = new_map;                                                                              \
+       pmap_set_pmap(vm_map_pmap(new_map), th);                                \

 }
 
 }
 

-#define pmap_kernel()                                                                          \
+#define pmap_kernel()                                                                           \

        (kernel_pmap)
 
        (kernel_pmap)
 

-#define pmap_compressed(pmap)                                                          \
+#define pmap_compressed(pmap)                                                           \

        ((pmap)->stats.compressed)
 
        ((pmap)->stats.compressed)
 

-#define pmap_resident_count(pmap)                                                      \
+#define pmap_resident_count(pmap)                                                       \

        ((pmap)->stats.resident_count)
 
        ((pmap)->stats.resident_count)
 

-#define pmap_resident_max(pmap)                                                                \
+#define pmap_resident_max(pmap)                                                         \

        ((pmap)->stats.resident_max)
 
 #define MACRO_NOOP
 
        ((pmap)->stats.resident_max)
 
 #define MACRO_NOOP
 

-#define pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr)         \
+#define pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr)          \

        MACRO_NOOP
 
        MACRO_NOOP
 

-#define pmap_pageable(pmap, start, end, pageable)                      \
+#define pmap_pageable(pmap, start, end, pageable)                       \

        MACRO_NOOP
 
        MACRO_NOOP
 

-#define pmap_kernel_va(VA)                                             \
+#define pmap_kernel_va(VA)                                              \

        (((VA) >= VM_MIN_KERNEL_ADDRESS) && ((VA) <= VM_MAX_KERNEL_ADDRESS))
 
        (((VA) >= VM_MIN_KERNEL_ADDRESS) && ((VA) <= VM_MAX_KERNEL_ADDRESS))
 

-#define        pmap_attribute(pmap,addr,size,attr,value)                       \
+#define pmap_attribute(pmap, addr, size, attr, value)                       \

        (KERN_INVALID_ADDRESS)
 
        (KERN_INVALID_ADDRESS)
 

-#define copyinmsg(from, to, cnt)                                                       \
+#define copyinmsg(from, to, cnt)                                                        \

        copyin(from, to, cnt)
 
        copyin(from, to, cnt)
 

-#define copyoutmsg(from, to, cnt)                                                      \
+#define copyoutmsg(from, to, cnt)                                                       \

        copyout(from, to, cnt)
 
        copyout(from, to, cnt)
 

-extern pmap_paddr_t kvtophys(vm_offset_t va); 
+extern pmap_paddr_t kvtophys(vm_offset_t va);
+extern vm_map_address_t phystokv(pmap_paddr_t pa);
+extern vm_map_address_t phystokv_range(pmap_paddr_t pa, vm_size_t *max_len);

 
 extern vm_map_address_t pmap_map(vm_map_address_t va, vm_offset_t sa, vm_offset_t ea, vm_prot_t prot, unsigned int flags);
 extern vm_map_address_t pmap_map_high_window_bd( vm_offset_t pa, vm_size_t len, vm_prot_t prot);
 extern kern_return_t pmap_map_block(pmap_t pmap, addr64_t va, ppnum_t pa, uint32_t size, vm_prot_t prot, int attr, unsigned int flags);
 extern void pmap_map_globals(void);
 
 
 extern vm_map_address_t pmap_map(vm_map_address_t va, vm_offset_t sa, vm_offset_t ea, vm_prot_t prot, unsigned int flags);
 extern vm_map_address_t pmap_map_high_window_bd( vm_offset_t pa, vm_size_t len, vm_prot_t prot);
 extern kern_return_t pmap_map_block(pmap_t pmap, addr64_t va, ppnum_t pa, uint32_t size, vm_prot_t prot, int attr, unsigned int flags);
 extern void pmap_map_globals(void);
 

-#define PMAP_MAP_BD_DEVICE     0x1
-#define PMAP_MAP_BD_WCOMB      0x2
-#define PMAP_MAP_BD_POSTED     0x3
-#define PMAP_MAP_BD_MASK       0x3
+#define PMAP_MAP_BD_DEVICE                    0x0
+#define PMAP_MAP_BD_WCOMB                     0x1
+#define PMAP_MAP_BD_POSTED                    0x2
+#define PMAP_MAP_BD_POSTED_REORDERED          0x3
+#define PMAP_MAP_BD_POSTED_COMBINED_REORDERED 0x4
+#define PMAP_MAP_BD_MASK                      0x7

 
 extern vm_map_address_t pmap_map_bd_with_options(vm_map_address_t va, vm_offset_t sa, vm_offset_t ea, vm_prot_t prot, int32_t options);
 extern vm_map_address_t pmap_map_bd(vm_map_address_t va, vm_offset_t sa, vm_offset_t ea, vm_prot_t prot);
 
 
 extern vm_map_address_t pmap_map_bd_with_options(vm_map_address_t va, vm_offset_t sa, vm_offset_t ea, vm_prot_t prot, int32_t options);
 extern vm_map_address_t pmap_map_bd(vm_map_address_t va, vm_offset_t sa, vm_offset_t ea, vm_prot_t prot);
 

-extern void pmap_init_pte_page(pmap_t, pt_entry_t *, vm_offset_t, unsigned int ttlevel, boolean_t alloc_ptd);
-extern void pmap_init_pte_static_page(pmap_t, pt_entry_t *, pmap_paddr_t);
+extern void pmap_init_pte_page(pmap_t, pt_entry_t *, vm_offset_t, unsigned int ttlevel, boolean_t alloc_ptd, boolean_t clear);

 
 extern boolean_t pmap_valid_address(pmap_paddr_t addr);
 extern void pmap_disable_NX(pmap_t pmap);
 
 extern boolean_t pmap_valid_address(pmap_paddr_t addr);
 extern void pmap_disable_NX(pmap_t pmap);


@@ -436,22 +468,24 @@ extern unsigned int pmap_map_cpu_windows_copy(ppnum_t pn, vm_prot_t prot, unsign
 extern void pmap_unmap_cpu_windows_copy(unsigned int index);
 
 extern void pt_fake_zone_init(int);
 extern void pmap_unmap_cpu_windows_copy(unsigned int index);
 
 extern void pt_fake_zone_init(int);

-extern void pt_fake_zone_info(int *, vm_size_t *, vm_size_t *, vm_size_t *, vm_size_t *, 
-                             uint64_t *, int *, int *, int *);
+extern void pt_fake_zone_info(int *, vm_size_t *, vm_size_t *, vm_size_t *, vm_size_t *,
+    uint64_t *, int *, int *, int *);

 
 extern boolean_t pmap_valid_page(ppnum_t pn);
 
 #define MACHINE_PMAP_IS_EMPTY 1
 extern boolean_t pmap_is_empty(pmap_t pmap, vm_map_offset_t start, vm_map_offset_t end);
 
 
 extern boolean_t pmap_valid_page(ppnum_t pn);
 
 #define MACHINE_PMAP_IS_EMPTY 1
 extern boolean_t pmap_is_empty(pmap_t pmap, vm_map_offset_t start, vm_map_offset_t end);
 

-#define ARM_PMAP_MAX_OFFSET_DEFAULT    0x01
-#define ARM_PMAP_MAX_OFFSET_MIN                0x02
-#define ARM_PMAP_MAX_OFFSET_MAX                0x04
-#define ARM_PMAP_MAX_OFFSET_DEVICE     0x08
-#define ARM_PMAP_MAX_OFFSET_JUMBO      0x10
+#define ARM_PMAP_MAX_OFFSET_DEFAULT     0x01
+#define ARM_PMAP_MAX_OFFSET_MIN         0x02
+#define ARM_PMAP_MAX_OFFSET_MAX         0x04
+#define ARM_PMAP_MAX_OFFSET_DEVICE      0x08
+#define ARM_PMAP_MAX_OFFSET_JUMBO       0x10

 
 
 extern vm_map_offset_t pmap_max_offset(boolean_t is64, unsigned int option);
 
 
 extern vm_map_offset_t pmap_max_offset(boolean_t is64, unsigned int option);

+extern vm_map_offset_t pmap_max_64bit_offset(unsigned int option);
+extern vm_map_offset_t pmap_max_32bit_offset(unsigned int option);

 
 boolean_t pmap_virtual_region(unsigned int region_select, vm_map_offset_t *startp, vm_map_size_t *size);
 
 
 boolean_t pmap_virtual_region(unsigned int region_select, vm_map_offset_t *startp, vm_map_size_t *size);
 


@@ -488,28 +522,55 @@ boolean_t pmap_enforces_execute_only(pmap_t pmap);
 #define PMAP_SET_PROCESS_INDEX 27
 #define PMAP_SWITCH_INDEX 28
 #define PMAP_SWITCH_USER_TTB_INDEX 29
 #define PMAP_SET_PROCESS_INDEX 27
 #define PMAP_SWITCH_INDEX 28
 #define PMAP_SWITCH_USER_TTB_INDEX 29

-#define PMAP_UNHINT_KV_ADDR_INDEX 30
+#define PMAP_CLEAR_USER_TTB_INDEX 30

 #define PMAP_UNMAP_CPU_WINDOWS_COPY_INDEX 31
 #define PMAP_UNNEST_OPTIONS_INDEX 32
 #define PMAP_FOOTPRINT_SUSPEND_INDEX 33
 #define PMAP_CPU_DATA_INIT_INDEX 34
 #define PMAP_RELEASE_PAGES_TO_KERNEL_INDEX 35
 #define PMAP_UNMAP_CPU_WINDOWS_COPY_INDEX 31
 #define PMAP_UNNEST_OPTIONS_INDEX 32
 #define PMAP_FOOTPRINT_SUSPEND_INDEX 33
 #define PMAP_CPU_DATA_INIT_INDEX 34
 #define PMAP_RELEASE_PAGES_TO_KERNEL_INDEX 35

+#define PMAP_SET_JIT_ENTITLED_INDEX 36
+
+
+#define PMAP_UPDATE_COMPRESSOR_PAGE_INDEX 57
+#define PMAP_TRIM_INDEX 64
+#define PMAP_LEDGER_ALLOC_INIT_INDEX 65
+#define PMAP_LEDGER_ALLOC_INDEX 66
+#define PMAP_LEDGER_FREE_INDEX 67
+

 
 

-#define MAX_PMAP_INDEX 36
+
+#define PMAP_COUNT 71

 
 #define PMAP_INVALID_CPU_NUM (~0U)
 
 
 #define PMAP_INVALID_CPU_NUM (~0U)
 

+struct pmap_cpu_data_array_entry {
+       pmap_cpu_data_t cpu_data;
+} __attribute__((aligned(1 << L2_CLINE)));
+

 /* Initialize the pmap per-CPU data for the current CPU. */
 extern void pmap_cpu_data_init(void);
 
 /* Get the pmap per-CPU data for the current CPU. */
 extern pmap_cpu_data_t * pmap_get_cpu_data(void);
 
 /* Initialize the pmap per-CPU data for the current CPU. */
 extern void pmap_cpu_data_init(void);
 
 /* Get the pmap per-CPU data for the current CPU. */
 extern pmap_cpu_data_t * pmap_get_cpu_data(void);
 

+

 #define MARK_AS_PMAP_TEXT
 #define MARK_AS_PMAP_DATA
 #define MARK_AS_PMAP_TEXT
 #define MARK_AS_PMAP_DATA

+#define MARK_AS_PMAP_RODATA
+
+

 
 extern kern_return_t pmap_return(boolean_t do_panic, boolean_t do_recurse);
 
 
 extern kern_return_t pmap_return(boolean_t do_panic, boolean_t do_recurse);
 

+extern lck_grp_t pmap_lck_grp;
+
+#define pmap_force_dcache_clean(va, sz) CleanPoC_DcacheRegion_Force(va, sz)
+#define pmap_simple_lock(l)             simple_lock(l, &pmap_lck_grp)
+#define pmap_simple_unlock(l)           simple_unlock(l)
+#define pmap_simple_lock_try(l)         simple_lock_try(l, &pmap_lck_grp)
+#define pmap_lock_bit(l, i)             hw_lock_bit(l, i, &pmap_lck_grp)
+#define pmap_unlock_bit(l, i)           hw_unlock_bit(l, i)
+

 #endif /* #ifndef ASSEMBLER */
 
 #if __ARM_KERNEL_PROTECT__
 #endif /* #ifndef ASSEMBLER */
 
 #if __ARM_KERNEL_PROTECT__