xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / i386 / cpu_data.h

diff --git a/osfmk/i386/cpu_data.h b/osfmk/i386/cpu_data.h
index 4201068f4d7be6506c9125121493e2e789bcc6ae..10d2355172831ad24c2f69bf557926bae8b6e2fd 100644 (file)
--- a/osfmk/i386/cpu_data.h
+++ b/osfmk/i386/cpu_data.h
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2020 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @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,21 +22,23 @@
  * 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@
  */
 /*
  * @OSF_COPYRIGHT@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@

- * 
+ *

  */
 
  */
 

-#ifndef        I386_CPU_DATA
+#ifndef I386_CPU_DATA

 #define I386_CPU_DATA
 
 #include <mach_assert.h>
 #define I386_CPU_DATA
 
 #include <mach_assert.h>

+#include <machine/atomic.h>

 
 #include <kern/assert.h>
 #include <kern/kern_types.h>
 
 #include <kern/assert.h>
 #include <kern/kern_types.h>

+#include <kern/mpqueue.h>

 #include <kern/queue.h>
 #include <kern/processor.h>
 #include <kern/pms.h>
 #include <kern/queue.h>
 #include <kern/processor.h>
 #include <kern/pms.h>


@@ -48,6 +50,7 @@
 #include <i386/pmCPU.h>
 #include <i386/cpu_topology.h>
 #include <i386/seg.h>
 #include <i386/pmCPU.h>
 #include <i386/cpu_topology.h>
 #include <i386/seg.h>

+#include <i386/mp.h>

 
 #if CONFIG_VMX
 #include <i386/vmx/vmx_cpu.h>
 
 #if CONFIG_VMX
 #include <i386/vmx/vmx_cpu.h>


@@ -71,29 +74,29 @@ struct prngContext;
  * Data structures embedded in per-cpu data:
  */
 typedef struct rtclock_timer {
  * Data structures embedded in per-cpu data:
  */
 typedef struct rtclock_timer {

-       mpqueue_head_t          queue;
-       uint64_t                deadline;
-       uint64_t                when_set;
-       boolean_t               has_expired;
+       mpqueue_head_t          queue;
+       uint64_t                deadline;
+       uint64_t                when_set;
+       boolean_t               has_expired;

 } rtclock_timer_t;
 
 typedef struct {
        /* The 'u' suffixed fields store the double-mapped descriptor addresses */
 } rtclock_timer_t;
 
 typedef struct {
        /* The 'u' suffixed fields store the double-mapped descriptor addresses */

-       struct x86_64_tss       *cdi_ktssu;
-       struct x86_64_tss       *cdi_ktssb;
-       x86_64_desc_register_t  cdi_gdtu;
-       x86_64_desc_register_t  cdi_gdtb;
-       x86_64_desc_register_t  cdi_idtu;
-       x86_64_desc_register_t  cdi_idtb;
-       struct fake_descriptor  *cdi_ldtu;
-       struct fake_descriptor  *cdi_ldtb;
-       vm_offset_t             cdi_sstku;
-       vm_offset_t             cdi_sstkb;
+       struct x86_64_tss       *cdi_ktssu;
+       struct x86_64_tss       *cdi_ktssb;
+       x86_64_desc_register_t  cdi_gdtu;
+       x86_64_desc_register_t  cdi_gdtb;
+       x86_64_desc_register_t  cdi_idtu;
+       x86_64_desc_register_t  cdi_idtb;
+       struct real_descriptor  *cdi_ldtu;
+       struct real_descriptor  *cdi_ldtb;
+       vm_offset_t             cdi_sstku;
+       vm_offset_t             cdi_sstkb;

 } cpu_desc_index_t;
 
 typedef enum {
 } cpu_desc_index_t;
 
 typedef enum {

-       TASK_MAP_32BIT,                 /* 32-bit user, compatibility mode */ 
-       TASK_MAP_64BIT,                 /* 64-bit user thread, shared space */ 
+       TASK_MAP_32BIT,                 /* 32-bit user, compatibility mode */
+       TASK_MAP_64BIT,                 /* 64-bit user thread, shared space */

 } task_map_t;
 
 
 } task_map_t;
 
 


@@ -104,24 +107,74 @@ typedef enum {
  * before loading this address into rsp.
  */
 typedef struct {
  * before loading this address into rsp.
  */
 typedef struct {

-       addr64_t        cu_isf;         /* thread->pcb->iss.isf */
-       uint64_t        cu_tmp;         /* temporary scratch */ 
-       addr64_t        cu_user_gs_base;
+       addr64_t        cu_isf;         /* thread->pcb->iss.isf */
+       uint64_t        cu_tmp;         /* temporary scratch */
+       addr64_t        cu_user_gs_base;

 } cpu_uber_t;
 
 } cpu_uber_t;
 

-typedef        uint16_t        pcid_t;
-typedef        uint8_t         pcid_ref_t;
+typedef uint16_t        pcid_t;
+typedef uint8_t         pcid_ref_t;

 
 #define CPU_RTIME_BINS (12)
 #define CPU_ITIME_BINS (CPU_RTIME_BINS)
 
 
 #define CPU_RTIME_BINS (12)
 #define CPU_ITIME_BINS (CPU_RTIME_BINS)
 

-#define MAXPLFRAMES (16)
+#define MAX_TRACE_BTFRAMES (16)

 typedef struct {
        boolean_t pltype;
        int plevel;
 typedef struct {
        boolean_t pltype;
        int plevel;

-       uint64_t plbt[MAXPLFRAMES];
+       uint64_t plbt[MAX_TRACE_BTFRAMES];

 } plrecord_t;
 
 } plrecord_t;
 

+#if     DEVELOPMENT || DEBUG
+typedef enum {
+       IOTRACE_PHYS_READ = 1,
+       IOTRACE_PHYS_WRITE,
+       IOTRACE_IO_READ,
+       IOTRACE_IO_WRITE,
+       IOTRACE_PORTIO_READ,
+       IOTRACE_PORTIO_WRITE
+} iotrace_type_e;
+
+typedef struct {
+       iotrace_type_e  iotype;
+       int             size;
+       uint64_t        vaddr;
+       uint64_t        paddr;
+       uint64_t        val;
+       uint64_t        start_time_abs;
+       uint64_t        duration;
+       uint64_t        backtrace[MAX_TRACE_BTFRAMES];
+} iotrace_entry_t;
+
+typedef struct {
+       int             vector;                 /* Vector number of interrupt */
+       thread_t        curthread;              /* Current thread at the time of the interrupt */
+       uint64_t        interrupted_pc;
+       int             curpl;                  /* Current preemption level */
+       int             curil;                  /* Current interrupt level */
+       uint64_t        start_time_abs;
+       uint64_t        duration;
+       uint64_t        backtrace[MAX_TRACE_BTFRAMES];
+} traptrace_entry_t;
+
+#define DEFAULT_IOTRACE_ENTRIES_PER_CPU (64)
+#define IOTRACE_MAX_ENTRIES_PER_CPU (256)
+extern volatile int mmiotrace_enabled;
+extern int iotrace_generators;
+extern int iotrace_entries_per_cpu;
+extern int *iotrace_next;
+extern iotrace_entry_t **iotrace_ring;
+
+#define TRAPTRACE_INVALID_INDEX (~0U)
+#define DEFAULT_TRAPTRACE_ENTRIES_PER_CPU (16)
+#define TRAPTRACE_MAX_ENTRIES_PER_CPU (256)
+extern volatile int traptrace_enabled;
+extern int traptrace_generators;
+extern int traptrace_entries_per_cpu;
+extern int *traptrace_next;
+extern traptrace_entry_t **traptrace_ring;
+#endif /* DEVELOPMENT || DEBUG */
+

 /*
  * Per-cpu data.
  *
 /*
  * Per-cpu data.
  *


@@ -129,45 +182,50 @@ typedef struct {
  * current_cpu_datap() macro. For speed, the %gs segment is based here, and
  * using this, inlines provides single-instruction access to frequently used
  * members - such as get_cpu_number()/cpu_number(), and get_active_thread()/
  * current_cpu_datap() macro. For speed, the %gs segment is based here, and
  * using this, inlines provides single-instruction access to frequently used
  * members - such as get_cpu_number()/cpu_number(), and get_active_thread()/

- * current_thread(). 
- * 
+ * current_thread().
+ *

  * Cpu data owned by another processor can be accessed using the
  * cpu_datap(cpu_number) macro which uses the cpu_data_ptr[] array of per-cpu
  * pointers.
  */
 typedef struct {
  * Cpu data owned by another processor can be accessed using the
  * cpu_datap(cpu_number) macro which uses the cpu_data_ptr[] array of per-cpu
  * pointers.
  */
 typedef struct {

-       pcid_t                  cpu_pcid_free_hint;
-#define        PMAP_PCID_MAX_PCID      (0x800)
-       pcid_ref_t              cpu_pcid_refcounts[PMAP_PCID_MAX_PCID];
-       pmap_t                  cpu_pcid_last_pmap_dispatched[PMAP_PCID_MAX_PCID];
+       pcid_t                  cpu_pcid_free_hint;
+#define PMAP_PCID_MAX_PCID      (0x800)
+       pcid_ref_t              cpu_pcid_refcounts[PMAP_PCID_MAX_PCID];
+       pmap_t                  cpu_pcid_last_pmap_dispatched[PMAP_PCID_MAX_PCID];

 } pcid_cdata_t;
 
 } pcid_cdata_t;
 

-typedef struct cpu_data
-{
-       struct pal_cpu_data     cpu_pal_data;           /* PAL-specific data */
-#define                                cpu_pd cpu_pal_data     /* convenience alias */
-       struct cpu_data         *cpu_this;              /* pointer to myself */
-       thread_t                cpu_active_thread;
-       thread_t                cpu_nthread;
-       volatile int            cpu_preemption_level;
-       int                     cpu_number;             /* Logical CPU */
-       void                    *cpu_int_state;         /* interrupt state */
-       vm_offset_t             cpu_active_stack;       /* kernel stack base */
-       vm_offset_t             cpu_kernel_stack;       /* kernel stack top */
-       vm_offset_t             cpu_int_stack_top;
-       int                     cpu_interrupt_level;
-       volatile int            cpu_signals;            /* IPI events */
-       volatile int            cpu_prior_signals;      /* Last set of events,
-                                                        * debugging
-                                                        */
-       ast_t                   cpu_pending_ast;
-       volatile int            cpu_running;
+typedef struct cpu_data {
+       struct pal_cpu_data     cpu_pal_data;           /* PAL-specific data */
+#define                         cpu_pd cpu_pal_data     /* convenience alias */
+       struct cpu_data         *cpu_this;              /* pointer to myself */
+       vm_offset_t             cpu_pcpu_base;
+       thread_t                cpu_active_thread;
+       thread_t                cpu_nthread;
+       int                     cpu_number;             /* Logical CPU */
+       void                    *cpu_int_state;         /* interrupt state */
+       vm_offset_t             cpu_active_stack;       /* kernel stack base */
+       vm_offset_t             cpu_kernel_stack;       /* kernel stack top */
+       vm_offset_t             cpu_int_stack_top;
+       volatile int            cpu_signals;            /* IPI events */
+       volatile int            cpu_prior_signals;      /* Last set of events,
+                                                        * debugging
+                                                        */
+       ast_t                   cpu_pending_ast;
+       /*
+        * Note if rearranging fields:
+        * We want cpu_preemption_level on a different
+        * cache line than cpu_active_thread
+        * for optimizing mtx_spin phase.
+        */
+       int                     cpu_interrupt_level;
+       volatile int            cpu_preemption_level;
+       volatile int            cpu_running;

 #if !MONOTONIC
 #if !MONOTONIC

-       boolean_t               cpu_fixed_pmcs_enabled;
+       boolean_t               cpu_fixed_pmcs_enabled;

 #endif /* !MONOTONIC */
 #endif /* !MONOTONIC */

-       rtclock_timer_t         rtclock_timer;
-       uint64_t                quantum_timer_deadline;
-       volatile addr64_t       cpu_active_cr3 __attribute((aligned(64)));
+       rtclock_timer_t         rtclock_timer;
+       volatile addr64_t       cpu_active_cr3 __attribute((aligned(64)));

        union {
                volatile uint32_t cpu_tlb_invalid;
                struct {
        union {
                volatile uint32_t cpu_tlb_invalid;
                struct {


@@ -175,41 +233,46 @@ typedef struct cpu_data
                        volatile uint16_t cpu_tlb_invalid_global;
                };
        };
                        volatile uint16_t cpu_tlb_invalid_global;
                };
        };

-       volatile task_map_t     cpu_task_map;
-       volatile addr64_t       cpu_task_cr3;
-       addr64_t                cpu_kernel_cr3;
+       uint64_t                cpu_ip_desc[2];
+       volatile task_map_t     cpu_task_map;
+       volatile addr64_t       cpu_task_cr3;
+       addr64_t                cpu_kernel_cr3;

        volatile addr64_t       cpu_ucr3;
        volatile addr64_t       cpu_ucr3;

-       boolean_t               cpu_pagezero_mapped;
-       cpu_uber_t              cpu_uber;
+       volatile addr64_t       cpu_shadowtask_cr3;
+       boolean_t               cpu_pagezero_mapped;
+       cpu_uber_t              cpu_uber;

 /* Double-mapped per-CPU exception stack address */
 /* Double-mapped per-CPU exception stack address */

-       uintptr_t               cd_estack;
-       int                     cpu_xstate;
+       uintptr_t               cd_estack;
+       int                     cpu_xstate;
+       int                     cpu_curtask_has_ldt;
+       int                     cpu_curthread_do_segchk;

 /* Address of shadowed, partially mirrored CPU data structures located
  * in the double mapped PML4
  */
 /* Address of shadowed, partially mirrored CPU data structures located
  * in the double mapped PML4
  */

-       void                    *cd_shadow;
-       struct processor        *cpu_processor;
-#if NCOPY_WINDOWS > 0
-       struct cpu_pmap         *cpu_pmap;
-#endif
-       struct real_descriptor  *cpu_ldtp;
-       struct cpu_desc_table   *cpu_desc_tablep;
-       cpu_desc_index_t        cpu_desc_index;
-       int                     cpu_ldt;
-#if NCOPY_WINDOWS > 0
-       vm_offset_t             cpu_copywindow_base;
-       uint64_t                *cpu_copywindow_pdp;
-
-       vm_offset_t             cpu_physwindow_base;
-       uint64_t                *cpu_physwindow_ptep;
-#endif
+       void                    *cd_shadow;
+       union {
+               volatile uint32_t cpu_tlb_invalid_count;
+               struct {
+                       volatile uint16_t cpu_tlb_invalid_local_count;
+                       volatile uint16_t cpu_tlb_invalid_global_count;
+               };
+       };
+
+       uint16_t                cpu_tlb_gen_counts_local[MAX_CPUS];
+       uint16_t                cpu_tlb_gen_counts_global[MAX_CPUS];
+
+       struct processor        *cpu_processor;
+       struct real_descriptor  *cpu_ldtp;
+       struct cpu_desc_table   *cpu_desc_tablep;
+       cpu_desc_index_t        cpu_desc_index;
+       int                     cpu_ldt;

 
 #define HWINTCNT_SIZE 256
 
 #define HWINTCNT_SIZE 256

-       uint32_t                cpu_hwIntCnt[HWINTCNT_SIZE];    /* Interrupt counts */
-       uint64_t                cpu_hwIntpexits[HWINTCNT_SIZE];
-       uint64_t                cpu_dr7; /* debug control register */
-       uint64_t                cpu_int_event_time;     /* intr entry/exit time */
-       pal_rtc_nanotime_t      *cpu_nanotime;          /* Nanotime info */
+       uint32_t                cpu_hwIntCnt[HWINTCNT_SIZE];    /* Interrupt counts */
+       uint64_t                cpu_hwIntpexits[HWINTCNT_SIZE];
+       uint64_t                cpu_dr7; /* debug control register */
+       uint64_t                cpu_int_event_time;     /* intr entry/exit time */
+       pal_rtc_nanotime_t      *cpu_nanotime;          /* Nanotime info */

 #if KPC
        /* double-buffered performance counter data */
        uint64_t                *cpu_kpc_buf[2];
 #if KPC
        /* double-buffered performance counter data */
        uint64_t                *cpu_kpc_buf[2];


@@ -220,145 +283,106 @@ typedef struct cpu_data
 #if MONOTONIC
        struct mt_cpu cpu_monotonic;
 #endif /* MONOTONIC */
 #if MONOTONIC
        struct mt_cpu cpu_monotonic;
 #endif /* MONOTONIC */

-       uint32_t                cpu_pmap_pcid_enabled;
-       pcid_t                  cpu_active_pcid;
-       pcid_t                  cpu_last_pcid;
-       pcid_t                  cpu_kernel_pcid;
-       volatile pcid_ref_t     *cpu_pmap_pcid_coherentp;
-       volatile pcid_ref_t     *cpu_pmap_pcid_coherentp_kernel;
-       pcid_cdata_t            *cpu_pcid_data;
-#ifdef PCID_STATS
-       uint64_t                cpu_pmap_pcid_flushes;
-       uint64_t                cpu_pmap_pcid_preserves;
+       uint32_t                cpu_pmap_pcid_enabled;
+       pcid_t                  cpu_active_pcid;
+       pcid_t                  cpu_last_pcid;
+       pcid_t                  cpu_kernel_pcid;
+       volatile pcid_ref_t     *cpu_pmap_pcid_coherentp;
+       volatile pcid_ref_t     *cpu_pmap_pcid_coherentp_kernel;
+       pcid_cdata_t            *cpu_pcid_data;
+#ifdef  PCID_STATS
+       uint64_t                cpu_pmap_pcid_flushes;
+       uint64_t                cpu_pmap_pcid_preserves;

 #endif
 #endif

-       uint64_t                cpu_aperf;
-       uint64_t                cpu_mperf;
-       uint64_t                cpu_c3res;
-       uint64_t                cpu_c6res;
-       uint64_t                cpu_c7res;
-       uint64_t                cpu_itime_total;
-       uint64_t                cpu_rtime_total;
-       uint64_t                cpu_ixtime;
+       uint64_t                cpu_aperf;
+       uint64_t                cpu_mperf;
+       uint64_t                cpu_c3res;
+       uint64_t                cpu_c6res;
+       uint64_t                cpu_c7res;
+       uint64_t                cpu_itime_total;
+       uint64_t                cpu_rtime_total;
+       uint64_t                cpu_ixtime;

        uint64_t                cpu_idle_exits;
        uint64_t                cpu_idle_exits;

-       uint64_t                cpu_rtimes[CPU_RTIME_BINS];
-       uint64_t                cpu_itimes[CPU_ITIME_BINS];
+       /*
+        * Note that the cacheline-copy mechanism uses the cpu_rtimes field in the shadow CPU
+        * structures to temporarily stash the code cacheline that includes the instruction
+        * pointer at the time of the fault (this field is otherwise unused in the shadow
+        * CPU structures).
+        */
+       uint64_t                cpu_rtimes[CPU_RTIME_BINS];
+       uint64_t                cpu_itimes[CPU_ITIME_BINS];

 #if !MONOTONIC
 #if !MONOTONIC

-       uint64_t                cpu_cur_insns;
-       uint64_t                cpu_cur_ucc;
-       uint64_t                cpu_cur_urc;
+       uint64_t                cpu_cur_insns;
+       uint64_t                cpu_cur_ucc;
+       uint64_t                cpu_cur_urc;

 #endif /* !MONOTONIC */
 #endif /* !MONOTONIC */

-       uint64_t                cpu_gpmcs[4];
+       uint64_t                cpu_gpmcs[4];

        uint64_t                cpu_max_observed_int_latency;
        int                     cpu_max_observed_int_latency_vector;
        uint64_t                cpu_max_observed_int_latency;
        int                     cpu_max_observed_int_latency_vector;

-       volatile boolean_t      cpu_NMI_acknowledged;
-       uint64_t                debugger_entry_time;
-       uint64_t                debugger_ipi_time;
+       volatile boolean_t      cpu_NMI_acknowledged;
+       uint64_t                debugger_entry_time;
+       uint64_t                debugger_ipi_time;

        /* A separate nested interrupt stack flag, to account
         * for non-nested interrupts arriving while on the interrupt stack
         * Currently only occurs when AICPM enables interrupts on the
         * interrupt stack during processor offlining.
         */
        /* A separate nested interrupt stack flag, to account
         * for non-nested interrupts arriving while on the interrupt stack
         * Currently only occurs when AICPM enables interrupts on the
         * interrupt stack during processor offlining.
         */

-       uint32_t                cpu_nested_istack;
-       uint32_t                cpu_nested_istack_events;
-       x86_saved_state64_t     *cpu_fatal_trap_state;
-       x86_saved_state64_t     *cpu_post_fatal_trap_state;
+       uint32_t                cpu_nested_istack;
+       uint32_t                cpu_nested_istack_events;
+       x86_saved_state64_t     *cpu_fatal_trap_state;
+       x86_saved_state64_t     *cpu_post_fatal_trap_state;

 #if CONFIG_VMX
 #if CONFIG_VMX

-       vmx_cpu_t               cpu_vmx;                /* wonderful world of virtualization */
+       vmx_cpu_t               cpu_vmx;                /* wonderful world of virtualization */

 #endif
 #if CONFIG_MCA
 #endif
 #if CONFIG_MCA

-       struct mca_state        *cpu_mca_state;         /* State at MC fault */
+       struct mca_state        *cpu_mca_state;         /* State at MC fault */

 #endif
 #endif

-       int                     cpu_type;
-       int                     cpu_subtype;
-       int                     cpu_threadtype;
-       boolean_t               cpu_iflag;
-       boolean_t               cpu_boot_complete;
-       int                     cpu_hibernate;
+       int                     cpu_type;
+       int                     cpu_subtype;
+       int                     cpu_threadtype;
+       boolean_t               cpu_iflag;
+       boolean_t               cpu_boot_complete;
+       int                     cpu_hibernate;

 #define MAX_PREEMPTION_RECORDS (8)
 #define MAX_PREEMPTION_RECORDS (8)

-#if    DEVELOPMENT || DEBUG
-       int                     cpu_plri;
-       plrecord_t              plrecords[MAX_PREEMPTION_RECORDS];
+#if     DEVELOPMENT || DEBUG
+       int                     cpu_plri;
+       plrecord_t              plrecords[MAX_PREEMPTION_RECORDS];

 #endif
 #endif

-       void                    *cpu_console_buf;
-       struct x86_lcpu         lcpu;
-       int                     cpu_phys_number;        /* Physical CPU */
-       cpu_id_t                cpu_id;                 /* Platform Expert */
+       void                    *cpu_console_buf;
+       struct x86_lcpu         lcpu;
+       int                     cpu_phys_number;        /* Physical CPU */
+       cpu_id_t                cpu_id;                 /* Platform Expert */

 #if DEBUG
 #if DEBUG

-       uint64_t                cpu_entry_cr3;
-       uint64_t                cpu_exit_cr3;
-       uint64_t                cpu_pcid_last_cr3;
+       uint64_t                cpu_entry_cr3;
+       uint64_t                cpu_exit_cr3;
+       uint64_t                cpu_pcid_last_cr3;
+#endif
+       boolean_t               cpu_rendezvous_in_progress;
+#if CST_DEMOTION_DEBUG
+       /* Count of thread wakeups issued by this processor */
+       uint64_t                cpu_wakeups_issued_total;
+#endif
+#if DEBUG || DEVELOPMENT
+       uint64_t                tsc_sync_delta;

 #endif
 #endif

-       boolean_t               cpu_rendezvous_in_progress;

 } cpu_data_t;
 
 } cpu_data_t;
 

-extern cpu_data_t      *cpu_data_ptr[];  
+extern cpu_data_t       *cpu_data_ptr[];

 
 

-/* Macro to generate inline bodies to retrieve per-cpu data fields. */
-#if defined(__clang__)
-#define GS_RELATIVE volatile __attribute__((address_space(256)))
-#ifndef offsetof
-#define offsetof(TYPE,MEMBER) __builtin_offsetof(TYPE,MEMBER)
+/*
+ * __SEG_GS marks %gs-relative operations:
+ *   https://clang.llvm.org/docs/LanguageExtensions.html#memory-references-to-specified-segments
+ *   https://gcc.gnu.org/onlinedocs/gcc/Named-Address-Spaces.html#x86-Named-Address-Spaces
+ */
+#if defined(__SEG_GS)
+// __seg_gs exists
+#elif defined(__clang__)
+#define __seg_gs __attribute__((address_space(256)))
+#else
+#error use a compiler that supports address spaces or __seg_gs

 #endif
 
 #endif
 

-#define CPU_DATA_GET(member,type)                                                                              \
-       cpu_data_t GS_RELATIVE *cpu_data =                                                      \
-               (cpu_data_t GS_RELATIVE *)0UL;                                                                  \
-       type ret;                                                                                                                       \
-       ret = cpu_data->member;                                                                                         \
-       return ret;
-
-#define CPU_DATA_GET_INDEX(member,index,type)                                                  \
-       cpu_data_t GS_RELATIVE *cpu_data =                                                      \
-               (cpu_data_t GS_RELATIVE *)0UL;                                                                  \
-       type ret;                                                                                                                       \
-       ret = cpu_data->member[index];                                                                          \
-       return ret;
-
-#define CPU_DATA_SET(member,value)                                                                             \
-       cpu_data_t GS_RELATIVE *cpu_data =                                                      \
-               (cpu_data_t GS_RELATIVE *)0UL;                                                                  \
-       cpu_data->member = value;
-
-#define CPU_DATA_XCHG(member,value,type)                                                               \
-       cpu_data_t GS_RELATIVE *cpu_data =                                                      \
-               (cpu_data_t GS_RELATIVE *)0UL;                                                                  \
-       type ret;                                                                                                                       \
-       ret = cpu_data->member;                                                                                         \
-       cpu_data->member = value;                                                                                       \
-       return ret;
-
-#else /* !defined(__clang__) */
-
-#ifndef offsetof
-#define offsetof(TYPE,MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif /* offsetof */
-#define CPU_DATA_GET(member,type)                                      \
-       type ret;                                                       \
-       __asm__ volatile ("mov %%gs:%P1,%0"                             \
-               : "=r" (ret)                                            \
-               : "i" (offsetof(cpu_data_t,member)));                   \
-       return ret;
-
-#define CPU_DATA_GET_INDEX(member,index,type)  \
-       type ret;                                                       \
-       __asm__ volatile ("mov %%gs:(%1),%0"                            \
-               : "=r" (ret)                                            \
-               : "r" (offsetof(cpu_data_t,member[index])));                    \
-       return ret;
-
-#define CPU_DATA_SET(member,value)                                     \
-       __asm__ volatile ("mov %0,%%gs:%P1"                             \
-               :                                                       \
-               : "r" (value), "i" (offsetof(cpu_data_t,member)));
-
-#define CPU_DATA_XCHG(member,value,type)                               \
-       type ret;                                                       \
-       __asm__ volatile ("xchg %0,%%gs:%P1"                            \
-               : "=r" (ret)                                            \
-               : "i" (offsetof(cpu_data_t,member)), "0" (value));      \
-       return ret;
-
-#endif /* !defined(__clang__) */
+#define CPU_DATA()            ((cpu_data_t __seg_gs *)0UL)

 
 /*
  * Everyone within the osfmk part of the kernel can use the fast
 
 /*
  * Everyone within the osfmk part of the kernel can use the fast


@@ -385,45 +409,51 @@ extern cpu_data_t *cpu_data_ptr[];
 static inline thread_t
 get_active_thread_volatile(void)
 {
 static inline thread_t
 get_active_thread_volatile(void)
 {

-       CPU_DATA_GET(cpu_active_thread,thread_t)
+       return CPU_DATA()->cpu_active_thread;

 }
 
 }
 

-static inline __pure2 thread_t
+static inline __attribute__((const)) thread_t

 get_active_thread(void)
 {
 get_active_thread(void)
 {

-       CPU_DATA_GET(cpu_active_thread,thread_t)
+       return CPU_DATA()->cpu_active_thread;

 }
 
 }
 

-#define current_thread_fast()          get_active_thread()
-#define current_thread_volatile()      get_active_thread_volatile()
-#define current_thread()               current_thread_fast()
+#define current_thread_fast()           get_active_thread()
+#define current_thread_volatile()       get_active_thread_volatile()
+#define current_thread()                current_thread_fast()

 
 

-#define cpu_mode_is64bit()             TRUE
+#define cpu_mode_is64bit()              TRUE

 
 static inline int
 get_preemption_level(void)
 {
 
 static inline int
 get_preemption_level(void)
 {

-       CPU_DATA_GET(cpu_preemption_level,int)
+       return CPU_DATA()->cpu_preemption_level;

 }
 static inline int
 get_interrupt_level(void)
 {
 }
 static inline int
 get_interrupt_level(void)
 {

-       CPU_DATA_GET(cpu_interrupt_level,int)
+       return CPU_DATA()->cpu_interrupt_level;

 }
 static inline int
 get_cpu_number(void)
 {
 }
 static inline int
 get_cpu_number(void)
 {

-       CPU_DATA_GET(cpu_number,int)
+       return CPU_DATA()->cpu_number;
+}
+static inline vm_offset_t
+get_current_percpu_base(void)
+{
+       return CPU_DATA()->cpu_pcpu_base;

 }
 static inline int
 get_cpu_phys_number(void)
 {
 }
 static inline int
 get_cpu_phys_number(void)
 {

-       CPU_DATA_GET(cpu_phys_number,int)
+       return CPU_DATA()->cpu_phys_number;

 }
 
 static inline cpu_data_t *
 }
 
 static inline cpu_data_t *

-current_cpu_datap(void) {
-       CPU_DATA_GET(cpu_this, cpu_data_t *);
+current_cpu_datap(void)
+{
+       return CPU_DATA()->cpu_this;

 }
 
 /*
 }
 
 /*


@@ -439,61 +469,35 @@ current_cpu_datap(void) {
  * The bounds check currently doesn't account for non-default thread stack sizes.
  */
 #if DEVELOPMENT || DEBUG
  * The bounds check currently doesn't account for non-default thread stack sizes.
  */
 #if DEVELOPMENT || DEBUG

-static inline void pltrace_bt(uint64_t *rets, int maxframes, uint64_t stacklo, uint64_t stackhi) {
-       uint64_t *cfp = (uint64_t *) __builtin_frame_address(0);
-       int plbtf;
-
-       assert(stacklo !=0  && stackhi !=0);
-
-       for (plbtf = 0; plbtf < maxframes; plbtf++) {
-               if (((uint64_t)cfp == 0) || (((uint64_t)cfp < stacklo) || ((uint64_t)cfp > stackhi))) {
-                       rets[plbtf] = 0;
-                       continue;
-               }
-               rets[plbtf] = *(cfp + 1);
-               cfp = (uint64_t *) (*cfp);
-       }
-}
-
-
-extern uint32_t                low_intstack[];         /* bottom */
-extern uint32_t                low_eintstack[];        /* top */
-extern char            mp_slave_stack[PAGE_SIZE];
-
-static inline void pltrace_internal(boolean_t enable) {
-       cpu_data_t *cdata = current_cpu_datap();
-       int cpli = cdata->cpu_preemption_level;
-       int cplrecord = cdata->cpu_plri;
-       uint64_t kstackb, kstackt, *plbts;
-
-       assert(cpli >= 0);
-
-       cdata->plrecords[cplrecord].pltype = enable;
-       cdata->plrecords[cplrecord].plevel = cpli;
-
-       plbts = &cdata->plrecords[cplrecord].plbt[0];
-
-       cplrecord++;
+static inline void
+rbtrace_bt(uint64_t *rets, int maxframes, cpu_data_t *cdata, uint64_t frameptr, bool use_cursp)
+{
+       extern uint32_t         low_intstack[];         /* bottom */
+       extern uint32_t         low_eintstack[];        /* top */
+       extern char             mp_slave_stack[];
+       int                     btidx = 0;

 
 

-       if (cplrecord >= MAX_PREEMPTION_RECORDS) {
-               cplrecord = 0;
-       }
+       uint64_t kstackb, kstackt;

 
 

-       cdata->cpu_plri = cplrecord;

        /* Obtain the 'current' program counter, initial backtrace
         * element. This will also indicate if we were unable to
         * trace further up the stack for some reason
         */
        /* Obtain the 'current' program counter, initial backtrace
         * element. This will also indicate if we were unable to
         * trace further up the stack for some reason
         */

-       __asm__ volatile("leaq 1f(%%rip), %%rax; mov %%rax, %0\n1:"
-           : "=m" (plbts[0])
-           :
-           : "rax");
-
+       if (use_cursp) {
+               __asm__ volatile ("leaq 1f(%%rip), %%rax; mov %%rax, %0\n1:"
+                     : "=m" (rets[btidx++])
+                     :
+                     : "rax");
+       }

 
        thread_t cplthread = cdata->cpu_active_thread;
        if (cplthread) {
                uintptr_t csp;
 
        thread_t cplthread = cdata->cpu_active_thread;
        if (cplthread) {
                uintptr_t csp;

-               __asm__ __volatile__ ("movq %%rsp, %0": "=r" (csp):);
+               if (use_cursp == true) {
+                       __asm__ __volatile__ ("movq %%rsp, %0": "=r" (csp):);
+               } else {
+                       csp = frameptr;
+               }

                /* Determine which stack we're on to populate stack bounds.
                 * We don't need to trace across stack boundaries for this
                 * routine.
                /* Determine which stack we're on to populate stack bounds.
                 * We don't need to trace across stack boundaries for this
                 * routine.


@@ -502,31 +506,151 @@ static inline void pltrace_internal(boolean_t enable) {
                kstackt = kstackb + KERNEL_STACK_SIZE;
                if (csp < kstackb || csp > kstackt) {
                        kstackt = cdata->cpu_kernel_stack;
                kstackt = kstackb + KERNEL_STACK_SIZE;
                if (csp < kstackb || csp > kstackt) {
                        kstackt = cdata->cpu_kernel_stack;

-                       kstackb = kstackb - KERNEL_STACK_SIZE;
+                       kstackb = kstackt - KERNEL_STACK_SIZE;

                        if (csp < kstackb || csp > kstackt) {
                                kstackt = cdata->cpu_int_stack_top;
                                kstackb = kstackt - INTSTACK_SIZE;
                                if (csp < kstackb || csp > kstackt) {
                                        kstackt = (uintptr_t)low_eintstack;
                        if (csp < kstackb || csp > kstackt) {
                                kstackt = cdata->cpu_int_stack_top;
                                kstackb = kstackt - INTSTACK_SIZE;
                                if (csp < kstackb || csp > kstackt) {
                                        kstackt = (uintptr_t)low_eintstack;

-                                       kstackb = (uintptr_t)low_eintstack - INTSTACK_SIZE;
+                                       kstackb = kstackt - INTSTACK_SIZE;

                                        if (csp < kstackb || csp > kstackt) {
                                                kstackb = (uintptr_t) mp_slave_stack;
                                        if (csp < kstackb || csp > kstackt) {
                                                kstackb = (uintptr_t) mp_slave_stack;

-                                               kstackt = (uintptr_t) mp_slave_stack + PAGE_SIZE;
+                                               kstackt = kstackb + PAGE_SIZE;
+                                       } else {
+                                               kstackb = 0;
+                                               kstackt = 0;

                                        }
                                }
                        }
                }
 
                                        }
                                }
                        }
                }
 

-               if (kstackb) {
-                       pltrace_bt(&plbts[1], MAXPLFRAMES - 1, kstackb, kstackt);
+               if (__probable(kstackb && kstackt)) {
+                       uint64_t *cfp = (uint64_t *) frameptr;
+                       int rbbtf;
+
+                       for (rbbtf = btidx; rbbtf < maxframes; rbbtf++) {
+                               if (((uint64_t)cfp == 0) || (((uint64_t)cfp < kstackb) || ((uint64_t)cfp > kstackt))) {
+                                       rets[rbbtf] = 0;
+                                       continue;
+                               }
+                               rets[rbbtf] = *(cfp + 1);
+                               cfp = (uint64_t *) (*cfp);
+                       }

                }
        }
 }
 
                }
        }
 }
 

+__attribute__((noinline))
+static inline void
+pltrace_internal(boolean_t enable)
+{
+       cpu_data_t *cdata = current_cpu_datap();
+       int cpli = cdata->cpu_preemption_level;
+       int cplrecord = cdata->cpu_plri;
+       uint64_t *plbts;
+
+       assert(cpli >= 0);
+
+       cdata->plrecords[cplrecord].pltype = enable;
+       cdata->plrecords[cplrecord].plevel = cpli;
+
+       plbts = &cdata->plrecords[cplrecord].plbt[0];
+
+       cplrecord++;
+
+       if (cplrecord >= MAX_PREEMPTION_RECORDS) {
+               cplrecord = 0;
+       }
+
+       cdata->cpu_plri = cplrecord;
+
+       rbtrace_bt(plbts, MAX_TRACE_BTFRAMES - 1, cdata, (uint64_t)__builtin_frame_address(0), false);
+}
+

 extern int plctrace_enabled;
 extern int plctrace_enabled;

+
+static inline void
+iotrace(iotrace_type_e type, uint64_t vaddr, uint64_t paddr, int size, uint64_t val,
+    uint64_t sabs, uint64_t duration)
+{
+       cpu_data_t *cdata;
+       int cpu_num, nextidx;
+       iotrace_entry_t *cur_iotrace_ring;
+
+       if (__improbable(mmiotrace_enabled == 0 || iotrace_generators == 0)) {
+               return;
+       }
+
+       cdata = current_cpu_datap();
+       cpu_num = cdata->cpu_number;
+       nextidx = iotrace_next[cpu_num];
+       cur_iotrace_ring = iotrace_ring[cpu_num];
+
+       cur_iotrace_ring[nextidx].iotype = type;
+       cur_iotrace_ring[nextidx].vaddr = vaddr;
+       cur_iotrace_ring[nextidx].paddr = paddr;
+       cur_iotrace_ring[nextidx].size = size;
+       cur_iotrace_ring[nextidx].val = val;
+       cur_iotrace_ring[nextidx].start_time_abs = sabs;
+       cur_iotrace_ring[nextidx].duration = duration;
+
+       iotrace_next[cpu_num] = ((nextidx + 1) >= iotrace_entries_per_cpu) ? 0 : (nextidx + 1);
+
+       rbtrace_bt(&cur_iotrace_ring[nextidx].backtrace[0],
+           MAX_TRACE_BTFRAMES - 1, cdata, (uint64_t)__builtin_frame_address(0), true);
+}
+
+static inline uint32_t
+traptrace_start(int vecnum, uint64_t ipc, uint64_t sabs, uint64_t frameptr)
+{
+       cpu_data_t *cdata;
+       unsigned int cpu_num, nextidx;
+       traptrace_entry_t *cur_traptrace_ring;
+
+       if (__improbable(traptrace_enabled == 0 || traptrace_generators == 0)) {
+               return TRAPTRACE_INVALID_INDEX;
+       }
+
+       assert(ml_get_interrupts_enabled() == FALSE);
+       cdata = current_cpu_datap();
+       cpu_num = (unsigned int)cdata->cpu_number;
+       nextidx = (unsigned int)traptrace_next[cpu_num];
+       /* prevent nested interrupts from clobbering this record */
+       traptrace_next[cpu_num] = (int)(((nextidx + 1) >= (unsigned int)traptrace_entries_per_cpu) ? 0 : (nextidx + 1));
+
+       cur_traptrace_ring = traptrace_ring[cpu_num];
+
+       cur_traptrace_ring[nextidx].vector = vecnum;
+       cur_traptrace_ring[nextidx].curthread = current_thread();
+       cur_traptrace_ring[nextidx].interrupted_pc = ipc;
+       cur_traptrace_ring[nextidx].curpl = cdata->cpu_preemption_level;
+       cur_traptrace_ring[nextidx].curil = cdata->cpu_interrupt_level;
+       cur_traptrace_ring[nextidx].start_time_abs = sabs;
+       cur_traptrace_ring[nextidx].duration = ~0ULL;
+
+       rbtrace_bt(&cur_traptrace_ring[nextidx].backtrace[0],
+           MAX_TRACE_BTFRAMES - 1, cdata, frameptr, false);
+
+       assert(nextidx <= 0xFFFF);
+
+       return (uint32_t)((cpu_num << 16) | nextidx);
+}
+
+static inline void
+traptrace_end(uint32_t index, uint64_t eabs)
+{
+       if (index != TRAPTRACE_INVALID_INDEX) {
+               traptrace_entry_t *ttentp = &traptrace_ring[index >> 16][index & 0xFFFF];
+
+               ttentp->duration = eabs - ttentp->start_time_abs;
+       }
+}
+

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

-static inline void pltrace(boolean_t plenable) {
+__header_always_inline void
+pltrace(boolean_t plenable)
+{

 #if DEVELOPMENT || DEBUG
        if (__improbable(plctrace_enabled != 0)) {
                pltrace_internal(plenable);
 #if DEVELOPMENT || DEBUG
        if (__improbable(plctrace_enabled != 0)) {
                pltrace_internal(plenable);


@@ -537,37 +661,26 @@ static inline void pltrace(boolean_t plenable) {
 }
 
 static inline void
 }
 
 static inline void

-disable_preemption_internal(void) {
+disable_preemption_internal(void)
+{

        assert(get_preemption_level() >= 0);
 
        assert(get_preemption_level() >= 0);
 

-#if defined(__clang__)
-       cpu_data_t GS_RELATIVE *cpu_data = (cpu_data_t GS_RELATIVE *)0UL;
-       cpu_data->cpu_preemption_level++;
-#else
-       __asm__ volatile ("incl %%gs:%P0"
-           :
-           : "i" (offsetof(cpu_data_t, cpu_preemption_level)));
-#endif
+       os_compiler_barrier();
+       CPU_DATA()->cpu_preemption_level++;
+       os_compiler_barrier();

        pltrace(FALSE);
 }
 
 static inline void
        pltrace(FALSE);
 }
 
 static inline void

-enable_preemption_internal(void) {
+enable_preemption_internal(void)
+{

        assert(get_preemption_level() > 0);
        pltrace(TRUE);
        assert(get_preemption_level() > 0);
        pltrace(TRUE);

-#if defined(__clang__)
-       cpu_data_t GS_RELATIVE *cpu_data = (cpu_data_t GS_RELATIVE *)0UL;
-       if (0 == --cpu_data->cpu_preemption_level)
+       os_compiler_barrier();
+       if (0 == --CPU_DATA()->cpu_preemption_level) {

                kernel_preempt_check();
                kernel_preempt_check();

-#else
-       __asm__ volatile ("decl %%gs:%P0                \n\t"
-                         "jne 1f                       \n\t"
-                         "call _kernel_preempt_check   \n\t"
-                         "1:"
-                       : /* no outputs */
-                       : "i" (offsetof(cpu_data_t, cpu_preemption_level))
-                       : "eax", "ecx", "edx", "cc", "memory");
-#endif
+       }
+       os_compiler_barrier();

 }
 
 static inline void
 }
 
 static inline void


@@ -576,19 +689,14 @@ enable_preemption_no_check(void)
        assert(get_preemption_level() > 0);
 
        pltrace(TRUE);
        assert(get_preemption_level() > 0);
 
        pltrace(TRUE);

-#if defined(__clang__)
-       cpu_data_t GS_RELATIVE *cpu_data = (cpu_data_t GS_RELATIVE *)0UL;
-       cpu_data->cpu_preemption_level--;
-#else
-       __asm__ volatile ("decl %%gs:%P0"
-                       : /* no outputs */
-                       : "i" (offsetof(cpu_data_t, cpu_preemption_level))
-                       : "cc", "memory");
-#endif
+       os_compiler_barrier();
+       CPU_DATA()->cpu_preemption_level--;
+       os_compiler_barrier();

 }
 
 static inline void
 }
 
 static inline void

-_enable_preemption_no_check(void) {
+_enable_preemption_no_check(void)
+{

        enable_preemption_no_check();
 }
 
        enable_preemption_no_check();
 }
 


@@ -611,17 +719,20 @@ mp_enable_preemption(void)
 }
 
 static inline void
 }
 
 static inline void

-_mp_enable_preemption(void) {
+_mp_enable_preemption(void)
+{

        enable_preemption_internal();
 }
 
 static inline void
        enable_preemption_internal();
 }
 
 static inline void

-mp_enable_preemption_no_check(void) {
+mp_enable_preemption_no_check(void)
+{

        enable_preemption_no_check();
 }
 
 static inline void
        enable_preemption_no_check();
 }
 
 static inline void

-_mp_enable_preemption_no_check(void) {
+_mp_enable_preemption_no_check(void)
+{

        enable_preemption_no_check();
 }
 
        enable_preemption_no_check();
 }
 


@@ -632,18 +743,21 @@ _mp_enable_preemption_no_check(void) {
 #endif
 
 static inline cpu_data_t *
 #endif
 
 static inline cpu_data_t *

-cpu_datap(int cpu) {
+cpu_datap(int cpu)
+{

        return cpu_data_ptr[cpu];
 }
 
 static inline int
        return cpu_data_ptr[cpu];
 }
 
 static inline int

-cpu_is_running(int cpu) {
-       return ((cpu_datap(cpu) != NULL) && (cpu_datap(cpu)->cpu_running));
+cpu_is_running(int cpu)
+{
+       return (cpu_datap(cpu) != NULL) && (cpu_datap(cpu)->cpu_running);

 }
 
 #ifdef MACH_KERNEL_PRIVATE
 static inline cpu_data_t *
 }
 
 #ifdef MACH_KERNEL_PRIVATE
 static inline cpu_data_t *

-cpu_shadowp(int cpu) {
+cpu_shadowp(int cpu)
+{

        return cpu_data_ptr[cpu]->cd_shadow;
 }
 
        return cpu_data_ptr[cpu]->cd_shadow;
 }
 


@@ -651,4 +765,4 @@ cpu_shadowp(int cpu) {
 extern cpu_data_t *cpu_data_alloc(boolean_t is_boot_cpu);
 extern void cpu_data_realloc(void);
 
 extern cpu_data_t *cpu_data_alloc(boolean_t is_boot_cpu);
 extern void cpu_data_realloc(void);
 

-#endif /* I386_CPU_DATA */
+#endif  /* I386_CPU_DATA */