xnu-7195.81.3.tar.gz

[apple/xnu.git] / bsd / kern / kdebug.c

diff --git a/bsd/kern/kdebug.c b/bsd/kern/kdebug.c
index 66361ad0dc008a010c747225f17a25720edec7b1..f0ca4b75c881484ed2ab0605c3970eee207ed69a 100644 (file)
--- a/bsd/kern/kdebug.c
+++ b/bsd/kern/kdebug.c
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @Apple_LICENSE_HEADER_START@
  *
  *
  * @Apple_LICENSE_HEADER_START@
  *


@@ -37,6 +37,7 @@
 #include <mach/mach_types.h>
 #include <mach/mach_time.h>
 #include <mach/mach_vm.h>
 #include <mach/mach_types.h>
 #include <mach/mach_time.h>
 #include <mach/mach_vm.h>

+#include <machine/atomic.h>

 #include <machine/machine_routines.h>
 
 #include <mach/machine.h>
 #include <machine/machine_routines.h>
 
 #include <mach/machine.h>


@@ -55,6 +56,7 @@
 #include <kern/task.h>
 #include <kern/debug.h>
 #include <kern/kalloc.h>
 #include <kern/task.h>
 #include <kern/debug.h>
 #include <kern/kalloc.h>

+#include <kern/cpu_number.h>

 #include <kern/cpu_data.h>
 #include <kern/assert.h>
 #include <kern/telemetry.h>
 #include <kern/cpu_data.h>
 #include <kern/assert.h>
 #include <kern/telemetry.h>


@@ -72,19 +74,20 @@
 #include <sys/fcntl.h>
 #include <sys/file_internal.h>
 #include <sys/ubc.h>
 #include <sys/fcntl.h>
 #include <sys/file_internal.h>
 #include <sys/ubc.h>

-#include <sys/param.h>                 /* for isset() */
+#include <sys/param.h>                  /* for isset() */

 
 

-#include <mach/mach_host.h>            /* for host_info() */
+#include <mach/mach_host.h>             /* for host_info() */

 #include <libkern/OSAtomic.h>
 
 #include <machine/pal_routines.h>
 #include <machine/atomic.h>
 
 #include <libkern/OSAtomic.h>
 
 #include <machine/pal_routines.h>
 #include <machine/atomic.h>
 

+extern unsigned int wake_nkdbufs;
+extern unsigned int trace_wrap;
+

 /*
  * IOP(s)
  *
 /*
  * IOP(s)
  *

- * https://coreoswiki.apple.com/wiki/pages/U6z3i0q9/Consistent_Logging_Implementers_Guide.html
- *

  * IOP(s) are auxiliary cores that want to participate in kdebug event logging.
  * They are registered dynamically. Each is assigned a cpu_id at registration.
  *
  * IOP(s) are auxiliary cores that want to participate in kdebug event logging.
  * They are registered dynamically. Each is assigned a cpu_id at registration.
  *


@@ -108,10 +111,10 @@
  */
 
 typedef struct kd_iop {
  */
 
 typedef struct kd_iop {

-       kd_callback_t   callback;
-       uint32_t        cpu_id;
-       uint64_t        last_timestamp; /* Prevent timer rollback */
-       struct kd_iop*  next;
+       kd_callback_t   callback;
+       uint32_t        cpu_id;
+       uint64_t        last_timestamp; /* Prevent timer rollback */
+       struct kd_iop*  next;

 } kd_iop_t;
 
 static kd_iop_t* kd_iops = NULL;
 } kd_iop_t;
 
 static kd_iop_t* kd_iops = NULL;


@@ -152,7 +155,8 @@ static mach_port_t  kdbg_typefilter_memory_entry;
  */
 #define TYPEFILTER_ALLOC_SIZE MAX(round_page_32(KDBG_TYPEFILTER_BITMAP_SIZE), KDBG_TYPEFILTER_BITMAP_SIZE)
 
  */
 #define TYPEFILTER_ALLOC_SIZE MAX(round_page_32(KDBG_TYPEFILTER_BITMAP_SIZE), KDBG_TYPEFILTER_BITMAP_SIZE)
 

-static typefilter_t typefilter_create(void)
+static typefilter_t
+typefilter_create(void)

 {
        typefilter_t tf;
        if (KERN_SUCCESS == kmem_alloc(kernel_map, (vm_offset_t*)&tf, TYPEFILTER_ALLOC_SIZE, VM_KERN_MEMORY_DIAG)) {
 {
        typefilter_t tf;
        if (KERN_SUCCESS == kmem_alloc(kernel_map, (vm_offset_t*)&tf, TYPEFILTER_ALLOC_SIZE, VM_KERN_MEMORY_DIAG)) {


@@ -162,52 +166,60 @@ static typefilter_t typefilter_create(void)
        return NULL;
 }
 
        return NULL;
 }
 

-static void typefilter_deallocate(typefilter_t tf)
+static void
+typefilter_deallocate(typefilter_t tf)

 {
        assert(tf != NULL);
        assert(tf != kdbg_typefilter);
        kmem_free(kernel_map, (vm_offset_t)tf, TYPEFILTER_ALLOC_SIZE);
 }
 
 {
        assert(tf != NULL);
        assert(tf != kdbg_typefilter);
        kmem_free(kernel_map, (vm_offset_t)tf, TYPEFILTER_ALLOC_SIZE);
 }
 

-static void typefilter_copy(typefilter_t dst, typefilter_t src)
+static void
+typefilter_copy(typefilter_t dst, typefilter_t src)

 {
        assert(src != NULL);
        assert(dst != NULL);
        memcpy(dst, src, KDBG_TYPEFILTER_BITMAP_SIZE);
 }
 
 {
        assert(src != NULL);
        assert(dst != NULL);
        memcpy(dst, src, KDBG_TYPEFILTER_BITMAP_SIZE);
 }
 

-static void typefilter_reject_all(typefilter_t tf)
+static void
+typefilter_reject_all(typefilter_t tf)

 {
        assert(tf != NULL);
        memset(tf, 0, KDBG_TYPEFILTER_BITMAP_SIZE);
 }
 
 {
        assert(tf != NULL);
        memset(tf, 0, KDBG_TYPEFILTER_BITMAP_SIZE);
 }
 

-static void typefilter_allow_all(typefilter_t tf)
+static void
+typefilter_allow_all(typefilter_t tf)

 {
        assert(tf != NULL);
        memset(tf, ~0, KDBG_TYPEFILTER_BITMAP_SIZE);
 }
 
 {
        assert(tf != NULL);
        memset(tf, ~0, KDBG_TYPEFILTER_BITMAP_SIZE);
 }
 

-static void typefilter_allow_class(typefilter_t tf, uint8_t class)
+static void
+typefilter_allow_class(typefilter_t tf, uint8_t class)

 {
        assert(tf != NULL);
        const uint32_t BYTES_PER_CLASS = 256 / 8; // 256 subclasses, 1 bit each
        memset(&tf[class * BYTES_PER_CLASS], 0xFF, BYTES_PER_CLASS);
 }
 
 {
        assert(tf != NULL);
        const uint32_t BYTES_PER_CLASS = 256 / 8; // 256 subclasses, 1 bit each
        memset(&tf[class * BYTES_PER_CLASS], 0xFF, BYTES_PER_CLASS);
 }
 

-static void typefilter_allow_csc(typefilter_t tf, uint16_t csc)
+static void
+typefilter_allow_csc(typefilter_t tf, uint16_t csc)

 {
        assert(tf != NULL);
        setbit(tf, csc);
 }
 
 {
        assert(tf != NULL);
        setbit(tf, csc);
 }
 

-static bool typefilter_is_debugid_allowed(typefilter_t tf, uint32_t id)
+static bool
+typefilter_is_debugid_allowed(typefilter_t tf, uint32_t id)

 {
        assert(tf != NULL);
        return isset(tf, KDBG_EXTRACT_CSC(id));
 }
 
 {
        assert(tf != NULL);
        return isset(tf, KDBG_EXTRACT_CSC(id));
 }
 

-static mach_port_t typefilter_create_memory_entry(typefilter_t tf)
+static mach_port_t
+typefilter_create_memory_entry(typefilter_t tf)

 {
        assert(tf != NULL);
 
 {
        assert(tf != NULL);
 


@@ -215,11 +227,11 @@ static mach_port_t typefilter_create_memory_entry(typefilter_t tf)
        memory_object_size_t size = TYPEFILTER_ALLOC_SIZE;
 
        mach_make_memory_entry_64(kernel_map,
        memory_object_size_t size = TYPEFILTER_ALLOC_SIZE;
 
        mach_make_memory_entry_64(kernel_map,

-                                 &size,
-                                 (memory_object_offset_t)tf,
-                                 VM_PROT_READ,
-                                 &memory_entry,
-                                 MACH_PORT_NULL);
+           &size,
+           (memory_object_offset_t)tf,
+           VM_PROT_READ,
+           &memory_entry,
+           MACH_PORT_NULL);

 
        return memory_entry;
 }
 
        return memory_entry;
 }


@@ -232,8 +244,7 @@ static void kdbg_disable_typefilter(void);
  * External prototypes
  */
 
  * External prototypes
  */
 

-void task_act_iterate_wth_args(task_t, void(*)(thread_t, void *), void *);
-int cpu_number(void);  /* XXX <machine/...> include path broken */
+void task_act_iterate_wth_args(task_t, void (*)(thread_t, void *), void *);

 void commpage_update_kdebug_state(void); /* XXX sign */
 
 extern int log_leaks;
 void commpage_update_kdebug_state(void); /* XXX sign */
 
 extern int log_leaks;


@@ -256,13 +267,6 @@ kdbg_timestamp(void)
 
 static int kdbg_debug = 0;
 
 
 static int kdbg_debug = 0;
 

-#if KDEBUG_MOJO_TRACE
-#include <sys/kdebugevents.h>
-static void kdebug_serial_print( /* forward */
-               uint32_t, uint32_t, uint64_t,
-               uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
-#endif
-

 int kdbg_control(int *, u_int, user_addr_t, size_t *);
 
 static int kdbg_read(user_addr_t, size_t *, vnode_t, vfs_context_t, uint32_t);
 int kdbg_control(int *, u_int, user_addr_t, size_t *);
 
 static int kdbg_read(user_addr_t, size_t *, vnode_t, vfs_context_t, uint32_t);


@@ -273,40 +277,39 @@ static int kdbg_setreg(kd_regtype *);
 static int kdbg_setpidex(kd_regtype *);
 static int kdbg_setpid(kd_regtype *);
 static void kdbg_thrmap_init(void);
 static int kdbg_setpidex(kd_regtype *);
 static int kdbg_setpid(kd_regtype *);
 static void kdbg_thrmap_init(void);

-static int kdbg_reinit(boolean_t);
-static int kdbg_bootstrap(boolean_t);
+static int kdbg_reinit(bool);
+static int kdbg_bootstrap(bool);

 static int kdbg_test(size_t flavor);
 
 static int kdbg_test(size_t flavor);
 

-static int kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx);
+static int kdbg_write_v1_header(bool write_thread_map, vnode_t vp, vfs_context_t ctx);

 static int kdbg_write_thread_map(vnode_t vp, vfs_context_t ctx);
 static int kdbg_copyout_thread_map(user_addr_t buffer, size_t *buffer_size);
 static void kdbg_clear_thread_map(void);
 
 static int kdbg_write_thread_map(vnode_t vp, vfs_context_t ctx);
 static int kdbg_copyout_thread_map(user_addr_t buffer, size_t *buffer_size);
 static void kdbg_clear_thread_map(void);
 

-static boolean_t kdbg_wait(uint64_t timeout_ms, boolean_t locked_wait);
+static bool kdbg_wait(uint64_t timeout_ms, bool locked_wait);

 static void kdbg_wakeup(void);
 
 int kdbg_cpumap_init_internal(kd_iop_t* iops, uint32_t cpu_count,
 static void kdbg_wakeup(void);
 
 int kdbg_cpumap_init_internal(kd_iop_t* iops, uint32_t cpu_count,

-                              uint8_t** cpumap, uint32_t* cpumap_size);
+    uint8_t** cpumap, uint32_t* cpumap_size);

 
 

-static kd_threadmap *kdbg_thrmap_init_internal(unsigned int count,
-                                               unsigned int *mapsize,
-                                               unsigned int *mapcount);
+static kd_threadmap *kdbg_thrmap_init_internal(size_t max_count,
+    vm_size_t *map_size, vm_size_t *map_count);

 
 

-static boolean_t kdebug_current_proc_enabled(uint32_t debugid);
+static bool kdebug_current_proc_enabled(uint32_t debugid);

 static errno_t kdebug_check_trace_string(uint32_t debugid, uint64_t str_id);
 
 int kdbg_write_v3_header(user_addr_t, size_t *, int);
 int kdbg_write_v3_chunk_header(user_addr_t buffer, uint32_t tag,
 static errno_t kdebug_check_trace_string(uint32_t debugid, uint64_t str_id);
 
 int kdbg_write_v3_header(user_addr_t, size_t *, int);
 int kdbg_write_v3_chunk_header(user_addr_t buffer, uint32_t tag,

-                               uint32_t sub_tag, uint64_t length,
-                               vnode_t vp, vfs_context_t ctx);
+    uint32_t sub_tag, uint64_t length,
+    vnode_t vp, vfs_context_t ctx);

 
 user_addr_t kdbg_write_v3_event_chunk_header(user_addr_t buffer, uint32_t tag,
 
 user_addr_t kdbg_write_v3_event_chunk_header(user_addr_t buffer, uint32_t tag,

-                                             uint64_t length, vnode_t vp,
-                                             vfs_context_t ctx);
+    uint64_t length, vnode_t vp,
+    vfs_context_t ctx);

 
 // Helper functions
 
 
 // Helper functions
 

-static int create_buffers(boolean_t);
+static int create_buffers(bool);

 static void delete_buffers(void);
 
 extern int tasks_count;
 static void delete_buffers(void);
 
 extern int tasks_count;


@@ -320,16 +323,16 @@ unsigned int kdebug_enable = 0;
 
 #define KD_EARLY_BUFFER_SIZE (16 * 1024)
 #define KD_EARLY_BUFFER_NBUFS (KD_EARLY_BUFFER_SIZE / sizeof(kd_buf))
 
 #define KD_EARLY_BUFFER_SIZE (16 * 1024)
 #define KD_EARLY_BUFFER_NBUFS (KD_EARLY_BUFFER_SIZE / sizeof(kd_buf))

-#if CONFIG_EMBEDDED
+#if defined(__x86_64__)
+__attribute__((aligned(KD_EARLY_BUFFER_SIZE)))
+static kd_buf kd_early_buffer[KD_EARLY_BUFFER_NBUFS];
+#else /* defined(__x86_64__) */

 /*
 /*

- * On embedded, the space for this is carved out by osfmk/arm/data.s -- clang
+ * On ARM, the space for this is carved out by osfmk/arm/data.s -- clang

  * has problems aligning to greater than 4K.
  */
 extern kd_buf kd_early_buffer[KD_EARLY_BUFFER_NBUFS];
  * has problems aligning to greater than 4K.
  */
 extern kd_buf kd_early_buffer[KD_EARLY_BUFFER_NBUFS];

-#else /* CONFIG_EMBEDDED */
-__attribute__((aligned(KD_EARLY_BUFFER_SIZE)))
-static kd_buf kd_early_buffer[KD_EARLY_BUFFER_NBUFS];
-#endif /* !CONFIG_EMBEDDED */
+#endif /* !defined(__x86_64__) */

 
 static unsigned int kd_early_index = 0;
 static bool kd_early_overflow = false;
 
 static unsigned int kd_early_index = 0;
 static bool kd_early_overflow = false;


@@ -338,8 +341,8 @@ static bool kd_early_done = false;
 #define SLOW_NOLOG  0x01
 #define SLOW_CHECKS 0x02
 
 #define SLOW_NOLOG  0x01
 #define SLOW_CHECKS 0x02
 

-#define EVENTS_PER_STORAGE_UNIT                2048
-#define MIN_STORAGE_UNITS_PER_CPU      4
+#define EVENTS_PER_STORAGE_UNIT         2048
+#define MIN_STORAGE_UNITS_PER_CPU       4

 
 #define POINTER_FROM_KDS_PTR(x) (&kd_bufs[x.buffer_index].kdsb_addr[x.offset])
 
 
 #define POINTER_FROM_KDS_PTR(x) (&kd_bufs[x.buffer_index].kdsb_addr[x.offset])
 


@@ -352,24 +355,24 @@ union kds_ptr {
 };
 
 struct kd_storage {
 };
 
 struct kd_storage {

-       union   kds_ptr kds_next;
+       union   kds_ptr kds_next;

        uint32_t kds_bufindx;
        uint32_t kds_bufcnt;
        uint32_t kds_readlast;
        uint32_t kds_bufindx;
        uint32_t kds_bufcnt;
        uint32_t kds_readlast;

-       boolean_t kds_lostevents;
+       bool kds_lostevents;

        uint64_t  kds_timestamp;
 
        uint64_t  kds_timestamp;
 

-       kd_buf  kds_records[EVENTS_PER_STORAGE_UNIT];
+       kd_buf  kds_records[EVENTS_PER_STORAGE_UNIT];

 };
 
 #define MAX_BUFFER_SIZE            (1024 * 1024 * 128)
 #define N_STORAGE_UNITS_PER_BUFFER (MAX_BUFFER_SIZE / sizeof(struct kd_storage))
 static_assert(N_STORAGE_UNITS_PER_BUFFER <= 0x7ff,
 };
 
 #define MAX_BUFFER_SIZE            (1024 * 1024 * 128)
 #define N_STORAGE_UNITS_PER_BUFFER (MAX_BUFFER_SIZE / sizeof(struct kd_storage))
 static_assert(N_STORAGE_UNITS_PER_BUFFER <= 0x7ff,

-               "shoudn't overflow kds_ptr.offset");
+    "shoudn't overflow kds_ptr.offset");

 
 struct kd_storage_buffers {
 
 struct kd_storage_buffers {

-       struct  kd_storage      *kdsb_addr;
-       uint32_t                kdsb_size;
+       struct  kd_storage      *kdsb_addr;
+       uint32_t                kdsb_size;

 };
 
 #define KDS_PTR_NULL 0xffffffff
 };
 
 #define KDS_PTR_NULL 0xffffffff


@@ -383,11 +386,11 @@ int kds_waiter = 0;
 struct kd_bufinfo {
        union  kds_ptr kd_list_head;
        union  kds_ptr kd_list_tail;
 struct kd_bufinfo {
        union  kds_ptr kd_list_head;
        union  kds_ptr kd_list_tail;

-       boolean_t kd_lostevents;
+       bool kd_lostevents;

        uint32_t _pad;
        uint64_t kd_prev_timebase;
        uint32_t num_bufs;
        uint32_t _pad;
        uint64_t kd_prev_timebase;
        uint32_t num_bufs;

-} __attribute__(( aligned(MAX_CPU_CACHE_LINE_SIZE) ));
+} __attribute__((aligned(MAX_CPU_CACHE_LINE_SIZE)));

 
 
 /*
 
 
 /*


@@ -396,9 +399,9 @@ struct kd_bufinfo {
  */
 struct kd_ctrl_page_t {
        union kds_ptr kds_free_list;
  */
 struct kd_ctrl_page_t {
        union kds_ptr kds_free_list;

-       uint32_t enabled        :1;
-       uint32_t _pad0          :31;
-       int                     kds_inuse_count;
+       uint32_t enabled        :1;
+       uint32_t _pad0          :31;
+       int                     kds_inuse_count;

        uint32_t kdebug_flags;
        uint32_t kdebug_slowcheck;
        uint64_t oldest_time;
        uint32_t kdebug_flags;
        uint32_t kdebug_slowcheck;
        uint64_t oldest_time;


@@ -421,33 +424,33 @@ struct kd_ctrl_page_t {
 
 struct kd_bufinfo *kdbip = NULL;
 
 
 struct kd_bufinfo *kdbip = NULL;
 

-#define KDCOPYBUF_COUNT        8192
-#define KDCOPYBUF_SIZE (KDCOPYBUF_COUNT * sizeof(kd_buf))
+#define KDCOPYBUF_COUNT 8192
+#define KDCOPYBUF_SIZE  (KDCOPYBUF_COUNT * sizeof(kd_buf))

 
 

-#define PAGE_4KB       4096
-#define PAGE_16KB      16384
+#define PAGE_4KB        4096
+#define PAGE_16KB       16384

 
 kd_buf *kdcopybuf = NULL;
 
 unsigned int nkdbufs = 0;
 
 kd_buf *kdcopybuf = NULL;
 
 unsigned int nkdbufs = 0;

-unsigned int kdlog_beg=0;
-unsigned int kdlog_end=0;
-unsigned int kdlog_value1=0;
-unsigned int kdlog_value2=0;
-unsigned int kdlog_value3=0;
-unsigned int kdlog_value4=0;
+unsigned int kdlog_beg = 0;
+unsigned int kdlog_end = 0;
+unsigned int kdlog_value1 = 0;
+unsigned int kdlog_value2 = 0;
+unsigned int kdlog_value3 = 0;
+unsigned int kdlog_value4 = 0;

 
 static lck_spin_t * kdw_spin_lock;
 static lck_spin_t * kds_spin_lock;
 
 kd_threadmap *kd_mapptr = 0;
 
 static lck_spin_t * kdw_spin_lock;
 static lck_spin_t * kds_spin_lock;
 
 kd_threadmap *kd_mapptr = 0;

-unsigned int kd_mapsize = 0;
-unsigned int kd_mapcount = 0;
+vm_size_t kd_mapsize = 0;
+vm_size_t kd_mapcount = 0;

 
 

-off_t  RAW_file_offset = 0;
-int    RAW_file_written = 0;
+off_t   RAW_file_offset = 0;
+int     RAW_file_written = 0;

 
 

-#define        RAW_FLUSH_SIZE  (2 * 1024 * 1024)
+#define RAW_FLUSH_SIZE  (2 * 1024 * 1024)

 
 /*
  * A globally increasing counter for identifying strings in trace.  Starts at
 
 /*
  * A globally increasing counter for identifying strings in trace.  Starts at


@@ -466,85 +469,191 @@ static uint64_t g_curr_str_id = 1;
  */
 static uint64_t g_str_id_signature = (0x70acULL << STR_ID_SIG_OFFSET);
 
  */
 static uint64_t g_str_id_signature = (0x70acULL << STR_ID_SIG_OFFSET);
 

-#define INTERRUPT      0x01050000
-#define MACH_vmfault   0x01300008
-#define BSC_SysCall    0x040c0000
-#define MACH_SysCall   0x010c0000
+#define INTERRUPT       0x01050000
+#define MACH_vmfault    0x01300008
+#define BSC_SysCall     0x040c0000
+#define MACH_SysCall    0x010c0000

 
 

-/* task to string structure */
-struct tts
-{
-  task_t    task;            /* from procs task */
-  pid_t     pid;             /* from procs p_pid  */
-  char      task_comm[20];   /* from procs p_comm */
+struct kd_task_name {
+       task_t ktn_task;
+       pid_t ktn_pid;
+       char ktn_name[20];

 };
 
 };
 

-typedef struct tts tts_t;
-
-struct krt
-{
-       kd_threadmap *map;    /* pointer to the map buffer */
-       int count;
-       int maxcount;
-       struct tts *atts;
+struct kd_resolver {
+       kd_threadmap *krs_map;
+       vm_size_t krs_count;
+       vm_size_t krs_maxcount;
+       struct kd_task_name *krs_task;

 };
 
 };
 

+/*
+ * TRACE file formats...
+ *
+ * RAW_VERSION0
+ *
+ * uint32_t #threadmaps
+ * kd_threadmap[]
+ * kd_buf[]
+ *
+ * RAW_VERSION1
+ *
+ * RAW_header, with version_no set to RAW_VERSION1
+ * kd_threadmap[]
+ * Empty space to pad alignment to the nearest page boundary.
+ * kd_buf[]
+ *
+ * RAW_VERSION1+
+ *
+ * RAW_header, with version_no set to RAW_VERSION1
+ * kd_threadmap[]
+ * kd_cpumap_header, with version_no set to RAW_VERSION1
+ * kd_cpumap[]
+ * Empty space to pad alignment to the nearest page boundary.
+ * kd_buf[]
+ *
+ * V1+ implementation details...
+ *
+ * It would have been nice to add the cpumap data "correctly", but there were
+ * several obstacles. Existing code attempts to parse both V1 and V0 files.
+ * Due to the fact that V0 has no versioning or header, the test looks like
+ * this:
+ *
+ * // Read header
+ * if (header.version_no != RAW_VERSION1) { // Assume V0 }
+ *
+ * If we add a VERSION2 file format, all existing code is going to treat that
+ * as a VERSION0 file when reading it, and crash terribly when trying to read
+ * RAW_VERSION2 threadmap entries.
+ *
+ * To differentiate between a V1 and V1+ file, read as V1 until you reach
+ * the padding bytes. Then:
+ *
+ * boolean_t is_v1plus = FALSE;
+ * if (padding_bytes >= sizeof(kd_cpumap_header)) {
+ *     kd_cpumap_header header = // read header;
+ *     if (header.version_no == RAW_VERSION1) {
+ *         is_v1plus = TRUE;
+ *     }
+ * }
+ *
+ */
+
+#define RAW_VERSION3    0x00001000
+
+// Version 3 header
+// The header chunk has the tag 0x00001000 which also serves as a magic word
+// that identifies the file as a version 3 trace file. The header payload is
+// a set of fixed fields followed by a variable number of sub-chunks:
+/*
+ *  ____________________________________________________________________________
+ | Offset | Size | Field                                                    |
+ |  ----------------------------------------------------------------------------
+ |    0   |  4   | Tag (0x00001000)                                         |
+ |    4   |  4   | Sub-tag. Represents the version of the header.           |
+ |    8   |  8   | Length of header payload (40+8x)                         |
+ |   16   |  8   | Time base info. Two 32-bit numbers, numer/denom,         |
+ |        |      | for converting timestamps to nanoseconds.                |
+ |   24   |  8   | Timestamp of trace start.                                |
+ |   32   |  8   | Wall time seconds since Unix epoch.                      |
+ |        |      | As returned by gettimeofday().                           |
+ |   40   |  4   | Wall time microseconds. As returned by gettimeofday().   |
+ |   44   |  4   | Local time zone offset in minutes. ( " )                 |
+ |   48   |  4   | Type of daylight savings time correction to apply. ( " ) |
+ |   52   |  4   | Flags. 1 = 64-bit. Remaining bits should be written      |
+ |        |      | as 0 and ignored when reading.                           |
+ |   56   |  8x  | Variable number of sub-chunks. None are required.        |
+ |        |      | Ignore unknown chunks.                                   |
+ |  ----------------------------------------------------------------------------
+ */
+// NOTE: The header sub-chunks are considered part of the header chunk,
+// so they must be included in the header chunk’s length field.
+// The CPU map is an optional sub-chunk of the header chunk. It provides
+// information about the CPUs that are referenced from the trace events.
+typedef struct {
+       uint32_t tag;
+       uint32_t sub_tag;
+       uint64_t length;
+       uint32_t timebase_numer;
+       uint32_t timebase_denom;
+       uint64_t timestamp;
+       uint64_t walltime_secs;
+       uint32_t walltime_usecs;
+       uint32_t timezone_minuteswest;
+       uint32_t timezone_dst;
+       uint32_t flags;
+} __attribute__((packed)) kd_header_v3;
+
+typedef struct {
+       uint32_t tag;
+       uint32_t sub_tag;
+       uint64_t length;
+} __attribute__((packed)) kd_chunk_header_v3;
+
+#define V3_CONFIG       0x00001b00
+#define V3_CPU_MAP      0x00001c00
+#define V3_THREAD_MAP   0x00001d00
+#define V3_RAW_EVENTS   0x00001e00
+#define V3_NULL_CHUNK   0x00002000
+
+// The current version of all kernel managed chunks is 1. The
+// V3_CURRENT_CHUNK_VERSION is added to ease the simple case
+// when most/all the kernel managed chunks have the same version.
+
+#define V3_CURRENT_CHUNK_VERSION 1
+#define V3_HEADER_VERSION     V3_CURRENT_CHUNK_VERSION
+#define V3_CPUMAP_VERSION     V3_CURRENT_CHUNK_VERSION
+#define V3_THRMAP_VERSION     V3_CURRENT_CHUNK_VERSION
+#define V3_EVENT_DATA_VERSION V3_CURRENT_CHUNK_VERSION
+

 typedef struct krt krt_t;
 
 static uint32_t
 typedef struct krt krt_t;
 
 static uint32_t

-kdbg_cpu_count(boolean_t early_trace)
+kdbg_cpu_count(bool early_trace)

 {
        if (early_trace) {
 {
        if (early_trace) {

-#if CONFIG_EMBEDDED
-               return ml_get_cpu_count();
-#else
+#if defined(__x86_64__)

                return max_ncpus;
                return max_ncpus;

-#endif
+#else /* defined(__x86_64__) */
+               return ml_get_cpu_count();
+#endif /* !defined(__x86_64__) */

        }
 
        }
 

+#if defined(__x86_64__)

        host_basic_info_data_t hinfo;
        mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
        host_info((host_t)1 /* BSD_HOST */, HOST_BASIC_INFO, (host_info_t)&hinfo, &count);
        assert(hinfo.logical_cpu_max > 0);
        return hinfo.logical_cpu_max;
        host_basic_info_data_t hinfo;
        mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
        host_info((host_t)1 /* BSD_HOST */, HOST_BASIC_INFO, (host_info_t)&hinfo, &count);
        assert(hinfo.logical_cpu_max > 0);
        return hinfo.logical_cpu_max;

+#else /* defined(__x86_64__) */
+       return ml_get_topology_info()->max_cpu_id + 1;
+#endif /* !defined(__x86_64__) */

 }
 
 #if MACH_ASSERT
 }
 
 #if MACH_ASSERT

-#if CONFIG_EMBEDDED
-static boolean_t
+
+static bool

 kdbg_iop_list_is_valid(kd_iop_t* iop)
 {
 kdbg_iop_list_is_valid(kd_iop_t* iop)
 {

-        if (iop) {
-                /* Is list sorted by cpu_id? */
-                kd_iop_t* temp = iop;
-                do {
-                        assert(!temp->next || temp->next->cpu_id == temp->cpu_id - 1);
-                        assert(temp->next || (temp->cpu_id == kdbg_cpu_count(FALSE) || temp->cpu_id == kdbg_cpu_count(TRUE)));
-                } while ((temp = temp->next));
-
-                /* Does each entry have a function and a name? */
-                temp = iop;
-                do {
-                        assert(temp->callback.func);
-                        assert(strlen(temp->callback.iop_name) < sizeof(temp->callback.iop_name));
-                } while ((temp = temp->next));
-        }
-
-        return TRUE;
-}
+       if (iop) {
+               /* Is list sorted by cpu_id? */
+               kd_iop_t* temp = iop;
+               do {
+                       assert(!temp->next || temp->next->cpu_id == temp->cpu_id - 1);
+                       assert(temp->next || (temp->cpu_id == kdbg_cpu_count(false) || temp->cpu_id == kdbg_cpu_count(true)));
+               } while ((temp = temp->next));

 
 

-static boolean_t
-kdbg_iop_list_contains_cpu_id(kd_iop_t* list, uint32_t cpu_id)
-{
-       while (list) {
-               if (list->cpu_id == cpu_id)
-                       return TRUE;
-               list = list->next;
+               /* Does each entry have a function and a name? */
+               temp = iop;
+               do {
+                       assert(temp->callback.func);
+                       assert(strlen(temp->callback.iop_name) < sizeof(temp->callback.iop_name));
+               } while ((temp = temp->next));

        }
 
        }
 

-       return FALSE;
+       return true;

 }
 }

-#endif /* CONFIG_EMBEDDED */
+

 #endif /* MACH_ASSERT */
 
 static void
 #endif /* MACH_ASSERT */
 
 static void


@@ -556,14 +665,25 @@ kdbg_iop_list_callback(kd_iop_t* iop, kd_callback_type type, void* arg)
        }
 }
 
        }
 }
 

+static lck_grp_t *kdebug_lck_grp = NULL;
+

 static void
 static void

-kdbg_set_tracing_enabled(boolean_t enabled, uint32_t trace_type)
+kdbg_set_tracing_enabled(bool enabled, uint32_t trace_type)

 {
 {

-       int s = ml_set_interrupts_enabled(FALSE);
-       lck_spin_lock(kds_spin_lock);
+       /*
+        * Drain any events from IOPs before making the state change.  On
+        * enabling, this removes any stale events from before tracing.  On
+        * disabling, this saves any events up to the point tracing is disabled.
+        */
+       kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops, KD_CALLBACK_SYNC_FLUSH,
+           NULL);
+
+       int s = ml_set_interrupts_enabled(false);
+       lck_spin_lock_grp(kds_spin_lock, kdebug_lck_grp);
+

        if (enabled) {
                /*
        if (enabled) {
                /*

-                * The oldest valid time is now; reject old events from IOPs.
+                * The oldest valid time is now; reject past events from IOPs.

                 */
                kd_ctrl_page.oldest_time = kdbg_timestamp();
                kdebug_enable |= trace_type;
                 */
                kd_ctrl_page.oldest_time = kdbg_timestamp();
                kdebug_enable |= trace_type;


@@ -571,7 +691,7 @@ kdbg_set_tracing_enabled(boolean_t enabled, uint32_t trace_type)
                kd_ctrl_page.enabled = 1;
                commpage_update_kdebug_state();
        } else {
                kd_ctrl_page.enabled = 1;
                commpage_update_kdebug_state();
        } else {

-               kdebug_enable &= ~(KDEBUG_ENABLE_TRACE|KDEBUG_ENABLE_PPT);
+               kdebug_enable &= ~(KDEBUG_ENABLE_TRACE | KDEBUG_ENABLE_PPT);

                kd_ctrl_page.kdebug_slowcheck |= SLOW_NOLOG;
                kd_ctrl_page.enabled = 0;
                commpage_update_kdebug_state();
                kd_ctrl_page.kdebug_slowcheck |= SLOW_NOLOG;
                kd_ctrl_page.enabled = 0;
                commpage_update_kdebug_state();


@@ -580,23 +700,19 @@ kdbg_set_tracing_enabled(boolean_t enabled, uint32_t trace_type)
        ml_set_interrupts_enabled(s);
 
        if (enabled) {
        ml_set_interrupts_enabled(s);
 
        if (enabled) {

-               kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops, KD_CALLBACK_KDEBUG_ENABLED, NULL);
+               kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops,
+                   KD_CALLBACK_KDEBUG_ENABLED, NULL);

        } else {
        } else {

-               /*
-                * If you do not flush the IOP trace buffers, they can linger
-                * for a considerable period; consider code which disables and
-                * deallocates without a final sync flush.
-                */
-               kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops, KD_CALLBACK_KDEBUG_DISABLED, NULL);
-               kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops, KD_CALLBACK_SYNC_FLUSH, NULL);
+               kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops,
+                   KD_CALLBACK_KDEBUG_DISABLED, NULL);

        }
 }
 
 static void
        }
 }
 
 static void

-kdbg_set_flags(int slowflag, int enableflag, boolean_t enabled)
+kdbg_set_flags(int slowflag, int enableflag, bool enabled)

 {
 {

-       int s = ml_set_interrupts_enabled(FALSE);
-       lck_spin_lock(kds_spin_lock);
+       int s = ml_set_interrupts_enabled(false);
+       lck_spin_lock_grp(kds_spin_lock, kdebug_lck_grp);

 
        if (enabled) {
                kd_ctrl_page.kdebug_slowcheck |= slowflag;
 
        if (enabled) {
                kd_ctrl_page.kdebug_slowcheck |= slowflag;


@@ -605,7 +721,7 @@ kdbg_set_flags(int slowflag, int enableflag, boolean_t enabled)
                kd_ctrl_page.kdebug_slowcheck &= ~slowflag;
                kdebug_enable &= ~enableflag;
        }
                kd_ctrl_page.kdebug_slowcheck &= ~slowflag;
                kdebug_enable &= ~enableflag;
        }

-        
+

        lck_spin_unlock(kds_spin_lock);
        ml_set_interrupts_enabled(s);
 }
        lck_spin_unlock(kds_spin_lock);
        ml_set_interrupts_enabled(s);
 }


@@ -613,12 +729,12 @@ kdbg_set_flags(int slowflag, int enableflag, boolean_t enabled)
 /*
  * Disable wrapping and return true if trace wrapped, false otherwise.
  */
 /*
  * Disable wrapping and return true if trace wrapped, false otherwise.
  */

-static boolean_t
+static bool

 disable_wrap(uint32_t *old_slowcheck, uint32_t *old_flags)
 {
 disable_wrap(uint32_t *old_slowcheck, uint32_t *old_flags)
 {

-       boolean_t wrapped;
-       int s = ml_set_interrupts_enabled(FALSE);
-       lck_spin_lock(kds_spin_lock);
+       bool wrapped;
+       int s = ml_set_interrupts_enabled(false);
+       lck_spin_lock_grp(kds_spin_lock, kdebug_lck_grp);

 
        *old_slowcheck = kd_ctrl_page.kdebug_slowcheck;
        *old_flags = kd_ctrl_page.kdebug_flags;
 
        *old_slowcheck = kd_ctrl_page.kdebug_slowcheck;
        *old_flags = kd_ctrl_page.kdebug_flags;


@@ -636,20 +752,21 @@ disable_wrap(uint32_t *old_slowcheck, uint32_t *old_flags)
 static void
 enable_wrap(uint32_t old_slowcheck)
 {
 static void
 enable_wrap(uint32_t old_slowcheck)
 {

-       int s = ml_set_interrupts_enabled(FALSE);
-       lck_spin_lock(kds_spin_lock);
+       int s = ml_set_interrupts_enabled(false);
+       lck_spin_lock_grp(kds_spin_lock, kdebug_lck_grp);

 
        kd_ctrl_page.kdebug_flags &= ~KDBG_NOWRAP;
 
 
        kd_ctrl_page.kdebug_flags &= ~KDBG_NOWRAP;
 

-       if ( !(old_slowcheck & SLOW_NOLOG))
+       if (!(old_slowcheck & SLOW_NOLOG)) {

                kd_ctrl_page.kdebug_slowcheck &= ~SLOW_NOLOG;
                kd_ctrl_page.kdebug_slowcheck &= ~SLOW_NOLOG;

+       }

 
        lck_spin_unlock(kds_spin_lock);
        ml_set_interrupts_enabled(s);
 }
 
 static int
 
        lck_spin_unlock(kds_spin_lock);
        ml_set_interrupts_enabled(s);
 }
 
 static int

-create_buffers(boolean_t early_trace)
+create_buffers(bool early_trace)

 {
        unsigned int i;
        unsigned int p_buffer_size;
 {
        unsigned int i;
        unsigned int p_buffer_size;


@@ -666,9 +783,7 @@ create_buffers(boolean_t early_trace)
         */
        kd_ctrl_page.kdebug_iops = kd_iops;
 
         */
        kd_ctrl_page.kdebug_iops = kd_iops;
 

-#if CONFIG_EMBEDDED

        assert(kdbg_iop_list_is_valid(kd_ctrl_page.kdebug_iops));
        assert(kdbg_iop_list_is_valid(kd_ctrl_page.kdebug_iops));

-#endif

 
        /*
         * If the list is valid, it is sorted, newest -> oldest. Each iop entry
 
        /*
         * If the list is valid, it is sorted, newest -> oldest. Each iop entry


@@ -683,10 +798,11 @@ create_buffers(boolean_t early_trace)
                goto out;
        }
 
                goto out;
        }
 

-       if (nkdbufs < (kd_ctrl_page.kdebug_cpus * EVENTS_PER_STORAGE_UNIT * MIN_STORAGE_UNITS_PER_CPU))
+       if (nkdbufs < (kd_ctrl_page.kdebug_cpus * EVENTS_PER_STORAGE_UNIT * MIN_STORAGE_UNITS_PER_CPU)) {

                n_storage_units = kd_ctrl_page.kdebug_cpus * MIN_STORAGE_UNITS_PER_CPU;
                n_storage_units = kd_ctrl_page.kdebug_cpus * MIN_STORAGE_UNITS_PER_CPU;

-       else
+       } else {

                n_storage_units = nkdbufs / EVENTS_PER_STORAGE_UNIT;
                n_storage_units = nkdbufs / EVENTS_PER_STORAGE_UNIT;

+       }

 
        nkdbufs = n_storage_units * EVENTS_PER_STORAGE_UNIT;
 
 
        nkdbufs = n_storage_units * EVENTS_PER_STORAGE_UNIT;
 


@@ -696,13 +812,14 @@ create_buffers(boolean_t early_trace)
        f_buffer_size = N_STORAGE_UNITS_PER_BUFFER * sizeof(struct kd_storage);
        p_buffer_size = (n_storage_units % N_STORAGE_UNITS_PER_BUFFER) * sizeof(struct kd_storage);
 
        f_buffer_size = N_STORAGE_UNITS_PER_BUFFER * sizeof(struct kd_storage);
        p_buffer_size = (n_storage_units % N_STORAGE_UNITS_PER_BUFFER) * sizeof(struct kd_storage);
 

-       if (p_buffer_size)
+       if (p_buffer_size) {

                n_storage_buffers++;
                n_storage_buffers++;

+       }

 
        kd_bufs = NULL;
 
        if (kdcopybuf == 0) {
 
        kd_bufs = NULL;
 
        if (kdcopybuf == 0) {

-               if (kmem_alloc(kernel_map, (vm_offset_t *)&kdcopybuf, (vm_size_t)KDCOPYBUF_SIZE, VM_KERN_MEMORY_DIAG) != KERN_SUCCESS) {
+               if (kmem_alloc(kernel_map, (vm_offset_t *)&kdcopybuf, (vm_size_t)KDCOPYBUF_SIZE, VM_KERN_MEMORY_DIAG) != KERN_SUCCESS) {

                        error = ENOSPC;
                        goto out;
                }
                        error = ENOSPC;
                        goto out;
                }


@@ -735,13 +852,15 @@ create_buffers(boolean_t early_trace)
 
        for (i = 0; i < n_storage_buffers; i++) {
                struct kd_storage *kds;
 
        for (i = 0; i < n_storage_buffers; i++) {
                struct kd_storage *kds;

-               int     n_elements;
-               int     n;
+               uint16_t n_elements;
+               static_assert(N_STORAGE_UNITS_PER_BUFFER <= UINT16_MAX);
+               assert(kd_bufs[i].kdsb_size <= N_STORAGE_UNITS_PER_BUFFER *
+                   sizeof(struct kd_storage));

 
                n_elements = kd_bufs[i].kdsb_size / sizeof(struct kd_storage);
                kds = kd_bufs[i].kdsb_addr;
 
 
                n_elements = kd_bufs[i].kdsb_size / sizeof(struct kd_storage);
                kds = kd_bufs[i].kdsb_addr;
 

-               for (n = 0; n < n_elements; n++) {
+               for (uint16_t n = 0; n < n_elements; n++) {

                        kds[n].kds_next.buffer_index = kd_ctrl_page.kds_free_list.buffer_index;
                        kds[n].kds_next.offset = kd_ctrl_page.kds_free_list.offset;
 
                        kds[n].kds_next.buffer_index = kd_ctrl_page.kds_free_list.buffer_index;
                        kds[n].kds_next.offset = kd_ctrl_page.kds_free_list.offset;
 


@@ -756,26 +875,27 @@ create_buffers(boolean_t early_trace)
        for (i = 0; i < kd_ctrl_page.kdebug_cpus; i++) {
                kdbip[i].kd_list_head.raw = KDS_PTR_NULL;
                kdbip[i].kd_list_tail.raw = KDS_PTR_NULL;
        for (i = 0; i < kd_ctrl_page.kdebug_cpus; i++) {
                kdbip[i].kd_list_head.raw = KDS_PTR_NULL;
                kdbip[i].kd_list_tail.raw = KDS_PTR_NULL;

-               kdbip[i].kd_lostevents = FALSE;
+               kdbip[i].kd_lostevents = false;

                kdbip[i].num_bufs = 0;
        }
                kdbip[i].num_bufs = 0;
        }

-        
+

        kd_ctrl_page.kdebug_flags |= KDBG_BUFINIT;
 
        kd_ctrl_page.kds_inuse_count = 0;
        n_storage_threshold = n_storage_units / 2;
 out:
        kd_ctrl_page.kdebug_flags |= KDBG_BUFINIT;
 
        kd_ctrl_page.kds_inuse_count = 0;
        n_storage_threshold = n_storage_units / 2;
 out:

-       if (error)
+       if (error) {

                delete_buffers();
                delete_buffers();

+       }

 
 

-       return(error);
+       return error;

 }
 
 static void
 delete_buffers(void)
 {
        unsigned int i;
 }
 
 static void
 delete_buffers(void)
 {
        unsigned int i;

-       
+

        if (kd_bufs) {
                for (i = 0; i < n_storage_buffers; i++) {
                        if (kd_bufs[i].kdsb_addr) {
        if (kd_bufs) {
                for (i = 0; i < n_storage_buffers; i++) {
                        if (kd_bufs[i].kdsb_addr) {


@@ -796,10 +916,10 @@ delete_buffers(void)
 
        if (kdbip) {
                kmem_free(kernel_map, (vm_offset_t)kdbip, sizeof(struct kd_bufinfo) * kd_ctrl_page.kdebug_cpus);
 
        if (kdbip) {
                kmem_free(kernel_map, (vm_offset_t)kdbip, sizeof(struct kd_bufinfo) * kd_ctrl_page.kdebug_cpus);

-               
+

                kdbip = NULL;
        }
                kdbip = NULL;
        }

-        kd_ctrl_page.kdebug_iops = NULL;
+       kd_ctrl_page.kdebug_iops = NULL;

        kd_ctrl_page.kdebug_cpus = 0;
        kd_ctrl_page.kdebug_flags &= ~KDBG_BUFINIT;
 }
        kd_ctrl_page.kdebug_cpus = 0;
        kd_ctrl_page.kdebug_flags &= ~KDBG_BUFINIT;
 }


@@ -808,14 +928,14 @@ void
 release_storage_unit(int cpu, uint32_t kdsp_raw)
 {
        int s = 0;
 release_storage_unit(int cpu, uint32_t kdsp_raw)
 {
        int s = 0;

-       struct  kd_storage *kdsp_actual;
+       struct  kd_storage *kdsp_actual;

        struct kd_bufinfo *kdbp;
        union kds_ptr kdsp;
 
        kdsp.raw = kdsp_raw;
 
        struct kd_bufinfo *kdbp;
        union kds_ptr kdsp;
 
        kdsp.raw = kdsp_raw;
 

-       s = ml_set_interrupts_enabled(FALSE);
-       lck_spin_lock(kds_spin_lock);
+       s = ml_set_interrupts_enabled(false);
+       lck_spin_lock_grp(kds_spin_lock, kdebug_lck_grp);

 
        kdbp = &kdbip[cpu];
 
 
        kdbp = &kdbip[cpu];
 


@@ -824,7 +944,7 @@ release_storage_unit(int cpu, uint32_t kdsp_raw)
                 * it's possible for the storage unit pointed to
                 * by kdsp to have already been stolen... so
                 * check to see if it's still the head of the list
                 * it's possible for the storage unit pointed to
                 * by kdsp to have already been stolen... so
                 * check to see if it's still the head of the list

-                * now that we're behind the lock that protects 
+                * now that we're behind the lock that protects

                 * adding and removing from the queue...
                 * since we only ever release and steal units from
                 * that position, if it's no longer the head
                 * adding and removing from the queue...
                 * since we only ever release and steal units from
                 * that position, if it's no longer the head


@@ -842,19 +962,18 @@ release_storage_unit(int cpu, uint32_t kdsp_raw)
        ml_set_interrupts_enabled(s);
 }
 
        ml_set_interrupts_enabled(s);
 }
 

-
-boolean_t
+bool

 allocate_storage_unit(int cpu)
 {
        union kds_ptr kdsp;
        struct kd_storage *kdsp_actual, *kdsp_next_actual;
        struct kd_bufinfo *kdbp, *kdbp_vict, *kdbp_try;
        uint64_t oldest_ts, ts;
 allocate_storage_unit(int cpu)
 {
        union kds_ptr kdsp;
        struct kd_storage *kdsp_actual, *kdsp_next_actual;
        struct kd_bufinfo *kdbp, *kdbp_vict, *kdbp_try;
        uint64_t oldest_ts, ts;

-       boolean_t retval = TRUE;
+       bool retval = true;

        int s = 0;
 
        int s = 0;
 

-       s = ml_set_interrupts_enabled(FALSE);
-       lck_spin_lock(kds_spin_lock);
+       s = ml_set_interrupts_enabled(false);
+       lck_spin_lock_grp(kds_spin_lock, kdebug_lck_grp);

 
        kdbp = &kdbip[cpu];
 
 
        kdbp = &kdbip[cpu];
 


@@ -862,8 +981,9 @@ allocate_storage_unit(int cpu)
        if (kdbp->kd_list_tail.raw != KDS_PTR_NULL) {
                kdsp_actual = POINTER_FROM_KDS_PTR(kdbp->kd_list_tail);
 
        if (kdbp->kd_list_tail.raw != KDS_PTR_NULL) {
                kdsp_actual = POINTER_FROM_KDS_PTR(kdbp->kd_list_tail);
 

-               if (kdsp_actual->kds_bufindx < EVENTS_PER_STORAGE_UNIT)
+               if (kdsp_actual->kds_bufindx < EVENTS_PER_STORAGE_UNIT) {

                        goto out;
                        goto out;

+               }

        }
 
        if ((kdsp = kd_ctrl_page.kds_free_list).raw != KDS_PTR_NULL) {
        }
 
        if ((kdsp = kd_ctrl_page.kds_free_list).raw != KDS_PTR_NULL) {


@@ -881,15 +1001,14 @@ allocate_storage_unit(int cpu)
                 */
                if (kd_ctrl_page.kdebug_flags & KDBG_NOWRAP) {
                        kd_ctrl_page.kdebug_slowcheck |= SLOW_NOLOG;
                 */
                if (kd_ctrl_page.kdebug_flags & KDBG_NOWRAP) {
                        kd_ctrl_page.kdebug_slowcheck |= SLOW_NOLOG;

-                       kdbp->kd_lostevents = TRUE;
-                       retval = FALSE;
+                       kdbp->kd_lostevents = true;
+                       retval = false;

                        goto out;
                }
                kdbp_vict = NULL;
                oldest_ts = UINT64_MAX;
 
                for (kdbp_try = &kdbip[0]; kdbp_try < &kdbip[kd_ctrl_page.kdebug_cpus]; kdbp_try++) {
                        goto out;
                }
                kdbp_vict = NULL;
                oldest_ts = UINT64_MAX;
 
                for (kdbp_try = &kdbip[0]; kdbp_try < &kdbip[kd_ctrl_page.kdebug_cpus]; kdbp_try++) {

-

                        if (kdbp_try->kd_list_head.raw == KDS_PTR_NULL) {
                                /*
                                 * no storage unit to steal
                        if (kdbp_try->kd_list_head.raw == KDS_PTR_NULL) {
                                /*
                                 * no storage unit to steal


@@ -927,7 +1046,7 @@ allocate_storage_unit(int cpu)
                        kdebug_enable = 0;
                        kd_ctrl_page.enabled = 0;
                        commpage_update_kdebug_state();
                        kdebug_enable = 0;
                        kd_ctrl_page.enabled = 0;
                        commpage_update_kdebug_state();

-                       retval = FALSE;
+                       retval = false;

                        goto out;
                }
                kdsp = kdbp_vict->kd_list_head;
                        goto out;
                }
                kdsp = kdbp_vict->kd_list_head;


@@ -936,9 +1055,10 @@ allocate_storage_unit(int cpu)
 
                if (kdbp_vict->kd_list_head.raw != KDS_PTR_NULL) {
                        kdsp_next_actual = POINTER_FROM_KDS_PTR(kdbp_vict->kd_list_head);
 
                if (kdbp_vict->kd_list_head.raw != KDS_PTR_NULL) {
                        kdsp_next_actual = POINTER_FROM_KDS_PTR(kdbp_vict->kd_list_head);

-                       kdsp_next_actual->kds_lostevents = TRUE;
-               } else
-                       kdbp_vict->kd_lostevents = TRUE;
+                       kdsp_next_actual->kds_lostevents = true;
+               } else {
+                       kdbp_vict->kd_lostevents = true;
+               }

 
                if (kd_ctrl_page.oldest_time < oldest_ts) {
                        kd_ctrl_page.oldest_time = oldest_ts;
 
                if (kd_ctrl_page.oldest_time < oldest_ts) {
                        kd_ctrl_page.oldest_time = oldest_ts;


@@ -947,23 +1067,24 @@ allocate_storage_unit(int cpu)
        }
        kdsp_actual->kds_timestamp = kdbg_timestamp();
        kdsp_actual->kds_next.raw = KDS_PTR_NULL;
        }
        kdsp_actual->kds_timestamp = kdbg_timestamp();
        kdsp_actual->kds_next.raw = KDS_PTR_NULL;

-       kdsp_actual->kds_bufcnt   = 0;
+       kdsp_actual->kds_bufcnt   = 0;

        kdsp_actual->kds_readlast = 0;
 
        kdsp_actual->kds_lostevents = kdbp->kd_lostevents;
        kdsp_actual->kds_readlast = 0;
 
        kdsp_actual->kds_lostevents = kdbp->kd_lostevents;

-       kdbp->kd_lostevents = FALSE;
+       kdbp->kd_lostevents = false;

        kdsp_actual->kds_bufindx = 0;
 
        kdsp_actual->kds_bufindx = 0;
 

-       if (kdbp->kd_list_head.raw == KDS_PTR_NULL)
+       if (kdbp->kd_list_head.raw == KDS_PTR_NULL) {

                kdbp->kd_list_head = kdsp;
                kdbp->kd_list_head = kdsp;

-       else
+       } else {

                POINTER_FROM_KDS_PTR(kdbp->kd_list_tail)->kds_next = kdsp;
                POINTER_FROM_KDS_PTR(kdbp->kd_list_tail)->kds_next = kdsp;

+       }

        kdbp->kd_list_tail = kdsp;
 out:
        lck_spin_unlock(kds_spin_lock);
        ml_set_interrupts_enabled(s);
 
        kdbp->kd_list_tail = kdsp;
 out:
        lck_spin_unlock(kds_spin_lock);
        ml_set_interrupts_enabled(s);
 

-       return (retval);
+       return retval;

 }
 
 int
 }
 
 int


@@ -972,32 +1093,34 @@ kernel_debug_register_callback(kd_callback_t callback)
        kd_iop_t* iop;
        if (kmem_alloc(kernel_map, (vm_offset_t *)&iop, sizeof(kd_iop_t), VM_KERN_MEMORY_DIAG) == KERN_SUCCESS) {
                memcpy(&iop->callback, &callback, sizeof(kd_callback_t));
        kd_iop_t* iop;
        if (kmem_alloc(kernel_map, (vm_offset_t *)&iop, sizeof(kd_iop_t), VM_KERN_MEMORY_DIAG) == KERN_SUCCESS) {
                memcpy(&iop->callback, &callback, sizeof(kd_callback_t));

-               
+

                /*
                 * <rdar://problem/13351477> Some IOP clients are not providing a name.
                 *
                 * Remove when fixed.
                 */
                {
                /*
                 * <rdar://problem/13351477> Some IOP clients are not providing a name.
                 *
                 * Remove when fixed.
                 */
                {

-                       boolean_t is_valid_name = FALSE;
-                       for (uint32_t length=0; length<sizeof(callback.iop_name); ++length) {
+                       bool is_valid_name = false;
+                       for (uint32_t length = 0; length < sizeof(callback.iop_name); ++length) {

                                /* This is roughly isprintable(c) */
                                /* This is roughly isprintable(c) */

-                               if (callback.iop_name[length] > 0x20 && callback.iop_name[length] < 0x7F)
+                               if (callback.iop_name[length] > 0x20 && callback.iop_name[length] < 0x7F) {

                                        continue;
                                        continue;

+                               }

                                if (callback.iop_name[length] == 0) {
                                if (callback.iop_name[length] == 0) {

-                                       if (length)
-                                               is_valid_name = TRUE;
+                                       if (length) {
+                                               is_valid_name = true;
+                                       }

                                        break;
                                }
                        }
                                        break;
                                }
                        }

-                       
+

                        if (!is_valid_name) {
                                strlcpy(iop->callback.iop_name, "IOP-???", sizeof(iop->callback.iop_name));
                        }
                }
 
                iop->last_timestamp = 0;
                        if (!is_valid_name) {
                                strlcpy(iop->callback.iop_name, "IOP-???", sizeof(iop->callback.iop_name));
                        }
                }
 
                iop->last_timestamp = 0;

-               
+

                do {
                        /*
                         * We use two pieces of state, the old list head
                do {
                        /*
                         * We use two pieces of state, the old list head


@@ -1008,7 +1131,7 @@ kernel_debug_register_callback(kd_callback_t callback)
                         * TLDR; Must not read kd_iops more than once per loop.
                         */
                        iop->next = kd_iops;
                         * TLDR; Must not read kd_iops more than once per loop.
                         */
                        iop->next = kd_iops;

-                       iop->cpu_id = iop->next ? (iop->next->cpu_id+1) : kdbg_cpu_count(FALSE);
+                       iop->cpu_id = iop->next ? (iop->next->cpu_id + 1) : kdbg_cpu_count(false);

 
                        /*
                         * Header says OSCompareAndSwapPtr has a memory barrier
 
                        /*
                         * Header says OSCompareAndSwapPtr has a memory barrier


@@ -1023,43 +1146,44 @@ kernel_debug_register_callback(kd_callback_t callback)
 
 void
 kernel_debug_enter(
 
 void
 kernel_debug_enter(

-       uint32_t        coreid,
-       uint32_t        debugid,
-       uint64_t        timestamp,
-       uintptr_t       arg1,
-       uintptr_t       arg2,
-       uintptr_t       arg3,
-       uintptr_t       arg4,
-       uintptr_t       threadid
+       uint32_t        coreid,
+       uint32_t        debugid,
+       uint64_t        timestamp,
+       uintptr_t       arg1,
+       uintptr_t       arg2,
+       uintptr_t       arg3,
+       uintptr_t       arg4,
+       uintptr_t       threadid

        )
 {
        )
 {

-       uint32_t        bindx;
-       kd_buf          *kd;
+       uint32_t        bindx;
+       kd_buf          *kd;

        struct kd_bufinfo *kdbp;
        struct kd_storage *kdsp_actual;
        union  kds_ptr kds_raw;
 
        if (kd_ctrl_page.kdebug_slowcheck) {
        struct kd_bufinfo *kdbp;
        struct kd_storage *kdsp_actual;
        union  kds_ptr kds_raw;
 
        if (kd_ctrl_page.kdebug_slowcheck) {

-
-               if ( (kd_ctrl_page.kdebug_slowcheck & SLOW_NOLOG) || !(kdebug_enable & (KDEBUG_ENABLE_TRACE|KDEBUG_ENABLE_PPT)))
+               if ((kd_ctrl_page.kdebug_slowcheck & SLOW_NOLOG) || !(kdebug_enable & (KDEBUG_ENABLE_TRACE | KDEBUG_ENABLE_PPT))) {

                        goto out1;
                        goto out1;

-       
+               }
+

                if (kd_ctrl_page.kdebug_flags & KDBG_TYPEFILTER_CHECK) {
                if (kd_ctrl_page.kdebug_flags & KDBG_TYPEFILTER_CHECK) {

-                       if (typefilter_is_debugid_allowed(kdbg_typefilter, debugid))
+                       if (typefilter_is_debugid_allowed(kdbg_typefilter, debugid)) {

                                goto record_event;
                                goto record_event;

+                       }

                        goto out1;
                        goto out1;

-               }
-               else if (kd_ctrl_page.kdebug_flags & KDBG_RANGECHECK) {
-                       if (debugid >= kdlog_beg && debugid <= kdlog_end)
+               } else if (kd_ctrl_page.kdebug_flags & KDBG_RANGECHECK) {
+                       if (debugid >= kdlog_beg && debugid <= kdlog_end) {

                                goto record_event;
                                goto record_event;

+                       }

                        goto out1;
                        goto out1;

-               }
-               else if (kd_ctrl_page.kdebug_flags & KDBG_VALCHECK) {
+               } else if (kd_ctrl_page.kdebug_flags & KDBG_VALCHECK) {

                        if ((debugid & KDBG_EVENTID_MASK) != kdlog_value1 &&
                        if ((debugid & KDBG_EVENTID_MASK) != kdlog_value1 &&

-                               (debugid & KDBG_EVENTID_MASK) != kdlog_value2 &&
-                               (debugid & KDBG_EVENTID_MASK) != kdlog_value3 &&
-                               (debugid & KDBG_EVENTID_MASK) != kdlog_value4)
+                           (debugid & KDBG_EVENTID_MASK) != kdlog_value2 &&
+                           (debugid & KDBG_EVENTID_MASK) != kdlog_value3 &&
+                           (debugid & KDBG_EVENTID_MASK) != kdlog_value4) {

                                goto out1;
                                goto out1;

+                       }

                }
        }
 
                }
        }
 


@@ -1068,33 +1192,15 @@ record_event:
                goto out1;
        }
 
                goto out1;
        }
 

-#if CONFIG_EMBEDDED
-       /*
-       * When start_kern_tracing is called by the kernel to trace very
-       * early kernel events, it saves data to a secondary buffer until
-       * it is possible to initialize ktrace, and then dumps the events
-       * into the ktrace buffer using this method. In this case, iops will
-       * be NULL, and the coreid will be zero. It is not possible to have
-       * a valid IOP coreid of zero, so pass if both iops is NULL and coreid
-       * is zero.
-       */
-       assert(kdbg_iop_list_contains_cpu_id(kd_ctrl_page.kdebug_iops, coreid) || (kd_ctrl_page.kdebug_iops == NULL && coreid == 0));
-#endif
-

        disable_preemption();
 
        disable_preemption();
 

-       if (kd_ctrl_page.enabled == 0)
+       if (kd_ctrl_page.enabled == 0) {

                goto out;
                goto out;

+       }

 
        kdbp = &kdbip[coreid];
        timestamp &= KDBG_TIMESTAMP_MASK;
 
 
        kdbp = &kdbip[coreid];
        timestamp &= KDBG_TIMESTAMP_MASK;
 

-#if KDEBUG_MOJO_TRACE
-       if (kdebug_enable & KDEBUG_ENABLE_SERIAL)
-               kdebug_serial_print(coreid, debugid, timestamp,
-                                   arg1, arg2, arg3, arg4, threadid);
-#endif
-

 retry_q:
        kds_raw = kdbp->kd_list_tail;
 
 retry_q:
        kds_raw = kdbp->kd_list_tail;
 


@@ -1105,9 +1211,9 @@ retry_q:
                kdsp_actual = NULL;
                bindx = EVENTS_PER_STORAGE_UNIT;
        }
                kdsp_actual = NULL;
                bindx = EVENTS_PER_STORAGE_UNIT;
        }

-       
+

        if (kdsp_actual == NULL || bindx >= EVENTS_PER_STORAGE_UNIT) {
        if (kdsp_actual == NULL || bindx >= EVENTS_PER_STORAGE_UNIT) {

-               if (allocate_storage_unit(coreid) == FALSE) {
+               if (allocate_storage_unit(coreid) == false) {

                        /*
                         * this can only happen if wrapping
                         * has been disabled
                        /*
                         * this can only happen if wrapping
                         * has been disabled


@@ -1116,12 +1222,14 @@ retry_q:
                }
                goto retry_q;
        }
                }
                goto retry_q;
        }

-       if ( !OSCompareAndSwap(bindx, bindx + 1, &kdsp_actual->kds_bufindx))
+       if (!OSCompareAndSwap(bindx, bindx + 1, &kdsp_actual->kds_bufindx)) {

                goto retry_q;
                goto retry_q;

+       }

 
        // IOP entries can be allocated before xnu allocates and inits the buffer
 
        // IOP entries can be allocated before xnu allocates and inits the buffer

-       if (timestamp < kdsp_actual->kds_timestamp)
+       if (timestamp < kdsp_actual->kds_timestamp) {

                kdsp_actual->kds_timestamp = timestamp;
                kdsp_actual->kds_timestamp = timestamp;

+       }

 
        kd = &kdsp_actual->kds_records[bindx];
 
 
        kd = &kdsp_actual->kds_records[bindx];
 


@@ -1131,7 +1239,7 @@ retry_q:
        kd->arg3 = arg3;
        kd->arg4 = arg4;
        kd->arg5 = threadid;
        kd->arg3 = arg3;
        kd->arg4 = arg4;
        kd->arg5 = threadid;

-                 
+

        kdbg_set_timestamp_and_cpu(kd, timestamp, coreid);
 
        OSAddAtomic(1, &kdsp_actual->kds_bufcnt);
        kdbg_set_timestamp_and_cpu(kd, timestamp, coreid);
 
        OSAddAtomic(1, &kdsp_actual->kds_bufcnt);


@@ -1152,7 +1260,7 @@ static inline bool
 kdebug_debugid_procfilt_allowed(uint32_t debugid)
 {
        uint32_t procfilt_flags = kd_ctrl_page.kdebug_flags &
 kdebug_debugid_procfilt_allowed(uint32_t debugid)
 {
        uint32_t procfilt_flags = kd_ctrl_page.kdebug_flags &

-                       (KDBG_PIDCHECK | KDBG_PIDEXCLUDE);
+           (KDBG_PIDCHECK | KDBG_PIDEXCLUDE);

 
        if (!procfilt_flags) {
                return true;
 
        if (!procfilt_flags) {
                return true;


@@ -1162,7 +1270,7 @@ kdebug_debugid_procfilt_allowed(uint32_t debugid)
         * DBG_TRACE and MACH_SCHED tracepoints ignore the process filter.
         */
        if ((debugid & 0xffff0000) == MACHDBG_CODE(DBG_MACH_SCHED, 0) ||
         * DBG_TRACE and MACH_SCHED tracepoints ignore the process filter.
         */
        if ((debugid & 0xffff0000) == MACHDBG_CODE(DBG_MACH_SCHED, 0) ||

-               (debugid >> 24 == DBG_TRACE)) {
+           (debugid >> 24 == DBG_TRACE)) {

                return true;
        }
 
                return true;
        }
 


@@ -1212,42 +1320,44 @@ kernel_debug_internal(
 
        if (kd_ctrl_page.kdebug_slowcheck) {
                if ((kd_ctrl_page.kdebug_slowcheck & SLOW_NOLOG) ||
 
        if (kd_ctrl_page.kdebug_slowcheck) {
                if ((kd_ctrl_page.kdebug_slowcheck & SLOW_NOLOG) ||

-                   !(kdebug_enable & (KDEBUG_ENABLE_TRACE | KDEBUG_ENABLE_PPT)))
-               {
+                   !(kdebug_enable & (KDEBUG_ENABLE_TRACE | KDEBUG_ENABLE_PPT))) {

                        goto out1;
                }
 
                if (!ml_at_interrupt_context() && observe_procfilt &&
                        goto out1;
                }
 
                if (!ml_at_interrupt_context() && observe_procfilt &&

-                               !kdebug_debugid_procfilt_allowed(debugid)) {
+                   !kdebug_debugid_procfilt_allowed(debugid)) {

                        goto out1;
                }
 
                if (kd_ctrl_page.kdebug_flags & KDBG_TYPEFILTER_CHECK) {
                        goto out1;
                }
 
                if (kd_ctrl_page.kdebug_flags & KDBG_TYPEFILTER_CHECK) {

-                       if (typefilter_is_debugid_allowed(kdbg_typefilter, debugid))
+                       if (typefilter_is_debugid_allowed(kdbg_typefilter, debugid)) {

                                goto record_event;
                                goto record_event;

+                       }

 
                        goto out1;
                } else if (only_filter) {
                        goto out1;
 
                        goto out1;
                } else if (only_filter) {
                        goto out1;

-               }
-               else if (kd_ctrl_page.kdebug_flags & KDBG_RANGECHECK) {
+               } else if (kd_ctrl_page.kdebug_flags & KDBG_RANGECHECK) {

                        /* Always record trace system info */
                        /* Always record trace system info */

-                       if (KDBG_EXTRACT_CLASS(debugid) == DBG_TRACE)
+                       if (KDBG_EXTRACT_CLASS(debugid) == DBG_TRACE) {

                                goto record_event;
                                goto record_event;

+                       }

 
 

-                       if (debugid < kdlog_beg || debugid > kdlog_end)
+                       if (debugid < kdlog_beg || debugid > kdlog_end) {

                                goto out1;
                                goto out1;

-               }
-               else if (kd_ctrl_page.kdebug_flags & KDBG_VALCHECK) {
+                       }
+               } else if (kd_ctrl_page.kdebug_flags & KDBG_VALCHECK) {

                        /* Always record trace system info */
                        /* Always record trace system info */

-                       if (KDBG_EXTRACT_CLASS(debugid) == DBG_TRACE)
+                       if (KDBG_EXTRACT_CLASS(debugid) == DBG_TRACE) {

                                goto record_event;
                                goto record_event;

+                       }

 
                        if ((debugid & KDBG_EVENTID_MASK) != kdlog_value1 &&
                            (debugid & KDBG_EVENTID_MASK) != kdlog_value2 &&
                            (debugid & KDBG_EVENTID_MASK) != kdlog_value3 &&
 
                        if ((debugid & KDBG_EVENTID_MASK) != kdlog_value1 &&
                            (debugid & KDBG_EVENTID_MASK) != kdlog_value2 &&
                            (debugid & KDBG_EVENTID_MASK) != kdlog_value3 &&

-                           (debugid & KDBG_EVENTID_MASK) != kdlog_value4)
+                           (debugid & KDBG_EVENTID_MASK) != kdlog_value4) {

                                goto out1;
                                goto out1;

+                       }

                }
        } else if (only_filter) {
                goto out1;
                }
        } else if (only_filter) {
                goto out1;


@@ -1256,19 +1366,13 @@ kernel_debug_internal(
 record_event:
        disable_preemption();
 
 record_event:
        disable_preemption();
 

-       if (kd_ctrl_page.enabled == 0)
+       if (kd_ctrl_page.enabled == 0) {

                goto out;
                goto out;

+       }

 
        cpu = cpu_number();
        kdbp = &kdbip[cpu];
 
 
        cpu = cpu_number();
        kdbp = &kdbip[cpu];
 

-#if KDEBUG_MOJO_TRACE
-       if (kdebug_enable & KDEBUG_ENABLE_SERIAL)
-               kdebug_serial_print(cpu, debugid,
-                                   kdbg_timestamp() & KDBG_TIMESTAMP_MASK,
-                                   arg1, arg2, arg3, arg4, arg5);
-#endif
-

 retry_q:
        kds_raw = kdbp->kd_list_tail;
 
 retry_q:
        kds_raw = kdbp->kd_list_tail;
 


@@ -1281,7 +1385,7 @@ retry_q:
        }
 
        if (kdsp_actual == NULL || bindx >= EVENTS_PER_STORAGE_UNIT) {
        }
 
        if (kdsp_actual == NULL || bindx >= EVENTS_PER_STORAGE_UNIT) {

-               if (allocate_storage_unit(cpu) == FALSE) {
+               if (allocate_storage_unit(cpu) == false) {

                        /*
                         * this can only happen if wrapping
                         * has been disabled
                        /*
                         * this can only happen if wrapping
                         * has been disabled


@@ -1293,8 +1397,9 @@ retry_q:
 
        now = kdbg_timestamp() & KDBG_TIMESTAMP_MASK;
 
 
        now = kdbg_timestamp() & KDBG_TIMESTAMP_MASK;
 

-       if ( !OSCompareAndSwap(bindx, bindx + 1, &kdsp_actual->kds_bufindx))
+       if (!OSCompareAndSwap(bindx, bindx + 1, &kdsp_actual->kds_bufindx)) {

                goto retry_q;
                goto retry_q;

+       }

 
        kd = &kdsp_actual->kds_records[bindx];
 
 
        kd = &kdsp_actual->kds_records[bindx];
 


@@ -1316,8 +1421,8 @@ out:
        enable_preemption();
 out1:
        if (kds_waiter && kd_ctrl_page.kds_inuse_count >= n_storage_threshold) {
        enable_preemption();
 out1:
        if (kds_waiter && kd_ctrl_page.kds_inuse_count >= n_storage_threshold) {

-               uint32_t        etype;
-               uint32_t        stype;
+               uint32_t        etype;
+               uint32_t        stype;

 
                etype = debugid & KDBG_EVENTID_MASK;
                stype = debugid & KDBG_CSC_MASK;
 
                etype = debugid & KDBG_EVENTID_MASK;
                stype = debugid & KDBG_CSC_MASK;


@@ -1329,31 +1434,34 @@ out1:
        }
 }
 
        }
 }
 

+__attribute__((noinline))

 void
 kernel_debug(
 void
 kernel_debug(

-       uint32_t        debugid,
-       uintptr_t       arg1,
-       uintptr_t       arg2,
-       uintptr_t       arg3,
-       uintptr_t       arg4,
+       uint32_t        debugid,
+       uintptr_t       arg1,
+       uintptr_t       arg2,
+       uintptr_t       arg3,
+       uintptr_t       arg4,

        __unused uintptr_t arg5)
 {
        kernel_debug_internal(debugid, arg1, arg2, arg3, arg4,
        __unused uintptr_t arg5)
 {
        kernel_debug_internal(debugid, arg1, arg2, arg3, arg4,

-               (uintptr_t)thread_tid(current_thread()), 0);
+           (uintptr_t)thread_tid(current_thread()), 0);

 }
 
 }
 

+__attribute__((noinline))

 void
 kernel_debug1(
 void
 kernel_debug1(

-       uint32_t        debugid,
-       uintptr_t       arg1,
-       uintptr_t       arg2,
-       uintptr_t       arg3,
-       uintptr_t       arg4,
-       uintptr_t       arg5)
+       uint32_t        debugid,
+       uintptr_t       arg1,
+       uintptr_t       arg2,
+       uintptr_t       arg3,
+       uintptr_t       arg4,
+       uintptr_t       arg5)

 {
        kernel_debug_internal(debugid, arg1, arg2, arg3, arg4, arg5, 0);
 }
 
 {
        kernel_debug_internal(debugid, arg1, arg2, arg3, arg4, arg5, 0);
 }
 

+__attribute__((noinline))

 void
 kernel_debug_flags(
        uint32_t debugid,
 void
 kernel_debug_flags(
        uint32_t debugid,


@@ -1364,9 +1472,10 @@ kernel_debug_flags(
        uint64_t flags)
 {
        kernel_debug_internal(debugid, arg1, arg2, arg3, arg4,
        uint64_t flags)
 {
        kernel_debug_internal(debugid, arg1, arg2, arg3, arg4,

-               (uintptr_t)thread_tid(current_thread()), flags);
+           (uintptr_t)thread_tid(current_thread()), flags);

 }
 
 }
 

+__attribute__((noinline))

 void
 kernel_debug_filtered(
        uint32_t debugid,
 void
 kernel_debug_filtered(
        uint32_t debugid,


@@ -1413,9 +1522,9 @@ kernel_debug_string_simple(uint32_t eventid, const char *str)
        }
 
        kernel_debug_internal(debugid, str_buf[0],
        }
 
        kernel_debug_internal(debugid, str_buf[0],

-                                      str_buf[1],
-                                      str_buf[2],
-                                      str_buf[3], thread_id, 0);
+           str_buf[1],
+           str_buf[2],
+           str_buf[3], thread_id, 0);

 
        debugid &= KDBG_EVENTID_MASK;
        int i = 4;
 
        debugid &= KDBG_EVENTID_MASK;
        int i = 4;


@@ -1427,28 +1536,40 @@ kernel_debug_string_simple(uint32_t eventid, const char *str)
                        debugid |= DBG_FUNC_END;
                }
                kernel_debug_internal(debugid, str_buf[i],
                        debugid |= DBG_FUNC_END;
                }
                kernel_debug_internal(debugid, str_buf[i],

-                                              str_buf[i + 1],
-                                              str_buf[i + 2],
-                                              str_buf[i + 3], thread_id, 0);
+                   str_buf[i + 1],
+                   str_buf[i + 2],
+                   str_buf[i + 3], thread_id, 0);

        }
 }
 
        }
 }
 

-extern int     master_cpu;             /* MACH_KERNEL_PRIVATE */
+extern int      master_cpu;             /* MACH_KERNEL_PRIVATE */

 /*
  * Used prior to start_kern_tracing() being called.
  * Log temporarily into a static buffer.
  */
 void
 kernel_debug_early(
 /*
  * Used prior to start_kern_tracing() being called.
  * Log temporarily into a static buffer.
  */
 void
 kernel_debug_early(

-       uint32_t        debugid,
-       uintptr_t       arg1,
-       uintptr_t       arg2,
-       uintptr_t       arg3,
-       uintptr_t       arg4)
+       uint32_t        debugid,
+       uintptr_t       arg1,
+       uintptr_t       arg2,
+       uintptr_t       arg3,
+       uintptr_t       arg4)

 {
 {

+#if defined(__x86_64__)
+       extern int early_boot;
+       /*
+        * Note that "early" isn't early enough in some cases where
+        * we're invoked before gsbase is set on x86, hence the
+        * check of "early_boot".
+        */
+       if (early_boot) {
+               return;
+       }
+#endif
+

        /* If early tracing is over, use the normal path. */
        if (kd_early_done) {
        /* If early tracing is over, use the normal path. */
        if (kd_early_done) {

-               KERNEL_DEBUG_CONSTANT(debugid, arg1, arg2, arg3, arg4, 0);
+               KDBG_RELEASE(debugid, arg1, arg2, arg3, arg4);

                return;
        }
 
                return;
        }
 


@@ -1483,26 +1604,21 @@ kernel_debug_early_end(void)
        /* reset the current oldest time to allow early events */
        kd_ctrl_page.oldest_time = 0;
 
        /* reset the current oldest time to allow early events */
        kd_ctrl_page.oldest_time = 0;
 

-#if !CONFIG_EMBEDDED
+#if defined(__x86_64__)

        /* Fake sentinel marking the start of kernel time relative to TSC */
        /* Fake sentinel marking the start of kernel time relative to TSC */

-       kernel_debug_enter(0,
-                       TRACE_TIMESTAMPS,
-                       0,
-                       (uint32_t)(tsc_rebase_abs_time >> 32),
-                       (uint32_t)tsc_rebase_abs_time,
-                       tsc_at_boot,
-                       0,
-                       0);
-#endif
+       kernel_debug_enter(0, TRACE_TIMESTAMPS, 0,
+           (uint32_t)(tsc_rebase_abs_time >> 32), (uint32_t)tsc_rebase_abs_time,
+           tsc_at_boot, 0, 0);
+#endif /* defined(__x86_64__) */

        for (unsigned int i = 0; i < kd_early_index; i++) {
                kernel_debug_enter(0,
        for (unsigned int i = 0; i < kd_early_index; i++) {
                kernel_debug_enter(0,

-                       kd_early_buffer[i].debugid,
-                       kd_early_buffer[i].timestamp,
-                       kd_early_buffer[i].arg1,
-                       kd_early_buffer[i].arg2,
-                       kd_early_buffer[i].arg3,
-                       kd_early_buffer[i].arg4,
-                       0);
+                   kd_early_buffer[i].debugid,
+                   kd_early_buffer[i].timestamp,
+                   kd_early_buffer[i].arg1,
+                   kd_early_buffer[i].arg2,
+                   kd_early_buffer[i].arg3,
+                   kd_early_buffer[i].arg4,
+                   0);

        }
 
        /* Cut events-lost event on overflow */
        }
 
        /* Cut events-lost event on overflow */


@@ -1520,7 +1636,7 @@ void
 kernel_debug_disable(void)
 {
        if (kdebug_enable) {
 kernel_debug_disable(void)
 {
        if (kdebug_enable) {

-               kdbg_set_tracing_enabled(FALSE, 0);
+               kdbg_set_tracing_enabled(false, 0);

        }
 }
 
        }
 }
 


@@ -1534,8 +1650,8 @@ kdebug_validate_debugid(uint32_t debugid)
 
        debugid_class = KDBG_EXTRACT_CLASS(debugid);
        switch (debugid_class) {
 
        debugid_class = KDBG_EXTRACT_CLASS(debugid);
        switch (debugid_class) {

-               case DBG_TRACE:
-                       return EPERM;
+       case DBG_TRACE:
+               return EPERM;

        }
 
        return 0;
        }
 
        return 0;


@@ -1546,8 +1662,8 @@ kdebug_validate_debugid(uint32_t debugid)
  */
 int
 kdebug_typefilter(__unused struct proc* p,
  */
 int
 kdebug_typefilter(__unused struct proc* p,

-                 struct kdebug_typefilter_args* uap,
-                 __unused int *retval)
+    struct kdebug_typefilter_args* uap,
+    __unused int *retval)

 {
        int ret = KERN_SUCCESS;
 
 {
        int ret = KERN_SUCCESS;
 


@@ -1584,7 +1700,7 @@ kdebug_typefilter(__unused struct proc* p,
         * the first atomic load test of Global Typefilter Ptr, this function
         * can then safely use the remaining global state without atomic checks.
         */
         * the first atomic load test of Global Typefilter Ptr, this function
         * can then safely use the remaining global state without atomic checks.
         */

-       if (!__c11_atomic_load((_Atomic typefilter_t *)&kdbg_typefilter, memory_order_acquire)) {
+       if (!os_atomic_load(&kdbg_typefilter, acquire)) {

                return EINVAL;
        }
 
                return EINVAL;
        }
 


@@ -1594,19 +1710,19 @@ kdebug_typefilter(__unused struct proc* p,
        vm_map_t user_map = current_map();
 
        ret = mach_to_bsd_errno(
        vm_map_t user_map = current_map();
 
        ret = mach_to_bsd_errno(

-                       mach_vm_map_kernel(user_map,                            // target map
-                                   &user_addr,                         // [in, out] target address
-                                   TYPEFILTER_ALLOC_SIZE,              // initial size
-                                   0,                                  // mask (alignment?)
-                                   VM_FLAGS_ANYWHERE,                  // flags
-                                   VM_MAP_KERNEL_FLAGS_NONE,
-                                   VM_KERN_MEMORY_NONE,
-                                   kdbg_typefilter_memory_entry,       // port (memory entry!)
-                                   0,                                  // offset (in memory entry)
-                                   FALSE,                              // should copy
-                                   VM_PROT_READ,                       // cur_prot
-                                   VM_PROT_READ,                       // max_prot
-                                   VM_INHERIT_SHARE));                 // inherit behavior on fork
+               mach_vm_map_kernel(user_map,                                    // target map
+               &user_addr,                                             // [in, out] target address
+               TYPEFILTER_ALLOC_SIZE,                                  // initial size
+               0,                                                      // mask (alignment?)
+               VM_FLAGS_ANYWHERE,                                      // flags
+               VM_MAP_KERNEL_FLAGS_NONE,
+               VM_KERN_MEMORY_NONE,
+               kdbg_typefilter_memory_entry,                           // port (memory entry!)
+               0,                                                      // offset (in memory entry)
+               false,                                                  // should copy
+               VM_PROT_READ,                                           // cur_prot
+               VM_PROT_READ,                                           // max_prot
+               VM_INHERIT_SHARE));                                     // inherit behavior on fork

 
        if (ret == KERN_SUCCESS) {
                vm_size_t user_ptr_size = vm_map_is_64bit(user_map) ? 8 : 4;
 
        if (ret == KERN_SUCCESS) {
                vm_size_t user_ptr_size = vm_map_is_64bit(user_map) ? 8 : 4;


@@ -1645,22 +1761,24 @@ kdebug_trace(struct proc *p, struct kdebug_trace_args *uap, int32_t *retval)
  * enabled. This is to match the userspace wrapper behavior, which is optimizing
  * for non-error case performance.
  */
  * enabled. This is to match the userspace wrapper behavior, which is optimizing
  * for non-error case performance.
  */

-int kdebug_trace64(__unused struct proc *p, struct kdebug_trace64_args *uap, __unused int32_t *retval)
+int
+kdebug_trace64(__unused struct proc *p, struct kdebug_trace64_args *uap, __unused int32_t *retval)

 {
        int err;
 
 {
        int err;
 

-       if ( __probable(kdebug_enable == 0) )
-               return(0);
+       if (__probable(kdebug_enable == 0)) {
+               return 0;
+       }

 
        if ((err = kdebug_validate_debugid(uap->code)) != 0) {
                return err;
        }
 
        kernel_debug_internal(uap->code, (uintptr_t)uap->arg1,
 
        if ((err = kdebug_validate_debugid(uap->code)) != 0) {
                return err;
        }
 
        kernel_debug_internal(uap->code, (uintptr_t)uap->arg1,

-                       (uintptr_t)uap->arg2, (uintptr_t)uap->arg3, (uintptr_t)uap->arg4,
-                       (uintptr_t)thread_tid(current_thread()), 0);
+           (uintptr_t)uap->arg2, (uintptr_t)uap->arg3, (uintptr_t)uap->arg4,
+           (uintptr_t)thread_tid(current_thread()), 0);

 
 

-       return(0);
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -1689,7 +1807,7 @@ int kdebug_trace64(__unused struct proc *p, struct kdebug_trace64_args *uap, __u
  */
 static uint64_t
 kernel_debug_string_internal(uint32_t debugid, uint64_t str_id, void *vstr,
  */
 static uint64_t
 kernel_debug_string_internal(uint32_t debugid, uint64_t str_id, void *vstr,

-                             size_t str_len)
+    size_t str_len)

 {
        /* str must be word-aligned */
        uintptr_t *str = vstr;
 {
        /* str must be word-aligned */
        uintptr_t *str = vstr;


@@ -1697,14 +1815,14 @@ kernel_debug_string_internal(uint32_t debugid, uint64_t str_id, void *vstr,
        uintptr_t thread_id;
        int i;
        uint32_t trace_debugid = TRACEDBG_CODE(DBG_TRACE_STRING,
        uintptr_t thread_id;
        int i;
        uint32_t trace_debugid = TRACEDBG_CODE(DBG_TRACE_STRING,

-                                              TRACE_STRING_GLOBAL);
+           TRACE_STRING_GLOBAL);

 
        thread_id = (uintptr_t)thread_tid(current_thread());
 
        /* if the ID is being invalidated, just emit that */
        if (str_id != 0 && str_len == 0) {
                kernel_debug_internal(trace_debugid | DBG_FUNC_START | DBG_FUNC_END,
 
        thread_id = (uintptr_t)thread_tid(current_thread());
 
        /* if the ID is being invalidated, just emit that */
        if (str_id != 0 && str_len == 0) {
                kernel_debug_internal(trace_debugid | DBG_FUNC_START | DBG_FUNC_END,

-                               (uintptr_t)debugid, (uintptr_t)str_id, 0, 0, thread_id, 0);
+                   (uintptr_t)debugid, (uintptr_t)str_id, 0, 0, thread_id, 0);

                return str_id;
        }
 
                return str_id;
        }
 


@@ -1721,7 +1839,7 @@ kernel_debug_string_internal(uint32_t debugid, uint64_t str_id, void *vstr,
        }
 
        kernel_debug_internal(trace_debugid, (uintptr_t)debugid, (uintptr_t)str_id,
        }
 
        kernel_debug_internal(trace_debugid, (uintptr_t)debugid, (uintptr_t)str_id,

-                       str[0], str[1], thread_id, 0);
+           str[0], str[1], thread_id, 0);

 
        trace_debugid &= KDBG_EVENTID_MASK;
        i = 2;
 
        trace_debugid &= KDBG_EVENTID_MASK;
        i = 2;


@@ -1732,9 +1850,9 @@ kernel_debug_string_internal(uint32_t debugid, uint64_t str_id, void *vstr,
                        trace_debugid |= DBG_FUNC_END;
                }
                kernel_debug_internal(trace_debugid, str[i],
                        trace_debugid |= DBG_FUNC_END;
                }
                kernel_debug_internal(trace_debugid, str[i],

-                                                    str[i + 1],
-                                                    str[i + 2],
-                                                    str[i + 3], thread_id, 0);
+                   str[i + 1],
+                   str[i + 2],
+                   str[i + 3], thread_id, 0);

        }
 
        return str_id;
        }
 
        return str_id;


@@ -1745,19 +1863,18 @@ kernel_debug_string_internal(uint32_t debugid, uint64_t str_id, void *vstr,
  * Trace system and scheduling events circumvent this check, as do events
  * emitted in interrupt context.
  */
  * Trace system and scheduling events circumvent this check, as do events
  * emitted in interrupt context.
  */

-static boolean_t
+static bool

 kdebug_current_proc_enabled(uint32_t debugid)
 {
        /* can't determine current process in interrupt context */
        if (ml_at_interrupt_context()) {
 kdebug_current_proc_enabled(uint32_t debugid)
 {
        /* can't determine current process in interrupt context */
        if (ml_at_interrupt_context()) {

-               return TRUE;
+               return true;

        }
 
        /* always emit trace system and scheduling events */
        if ((KDBG_EXTRACT_CLASS(debugid) == DBG_TRACE ||
        }
 
        /* always emit trace system and scheduling events */
        if ((KDBG_EXTRACT_CLASS(debugid) == DBG_TRACE ||

-           (debugid & KDBG_CSC_MASK) == MACHDBG_CODE(DBG_MACH_SCHED, 0)))
-       {
-               return TRUE;
+           (debugid & KDBG_CSC_MASK) == MACHDBG_CODE(DBG_MACH_SCHED, 0))) {
+               return true;

        }
 
        if (kd_ctrl_page.kdebug_flags & KDBG_PIDCHECK) {
        }
 
        if (kd_ctrl_page.kdebug_flags & KDBG_PIDCHECK) {


@@ -1765,53 +1882,58 @@ kdebug_current_proc_enabled(uint32_t debugid)
 
                /* only the process with the kdebug bit set is allowed */
                if (cur_proc && !(cur_proc->p_kdebug)) {
 
                /* only the process with the kdebug bit set is allowed */
                if (cur_proc && !(cur_proc->p_kdebug)) {

-                       return FALSE;
+                       return false;

                }
        } else if (kd_ctrl_page.kdebug_flags & KDBG_PIDEXCLUDE) {
                proc_t cur_proc = current_proc();
 
                /* every process except the one with the kdebug bit set is allowed */
                if (cur_proc && cur_proc->p_kdebug) {
                }
        } else if (kd_ctrl_page.kdebug_flags & KDBG_PIDEXCLUDE) {
                proc_t cur_proc = current_proc();
 
                /* every process except the one with the kdebug bit set is allowed */
                if (cur_proc && cur_proc->p_kdebug) {

-                       return FALSE;
+                       return false;

                }
        }
 
                }
        }
 

-       return TRUE;
+       return true;

 }
 
 }
 

-boolean_t
+bool

 kdebug_debugid_enabled(uint32_t debugid)
 {
        /* if no filtering is enabled */
        if (!kd_ctrl_page.kdebug_slowcheck) {
 kdebug_debugid_enabled(uint32_t debugid)
 {
        /* if no filtering is enabled */
        if (!kd_ctrl_page.kdebug_slowcheck) {

-               return TRUE;
+               return true;

        }
 
        return kdebug_debugid_explicitly_enabled(debugid);
 }
 
        }
 
        return kdebug_debugid_explicitly_enabled(debugid);
 }
 

-boolean_t
+bool

 kdebug_debugid_explicitly_enabled(uint32_t debugid)
 {
        if (kd_ctrl_page.kdebug_flags & KDBG_TYPEFILTER_CHECK) {
                return typefilter_is_debugid_allowed(kdbg_typefilter, debugid);
        } else if (KDBG_EXTRACT_CLASS(debugid) == DBG_TRACE) {
 kdebug_debugid_explicitly_enabled(uint32_t debugid)
 {
        if (kd_ctrl_page.kdebug_flags & KDBG_TYPEFILTER_CHECK) {
                return typefilter_is_debugid_allowed(kdbg_typefilter, debugid);
        } else if (KDBG_EXTRACT_CLASS(debugid) == DBG_TRACE) {

-               return TRUE;
+               return true;

        } else if (kd_ctrl_page.kdebug_flags & KDBG_RANGECHECK) {
                if (debugid < kdlog_beg || debugid > kdlog_end) {
        } else if (kd_ctrl_page.kdebug_flags & KDBG_RANGECHECK) {
                if (debugid < kdlog_beg || debugid > kdlog_end) {

-                       return FALSE;
+                       return false;

                }
        } else if (kd_ctrl_page.kdebug_flags & KDBG_VALCHECK) {
                if ((debugid & KDBG_EVENTID_MASK) != kdlog_value1 &&
                }
        } else if (kd_ctrl_page.kdebug_flags & KDBG_VALCHECK) {
                if ((debugid & KDBG_EVENTID_MASK) != kdlog_value1 &&

-                       (debugid & KDBG_EVENTID_MASK) != kdlog_value2 &&
-                       (debugid & KDBG_EVENTID_MASK) != kdlog_value3 &&
-                       (debugid & KDBG_EVENTID_MASK) != kdlog_value4)
-               {
-                       return FALSE;
+                   (debugid & KDBG_EVENTID_MASK) != kdlog_value2 &&
+                   (debugid & KDBG_EVENTID_MASK) != kdlog_value3 &&
+                   (debugid & KDBG_EVENTID_MASK) != kdlog_value4) {
+                       return false;

                }
        }
 
                }
        }
 

-       return TRUE;
+       return true;
+}
+
+bool
+kdebug_using_continuous_time(void)
+{
+       return kdebug_enable & KDEBUG_ENABLE_CONT_TIME;

 }
 
 /*
 }
 
 /*


@@ -1879,7 +2001,7 @@ kernel_debug_string(uint32_t debugid, uint64_t *str_id, const char *str)
        memset(str_buf, 0, sizeof(str_buf));
        len_copied = strlcpy(str_buf, str, MAX_STR_LEN + 1);
        *str_id = kernel_debug_string_internal(debugid, *str_id, str_buf,
        memset(str_buf, 0, sizeof(str_buf));
        len_copied = strlcpy(str_buf, str, MAX_STR_LEN + 1);
        *str_id = kernel_debug_string_internal(debugid, *str_id, str_buf,

-                                              len_copied);
+           len_copied);

        return 0;
 }
 
        return 0;
 }
 


@@ -1888,8 +2010,8 @@ kernel_debug_string(uint32_t debugid, uint64_t *str_id, const char *str)
  */
 int
 kdebug_trace_string(__unused struct proc *p,
  */
 int
 kdebug_trace_string(__unused struct proc *p,

-                    struct kdebug_trace_string_args *uap,
-                    uint64_t *retval)
+    struct kdebug_trace_string_args *uap,
+    uint64_t *retval)

 {
        __attribute__((aligned(sizeof(uintptr_t)))) char str_buf[STR_BUF_SIZE];
        static_assert(sizeof(str_buf) > MAX_STR_LEN);
 {
        __attribute__((aligned(sizeof(uintptr_t)))) char str_buf[STR_BUF_SIZE];
        static_assert(sizeof(str_buf) > MAX_STR_LEN);


@@ -1918,7 +2040,7 @@ kdebug_trace_string(__unused struct proc *p,
                }
 
                *retval = kernel_debug_string_internal(uap->debugid, uap->str_id,
                }
 
                *retval = kernel_debug_string_internal(uap->debugid, uap->str_id,

-                                                      NULL, 0);
+                   NULL, 0);

                return 0;
        }
 
                return 0;
        }
 


@@ -1940,7 +2062,7 @@ kdebug_trace_string(__unused struct proc *p,
        len_copied--;
 
        *retval = kernel_debug_string_internal(uap->debugid, uap->str_id, str_buf,
        len_copied--;
 
        *retval = kernel_debug_string_internal(uap->debugid, uap->str_id, str_buf,

-                                              len_copied);
+           len_copied);

        return 0;
 }
 
        return 0;
 }
 


@@ -1948,7 +2070,6 @@ static void
 kdbg_lock_init(void)
 {
        static lck_grp_attr_t *kdebug_lck_grp_attr = NULL;
 kdbg_lock_init(void)
 {
        static lck_grp_attr_t *kdebug_lck_grp_attr = NULL;

-       static lck_grp_t      *kdebug_lck_grp      = NULL;

        static lck_attr_t     *kdebug_lck_attr     = NULL;
 
        if (kd_ctrl_page.kdebug_flags & KDBG_LOCKINIT) {
        static lck_attr_t     *kdebug_lck_attr     = NULL;
 
        if (kd_ctrl_page.kdebug_flags & KDBG_LOCKINIT) {


@@ -1967,15 +2088,15 @@ kdbg_lock_init(void)
 }
 
 int
 }
 
 int

-kdbg_bootstrap(boolean_t early_trace)
+kdbg_bootstrap(bool early_trace)

 {
        kd_ctrl_page.kdebug_flags &= ~KDBG_WRAPPED;
 
 {
        kd_ctrl_page.kdebug_flags &= ~KDBG_WRAPPED;
 

-       return (create_buffers(early_trace));
+       return create_buffers(early_trace);

 }
 
 int
 }
 
 int

-kdbg_reinit(boolean_t early_trace)
+kdbg_reinit(bool early_trace)

 {
        int ret = 0;
 
 {
        int ret = 0;
 


@@ -2001,32 +2122,30 @@ kdbg_reinit(boolean_t early_trace)
        RAW_file_offset = 0;
        RAW_file_written = 0;
 
        RAW_file_offset = 0;
        RAW_file_written = 0;
 

-       return(ret);
+       return ret;

 }
 
 void
 kdbg_trace_data(struct proc *proc, long *arg_pid, long *arg_uniqueid)
 {
 }
 
 void
 kdbg_trace_data(struct proc *proc, long *arg_pid, long *arg_uniqueid)
 {

-       if (!proc) { 
+       if (!proc) {

                *arg_pid = 0;
                *arg_pid = 0;

-               *arg_uniqueid = 0; 
-       } else { 
+               *arg_uniqueid = 0;
+       } else {

                *arg_pid = proc->p_pid;
                *arg_pid = proc->p_pid;

-               *arg_uniqueid = proc->p_uniqueid;
-               if ((uint64_t) *arg_uniqueid != proc->p_uniqueid) { 
-                       *arg_uniqueid = 0; 
+               /* Fit in a trace point */
+               *arg_uniqueid = (long)proc->p_uniqueid;
+               if ((uint64_t) *arg_uniqueid != proc->p_uniqueid) {
+                       *arg_uniqueid = 0;

                }
        }
 }
 
 
 void
                }
        }
 }
 
 
 void

-kdbg_trace_string(struct proc *proc, long *arg1, long *arg2, long *arg3, long *arg4)
+kdbg_trace_string(struct proc *proc, long *arg1, long *arg2, long *arg3,
+    long *arg4)

 {
 {

-       char *dbg_nameptr; 
-       int dbg_namelen;
-       long dbg_parms[4];
-

        if (!proc) {
                *arg1 = 0;
                *arg2 = 0;
        if (!proc) {
                *arg1 = 0;
                *arg2 = 0;


@@ -2034,50 +2153,22 @@ kdbg_trace_string(struct proc *proc, long *arg1, long *arg2, long *arg3, long *a
                *arg4 = 0;
                return;
        }
                *arg4 = 0;
                return;
        }

-       /*
-        * Collect the pathname for tracing
-        */
-       dbg_nameptr = proc->p_comm;
-       dbg_namelen = (int)strlen(proc->p_comm);
-       dbg_parms[0]=0L;
-       dbg_parms[1]=0L;
-       dbg_parms[2]=0L;
-       dbg_parms[3]=0L;
-  
-       if(dbg_namelen > (int)sizeof(dbg_parms))
-               dbg_namelen = (int)sizeof(dbg_parms);
-    
-       strncpy((char *)dbg_parms, dbg_nameptr, dbg_namelen);
-
-       *arg1=dbg_parms[0];
-       *arg2=dbg_parms[1];
-       *arg3=dbg_parms[2];
-       *arg4=dbg_parms[3];
-}
-
-static void
-kdbg_resolve_map(thread_t th_act, void *opaque)
-{
-       kd_threadmap *mapptr;
-       krt_t *t = (krt_t *)opaque;

 
 

-       if (t->count < t->maxcount) {
-               mapptr = &t->map[t->count];
-               mapptr->thread  = (uintptr_t)thread_tid(th_act);
+       const char *procname = proc_best_name(proc);
+       size_t namelen = strlen(procname);

 
 

-               (void) strlcpy (mapptr->command, t->atts->task_comm,
-                               sizeof(t->atts->task_comm));
-               /*
-                * Some kernel threads have no associated pid.
-                * We still need to mark the entry as valid.
-                */
-               if (t->atts->pid)
-                       mapptr->valid = t->atts->pid;
-               else
-                       mapptr->valid = 1;
+       long args[4] = { 0 };

 
 

-               t->count++;
+       if (namelen > sizeof(args)) {
+               namelen = sizeof(args);

        }
        }

+
+       strncpy((char *)args, procname, namelen);
+
+       *arg1 = args[0];
+       *arg2 = args[1];
+       *arg3 = args[2];
+       *arg4 = args[3];

 }
 
 /*
 }
 
 /*


@@ -2116,7 +2207,7 @@ kdbg_cpumap_init_internal(kd_iop_t* iops, uint32_t cpu_count, uint8_t** cpumap,
        uint32_t bytes_needed = sizeof(kd_cpumap_header) + cpu_count * sizeof(kd_cpumap);
        uint32_t bytes_available = *cpumap_size;
        *cpumap_size = bytes_needed;
        uint32_t bytes_needed = sizeof(kd_cpumap_header) + cpu_count * sizeof(kd_cpumap);
        uint32_t bytes_available = *cpumap_size;
        *cpumap_size = bytes_needed;

-       
+

        if (*cpumap == NULL) {
                if (kmem_alloc(kernel_map, (vm_offset_t*)cpumap, (vm_size_t)*cpumap_size, VM_KERN_MEMORY_DIAG) != KERN_SUCCESS) {
                        return ENOMEM;
        if (*cpumap == NULL) {
                if (kmem_alloc(kernel_map, (vm_offset_t*)cpumap, (vm_size_t)*cpumap_size, VM_KERN_MEMORY_DIAG) != KERN_SUCCESS) {
                        return ENOMEM;


@@ -2138,11 +2229,11 @@ kdbg_cpumap_init_internal(kd_iop_t* iops, uint32_t cpu_count, uint8_t** cpumap,
                cpus[index].cpu_id = iops->cpu_id;
                cpus[index].flags = KDBG_CPUMAP_IS_IOP;
                strlcpy(cpus[index].name, iops->callback.iop_name, sizeof(cpus->name));
                cpus[index].cpu_id = iops->cpu_id;
                cpus[index].flags = KDBG_CPUMAP_IS_IOP;
                strlcpy(cpus[index].name, iops->callback.iop_name, sizeof(cpus->name));

-               
+

                iops = iops->next;
                index--;
        }
                iops = iops->next;
                index--;
        }

-       
+

        while (index >= 0) {
                cpus[index].cpu_id = index;
                cpus[index].flags = 0;
        while (index >= 0) {
                cpus[index].cpu_id = index;
                cpus[index].flags = 0;


@@ -2150,7 +2241,7 @@ kdbg_cpumap_init_internal(kd_iop_t* iops, uint32_t cpu_count, uint8_t** cpumap,
 
                index--;
        }
 
                index--;
        }

-       
+

        return KERN_SUCCESS;
 }
 
        return KERN_SUCCESS;
 }
 


@@ -2170,99 +2261,119 @@ kdbg_thrmap_init(void)
        }
 }
 
        }
 }
 

-static kd_threadmap *
-kdbg_thrmap_init_internal(unsigned int count, unsigned int *mapsize, unsigned int *mapcount)
+static void
+kd_resolve_map(thread_t thread, void *opaque)

 {
 {

-       kd_threadmap *mapptr;
-       proc_t p;
-       struct krt akrt;
-       int tts_count = 0;    /* number of task-to-string structures */
-       struct tts *tts_mapptr;
-       unsigned int tts_mapsize = 0;
-       vm_offset_t kaddr;
-
-       assert(mapsize != NULL);
-       assert(mapcount != NULL);
-
-       *mapcount = threads_count;
-       tts_count = tasks_count;
-
-       /*
-        * The proc count could change during buffer allocation,
-        * so introduce a small fudge factor to bump up the
-        * buffer sizes. This gives new tasks some chance of 
-        * making into the tables.  Bump up by 25%.
-        */
-       *mapcount += *mapcount / 4;
-       tts_count += tts_count / 4;
+       struct kd_resolver *resolve = opaque;

 
 

-       *mapsize = *mapcount * sizeof(kd_threadmap);
-
-       if (count && count < *mapcount) {
-               return 0;
-       }
+       if (resolve->krs_count < resolve->krs_maxcount) {
+               kd_threadmap *map = &resolve->krs_map[resolve->krs_count];
+               struct kd_task_name *task_name = resolve->krs_task;
+               map->thread = (uintptr_t)thread_tid(thread);

 
 

-       if ((kmem_alloc(kernel_map, &kaddr, (vm_size_t)*mapsize, VM_KERN_MEMORY_DIAG) == KERN_SUCCESS)) {
-               bzero((void *)kaddr, *mapsize);
-               mapptr = (kd_threadmap *)kaddr;
-       } else {
-               return 0;
+               (void)strlcpy(map->command, task_name->ktn_name, sizeof(map->command));
+               /*
+                * Kernel threads should still be marked with non-zero valid bit.
+                */
+               pid_t pid = resolve->krs_task->ktn_pid;
+               map->valid = pid == 0 ? 1 : pid;
+               resolve->krs_count++;

        }
        }

+}

 
 

-       tts_mapsize = tts_count * sizeof(struct tts);
-
-       if ((kmem_alloc(kernel_map, &kaddr, (vm_size_t)tts_mapsize, VM_KERN_MEMORY_DIAG) == KERN_SUCCESS)) {
-               bzero((void *)kaddr, tts_mapsize);
-               tts_mapptr = (struct tts *)kaddr;
-       } else {
-               kmem_free(kernel_map, (vm_offset_t)mapptr, *mapsize);
-
-               return 0;
-       }
+static vm_size_t
+kd_resolve_tasks(struct kd_task_name *task_names, vm_size_t ntasks)
+{
+       vm_size_t i = 0;
+       proc_t p = PROC_NULL;

 
 

-       /*
-        * Save the proc's name and take a reference for each task associated
-        * with a valid process.
-        */

        proc_list_lock();
        proc_list_lock();

-
-       int i = 0;

        ALLPROC_FOREACH(p) {
        ALLPROC_FOREACH(p) {

-               if (i >= tts_count) {
+               if (i >= ntasks) {

                        break;
                }
                        break;
                }

-               if (p->p_lflag & P_LEXIT) {
-                       continue;
-               }
-               if (p->task) {
+               /*
+                * Only record processes that can be referenced and are not exiting.
+                */
+               if (p->task && (p->p_lflag & P_LEXIT) == 0) {

                        task_reference(p->task);
                        task_reference(p->task);

-                       tts_mapptr[i].task = p->task;
-                       tts_mapptr[i].pid = p->p_pid;
-                       (void)strlcpy(tts_mapptr[i].task_comm, proc_best_name(p), sizeof(tts_mapptr[i].task_comm));
+                       task_names[i].ktn_task = p->task;
+                       task_names[i].ktn_pid = p->p_pid;
+                       (void)strlcpy(task_names[i].ktn_name, proc_best_name(p),
+                           sizeof(task_names[i].ktn_name));

                        i++;
                }
        }
                        i++;
                }
        }

-       tts_count = i;
-

        proc_list_unlock();
 
        proc_list_unlock();
 

+       return i;
+}
+
+static vm_size_t
+kd_resolve_threads(kd_threadmap *map, struct kd_task_name *task_names,
+    vm_size_t ntasks, vm_size_t nthreads)
+{
+       struct kd_resolver resolver = {
+               .krs_map = map, .krs_count = 0, .krs_maxcount = nthreads,
+       };
+
+       for (int i = 0; i < ntasks; i++) {
+               struct kd_task_name *cur_task = &task_names[i];
+               resolver.krs_task = cur_task;
+               task_act_iterate_wth_args(cur_task->ktn_task, kd_resolve_map,
+                   &resolver);
+               task_deallocate(cur_task->ktn_task);
+       }
+
+       return resolver.krs_count;
+}
+
+static kd_threadmap *
+kdbg_thrmap_init_internal(size_t maxthreads, vm_size_t *mapsize,
+    vm_size_t *mapcount)
+{
+       kd_threadmap *thread_map = NULL;
+       struct kd_task_name *task_names;
+       vm_size_t names_size = 0;
+
+       assert(mapsize != NULL);
+       assert(mapcount != NULL);
+
+       vm_size_t nthreads = threads_count;
+       vm_size_t ntasks = tasks_count;
+

        /*
        /*

-        * Initialize thread map data
+        * Allow 25% more threads and tasks to be created between now and taking the
+        * proc_list_lock.

         */
         */

-       akrt.map = mapptr;
-       akrt.count = 0;
-       akrt.maxcount = *mapcount;
+       if (os_add_overflow(nthreads, nthreads / 4, &nthreads) ||
+           os_add_overflow(ntasks, ntasks / 4, &ntasks)) {
+               return NULL;
+       }

 
 

-       for (i = 0; i < tts_count; i++) {
-               akrt.atts = &tts_mapptr[i];
-               task_act_iterate_wth_args(tts_mapptr[i].task, kdbg_resolve_map, &akrt);
-               task_deallocate((task_t)tts_mapptr[i].task);
+       *mapcount = nthreads;
+       if (os_mul_overflow(nthreads, sizeof(kd_threadmap), mapsize)) {
+               return NULL;
+       }
+       if (os_mul_overflow(ntasks, sizeof(task_names[0]), &names_size)) {
+               return NULL;

        }
        }

-       kmem_free(kernel_map, (vm_offset_t)tts_mapptr, tts_mapsize);

 
 

-       *mapcount = akrt.count;
+       /*
+        * Wait until the out-parameters have been filled with the needed size to
+        * do the bounds checking on the provided maximum.
+        */
+       if (maxthreads != 0 && maxthreads < nthreads) {
+               return NULL;
+       }

 
 

-       return mapptr;
+       thread_map = kalloc_tag(*mapsize, VM_KERN_MEMORY_DIAG);
+       bzero(thread_map, *mapsize);
+       task_names = kheap_alloc(KHEAP_TEMP, names_size, Z_WAITOK | Z_ZERO);
+       ntasks = kd_resolve_tasks(task_names, ntasks);
+       *mapcount = kd_resolve_threads(thread_map, task_names, ntasks, nthreads);
+       kheap_free(KHEAP_TEMP, task_names, names_size);
+       return thread_map;

 }
 
 static void
 }
 
 static void


@@ -2326,34 +2437,36 @@ kdebug_reset(void)
 void
 kdebug_free_early_buf(void)
 {
 void
 kdebug_free_early_buf(void)
 {

-#if !CONFIG_EMBEDDED
-       /* Must be done with the buffer, so release it back to the VM.
-        * On embedded targets this buffer is freed when the BOOTDATA segment is freed. */
+#if defined(__x86_64__)
+       /*
+        * Make Intel aware that the early buffer is no longer being used.  ARM
+        * handles this as part of the BOOTDATA segment.
+        */

        ml_static_mfree((vm_offset_t)&kd_early_buffer, sizeof(kd_early_buffer));
        ml_static_mfree((vm_offset_t)&kd_early_buffer, sizeof(kd_early_buffer));

-#endif
+#endif /* defined(__x86_64__) */

 }
 
 int
 kdbg_setpid(kd_regtype *kdr)
 {
        pid_t pid;
 }
 
 int
 kdbg_setpid(kd_regtype *kdr)
 {
        pid_t pid;

-       int flag, ret=0;
+       int flag, ret = 0;

        struct proc *p;
 
        pid = (pid_t)kdr->value1;
        flag = (int)kdr->value2;
 
        if (pid >= 0) {
        struct proc *p;
 
        pid = (pid_t)kdr->value1;
        flag = (int)kdr->value2;
 
        if (pid >= 0) {

-               if ((p = proc_find(pid)) == NULL)
+               if ((p = proc_find(pid)) == NULL) {

                        ret = ESRCH;
                        ret = ESRCH;

-               else {
+               } else {

                        if (flag == 1) {
                                /*
                                 * turn on pid check for this and all pids
                                 */
                                kd_ctrl_page.kdebug_flags |= KDBG_PIDCHECK;
                                kd_ctrl_page.kdebug_flags &= ~KDBG_PIDEXCLUDE;
                        if (flag == 1) {
                                /*
                                 * turn on pid check for this and all pids
                                 */
                                kd_ctrl_page.kdebug_flags |= KDBG_PIDCHECK;
                                kd_ctrl_page.kdebug_flags &= ~KDBG_PIDEXCLUDE;

-                               kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
+                               kdbg_set_flags(SLOW_CHECKS, 0, true);

 
                                p->p_kdebug = 1;
                        } else {
 
                                p->p_kdebug = 1;
                        } else {


@@ -2362,16 +2475,16 @@ kdbg_setpid(kd_regtype *kdr)
                                 * Don't turn off all pid checking though
                                 *
                                 * kd_ctrl_page.kdebug_flags &= ~KDBG_PIDCHECK;
                                 * Don't turn off all pid checking though
                                 *
                                 * kd_ctrl_page.kdebug_flags &= ~KDBG_PIDCHECK;

-                                */   
+                                */

                                p->p_kdebug = 0;
                        }
                        proc_rele(p);
                }
                                p->p_kdebug = 0;
                        }
                        proc_rele(p);
                }

-       }
-       else
+       } else {

                ret = EINVAL;
                ret = EINVAL;

+       }

 
 

-       return(ret);
+       return ret;

 }
 
 /* This is for pid exclusion in the trace buffer */
 }
 
 /* This is for pid exclusion in the trace buffer */


@@ -2379,41 +2492,41 @@ int
 kdbg_setpidex(kd_regtype *kdr)
 {
        pid_t pid;
 kdbg_setpidex(kd_regtype *kdr)
 {
        pid_t pid;

-       int flag, ret=0;
+       int flag, ret = 0;

        struct proc *p;
 
        pid = (pid_t)kdr->value1;
        flag = (int)kdr->value2;
 
        if (pid >= 0) {
        struct proc *p;
 
        pid = (pid_t)kdr->value1;
        flag = (int)kdr->value2;
 
        if (pid >= 0) {

-               if ((p = proc_find(pid)) == NULL)
+               if ((p = proc_find(pid)) == NULL) {

                        ret = ESRCH;
                        ret = ESRCH;

-               else {
+               } else {

                        if (flag == 1) {
                                /*
                                 * turn on pid exclusion
                                 */
                                kd_ctrl_page.kdebug_flags |= KDBG_PIDEXCLUDE;
                                kd_ctrl_page.kdebug_flags &= ~KDBG_PIDCHECK;
                        if (flag == 1) {
                                /*
                                 * turn on pid exclusion
                                 */
                                kd_ctrl_page.kdebug_flags |= KDBG_PIDEXCLUDE;
                                kd_ctrl_page.kdebug_flags &= ~KDBG_PIDCHECK;

-                               kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
+                               kdbg_set_flags(SLOW_CHECKS, 0, true);

 
                                p->p_kdebug = 1;
 
                                p->p_kdebug = 1;

-                       }
-                       else {
+                       } else {

                                /*
                                 * turn off pid exclusion for this pid value
                                 * Don't turn off all pid exclusion though
                                 *
                                 * kd_ctrl_page.kdebug_flags &= ~KDBG_PIDEXCLUDE;
                                /*
                                 * turn off pid exclusion for this pid value
                                 * Don't turn off all pid exclusion though
                                 *
                                 * kd_ctrl_page.kdebug_flags &= ~KDBG_PIDEXCLUDE;

-                                */   
+                                */

                                p->p_kdebug = 0;
                        }
                        proc_rele(p);
                }
                                p->p_kdebug = 0;
                        }
                        proc_rele(p);
                }

-       } else
+       } else {

                ret = EINVAL;
                ret = EINVAL;

+       }

 
 

-       return(ret);
+       return ret;

 }
 
 /*
 }
 
 /*


@@ -2449,7 +2562,7 @@ kdbg_initialize_typefilter(typefilter_t tf)
         * that any non-null kdbg_typefilter means a
         * valid memory_entry is available.
         */
         * that any non-null kdbg_typefilter means a
         * valid memory_entry is available.
         */

-       __c11_atomic_store(((_Atomic typefilter_t*)&kdbg_typefilter), tf, memory_order_release);
+       os_atomic_store(&kdbg_typefilter, tf, release);

 
        return KERN_SUCCESS;
 }
 
        return KERN_SUCCESS;
 }


@@ -2477,7 +2590,7 @@ kdbg_copyin_typefilter(user_addr_t addr, size_t size)
                         *
                         * Allocating a typefilter for the copyin allows
                         * the kernel to hold the invariant that DBG_TRACE
                         *
                         * Allocating a typefilter for the copyin allows
                         * the kernel to hold the invariant that DBG_TRACE

-                        * must always be allowed. 
+                        * must always be allowed.

                         */
                        if (!kdbg_typefilter) {
                                if ((ret = kdbg_initialize_typefilter(tf))) {
                         */
                        if (!kdbg_typefilter) {
                                if ((ret = kdbg_initialize_typefilter(tf))) {


@@ -2492,8 +2605,9 @@ kdbg_copyin_typefilter(user_addr_t addr, size_t size)
                        kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops, KD_CALLBACK_TYPEFILTER_CHANGED, kdbg_typefilter);
                }
 
                        kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops, KD_CALLBACK_TYPEFILTER_CHANGED, kdbg_typefilter);
                }
 

-               if (tf)
+               if (tf) {

                        typefilter_deallocate(tf);
                        typefilter_deallocate(tf);

+               }

        }
 
        return ret;
        }
 
        return ret;


@@ -2510,7 +2624,7 @@ kdbg_enable_typefilter(void)
        assert(kdbg_typefilter);
        kd_ctrl_page.kdebug_flags &= ~(KDBG_RANGECHECK | KDBG_VALCHECK);
        kd_ctrl_page.kdebug_flags |= KDBG_TYPEFILTER_CHECK;
        assert(kdbg_typefilter);
        kd_ctrl_page.kdebug_flags &= ~(KDBG_RANGECHECK | KDBG_VALCHECK);
        kd_ctrl_page.kdebug_flags |= KDBG_TYPEFILTER_CHECK;

-       kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
+       kdbg_set_flags(SLOW_CHECKS, 0, true);

        commpage_update_kdebug_state();
 }
 
        commpage_update_kdebug_state();
 }
 


@@ -2525,9 +2639,9 @@ kdbg_disable_typefilter(void)
        kd_ctrl_page.kdebug_flags &= ~KDBG_TYPEFILTER_CHECK;
 
        if ((kd_ctrl_page.kdebug_flags & (KDBG_PIDCHECK | KDBG_PIDEXCLUDE))) {
        kd_ctrl_page.kdebug_flags &= ~KDBG_TYPEFILTER_CHECK;
 
        if ((kd_ctrl_page.kdebug_flags & (KDBG_PIDCHECK | KDBG_PIDEXCLUDE))) {

-               kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
+               kdbg_set_flags(SLOW_CHECKS, 0, true);

        } else {
        } else {

-               kdbg_set_flags(SLOW_CHECKS, 0, FALSE);
+               kdbg_set_flags(SLOW_CHECKS, 0, false);

        }
        commpage_update_kdebug_state();
 
        }
        commpage_update_kdebug_state();
 


@@ -2539,7 +2653,7 @@ kdbg_disable_typefilter(void)
                 */
                typefilter_allow_all(kdbg_typefilter);
                kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops,
                 */
                typefilter_allow_all(kdbg_typefilter);
                kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops,

-                               KD_CALLBACK_TYPEFILTER_CHANGED, kdbg_typefilter);
+                   KD_CALLBACK_TYPEFILTER_CHANGED, kdbg_typefilter);

        }
 }
 
        }
 }
 


@@ -2560,38 +2674,37 @@ kdebug_commpage_state(void)
 int
 kdbg_setreg(kd_regtype * kdr)
 {
 int
 kdbg_setreg(kd_regtype * kdr)
 {

-       int ret=0;
+       int ret = 0;

        unsigned int val_1, val_2, val;
        switch (kdr->type) {
        unsigned int val_1, val_2, val;
        switch (kdr->type) {

-       
-       case KDBG_CLASSTYPE :
+       case KDBG_CLASSTYPE:

                val_1 = (kdr->value1 & 0xff);
                val_2 = (kdr->value2 & 0xff);
                val_1 = (kdr->value1 & 0xff);
                val_2 = (kdr->value2 & 0xff);

-               kdlog_beg = (val_1<<24);
-               kdlog_end = (val_2<<24);
+               kdlog_beg = (val_1 << 24);
+               kdlog_end = (val_2 << 24);

                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
                kd_ctrl_page.kdebug_flags &= ~KDBG_VALCHECK;       /* Turn off specific value check  */
                kd_ctrl_page.kdebug_flags |= (KDBG_RANGECHECK | KDBG_CLASSTYPE);
                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
                kd_ctrl_page.kdebug_flags &= ~KDBG_VALCHECK;       /* Turn off specific value check  */
                kd_ctrl_page.kdebug_flags |= (KDBG_RANGECHECK | KDBG_CLASSTYPE);

-               kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
+               kdbg_set_flags(SLOW_CHECKS, 0, true);

                break;
                break;

-       case KDBG_SUBCLSTYPE :
+       case KDBG_SUBCLSTYPE:

                val_1 = (kdr->value1 & 0xff);
                val_2 = (kdr->value2 & 0xff);
                val = val_2 + 1;
                val_1 = (kdr->value1 & 0xff);
                val_2 = (kdr->value2 & 0xff);
                val = val_2 + 1;

-               kdlog_beg = ((val_1<<24) | (val_2 << 16));
-               kdlog_end = ((val_1<<24) | (val << 16));
+               kdlog_beg = ((val_1 << 24) | (val_2 << 16));
+               kdlog_end = ((val_1 << 24) | (val << 16));

                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
                kd_ctrl_page.kdebug_flags &= ~KDBG_VALCHECK;       /* Turn off specific value check  */
                kd_ctrl_page.kdebug_flags |= (KDBG_RANGECHECK | KDBG_SUBCLSTYPE);
                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
                kd_ctrl_page.kdebug_flags &= ~KDBG_VALCHECK;       /* Turn off specific value check  */
                kd_ctrl_page.kdebug_flags |= (KDBG_RANGECHECK | KDBG_SUBCLSTYPE);

-               kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
+               kdbg_set_flags(SLOW_CHECKS, 0, true);

                break;
                break;

-       case KDBG_RANGETYPE :
+       case KDBG_RANGETYPE:

                kdlog_beg = (kdr->value1);
                kdlog_end = (kdr->value2);
                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
                kd_ctrl_page.kdebug_flags &= ~KDBG_VALCHECK;       /* Turn off specific value check  */
                kd_ctrl_page.kdebug_flags |= (KDBG_RANGECHECK | KDBG_RANGETYPE);
                kdlog_beg = (kdr->value1);
                kdlog_end = (kdr->value2);
                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
                kd_ctrl_page.kdebug_flags &= ~KDBG_VALCHECK;       /* Turn off specific value check  */
                kd_ctrl_page.kdebug_flags |= (KDBG_RANGECHECK | KDBG_RANGETYPE);

-               kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
+               kdbg_set_flags(SLOW_CHECKS, 0, true);

                break;
        case KDBG_VALCHECK:
                kdlog_value1 = (kdr->value1);
                break;
        case KDBG_VALCHECK:
                kdlog_value1 = (kdr->value1);


@@ -2601,33 +2714,35 @@ kdbg_setreg(kd_regtype * kdr)
                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
                kd_ctrl_page.kdebug_flags &= ~KDBG_RANGECHECK;    /* Turn off range check */
                kd_ctrl_page.kdebug_flags |= KDBG_VALCHECK;       /* Turn on specific value check  */
                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
                kd_ctrl_page.kdebug_flags &= ~KDBG_RANGECHECK;    /* Turn off range check */
                kd_ctrl_page.kdebug_flags |= KDBG_VALCHECK;       /* Turn on specific value check  */

-               kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
+               kdbg_set_flags(SLOW_CHECKS, 0, true);

                break;
                break;

-       case KDBG_TYPENONE :
+       case KDBG_TYPENONE:

                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
 
                kd_ctrl_page.kdebug_flags &= (unsigned int)~KDBG_CKTYPES;
 

-               if ( (kd_ctrl_page.kdebug_flags & (KDBG_RANGECHECK | KDBG_VALCHECK   | 
-                                                  KDBG_PIDCHECK   | KDBG_PIDEXCLUDE | 
-                                                  KDBG_TYPEFILTER_CHECK)) )
-                       kdbg_set_flags(SLOW_CHECKS, 0, TRUE);
-               else
-                       kdbg_set_flags(SLOW_CHECKS, 0, FALSE);
+               if ((kd_ctrl_page.kdebug_flags & (KDBG_RANGECHECK | KDBG_VALCHECK   |
+                   KDBG_PIDCHECK   | KDBG_PIDEXCLUDE |
+                   KDBG_TYPEFILTER_CHECK))) {
+                       kdbg_set_flags(SLOW_CHECKS, 0, true);
+               } else {
+                       kdbg_set_flags(SLOW_CHECKS, 0, false);
+               }

 
                kdlog_beg = 0;
                kdlog_end = 0;
                break;
 
                kdlog_beg = 0;
                kdlog_end = 0;
                break;

-       default :
+       default:

                ret = EINVAL;
                break;
        }
                ret = EINVAL;
                break;
        }

-       return(ret);
+       return ret;

 }
 
 static int
 kdbg_write_to_vnode(caddr_t buffer, size_t size, vnode_t vp, vfs_context_t ctx, off_t file_offset)
 {
 }
 
 static int
 kdbg_write_to_vnode(caddr_t buffer, size_t size, vnode_t vp, vfs_context_t ctx, off_t file_offset)
 {

-       return vn_rdwr(UIO_WRITE, vp, buffer, size, file_offset, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT,
-                       vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));
+       assert(size < INT_MAX);
+       return vn_rdwr(UIO_WRITE, vp, buffer, (int)size, file_offset, UIO_SYSSPACE, IO_NODELOCKED | IO_UNIT,
+                  vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));

 }
 
 int
 }
 
 int


@@ -2652,8 +2767,7 @@ kdbg_write_v3_chunk_header(user_addr_t buffer, uint32_t tag, uint32_t sub_tag, u
                                goto write_error;
                        }
                        RAW_file_offset  += (sizeof(kd_chunk_header_v3));
                                goto write_error;
                        }
                        RAW_file_offset  += (sizeof(kd_chunk_header_v3));

-               }
-               else {
+               } else {

                        ret = copyout(&header, buffer, sizeof(kd_chunk_header_v3));
                        if (ret) {
                                goto write_error;
                        ret = copyout(&header, buffer, sizeof(kd_chunk_header_v3));
                        if (ret) {
                                goto write_error;


@@ -2664,25 +2778,7 @@ write_error:
        return ret;
 }
 
        return ret;
 }
 

-int
-kdbg_write_v3_chunk_header_to_buffer(void * buffer, uint32_t tag, uint32_t sub_tag, uint64_t length)
-{
-       kd_chunk_header_v3 header = {
-               .tag = tag,
-               .sub_tag = sub_tag,
-               .length = length,
-       };
-
-       if (!buffer) {
-               return 0;
-       }
-
-       memcpy(buffer, &header, sizeof(kd_chunk_header_v3));
-
-       return (sizeof(kd_chunk_header_v3));
-}
-
-int
+static int

 kdbg_write_v3_chunk_to_fd(uint32_t tag, uint32_t sub_tag, uint64_t length, void *payload, uint64_t payload_size, int fd)
 {
        proc_t p;
 kdbg_write_v3_chunk_to_fd(uint32_t tag, uint32_t sub_tag, uint64_t length, void *payload, uint64_t payload_size, int fd)
 {
        proc_t p;


@@ -2691,25 +2787,16 @@ kdbg_write_v3_chunk_to_fd(uint32_t tag, uint32_t sub_tag, uint64_t length, void
        vnode_t vp;
        p = current_proc();
 
        vnode_t vp;
        p = current_proc();
 

-       proc_fdlock(p);
-       if ( (fp_lookup(p, fd, &fp, 1)) ) {
-               proc_fdunlock(p);
-               return EFAULT;
+       if (fp_get_ftype(p, fd, DTYPE_VNODE, EBADF, &fp)) {
+               return EBADF;

        }
 
        }
 

+       vp = fp->fp_glob->fg_data;

        context.vc_thread = current_thread();
        context.vc_thread = current_thread();

-       context.vc_ucred = fp->f_fglob->fg_cred;
+       context.vc_ucred = fp->fp_glob->fg_cred;

 
 

-       if (FILEGLOB_DTYPE(fp->f_fglob) != DTYPE_VNODE) {
-               fp_drop(p, fd, fp, 1);
-               proc_fdunlock(p);
-               return EBADF;
-       }
-       vp = (struct vnode *) fp->f_fglob->fg_data;
-       proc_fdunlock(p);
-
-       if ( (vnode_getwithref(vp)) == 0 ) {
-               RAW_file_offset = fp->f_fglob->fg_offset;
+       if ((vnode_getwithref(vp)) == 0) {
+               RAW_file_offset = fp->fp_glob->fg_offset;

 
                kd_chunk_header_v3 chunk_header = {
                        .tag = tag,
 
                kd_chunk_header_v3 chunk_header = {
                        .tag = tag,


@@ -2727,7 +2814,7 @@ kdbg_write_v3_chunk_to_fd(uint32_t tag, uint32_t sub_tag, uint64_t length, void
                        RAW_file_offset  += payload_size;
                }
 
                        RAW_file_offset  += payload_size;
                }
 

-               fp->f_fglob->fg_offset = RAW_file_offset;
+               fp->fp_glob->fg_offset = RAW_file_offset;

                vnode_put(vp);
        }
 
                vnode_put(vp);
        }
 


@@ -2738,180 +2825,179 @@ kdbg_write_v3_chunk_to_fd(uint32_t tag, uint32_t sub_tag, uint64_t length, void
 user_addr_t
 kdbg_write_v3_event_chunk_header(user_addr_t buffer, uint32_t tag, uint64_t length, vnode_t vp, vfs_context_t ctx)
 {
 user_addr_t
 kdbg_write_v3_event_chunk_header(user_addr_t buffer, uint32_t tag, uint64_t length, vnode_t vp, vfs_context_t ctx)
 {

-        uint64_t future_chunk_timestamp = 0;
-        length += sizeof(uint64_t);
-
-        if (kdbg_write_v3_chunk_header(buffer, tag, V3_EVENT_DATA_VERSION, length, vp, ctx)) {
-                return 0;
-        }
-        if (buffer) {
-                buffer += sizeof(kd_chunk_header_v3);
-        }
-
-        // Check that only one of them is valid
-        assert(!buffer ^ !vp);
-        assert((vp == NULL) || (ctx != NULL));
-
-        // Write the 8-byte future_chunk_timestamp field in the payload
-        if (buffer || vp) {
-                if (vp) {
-                        int ret = kdbg_write_to_vnode((caddr_t)&future_chunk_timestamp, sizeof(uint64_t), vp, ctx, RAW_file_offset);
-                        if (!ret) {
-                                RAW_file_offset  += (sizeof(uint64_t));
-                        }
-                }
-                else {
-                        if (copyout(&future_chunk_timestamp, buffer, sizeof(uint64_t))) {
-                                return 0;
-                        }
-                }
-        }
-
-        return (buffer + sizeof(uint64_t));
+       uint64_t future_chunk_timestamp = 0;
+       length += sizeof(uint64_t);
+
+       if (kdbg_write_v3_chunk_header(buffer, tag, V3_EVENT_DATA_VERSION, length, vp, ctx)) {
+               return 0;
+       }
+       if (buffer) {
+               buffer += sizeof(kd_chunk_header_v3);
+       }
+
+       // Check that only one of them is valid
+       assert(!buffer ^ !vp);
+       assert((vp == NULL) || (ctx != NULL));
+
+       // Write the 8-byte future_chunk_timestamp field in the payload
+       if (buffer || vp) {
+               if (vp) {
+                       int ret = kdbg_write_to_vnode((caddr_t)&future_chunk_timestamp, sizeof(uint64_t), vp, ctx, RAW_file_offset);
+                       if (!ret) {
+                               RAW_file_offset  += (sizeof(uint64_t));
+                       }
+               } else {
+                       if (copyout(&future_chunk_timestamp, buffer, sizeof(uint64_t))) {
+                               return 0;
+                       }
+               }
+       }
+
+       return buffer + sizeof(uint64_t);

 }
 
 int
 kdbg_write_v3_header(user_addr_t user_header, size_t *user_header_size, int fd)
 {
 }
 
 int
 kdbg_write_v3_header(user_addr_t user_header, size_t *user_header_size, int fd)
 {

-        int ret = KERN_SUCCESS;
-
-        uint8_t* cpumap = 0;
-        uint32_t cpumap_size = 0;
-        uint32_t thrmap_size = 0;
-
-        size_t bytes_needed = 0;
-
-        // Check that only one of them is valid
-        assert(!user_header ^ !fd);
-        assert(user_header_size);
-
-        if ( !(kd_ctrl_page.kdebug_flags & KDBG_BUFINIT) ) {
-                ret = EINVAL;
-                goto bail;
-        }
-
-        if ( !(user_header || fd) ) {
-                ret = EINVAL;
-                goto bail;
-        }
-
-        // Initialize the cpu map
-        ret = kdbg_cpumap_init_internal(kd_ctrl_page.kdebug_iops, kd_ctrl_page.kdebug_cpus, &cpumap, &cpumap_size);
-        if (ret != KERN_SUCCESS) {
-                goto bail;
-        }
-
-        // Check if a thread map is initialized
-        if ( !kd_mapptr ) {
-                ret = EINVAL;
-                goto bail;
-        }
-        thrmap_size = kd_mapcount * sizeof(kd_threadmap);
-
-        mach_timebase_info_data_t timebase = {0, 0};
-        clock_timebase_info(&timebase);
-
-        // Setup the header.
-        // See v3 header description in sys/kdebug.h for more inforamtion.
-        kd_header_v3 header = {
-            .tag = RAW_VERSION3,
-            .sub_tag = V3_HEADER_VERSION,
-            .length = (sizeof(kd_header_v3) + cpumap_size - sizeof(kd_cpumap_header)),
-            .timebase_numer = timebase.numer,
-            .timebase_denom = timebase.denom,
-            .timestamp = 0, /* FIXME rdar://problem/22053009 */
-            .walltime_secs = 0,
-            .walltime_usecs = 0,
-            .timezone_minuteswest = 0,
-            .timezone_dst = 0,
+       int ret = KERN_SUCCESS;
+
+       uint8_t* cpumap = 0;
+       uint32_t cpumap_size = 0;
+       uint32_t thrmap_size = 0;
+
+       size_t bytes_needed = 0;
+
+       // Check that only one of them is valid
+       assert(!user_header ^ !fd);
+       assert(user_header_size);
+
+       if (!(kd_ctrl_page.kdebug_flags & KDBG_BUFINIT)) {
+               ret = EINVAL;
+               goto bail;
+       }
+
+       if (!(user_header || fd)) {
+               ret = EINVAL;
+               goto bail;
+       }
+
+       // Initialize the cpu map
+       ret = kdbg_cpumap_init_internal(kd_ctrl_page.kdebug_iops, kd_ctrl_page.kdebug_cpus, &cpumap, &cpumap_size);
+       if (ret != KERN_SUCCESS) {
+               goto bail;
+       }
+
+       // Check if a thread map is initialized
+       if (!kd_mapptr) {
+               ret = EINVAL;
+               goto bail;
+       }
+       if (os_mul_overflow(kd_mapcount, sizeof(kd_threadmap), &thrmap_size)) {
+               ret = ERANGE;
+               goto bail;
+       }
+
+       mach_timebase_info_data_t timebase = {0, 0};
+       clock_timebase_info(&timebase);
+
+       // Setup the header.
+       // See v3 header description in sys/kdebug.h for more inforamtion.
+       kd_header_v3 header = {
+               .tag = RAW_VERSION3,
+               .sub_tag = V3_HEADER_VERSION,
+               .length = (sizeof(kd_header_v3) + cpumap_size - sizeof(kd_cpumap_header)),
+               .timebase_numer = timebase.numer,
+               .timebase_denom = timebase.denom,
+               .timestamp = 0, /* FIXME rdar://problem/22053009 */
+               .walltime_secs = 0,
+               .walltime_usecs = 0,
+               .timezone_minuteswest = 0,
+               .timezone_dst = 0,

 #if defined(__LP64__)
 #if defined(__LP64__)

-            .flags = 1,
+               .flags = 1,

 #else
 #else

-            .flags = 0,
+               .flags = 0,

 #endif
 #endif

-        };
-
-        // If its a buffer, check if we have enough space to copy the header and the maps.
-        if (user_header) {
-                bytes_needed = header.length + thrmap_size + (2 * sizeof(kd_chunk_header_v3));
-                if (*user_header_size < bytes_needed) {
-                        ret = EINVAL;
-                        goto bail;
-                }
-        }
-
-        // Start writing the header
-        if (fd) {
-                void *hdr_ptr = (void *)(((uintptr_t) &header) + sizeof(kd_chunk_header_v3));
-                size_t payload_size = (sizeof(kd_header_v3) - sizeof(kd_chunk_header_v3));
-
-                ret = kdbg_write_v3_chunk_to_fd(RAW_VERSION3, V3_HEADER_VERSION, header.length, hdr_ptr, payload_size, fd);
-                if (ret) {
-                        goto bail;
-                }
-        }
-        else {
-            if (copyout(&header, user_header, sizeof(kd_header_v3))) {
-                    ret = EFAULT;
-                    goto bail;
-            }
-            // Update the user pointer
-            user_header += sizeof(kd_header_v3);
-        }
-
-        // Write a cpu map. This is a sub chunk of the header
-        cpumap = (uint8_t*)((uintptr_t) cpumap + sizeof(kd_cpumap_header));
-        size_t payload_size = (size_t)(cpumap_size - sizeof(kd_cpumap_header));
-        if (fd) {
-                ret = kdbg_write_v3_chunk_to_fd(V3_CPU_MAP, V3_CPUMAP_VERSION, payload_size, (void *)cpumap, payload_size, fd);
-                if (ret) {
-                        goto bail;
-                }
-        }
-        else {
-                ret = kdbg_write_v3_chunk_header(user_header, V3_CPU_MAP, V3_CPUMAP_VERSION, payload_size, NULL, NULL);
-                if (ret) {
-                        goto bail;
-                }
-                user_header += sizeof(kd_chunk_header_v3);
-                if (copyout(cpumap, user_header, payload_size))  {
-                        ret = EFAULT;
-                        goto bail;
-                }
-                // Update the user pointer
-                user_header += payload_size;
-        }
-
-        // Write a thread map
-        if (fd) {
-                ret = kdbg_write_v3_chunk_to_fd(V3_THREAD_MAP, V3_THRMAP_VERSION, thrmap_size, (void *)kd_mapptr, thrmap_size, fd);
-                if (ret) {
-                        goto bail;
-                }
-        }
-        else {
-                ret = kdbg_write_v3_chunk_header(user_header, V3_THREAD_MAP, V3_THRMAP_VERSION, thrmap_size, NULL, NULL);
-                if (ret) {
-                        goto bail;
-                }
-                user_header += sizeof(kd_chunk_header_v3);
-                if (copyout(kd_mapptr, user_header, thrmap_size)) {
-                        ret = EFAULT;
-                        goto bail;
-                }
-                user_header += thrmap_size;
-        }
-
-        if (fd) {
-                RAW_file_written += bytes_needed;
-        }
-
-        *user_header_size = bytes_needed;
+       };
+
+       // If its a buffer, check if we have enough space to copy the header and the maps.
+       if (user_header) {
+               bytes_needed = (size_t)header.length + thrmap_size + (2 * sizeof(kd_chunk_header_v3));
+               if (*user_header_size < bytes_needed) {
+                       ret = EINVAL;
+                       goto bail;
+               }
+       }
+
+       // Start writing the header
+       if (fd) {
+               void *hdr_ptr = (void *)(((uintptr_t) &header) + sizeof(kd_chunk_header_v3));
+               size_t payload_size = (sizeof(kd_header_v3) - sizeof(kd_chunk_header_v3));
+
+               ret = kdbg_write_v3_chunk_to_fd(RAW_VERSION3, V3_HEADER_VERSION, header.length, hdr_ptr, payload_size, fd);
+               if (ret) {
+                       goto bail;
+               }
+       } else {
+               if (copyout(&header, user_header, sizeof(kd_header_v3))) {
+                       ret = EFAULT;
+                       goto bail;
+               }
+               // Update the user pointer
+               user_header += sizeof(kd_header_v3);
+       }
+
+       // Write a cpu map. This is a sub chunk of the header
+       cpumap = (uint8_t*)((uintptr_t) cpumap + sizeof(kd_cpumap_header));
+       size_t payload_size = (size_t)(cpumap_size - sizeof(kd_cpumap_header));
+       if (fd) {
+               ret = kdbg_write_v3_chunk_to_fd(V3_CPU_MAP, V3_CPUMAP_VERSION, payload_size, (void *)cpumap, payload_size, fd);
+               if (ret) {
+                       goto bail;
+               }
+       } else {
+               ret = kdbg_write_v3_chunk_header(user_header, V3_CPU_MAP, V3_CPUMAP_VERSION, payload_size, NULL, NULL);
+               if (ret) {
+                       goto bail;
+               }
+               user_header += sizeof(kd_chunk_header_v3);
+               if (copyout(cpumap, user_header, payload_size)) {
+                       ret = EFAULT;
+                       goto bail;
+               }
+               // Update the user pointer
+               user_header += payload_size;
+       }
+
+       // Write a thread map
+       if (fd) {
+               ret = kdbg_write_v3_chunk_to_fd(V3_THREAD_MAP, V3_THRMAP_VERSION, thrmap_size, (void *)kd_mapptr, thrmap_size, fd);
+               if (ret) {
+                       goto bail;
+               }
+       } else {
+               ret = kdbg_write_v3_chunk_header(user_header, V3_THREAD_MAP, V3_THRMAP_VERSION, thrmap_size, NULL, NULL);
+               if (ret) {
+                       goto bail;
+               }
+               user_header += sizeof(kd_chunk_header_v3);
+               if (copyout(kd_mapptr, user_header, thrmap_size)) {
+                       ret = EFAULT;
+                       goto bail;
+               }
+               user_header += thrmap_size;
+       }
+
+       if (fd) {
+               RAW_file_written += bytes_needed;
+       }
+
+       *user_header_size = bytes_needed;

 bail:
 bail:

-        if (cpumap) {
-                kmem_free(kernel_map, (vm_offset_t)cpumap, cpumap_size);
-        }
-        return (ret);
+       if (cpumap) {
+               kmem_free(kernel_map, (vm_offset_t)cpumap, cpumap_size);
+       }
+       return ret;

 }
 
 int
 }
 
 int


@@ -2931,41 +3017,44 @@ kdbg_readcpumap(user_addr_t user_cpumap, size_t *user_cpumap_size)
                        }
                        *user_cpumap_size = cpumap_size;
                        kmem_free(kernel_map, (vm_offset_t)cpumap, cpumap_size);
                        }
                        *user_cpumap_size = cpumap_size;
                        kmem_free(kernel_map, (vm_offset_t)cpumap, cpumap_size);

-               } else
+               } else {

                        ret = EINVAL;
                        ret = EINVAL;

-       } else
+               }
+       } else {

                ret = EINVAL;
                ret = EINVAL;

+       }

 
 

-       return (ret);
+       return ret;

 }
 
 int
 kdbg_readcurthrmap(user_addr_t buffer, size_t *bufsize)
 {
        kd_threadmap *mapptr;
 }
 
 int
 kdbg_readcurthrmap(user_addr_t buffer, size_t *bufsize)
 {
        kd_threadmap *mapptr;

-       unsigned int mapsize;
-       unsigned int mapcount;
-       unsigned int count = 0;
+       vm_size_t mapsize;
+       vm_size_t mapcount;

        int ret = 0;
        int ret = 0;

+       size_t count = *bufsize / sizeof(kd_threadmap);

 
 

-       count = *bufsize/sizeof(kd_threadmap);

        *bufsize = 0;
 
        *bufsize = 0;
 

-       if ( (mapptr = kdbg_thrmap_init_internal(count, &mapsize, &mapcount)) ) {
-               if (copyout(mapptr, buffer, mapcount * sizeof(kd_threadmap)))
+       if ((mapptr = kdbg_thrmap_init_internal(count, &mapsize, &mapcount))) {
+               if (copyout(mapptr, buffer, mapcount * sizeof(kd_threadmap))) {

                        ret = EFAULT;
                        ret = EFAULT;

-               else
+               } else {

                        *bufsize = (mapcount * sizeof(kd_threadmap));
                        *bufsize = (mapcount * sizeof(kd_threadmap));

+               }

 
 

-               kmem_free(kernel_map, (vm_offset_t)mapptr, mapsize);
-       } else
+               kfree(mapptr, mapsize);
+       } else {

                ret = EINVAL;
                ret = EINVAL;

+       }

 
 

-       return (ret);
+       return ret;

 }
 
 static int
 }
 
 static int

-kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
+kdbg_write_v1_header(bool write_thread_map, vnode_t vp, vfs_context_t ctx)

 {
        int ret = 0;
        RAW_header header;
 {
        int ret = 0;
        RAW_header header;


@@ -2976,12 +3065,20 @@ kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
        uint32_t extra_thread_count = 0;
        uint32_t cpumap_size;
        size_t map_size = 0;
        uint32_t extra_thread_count = 0;
        uint32_t cpumap_size;
        size_t map_size = 0;

-       size_t map_count = 0;
+       uint32_t map_count = 0;

 
        if (write_thread_map) {
                assert(kd_ctrl_page.kdebug_flags & KDBG_MAPINIT);
 
        if (write_thread_map) {
                assert(kd_ctrl_page.kdebug_flags & KDBG_MAPINIT);

-               map_count = kd_mapcount;
-               map_size = map_count * sizeof(kd_threadmap);
+               if (kd_mapcount > UINT32_MAX) {
+                       return ERANGE;
+               }
+               map_count = (uint32_t)kd_mapcount;
+               if (os_mul_overflow(map_count, sizeof(kd_threadmap), &map_size)) {
+                       return ERANGE;
+               }
+               if (map_size >= INT_MAX) {
+                       return ERANGE;
+               }

        }
 
        /*
        }
 
        /*


@@ -3002,7 +3099,7 @@ kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
        assert(vp);
        assert(ctx);
 
        assert(vp);
        assert(ctx);
 

-       pad_size = PAGE_16KB - ((sizeof(RAW_header) + map_size) & PAGE_MASK_64);
+       pad_size = PAGE_16KB - ((sizeof(RAW_header) + map_size) & PAGE_MASK);

        cpumap_size = sizeof(kd_cpumap_header) + kd_ctrl_page.kdebug_cpus * sizeof(kd_cpumap);
 
        if (cpumap_size > pad_size) {
        cpumap_size = sizeof(kd_cpumap_header) + kd_ctrl_page.kdebug_cpus * sizeof(kd_cpumap);
 
        if (cpumap_size > pad_size) {


@@ -3020,7 +3117,7 @@ kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
         * the cpumap is embedded in the last 4K page before when the event data is expected.
         * This way the tools can read the data starting the next page boundary on both
         * 4K and 16K systems preserving compatibility with older versions of the tools
         * the cpumap is embedded in the last 4K page before when the event data is expected.
         * This way the tools can read the data starting the next page boundary on both
         * 4K and 16K systems preserving compatibility with older versions of the tools

-       */
+        */

        if (pad_size > PAGE_4KB) {
                pad_size -= PAGE_4KB;
                extra_thread_count = (pad_size / sizeof(kd_threadmap)) + 1;
        if (pad_size > PAGE_4KB) {
                pad_size -= PAGE_4KB;
                extra_thread_count = (pad_size / sizeof(kd_threadmap)) + 1;


@@ -3034,8 +3131,8 @@ kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
        header.TOD_secs = secs;
        header.TOD_usecs = usecs;
 
        header.TOD_secs = secs;
        header.TOD_usecs = usecs;
 

-       ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)&header, sizeof(RAW_header), RAW_file_offset,
-                     UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));
+       ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)&header, (int)sizeof(RAW_header), RAW_file_offset,
+           UIO_SYSSPACE, IO_NODELOCKED | IO_UNIT, vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));

        if (ret) {
                goto write_error;
        }
        if (ret) {
                goto write_error;
        }


@@ -3043,8 +3140,9 @@ kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
        RAW_file_written += sizeof(RAW_header);
 
        if (write_thread_map) {
        RAW_file_written += sizeof(RAW_header);
 
        if (write_thread_map) {

-               ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)kd_mapptr, map_size, RAW_file_offset,
-                             UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));
+               assert(map_size < INT_MAX);
+               ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)kd_mapptr, (int)map_size, RAW_file_offset,
+                   UIO_SYSSPACE, IO_NODELOCKED | IO_UNIT, vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));

                if (ret) {
                        goto write_error;
                }
                if (ret) {
                        goto write_error;
                }


@@ -3055,16 +3153,16 @@ kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
 
        if (extra_thread_count) {
                pad_size = extra_thread_count * sizeof(kd_threadmap);
 
        if (extra_thread_count) {
                pad_size = extra_thread_count * sizeof(kd_threadmap);

-               pad_buf = kalloc(pad_size);
+               pad_buf = kheap_alloc(KHEAP_TEMP, pad_size, Z_WAITOK | Z_ZERO);

                if (!pad_buf) {
                        ret = ENOMEM;
                        goto write_error;
                }
                if (!pad_buf) {
                        ret = ENOMEM;
                        goto write_error;
                }

-               memset(pad_buf, 0, pad_size);

 
 

-               ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)pad_buf, pad_size, RAW_file_offset,
-                             UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));
-               kfree(pad_buf, pad_size);
+               assert(pad_size < INT_MAX);
+               ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)pad_buf, (int)pad_size, RAW_file_offset,
+                   UIO_SYSSPACE, IO_NODELOCKED | IO_UNIT, vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));
+               kheap_free(KHEAP_TEMP, pad_buf, pad_size);

                if (ret) {
                        goto write_error;
                }
                if (ret) {
                        goto write_error;
                }


@@ -3073,14 +3171,13 @@ kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
                RAW_file_written += pad_size;
        }
 
                RAW_file_written += pad_size;
        }
 

-       pad_size = PAGE_SIZE - (RAW_file_offset & PAGE_MASK_64);
+       pad_size = PAGE_SIZE - (RAW_file_offset & PAGE_MASK);

        if (pad_size) {
        if (pad_size) {

-               pad_buf = (char *)kalloc(pad_size);
+               pad_buf = (char *)kheap_alloc(KHEAP_TEMP, pad_size, Z_WAITOK | Z_ZERO);

                if (!pad_buf) {
                        ret = ENOMEM;
                        goto write_error;
                }
                if (!pad_buf) {
                        ret = ENOMEM;
                        goto write_error;
                }

-               memset(pad_buf, 0, pad_size);

 
                /*
                 * embed a cpumap in the padding bytes.
 
                /*
                 * embed a cpumap in the padding bytes.


@@ -3092,9 +3189,10 @@ kdbg_write_v1_header(boolean_t write_thread_map, vnode_t vp, vfs_context_t ctx)
                        memset(pad_buf, 0, pad_size);
                }
 
                        memset(pad_buf, 0, pad_size);
                }
 

-               ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)pad_buf, pad_size, RAW_file_offset,
-                               UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));
-               kfree(pad_buf, pad_size);
+               assert(pad_size < INT_MAX);
+               ret = vn_rdwr(UIO_WRITE, vp, (caddr_t)pad_buf, (int)pad_size, RAW_file_offset,
+                   UIO_SYSSPACE, IO_NODELOCKED | IO_UNIT, vfs_context_ucred(ctx), (int *) 0, vfs_context_proc(ctx));
+               kheap_free(KHEAP_TEMP, pad_buf, pad_size);

                if (ret) {
                        goto write_error;
                }
                if (ret) {
                        goto write_error;
                }


@@ -3114,7 +3212,7 @@ kdbg_clear_thread_map(void)
 
        if (kd_ctrl_page.kdebug_flags & KDBG_MAPINIT) {
                assert(kd_mapptr != NULL);
 
        if (kd_ctrl_page.kdebug_flags & KDBG_MAPINIT) {
                assert(kd_mapptr != NULL);

-               kmem_free(kernel_map, (vm_offset_t)kd_mapptr, kd_mapsize);
+               kfree(kd_mapptr, kd_mapsize);

                kd_mapptr = NULL;
                kd_mapsize = 0;
                kd_mapcount = 0;
                kd_mapptr = NULL;
                kd_mapsize = 0;
                kd_mapcount = 0;


@@ -3134,7 +3232,7 @@ static int
 kdbg_write_thread_map(vnode_t vp, vfs_context_t ctx)
 {
        int ret = 0;
 kdbg_write_thread_map(vnode_t vp, vfs_context_t ctx)
 {
        int ret = 0;

-       boolean_t map_initialized;
+       bool map_initialized;

 
        ktrace_assert_lock_held();
        assert(ctx != NULL);
 
        ktrace_assert_lock_held();
        assert(ctx != NULL);


@@ -3163,7 +3261,7 @@ kdbg_write_thread_map(vnode_t vp, vfs_context_t ctx)
 static int
 kdbg_copyout_thread_map(user_addr_t buffer, size_t *buffer_size)
 {
 static int
 kdbg_copyout_thread_map(user_addr_t buffer, size_t *buffer_size)
 {

-       boolean_t map_initialized;
+       bool map_initialized;

        size_t map_size;
        int ret = 0;
 
        size_t map_size;
        int ret = 0;
 


@@ -3192,7 +3290,7 @@ int
 kdbg_readthrmap_v3(user_addr_t buffer, size_t buffer_size, int fd)
 {
        int ret = 0;
 kdbg_readthrmap_v3(user_addr_t buffer, size_t buffer_size, int fd)
 {
        int ret = 0;

-       boolean_t map_initialized;
+       bool map_initialized;

        size_t map_size;
 
        ktrace_assert_lock_held();
        size_t map_size;
 
        ktrace_assert_lock_held();


@@ -3204,8 +3302,7 @@ kdbg_readthrmap_v3(user_addr_t buffer, size_t buffer_size, int fd)
        map_initialized = (kd_ctrl_page.kdebug_flags & KDBG_MAPINIT);
        map_size = kd_mapcount * sizeof(kd_threadmap);
 
        map_initialized = (kd_ctrl_page.kdebug_flags & KDBG_MAPINIT);
        map_size = kd_mapcount * sizeof(kd_threadmap);
 

-       if (map_initialized && (buffer_size >= map_size))
-       {
+       if (map_initialized && (buffer_size >= map_size)) {

                ret = kdbg_write_v3_header(buffer, &buffer_size, fd);
 
                if (ret == 0) {
                ret = kdbg_write_v3_header(buffer, &buffer_size, fd);
 
                if (ret == 0) {


@@ -3215,24 +3312,18 @@ kdbg_readthrmap_v3(user_addr_t buffer, size_t buffer_size, int fd)
                ret = EINVAL;
        }
 
                ret = EINVAL;
        }
 

-       return  ret;
+       return ret;

 }
 
 static void
 }
 
 static void

-kdbg_set_nkdbufs(unsigned int value)
+kdbg_set_nkdbufs(unsigned int req_nkdbufs)

 {
        /*
 {
        /*

-        * We allow a maximum buffer size of 50% of either ram or max mapped
-        * address, whichever is smaller 'value' is the desired number of trace
-        * entries
+        * Only allow allocation up to half the available memory (sane_size).

         */
         */

-       unsigned int max_entries = (sane_size / 2) / sizeof(kd_buf);
-
-       if (value <= max_entries) {
-               nkdbufs = value;
-       } else {
-               nkdbufs = max_entries;
-       }
+       uint64_t max_nkdbufs = (sane_size / 2) / sizeof(kd_buf);
+       nkdbufs = (req_nkdbufs > max_nkdbufs) ? (unsigned int)max_nkdbufs :
+           req_nkdbufs;

 }
 
 /*
 }
 
 /*


@@ -3245,8 +3336,8 @@ kdbg_set_nkdbufs(unsigned int value)
  *
  * Called with `ktrace_lock` locked and interrupts enabled.
  */
  *
  * Called with `ktrace_lock` locked and interrupts enabled.
  */

-static boolean_t
-kdbg_wait(uint64_t timeout_ms, boolean_t locked_wait)
+static bool
+kdbg_wait(uint64_t timeout_ms, bool locked_wait)

 {
        int wait_result = THREAD_AWAKENED;
        uint64_t abstime = 0;
 {
        int wait_result = THREAD_AWAKENED;
        uint64_t abstime = 0;


@@ -3255,15 +3346,15 @@ kdbg_wait(uint64_t timeout_ms, boolean_t locked_wait)
 
        if (timeout_ms != 0) {
                uint64_t ns = timeout_ms * NSEC_PER_MSEC;
 
        if (timeout_ms != 0) {
                uint64_t ns = timeout_ms * NSEC_PER_MSEC;

-               nanoseconds_to_absolutetime(ns,  &abstime);
+               nanoseconds_to_absolutetime(ns, &abstime);

                clock_absolutetime_interval_to_deadline(abstime, &abstime);
        }
 
                clock_absolutetime_interval_to_deadline(abstime, &abstime);
        }
 

-       boolean_t s = ml_set_interrupts_enabled(FALSE);
+       bool s = ml_set_interrupts_enabled(false);

        if (!s) {
                panic("kdbg_wait() called with interrupts disabled");
        }
        if (!s) {
                panic("kdbg_wait() called with interrupts disabled");
        }

-       lck_spin_lock(kdw_spin_lock);
+       lck_spin_lock_grp(kdw_spin_lock, kdebug_lck_grp);

 
        if (!locked_wait) {
                /* drop the mutex to allow others to access trace */
 
        if (!locked_wait) {
                /* drop the mutex to allow others to access trace */


@@ -3271,8 +3362,7 @@ kdbg_wait(uint64_t timeout_ms, boolean_t locked_wait)
        }
 
        while (wait_result == THREAD_AWAKENED &&
        }
 
        while (wait_result == THREAD_AWAKENED &&

-              kd_ctrl_page.kds_inuse_count < n_storage_threshold)
-       {
+           kd_ctrl_page.kds_inuse_count < n_storage_threshold) {

                kds_waiter = 1;
 
                if (abstime) {
                kds_waiter = 1;
 
                if (abstime) {


@@ -3285,7 +3375,7 @@ kdbg_wait(uint64_t timeout_ms, boolean_t locked_wait)
        }
 
        /* check the count under the spinlock */
        }
 
        /* check the count under the spinlock */

-       boolean_t threshold_exceeded = (kd_ctrl_page.kds_inuse_count >= n_storage_threshold);
+       bool threshold_exceeded = (kd_ctrl_page.kds_inuse_count >= n_storage_threshold);

 
        lck_spin_unlock(kdw_spin_lock);
        ml_set_interrupts_enabled(s);
 
        lck_spin_unlock(kdw_spin_lock);
        ml_set_interrupts_enabled(s);


@@ -3306,7 +3396,7 @@ kdbg_wait(uint64_t timeout_ms, boolean_t locked_wait)
 static void
 kdbg_wakeup(void)
 {
 static void
 kdbg_wakeup(void)
 {

-       boolean_t need_kds_wakeup = FALSE;
+       bool need_kds_wakeup = false;

 
        /*
         * Try to take the lock here to synchronize with the waiter entering
 
        /*
         * Try to take the lock here to synchronize with the waiter entering


@@ -3316,21 +3406,20 @@ kdbg_wakeup(void)
         * conditions.  No problem if we fail, there will be lots of additional
         * events coming in that will eventually succeed in grabbing this lock.
         */
         * conditions.  No problem if we fail, there will be lots of additional
         * events coming in that will eventually succeed in grabbing this lock.
         */

-       boolean_t s = ml_set_interrupts_enabled(FALSE);
+       bool s = ml_set_interrupts_enabled(false);

 
        if (lck_spin_try_lock(kdw_spin_lock)) {
                if (kds_waiter &&
 
        if (lck_spin_try_lock(kdw_spin_lock)) {
                if (kds_waiter &&

-                   (kd_ctrl_page.kds_inuse_count >= n_storage_threshold))
-               {
+                   (kd_ctrl_page.kds_inuse_count >= n_storage_threshold)) {

                        kds_waiter = 0;
                        kds_waiter = 0;

-                       need_kds_wakeup = TRUE;
+                       need_kds_wakeup = true;

                }
                lck_spin_unlock(kdw_spin_lock);
        }
 
        ml_set_interrupts_enabled(s);
 
                }
                lck_spin_unlock(kdw_spin_lock);
        }
 
        ml_set_interrupts_enabled(s);
 

-       if (need_kds_wakeup == TRUE) {
+       if (need_kds_wakeup == true) {

                wakeup(&kds_waiter);
        }
 }
                wakeup(&kds_waiter);
        }
 }


@@ -3346,14 +3435,13 @@ kdbg_control(int *name, u_int namelen, user_addr_t where, size_t *sizep)
        proc_t p;
 
        if (name[0] == KERN_KDWRITETR ||
        proc_t p;
 
        if (name[0] == KERN_KDWRITETR ||

-               name[0] == KERN_KDWRITETR_V3 ||
-               name[0] == KERN_KDWRITEMAP ||
-               name[0] == KERN_KDWRITEMAP_V3 ||
-               name[0] == KERN_KDEFLAGS ||
-               name[0] == KERN_KDDFLAGS ||
-               name[0] == KERN_KDENABLE ||
-               name[0] == KERN_KDSETBUF)
-       {
+           name[0] == KERN_KDWRITETR_V3 ||
+           name[0] == KERN_KDWRITEMAP ||
+           name[0] == KERN_KDWRITEMAP_V3 ||
+           name[0] == KERN_KDEFLAGS ||
+           name[0] == KERN_KDDFLAGS ||
+           name[0] == KERN_KDENABLE ||
+           name[0] == KERN_KDSETBUF) {

                if (namelen < 2) {
                        return EINVAL;
                }
                if (namelen < 2) {
                        return EINVAL;
                }


@@ -3372,8 +3460,7 @@ kdbg_control(int *name, u_int namelen, user_addr_t where, size_t *sizep)
         */
        if (name[0] != KERN_KDGETBUF &&
            name[0] != KERN_KDGETREG &&
         */
        if (name[0] != KERN_KDGETBUF &&
            name[0] != KERN_KDGETREG &&

-           name[0] != KERN_KDREADCURTHRMAP)
-       {
+           name[0] != KERN_KDREADCURTHRMAP) {

                if ((ret = ktrace_configure(KTRACE_KDEBUG))) {
                        goto out;
                }
                if ((ret = ktrace_configure(KTRACE_KDEBUG))) {
                        goto out;
                }


@@ -3383,242 +3470,236 @@ kdbg_control(int *name, u_int namelen, user_addr_t where, size_t *sizep)
                }
        }
 
                }
        }
 

-       switch(name[0]) {
-               case KERN_KDGETBUF:
-                       if (size < sizeof(kd_bufinfo.nkdbufs)) {
-                               /*
-                                * There is not enough room to return even
-                                * the first element of the info structure.
-                                */
-                               ret = EINVAL;
-                               break;
-                       }
-
-                       memset(&kd_bufinfo, 0, sizeof(kd_bufinfo));
+       switch (name[0]) {
+       case KERN_KDGETBUF:
+               if (size < sizeof(kd_bufinfo.nkdbufs)) {
+                       /*
+                        * There is not enough room to return even
+                        * the first element of the info structure.
+                        */
+                       ret = EINVAL;
+                       break;
+               }

 
 

-                       kd_bufinfo.nkdbufs = nkdbufs;
-                       kd_bufinfo.nkdthreads = kd_mapcount;
+               memset(&kd_bufinfo, 0, sizeof(kd_bufinfo));

 
 

-                       if ( (kd_ctrl_page.kdebug_slowcheck & SLOW_NOLOG) )
-                               kd_bufinfo.nolog = 1;
-                       else
-                               kd_bufinfo.nolog = 0;
+               kd_bufinfo.nkdbufs = nkdbufs;
+               kd_bufinfo.nkdthreads = kd_mapcount < INT_MAX ? (int)kd_mapcount :
+                   INT_MAX;
+               if ((kd_ctrl_page.kdebug_slowcheck & SLOW_NOLOG)) {
+                       kd_bufinfo.nolog = 1;
+               } else {
+                       kd_bufinfo.nolog = 0;
+               }

 
 

-                       kd_bufinfo.flags = kd_ctrl_page.kdebug_flags;
+               kd_bufinfo.flags = kd_ctrl_page.kdebug_flags;

 #if defined(__LP64__)
 #if defined(__LP64__)

-                       kd_bufinfo.flags |= KDBG_LP64;
+               kd_bufinfo.flags |= KDBG_LP64;

 #endif
 #endif

-                       {
-                               int pid = ktrace_get_owning_pid();
-                               kd_bufinfo.bufid = (pid == 0 ? -1 : pid);
-                       }
+               {
+                       int pid = ktrace_get_owning_pid();
+                       kd_bufinfo.bufid = (pid == 0 ? -1 : pid);
+               }

 
 

-                       if (size >= sizeof(kd_bufinfo)) {
-                               /*
-                                * Provide all the info we have
-                                */
-                               if (copyout(&kd_bufinfo, where, sizeof(kd_bufinfo)))
-                                       ret = EINVAL;
-                       } else {
-                               /*
-                                * For backwards compatibility, only provide
-                                * as much info as there is room for.
-                                */
-                               if (copyout(&kd_bufinfo, where, size))
-                                       ret = EINVAL;
+               if (size >= sizeof(kd_bufinfo)) {
+                       /*
+                        * Provide all the info we have
+                        */
+                       if (copyout(&kd_bufinfo, where, sizeof(kd_bufinfo))) {
+                               ret = EINVAL;

                        }
                        }

-                       break;
+               } else {
+                       /*
+                        * For backwards compatibility, only provide
+                        * as much info as there is room for.
+                        */
+                       if (copyout(&kd_bufinfo, where, size)) {
+                               ret = EINVAL;
+                       }
+               }
+               break;

 
 

-               case KERN_KDREADCURTHRMAP:
-                       ret = kdbg_readcurthrmap(where, sizep);
-                       break;
+       case KERN_KDREADCURTHRMAP:
+               ret = kdbg_readcurthrmap(where, sizep);
+               break;

 
 

-               case KERN_KDEFLAGS:
-                       value &= KDBG_USERFLAGS;
-                       kd_ctrl_page.kdebug_flags |= value;
-                       break;
+       case KERN_KDEFLAGS:
+               value &= KDBG_USERFLAGS;
+               kd_ctrl_page.kdebug_flags |= value;
+               break;

 
 

-               case KERN_KDDFLAGS:
-                       value &= KDBG_USERFLAGS;
-                       kd_ctrl_page.kdebug_flags &= ~value;
-                       break;
+       case KERN_KDDFLAGS:
+               value &= KDBG_USERFLAGS;
+               kd_ctrl_page.kdebug_flags &= ~value;
+               break;

 
 

-               case KERN_KDENABLE:
+       case KERN_KDENABLE:
+               /*
+                * Enable tracing mechanism.  Two types:
+                * KDEBUG_TRACE is the standard one,
+                * and KDEBUG_PPT which is a carefully
+                * chosen subset to avoid performance impact.
+                */
+               if (value) {

                        /*
                        /*

-                        * Enable tracing mechanism.  Two types:
-                        * KDEBUG_TRACE is the standard one,
-                        * and KDEBUG_PPT which is a carefully
-                        * chosen subset to avoid performance impact.
+                        * enable only if buffer is initialized

                         */
                         */

-                       if (value) {
-                               /*
-                                * enable only if buffer is initialized
-                                */
-                               if (!(kd_ctrl_page.kdebug_flags & KDBG_BUFINIT) || 
-                                   !(value == KDEBUG_ENABLE_TRACE || value == KDEBUG_ENABLE_PPT)) {
-                                       ret = EINVAL;
-                                       break;
-                               }
-                               kdbg_thrmap_init();
-
-                               kdbg_set_tracing_enabled(TRUE, value);
+                       if (!(kd_ctrl_page.kdebug_flags & KDBG_BUFINIT) ||
+                           !(value == KDEBUG_ENABLE_TRACE || value == KDEBUG_ENABLE_PPT)) {
+                               ret = EINVAL;
+                               break;

                        }
                        }

-                       else
-                       {
-                               if (!kdebug_enable) {
-                                       break;
-                               }
+                       kdbg_thrmap_init();

 
 

-                               kernel_debug_disable();
+                       kdbg_set_tracing_enabled(true, value);
+               } else {
+                       if (!kdebug_enable) {
+                               break;

                        }
                        }

-                       break;

 
 

-               case KERN_KDSETBUF:
-                       kdbg_set_nkdbufs(value);
-                       break;
+                       kernel_debug_disable();
+               }
+               break;

 
 

-               case KERN_KDSETUP:
-                       ret = kdbg_reinit(FALSE);
-                       break;
+       case KERN_KDSETBUF:
+               kdbg_set_nkdbufs(value);
+               break;

 
 

-               case KERN_KDREMOVE:
-                       ktrace_reset(KTRACE_KDEBUG);
-                       break;
+       case KERN_KDSETUP:
+               ret = kdbg_reinit(false);
+               break;

 
 

-               case KERN_KDSETREG:
-                       if(size < sizeof(kd_regtype)) {
-                               ret = EINVAL;
-                               break;
-                       }
-                       if (copyin(where, &kd_Reg, sizeof(kd_regtype))) {
-                               ret = EINVAL;
-                               break;
-                       }
+       case KERN_KDREMOVE:
+               ktrace_reset(KTRACE_KDEBUG);
+               break;

 
 

-                       ret = kdbg_setreg(&kd_Reg);
+       case KERN_KDSETREG:
+               if (size < sizeof(kd_regtype)) {
+                       ret = EINVAL;

                        break;
                        break;

-
-               case KERN_KDGETREG:
+               }
+               if (copyin(where, &kd_Reg, sizeof(kd_regtype))) {

                        ret = EINVAL;
                        break;
                        ret = EINVAL;
                        break;

+               }
+
+               ret = kdbg_setreg(&kd_Reg);
+               break;

 
 

-               case KERN_KDREADTR:
-                       ret = kdbg_read(where, sizep, NULL, NULL, RAW_VERSION1);
+       case KERN_KDGETREG:
+               ret = EINVAL;
+               break;
+
+       case KERN_KDREADTR:
+               ret = kdbg_read(where, sizep, NULL, NULL, RAW_VERSION1);
+               break;
+
+       case KERN_KDWRITETR:
+       case KERN_KDWRITETR_V3:
+       case KERN_KDWRITEMAP:
+       case KERN_KDWRITEMAP_V3:
+       {
+               struct  vfs_context context;
+               struct  fileproc *fp;
+               size_t  number;
+               vnode_t vp;
+               int     fd;
+
+               if (name[0] == KERN_KDWRITETR || name[0] == KERN_KDWRITETR_V3) {
+                       (void)kdbg_wait(size, true);
+               }
+               p = current_proc();
+               fd = value;
+
+
+               if (fp_get_ftype(p, fd, DTYPE_VNODE, EBADF, &fp)) {
+                       ret = EBADF;

                        break;
                        break;

+               }

 
 

-               case KERN_KDWRITETR:
-               case KERN_KDWRITETR_V3:
-               case KERN_KDWRITEMAP:
-               case KERN_KDWRITEMAP_V3:
-               {
-                       struct  vfs_context context;
-                       struct  fileproc *fp;
-                       size_t  number;
-                       vnode_t vp;
-                       int     fd;
+               vp = fp->fp_glob->fg_data;
+               context.vc_thread = current_thread();
+               context.vc_ucred = fp->fp_glob->fg_cred;

 
 

+               if ((ret = vnode_getwithref(vp)) == 0) {
+                       RAW_file_offset = fp->fp_glob->fg_offset;

                        if (name[0] == KERN_KDWRITETR || name[0] == KERN_KDWRITETR_V3) {
                        if (name[0] == KERN_KDWRITETR || name[0] == KERN_KDWRITETR_V3) {

-                               (void)kdbg_wait(size, TRUE);
-                       }
-                       p = current_proc();
-                       fd = value;
+                               number = nkdbufs * sizeof(kd_buf);

 
 

-                       proc_fdlock(p);
-                       if ( (ret = fp_lookup(p, fd, &fp, 1)) ) {
-                               proc_fdunlock(p);
-                               break;
-                       }
-                       context.vc_thread = current_thread();
-                       context.vc_ucred = fp->f_fglob->fg_cred;
-
-                       if (FILEGLOB_DTYPE(fp->f_fglob) != DTYPE_VNODE) {
-                               fp_drop(p, fd, fp, 1);
-                               proc_fdunlock(p);
+                               KDBG_RELEASE(TRACE_WRITING_EVENTS | DBG_FUNC_START);
+                               if (name[0] == KERN_KDWRITETR_V3) {
+                                       ret = kdbg_read(0, &number, vp, &context, RAW_VERSION3);
+                               } else {
+                                       ret = kdbg_read(0, &number, vp, &context, RAW_VERSION1);
+                               }
+                               KDBG_RELEASE(TRACE_WRITING_EVENTS | DBG_FUNC_END, number);

 
 

-                               ret = EBADF;
-                               break;
-                       }
-                       vp = (struct vnode *)fp->f_fglob->fg_data;
-                       proc_fdunlock(p);
-
-                       if ((ret = vnode_getwithref(vp)) == 0) {
-                               RAW_file_offset = fp->f_fglob->fg_offset;
-                               if (name[0] == KERN_KDWRITETR || name[0] == KERN_KDWRITETR_V3) {
-                                       number = nkdbufs * sizeof(kd_buf);
-
-                                       KDBG_RELEASE(TRACE_WRITING_EVENTS | DBG_FUNC_START);
-                                       if (name[0] == KERN_KDWRITETR_V3)
-                                               ret = kdbg_read(0, &number, vp, &context, RAW_VERSION3);
-                                       else
-                                               ret = kdbg_read(0, &number, vp, &context, RAW_VERSION1);
-                                       KDBG_RELEASE(TRACE_WRITING_EVENTS | DBG_FUNC_END, number);
-
-                                       *sizep = number;
+                               *sizep = number;
+                       } else {
+                               number = kd_mapcount * sizeof(kd_threadmap);
+                               if (name[0] == KERN_KDWRITEMAP_V3) {
+                                       ret = kdbg_readthrmap_v3(0, number, fd);

                                } else {
                                } else {

-                                       number = kd_mapcount * sizeof(kd_threadmap);
-                                       if (name[0] == KERN_KDWRITEMAP_V3) {
-                                               ret = kdbg_readthrmap_v3(0, number, fd);
-                                       } else {
-                                               ret = kdbg_write_thread_map(vp, &context);
-                                       }
+                                       ret = kdbg_write_thread_map(vp, &context);

                                }
                                }

-                               fp->f_fglob->fg_offset = RAW_file_offset;
-                               vnode_put(vp);

                        }
                        }

-                       fp_drop(p, fd, fp, 0);
+                       fp->fp_glob->fg_offset = RAW_file_offset;
+                       vnode_put(vp);
+               }
+               fp_drop(p, fd, fp, 0);
+
+               break;
+       }
+       case KERN_KDBUFWAIT:
+               *sizep = kdbg_wait(size, false);
+               break;

 
 

+       case KERN_KDPIDTR:
+               if (size < sizeof(kd_regtype)) {
+                       ret = EINVAL;

                        break;
                }
                        break;
                }

-               case KERN_KDBUFWAIT:
-                       *sizep = kdbg_wait(size, FALSE);
+               if (copyin(where, &kd_Reg, sizeof(kd_regtype))) {
+                       ret = EINVAL;

                        break;
                        break;

+               }

 
 

-               case KERN_KDPIDTR:
-                       if (size < sizeof(kd_regtype)) {
-                               ret = EINVAL;
-                               break;
-                       }
-                       if (copyin(where, &kd_Reg, sizeof(kd_regtype))) {
-                               ret = EINVAL;
-                               break;
-                       }
+               ret = kdbg_setpid(&kd_Reg);
+               break;

 
 

-                       ret = kdbg_setpid(&kd_Reg);
+       case KERN_KDPIDEX:
+               if (size < sizeof(kd_regtype)) {
+                       ret = EINVAL;

                        break;
                        break;

-
-               case KERN_KDPIDEX:
-                       if (size < sizeof(kd_regtype)) {
-                               ret = EINVAL;
-                               break;
-                       }
-                       if (copyin(where, &kd_Reg, sizeof(kd_regtype))) {
-                               ret = EINVAL;
-                               break;
-                       }
-
-                       ret = kdbg_setpidex(&kd_Reg);
+               }
+               if (copyin(where, &kd_Reg, sizeof(kd_regtype))) {
+                       ret = EINVAL;

                        break;
                        break;

+               }

 
 

-               case KERN_KDCPUMAP:
-                       ret = kdbg_readcpumap(where, sizep);
-                       break;
+               ret = kdbg_setpidex(&kd_Reg);
+               break;

 
 

-               case KERN_KDTHRMAP:
-                       ret = kdbg_copyout_thread_map(where, sizep);
-                       break;
+       case KERN_KDCPUMAP:
+               ret = kdbg_readcpumap(where, sizep);
+               break;

 
 

-               case KERN_KDSET_TYPEFILTER: {
-                       ret = kdbg_copyin_typefilter(where, size);
-                       break;
-               }
+       case KERN_KDTHRMAP:
+               ret = kdbg_copyout_thread_map(where, sizep);
+               break;

 
 

-               case KERN_KDTEST:
-                       ret = kdbg_test(size);
-                       break;
+       case KERN_KDSET_TYPEFILTER: {
+               ret = kdbg_copyin_typefilter(where, size);
+               break;
+       }

 
 

-               default:
-                       ret = EINVAL;
-                       break;
+       case KERN_KDTEST:
+               ret = kdbg_test(size);
+               break;
+
+       default:
+               ret = EINVAL;
+               break;

        }
 out:
        ktrace_unlock();
        }
 out:
        ktrace_unlock();


@@ -3636,7 +3717,7 @@ out:
 int
 kdbg_read(user_addr_t buffer, size_t *number, vnode_t vp, vfs_context_t ctx, uint32_t file_version)
 {
 int
 kdbg_read(user_addr_t buffer, size_t *number, vnode_t vp, vfs_context_t ctx, uint32_t file_version)
 {

-       unsigned int count;
+       size_t count;

        unsigned int cpu, min_cpu;
        uint64_t barrier_min = 0, barrier_max = 0, t, earliest_time;
        int error = 0;
        unsigned int cpu, min_cpu;
        uint64_t barrier_min = 0, barrier_max = 0, t, earliest_time;
        int error = 0;


@@ -3648,43 +3729,41 @@ kdbg_read(user_addr_t buffer, size_t *number, vnode_t vp, vfs_context_t ctx, uin
        struct kd_storage *kdsp_actual;
        struct kd_bufinfo *kdbp;
        struct kd_bufinfo *min_kdbp;
        struct kd_storage *kdsp_actual;
        struct kd_bufinfo *kdbp;
        struct kd_bufinfo *min_kdbp;

-       uint32_t tempbuf_count;
+       size_t tempbuf_count;

        uint32_t tempbuf_number;
        uint32_t old_kdebug_flags;
        uint32_t old_kdebug_slowcheck;
        uint32_t tempbuf_number;
        uint32_t old_kdebug_flags;
        uint32_t old_kdebug_slowcheck;

-       boolean_t out_of_events = FALSE;
-       boolean_t wrapped = FALSE;
+       bool out_of_events = false;
+       bool wrapped = false;

 
 

-       assert(number);
-       count = *number/sizeof(kd_buf);
+       assert(number != NULL);
+       count = *number / sizeof(kd_buf);

        *number = 0;
 
        ktrace_assert_lock_held();
 
        *number = 0;
 
        ktrace_assert_lock_held();
 

-       if (count == 0 || !(kd_ctrl_page.kdebug_flags & KDBG_BUFINIT) || kdcopybuf == 0)
+       if (count == 0 || !(kd_ctrl_page.kdebug_flags & KDBG_BUFINIT) || kdcopybuf == 0) {

                return EINVAL;
                return EINVAL;

+       }

 
        thread_set_eager_preempt(current_thread());
 
        memset(&lostevent, 0, sizeof(lostevent));
        lostevent.debugid = TRACE_LOST_EVENTS;
 
 
        thread_set_eager_preempt(current_thread());
 
        memset(&lostevent, 0, sizeof(lostevent));
        lostevent.debugid = TRACE_LOST_EVENTS;
 

-       /*
-        * Capture the current time. Only sort events that have occured
-        * before now.  Since the IOPs are being flushed here, it is possible
-        * that events occur on the AP while running live tracing. If we are
-        * disabled, no new events should occur on the AP.
-        */
-       if (kd_ctrl_page.enabled) {
-               barrier_max = kdbg_timestamp() & KDBG_TIMESTAMP_MASK;
-       }
-

        /*
         * Request each IOP to provide us with up to date entries before merging
         * buffers together.
         */
        kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops, KD_CALLBACK_SYNC_FLUSH, NULL);
 
        /*
         * Request each IOP to provide us with up to date entries before merging
         * buffers together.
         */
        kdbg_iop_list_callback(kd_ctrl_page.kdebug_iops, KD_CALLBACK_SYNC_FLUSH, NULL);
 

+       /*
+        * Capture the current time.  Only sort events that have occured
+        * before now.  Since the IOPs are being flushed here, it is possible
+        * that events occur on the AP while running live tracing.
+        */
+       barrier_max = kdbg_timestamp() & KDBG_TIMESTAMP_MASK;
+

        /*
         * Disable wrap so storage units cannot be stolen out from underneath us
         * while merging events.
        /*
         * Disable wrap so storage units cannot be stolen out from underneath us
         * while merging events.


@@ -3697,8 +3776,9 @@ kdbg_read(user_addr_t buffer, size_t *number, vnode_t vp, vfs_context_t ctx, uin
         */
        wrapped = disable_wrap(&old_kdebug_slowcheck, &old_kdebug_flags);
 
         */
        wrapped = disable_wrap(&old_kdebug_slowcheck, &old_kdebug_flags);
 

-       if (count > nkdbufs)
+       if (count > nkdbufs) {

                count = nkdbufs;
                count = nkdbufs;

+       }

 
        if ((tempbuf_count = count) > KDCOPYBUF_COUNT) {
                tempbuf_count = KDCOPYBUF_COUNT;
 
        if ((tempbuf_count = count) > KDCOPYBUF_COUNT) {
                tempbuf_count = KDCOPYBUF_COUNT;


@@ -3716,7 +3796,7 @@ kdbg_read(user_addr_t buffer, size_t *number, vnode_t vp, vfs_context_t ctx, uin
                                continue;
                        }
                        kdsp_actual = POINTER_FROM_KDS_PTR(kdsp);
                                continue;
                        }
                        kdsp_actual = POINTER_FROM_KDS_PTR(kdsp);

-                       kdsp_actual->kds_lostevents = FALSE;
+                       kdsp_actual->kds_lostevents = false;

                }
        }
        /*
                }
        }
        /*


@@ -3738,7 +3818,7 @@ kdbg_read(user_addr_t buffer, size_t *number, vnode_t vp, vfs_context_t ctx, uin
                         */
                        kdbg_set_timestamp_and_cpu(&lostevent, barrier_min, 0);
                        *tempbuf = lostevent;
                         */
                        kdbg_set_timestamp_and_cpu(&lostevent, barrier_min, 0);
                        *tempbuf = lostevent;

-                       wrapped = FALSE;
+                       wrapped = false;

                        goto nextevent;
                }
 
                        goto nextevent;
                }
 


@@ -3776,14 +3856,14 @@ next_event:
                                 */
                                if (kdsp_actual->kds_lostevents) {
                                        lostevents = true;
                                 */
                                if (kdsp_actual->kds_lostevents) {
                                        lostevents = true;

-                                       kdsp_actual->kds_lostevents = FALSE;
+                                       kdsp_actual->kds_lostevents = false;

 
                                        /*
                                         * The earliest event we can trust is the first one in this
                                         * stolen storage unit.
                                         */
                                        uint64_t lost_time =
 
                                        /*
                                         * The earliest event we can trust is the first one in this
                                         * stolen storage unit.
                                         */
                                        uint64_t lost_time =

-                                                       kdbg_get_timestamp(&kdsp_actual->kds_records[0]);
+                                           kdbg_get_timestamp(&kdsp_actual->kds_records[0]);

                                        if (kd_ctrl_page.oldest_time < lost_time) {
                                                /*
                                                 * If this is the first time we've seen lost events for
                                        if (kd_ctrl_page.oldest_time < lost_time) {
                                                /*
                                                 * If this is the first time we've seen lost events for


@@ -3798,20 +3878,15 @@ next_event:
 
                                t = kdbg_get_timestamp(&kdsp_actual->kds_records[rcursor]);
 
 
                                t = kdbg_get_timestamp(&kdsp_actual->kds_records[rcursor]);
 

-                               if ((t > barrier_max) && (barrier_max > 0)) {
+                               if (t > barrier_max) {

                                        if (kdbg_debug) {
                                                printf("kdebug: FUTURE EVENT: debugid %#8x: "
                                        if (kdbg_debug) {
                                                printf("kdebug: FUTURE EVENT: debugid %#8x: "

-                                                               "time %lld from CPU %u "
-                                                               "(barrier at time %lld, read %lu events)\n",
-                                                               kdsp_actual->kds_records[rcursor].debugid,
-                                                               t, cpu, barrier_max, *number + tempbuf_number);
+                                                   "time %lld from CPU %u "
+                                                   "(barrier at time %lld, read %lu events)\n",
+                                                   kdsp_actual->kds_records[rcursor].debugid,
+                                                   t, cpu, barrier_max, *number + tempbuf_number);

                                        }
                                        }

-                                       /*
-                                        * Need to flush IOPs again before we can sort any more
-                                        * data from the buffers.
-                                        */
-                                       out_of_events = TRUE;
-                                       break;
+                                       goto next_cpu;

                                }
                                if (t < kdsp_actual->kds_timestamp) {
                                        /*
                                }
                                if (t < kdsp_actual->kds_timestamp) {
                                        /*


@@ -3824,7 +3899,7 @@ next_event:
                                         * Bail out so we don't get out-of-order events by
                                         * continuing to read events from other CPUs' events.
                                         */
                                         * Bail out so we don't get out-of-order events by
                                         * continuing to read events from other CPUs' events.
                                         */

-                                       out_of_events = TRUE;
+                                       out_of_events = true;

                                        break;
                                }
 
                                        break;
                                }
 


@@ -3834,6 +3909,13 @@ next_event:
                                 */
                                if (t < barrier_min) {
                                        kdsp_actual->kds_readlast++;
                                 */
                                if (t < barrier_min) {
                                        kdsp_actual->kds_readlast++;

+                                       if (kdbg_debug) {
+                                               printf("kdebug: PAST EVENT: debugid %#8x: "
+                                                   "time %lld from CPU %u "
+                                                   "(barrier at time %lld)\n",
+                                                   kdsp_actual->kds_records[rcursor].debugid,
+                                                   t, cpu, barrier_min);
+                                       }

 
                                        if (kdsp_actual->kds_readlast >= EVENTS_PER_STORAGE_UNIT) {
                                                release_storage_unit(cpu, kdsp.raw);
 
                                        if (kdsp_actual->kds_readlast >= EVENTS_PER_STORAGE_UNIT) {
                                                release_storage_unit(cpu, kdsp.raw);


@@ -3873,7 +3955,7 @@ next_event:
                        }
                        if (min_kdbp == NULL) {
                                /* All buffers ran empty. */
                        }
                        if (min_kdbp == NULL) {
                                /* All buffers ran empty. */

-                               out_of_events = TRUE;
+                               out_of_events = true;

                        }
                        if (out_of_events) {
                                break;
                        }
                        if (out_of_events) {
                                break;


@@ -3885,8 +3967,9 @@ next_event:
                        /* Copy earliest event into merged events scratch buffer. */
                        *tempbuf = kdsp_actual->kds_records[kdsp_actual->kds_readlast++];
 
                        /* Copy earliest event into merged events scratch buffer. */
                        *tempbuf = kdsp_actual->kds_records[kdsp_actual->kds_readlast++];
 

-                       if (kdsp_actual->kds_readlast == EVENTS_PER_STORAGE_UNIT)
+                       if (kdsp_actual->kds_readlast == EVENTS_PER_STORAGE_UNIT) {

                                release_storage_unit(min_cpu, kdsp.raw);
                                release_storage_unit(min_cpu, kdsp.raw);

+                       }

 
                        /*
                         * Watch for out of order timestamps (from IOPs).
 
                        /*
                         * Watch for out of order timestamps (from IOPs).


@@ -3899,10 +3982,17 @@ next_event:
                                if (traced_retrograde) {
                                        continue;
                                }
                                if (traced_retrograde) {
                                        continue;
                                }

+                               if (kdbg_debug) {
+                                       printf("kdebug: RETRO EVENT: debugid %#8x: "
+                                           "time %lld from CPU %u "
+                                           "(barrier at time %lld)\n",
+                                           kdsp_actual->kds_records[rcursor].debugid,
+                                           t, cpu, barrier_min);
+                               }

 
                                kdbg_set_timestamp_and_cpu(tempbuf, min_kdbp->kd_prev_timebase, kdbg_get_cpu(tempbuf));
                                tempbuf->arg1 = tempbuf->debugid;
 
                                kdbg_set_timestamp_and_cpu(tempbuf, min_kdbp->kd_prev_timebase, kdbg_get_cpu(tempbuf));
                                tempbuf->arg1 = tempbuf->debugid;

-                               tempbuf->arg2 = earliest_time;
+                               tempbuf->arg2 = (kd_buf_argtype)earliest_time;

                                tempbuf->arg3 = 0;
                                tempbuf->arg4 = 0;
                                tempbuf->debugid = TRACE_RETROGRADE_EVENTS;
                                tempbuf->arg3 = 0;
                                tempbuf->arg4 = 0;
                                tempbuf->debugid = TRACE_RETROGRADE_EVENTS;


@@ -3915,8 +4005,9 @@ nextevent:
                        tempbuf_number++;
                        tempbuf++;
 
                        tempbuf_number++;
                        tempbuf++;
 

-                       if ((RAW_file_written += sizeof(kd_buf)) >= RAW_FLUSH_SIZE)
+                       if ((RAW_file_written += sizeof(kd_buf)) >= RAW_FLUSH_SIZE) {

                                break;
                                break;

+                       }

                }
                if (tempbuf_number) {
                        /*
                }
                if (tempbuf_number) {
                        /*


@@ -3928,12 +4019,13 @@ nextevent:
                                kd_ctrl_page.oldest_time = latest_time;
                        }
                        if (file_version == RAW_VERSION3) {
                                kd_ctrl_page.oldest_time = latest_time;
                        }
                        if (file_version == RAW_VERSION3) {

-                               if ( !(kdbg_write_v3_event_chunk_header(buffer, V3_RAW_EVENTS, (tempbuf_number * sizeof(kd_buf)), vp, ctx))) {
+                               if (!(kdbg_write_v3_event_chunk_header(buffer, V3_RAW_EVENTS, (tempbuf_number * sizeof(kd_buf)), vp, ctx))) {

                                        error = EFAULT;
                                        goto check_error;
                                }
                                        error = EFAULT;
                                        goto check_error;
                                }

-                               if (buffer)
+                               if (buffer) {

                                        buffer += (sizeof(kd_chunk_header_v3) + sizeof(uint64_t));
                                        buffer += (sizeof(kd_chunk_header_v3) + sizeof(uint64_t));

+                               }

 
                                assert(count >= (sizeof(kd_chunk_header_v3) + sizeof(uint64_t)));
                                count -= (sizeof(kd_chunk_header_v3) + sizeof(uint64_t));
 
                                assert(count >= (sizeof(kd_chunk_header_v3) + sizeof(uint64_t)));
                                count -= (sizeof(kd_chunk_header_v3) + sizeof(uint64_t));


@@ -3942,8 +4034,9 @@ nextevent:
                        if (vp) {
                                size_t write_size = tempbuf_number * sizeof(kd_buf);
                                error = kdbg_write_to_vnode((caddr_t)kdcopybuf, write_size, vp, ctx, RAW_file_offset);
                        if (vp) {
                                size_t write_size = tempbuf_number * sizeof(kd_buf);
                                error = kdbg_write_to_vnode((caddr_t)kdcopybuf, write_size, vp, ctx, RAW_file_offset);

-                               if (!error)
+                               if (!error) {

                                        RAW_file_offset += write_size;
                                        RAW_file_offset += write_size;

+                               }

 
                                if (RAW_file_written >= RAW_FLUSH_SIZE) {
                                        error = VNOP_FSYNC(vp, MNT_NOWAIT, ctx);
 
                                if (RAW_file_written >= RAW_FLUSH_SIZE) {
                                        error = VNOP_FSYNC(vp, MNT_NOWAIT, ctx);


@@ -3963,29 +4056,55 @@ check_error:
                        count   -= tempbuf_number;
                        *number += tempbuf_number;
                }
                        count   -= tempbuf_number;
                        *number += tempbuf_number;
                }

-               if (out_of_events == TRUE)
-                      /*
-                       * all trace buffers are empty
-                       */
-                       break;
+               if (out_of_events == true) {
+                       /*
+                        * all trace buffers are empty
+                        */
+                       break;
+               }

 
 

-               if ((tempbuf_count = count) > KDCOPYBUF_COUNT)
-                       tempbuf_count = KDCOPYBUF_COUNT;
+               if ((tempbuf_count = count) > KDCOPYBUF_COUNT) {
+                       tempbuf_count = KDCOPYBUF_COUNT;
+               }

        }
        }

-       if ( !(old_kdebug_flags & KDBG_NOWRAP)) {
+       if (!(old_kdebug_flags & KDBG_NOWRAP)) {

                enable_wrap(old_kdebug_slowcheck);
        }
        thread_clear_eager_preempt(current_thread());
                enable_wrap(old_kdebug_slowcheck);
        }
        thread_clear_eager_preempt(current_thread());

-       return (error);
+       return error;

 }
 
 }
 

+#define KDEBUG_TEST_CODE(code) BSDDBG_CODE(DBG_BSD_KDEBUG_TEST, (code))
+
+/*
+ * A test IOP for the SYNC_FLUSH callback.
+ */
+
+static int sync_flush_iop = 0;
+
+static void
+sync_flush_callback(void * __unused context, kd_callback_type reason,
+    void * __unused arg)
+{
+       assert(sync_flush_iop > 0);
+
+       if (reason == KD_CALLBACK_SYNC_FLUSH) {
+               kernel_debug_enter(sync_flush_iop, KDEBUG_TEST_CODE(0xff),
+                   kdbg_timestamp(), 0, 0, 0, 0, 0);
+       }
+}
+
+static struct kd_callback sync_flush_kdcb = {
+       .func = sync_flush_callback,
+       .iop_name = "test_sf",
+};
+

 static int
 kdbg_test(size_t flavor)
 {
        int code = 0;
        int dummy_iop = 0;
 
 static int
 kdbg_test(size_t flavor)
 {
        int code = 0;
        int dummy_iop = 0;
 

-#define KDEBUG_TEST_CODE(code) BSDDBG_CODE(DBG_BSD_KDEBUG_TEST, (code))

        switch (flavor) {
        case 1:
                /* try each macro */
        switch (flavor) {
        case 1:
                /* try each macro */


@@ -4028,45 +4147,48 @@ kdbg_test(size_t flavor)
 
                /* ensure old timestamps are not emitted from kernel_debug_enter */
                kernel_debug_enter(dummy_iop, KDEBUG_TEST_CODE(code),
 
                /* ensure old timestamps are not emitted from kernel_debug_enter */
                kernel_debug_enter(dummy_iop, KDEBUG_TEST_CODE(code),

-                               100 /* very old timestamp */, 0, 0, 0,
-                               0, (uintptr_t)thread_tid(current_thread()));
+                   100 /* very old timestamp */, 0, 0, 0, 0, 0);

                code++;
                kernel_debug_enter(dummy_iop, KDEBUG_TEST_CODE(code),
                code++;
                kernel_debug_enter(dummy_iop, KDEBUG_TEST_CODE(code),

-                               kdbg_timestamp(), 0, 0, 0, 0,
-                               (uintptr_t)thread_tid(current_thread()));
+                   kdbg_timestamp(), 0, 0, 0, 0, 0);

                code++;
                break;
 
                code++;
                break;
 

+       case 3:
+               if (kd_ctrl_page.kdebug_iops) {
+                       dummy_iop = kd_ctrl_page.kdebug_iops[0].cpu_id;
+               }
+               kernel_debug_enter(dummy_iop, KDEBUG_TEST_CODE(code),
+                   kdbg_timestamp() * 2 /* !!! */, 0, 0, 0, 0, 0);
+               break;
+
+       case 4:
+               if (!sync_flush_iop) {
+                       sync_flush_iop = kernel_debug_register_callback(
+                               sync_flush_kdcb);
+                       assert(sync_flush_iop > 0);
+               }
+               break;
+

        default:
                return ENOTSUP;
        }
        default:
                return ENOTSUP;
        }

-#undef KDEBUG_TEST_CODE

 
        return 0;
 }
 
 
        return 0;
 }
 

+#undef KDEBUG_TEST_CODE
+

 void
 void

-kdebug_init(unsigned int n_events, char *filter_desc, boolean_t wrapping)
+kdebug_init(unsigned int n_events, char *filter_desc, enum kdebug_opts opts)

 {
        assert(filter_desc != NULL);
 
 {
        assert(filter_desc != NULL);
 

-#if defined(__x86_64__)
-       /* only trace MACH events when outputting kdebug to serial */
-       if (kdebug_serial) {
-               n_events = 1;
-               if (filter_desc[0] == '\0') {
-                       filter_desc[0] = 'C';
-                       filter_desc[1] = '1';
-                       filter_desc[2] = '\0';
-               }
-       }
-#endif /* defined(__x86_64__) */
-

        if (log_leaks && n_events == 0) {
                n_events = 200000;
        }
 
        if (log_leaks && n_events == 0) {
                n_events = 200000;
        }
 

-       kdebug_trace_start(n_events, filter_desc, wrapping, FALSE);
+       kdebug_trace_start(n_events, filter_desc, opts);

 }
 
 static void
 }
 
 static void


@@ -4082,10 +4204,10 @@ kdbg_set_typefilter_string(const char *filter_desc)
        typefilter_allow_class(kdbg_typefilter, DBG_TRACE);
 
        /* if the filter description starts with a number, assume it's a csc */
        typefilter_allow_class(kdbg_typefilter, DBG_TRACE);
 
        /* if the filter description starts with a number, assume it's a csc */

-       if (filter_desc[0] >= '0' && filter_desc[0] <= '9'){
+       if (filter_desc[0] >= '0' && filter_desc[0] <= '9') {

                unsigned long csc = strtoul(filter_desc, NULL, 0);
                if (filter_desc != end && csc <= KDBG_CSC_MAX) {
                unsigned long csc = strtoul(filter_desc, NULL, 0);
                if (filter_desc != end && csc <= KDBG_CSC_MAX) {

-                       typefilter_allow_csc(kdbg_typefilter, csc);
+                       typefilter_allow_csc(kdbg_typefilter, (uint16_t)csc);

                }
                return;
        }
                }
                return;
        }


@@ -4095,35 +4217,36 @@ kdbg_set_typefilter_string(const char *filter_desc)
 
                char filter_type = filter_desc[0];
                if (filter_type != 'C' && filter_type != 'S') {
 
                char filter_type = filter_desc[0];
                if (filter_type != 'C' && filter_type != 'S') {

+                       printf("kdebug: unexpected filter type `%c'\n", filter_type);

                        return;
                }
                filter_desc++;
 
                allow_value = strtoul(filter_desc, &end, 0);
                if (filter_desc == end) {
                        return;
                }
                filter_desc++;
 
                allow_value = strtoul(filter_desc, &end, 0);
                if (filter_desc == end) {

-                       /* cannot parse as integer */
+                       printf("kdebug: cannot parse `%s' as integer\n", filter_desc);

                        return;
                }
 
                switch (filter_type) {
                        return;
                }
 
                switch (filter_type) {

-                       case 'C':
-                               if (allow_value <= KDBG_CLASS_MAX) {
-                                       typefilter_allow_class(kdbg_typefilter, allow_value);
-                               } else {
-                                       /* illegal class */
-                                       return;
-                               }
-                               break;
-                       case 'S':
-                               if (allow_value <= KDBG_CSC_MAX) {
-                                       typefilter_allow_csc(kdbg_typefilter, allow_value);
-                               } else {
-                                       /* illegal class subclass */
-                                       return;
-                               }
-                               break;
-                       default:
+               case 'C':
+                       if (allow_value > KDBG_CLASS_MAX) {
+                               printf("kdebug: class 0x%lx is invalid\n", allow_value);

                                return;
                                return;

+                       }
+                       printf("kdebug: C 0x%lx\n", allow_value);
+                       typefilter_allow_class(kdbg_typefilter, (uint8_t)allow_value);
+                       break;
+               case 'S':
+                       if (allow_value > KDBG_CSC_MAX) {
+                               printf("kdebug: class-subclass 0x%lx is invalid\n", allow_value);
+                               return;
+                       }
+                       printf("kdebug: S 0x%lx\n", allow_value);
+                       typefilter_allow_csc(kdbg_typefilter, (uint16_t)allow_value);
+                       break;
+               default:
+                       __builtin_unreachable();

                }
 
                /* advance to next filter entry */
                }
 
                /* advance to next filter entry */


@@ -4134,13 +4257,23 @@ kdbg_set_typefilter_string(const char *filter_desc)
        }
 }
 
        }
 }
 

+uint64_t
+kdebug_wake(void)
+{
+       if (!wake_nkdbufs) {
+               return 0;
+       }
+       uint64_t start = mach_absolute_time();
+       kdebug_trace_start(wake_nkdbufs, NULL, trace_wrap ? KDOPT_WRAPPING : 0);
+       return mach_absolute_time() - start;
+}
+

 /*
 /*

- * This function is meant to be called from the bootstrap thread or coming out
- * of acpi_idle_kernel.
+ * This function is meant to be called from the bootstrap thread or kdebug_wake.

  */
 void
 kdebug_trace_start(unsigned int n_events, const char *filter_desc,
  */
 void
 kdebug_trace_start(unsigned int n_events, const char *filter_desc,

-       boolean_t wrapping, boolean_t at_wake)
+    enum kdebug_opts opts)

 {
        if (!n_events) {
                kd_early_done = true;
 {
        if (!n_events) {
                kd_early_done = true;


@@ -4157,7 +4290,7 @@ kdebug_trace_start(unsigned int n_events, const char *filter_desc,
 
        kernel_debug_string_early("start_kern_tracing");
 
 
        kernel_debug_string_early("start_kern_tracing");
 

-       if (kdbg_reinit(TRUE)) {
+       if (kdbg_reinit((opts & KDOPT_ATBOOT))) {

                printf("error from kdbg_reinit, kernel tracing not started\n");
                goto out;
        }
                printf("error from kdbg_reinit, kernel tracing not started\n");
                goto out;
        }


@@ -4166,7 +4299,7 @@ kdebug_trace_start(unsigned int n_events, const char *filter_desc,
         * Wrapping is disabled because boot and wake tracing is interested in
         * the earliest events, at the expense of later ones.
         */
         * Wrapping is disabled because boot and wake tracing is interested in
         * the earliest events, at the expense of later ones.
         */

-       if (!wrapping) {
+       if (!(opts & KDOPT_WRAPPING)) {

                uint32_t old1, old2;
                (void)disable_wrap(&old1, &old2);
        }
                uint32_t old1, old2;
                (void)disable_wrap(&old1, &old2);
        }


@@ -4182,16 +4315,15 @@ kdebug_trace_start(unsigned int n_events, const char *filter_desc,
         * Hold off interrupts between getting a thread map and enabling trace
         * and until the early traces are recorded.
         */
         * Hold off interrupts between getting a thread map and enabling trace
         * and until the early traces are recorded.
         */

-       boolean_t s = ml_set_interrupts_enabled(FALSE);
+       bool s = ml_set_interrupts_enabled(false);

 
 

-       if (at_wake) {
+       if (!(opts & KDOPT_ATBOOT)) {

                kdbg_thrmap_init();
        }
 
                kdbg_thrmap_init();
        }
 

-       kdbg_set_tracing_enabled(TRUE, KDEBUG_ENABLE_TRACE | (kdebug_serial ?
-                                KDEBUG_ENABLE_SERIAL : 0));
+       kdbg_set_tracing_enabled(true, KDEBUG_ENABLE_TRACE);

 
 

-       if (!at_wake) {
+       if ((opts & KDOPT_ATBOOT)) {

                /*
                 * Transfer all very early events from the static buffer into the real
                 * buffers.
                /*
                 * Transfer all very early events from the static buffer into the real
                 * buffers.


@@ -4201,14 +4333,8 @@ kdebug_trace_start(unsigned int n_events, const char *filter_desc,
 
        ml_set_interrupts_enabled(s);
 
 
        ml_set_interrupts_enabled(s);
 

-       printf("kernel tracing started with %u events\n", n_events);
-
-#if KDEBUG_MOJO_TRACE
-       if (kdebug_serial) {
-               printf("serial output enabled with %lu named events\n",
-               sizeof(kd_events)/sizeof(kd_event_t));
-       }
-#endif /* KDEBUG_MOJO_TRACE */
+       printf("kernel tracing started with %u events, filter = %s\n", n_events,
+           filter_desc ?: "none");

 
 out:
        ktrace_end_single_threaded();
 
 out:
        ktrace_end_single_threaded();


@@ -4272,14 +4398,14 @@ kdbg_dump_trace_to_file(const char *filename)
                .debugid = TRACE_WRITING_EVENTS | DBG_FUNC_END,
                .arg1 = write_size,
                .arg2 = ret,
                .debugid = TRACE_WRITING_EVENTS | DBG_FUNC_END,
                .arg1 = write_size,
                .arg2 = ret,

-               .arg5 = thread_tid(current_thread()),
+               .arg5 = (kd_buf_argtype)thread_tid(current_thread()),

        };
        kdbg_set_timestamp_and_cpu(&end_event, kdbg_timestamp(),
        };
        kdbg_set_timestamp_and_cpu(&end_event, kdbg_timestamp(),

-                       cpu_number());
+           cpu_number());

 
        /* this is best effort -- ignore any errors */
        (void)kdbg_write_to_vnode((caddr_t)&end_event, sizeof(kd_buf), vp, ctx,
 
        /* this is best effort -- ignore any errors */
        (void)kdbg_write_to_vnode((caddr_t)&end_event, sizeof(kd_buf), vp, ctx,

-                       RAW_file_offset);
+           RAW_file_offset);

 
 out_close:
        vnode_close(vp, FWRITE, ctx);
 
 out_close:
        vnode_close(vp, FWRITE, ctx);


@@ -4305,162 +4431,18 @@ kdbg_sysctl_continuous SYSCTL_HANDLER_ARGS
 }
 
 SYSCTL_NODE(_kern, OID_AUTO, kdbg, CTLFLAG_RD | CTLFLAG_LOCKED, 0,
 }
 
 SYSCTL_NODE(_kern, OID_AUTO, kdbg, CTLFLAG_RD | CTLFLAG_LOCKED, 0,

-               "kdbg");
+    "kdbg");

 
 SYSCTL_PROC(_kern_kdbg, OID_AUTO, experimental_continuous,
 
 SYSCTL_PROC(_kern_kdbg, OID_AUTO, experimental_continuous,

-               CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, 0,
-               sizeof(int), kdbg_sysctl_continuous, "I",
-               "Set kdebug to use mach_continuous_time");
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, 0,
+    sizeof(int), kdbg_sysctl_continuous, "I",
+    "Set kdebug to use mach_continuous_time");

 
 SYSCTL_INT(_kern_kdbg, OID_AUTO, debug,
 
 SYSCTL_INT(_kern_kdbg, OID_AUTO, debug,

-               CTLFLAG_RW | CTLFLAG_LOCKED,
-               &kdbg_debug, 0, "Set kdebug debug mode");
+    CTLFLAG_RW | CTLFLAG_LOCKED,
+    &kdbg_debug, 0, "Set kdebug debug mode");

 
 SYSCTL_QUAD(_kern_kdbg, OID_AUTO, oldest_time,
 
 SYSCTL_QUAD(_kern_kdbg, OID_AUTO, oldest_time,

-               CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_LOCKED,
-               &kd_ctrl_page.oldest_time,
-               "Find the oldest timestamp still in trace");
-
-#if KDEBUG_MOJO_TRACE
-static kd_event_t *
-binary_search(uint32_t id)
-{
-       int low, high, mid;
-
-       low = 0;
-       high = sizeof(kd_events)/sizeof(kd_event_t) - 1;
-
-       while (TRUE)
-       {
-               mid = (low + high) / 2;
-
-               if (low > high)
-                       return NULL; /* failed */
-               else if ( low + 1 >= high) {
-                       /* We have a match */
-                       if (kd_events[high].id == id)
-                               return &kd_events[high];
-                       else if (kd_events[low].id == id)
-                               return &kd_events[low];
-                       else
-                               return NULL;  /* search failed */
-               }
-               else if (id < kd_events[mid].id)
-                       high = mid;
-               else
-                       low = mid;
-       } 
-}
-
-/*
- * Look up event id to get name string.
- * Using a per-cpu cache of a single entry
- * before resorting to a binary search of the full table.
- */
-#define        NCACHE  1
-static kd_event_t      *last_hit[MAX_CPUS];
-static kd_event_t *
-event_lookup_cache(uint32_t cpu, uint32_t id)
-{
-       if (last_hit[cpu] == NULL || last_hit[cpu]->id != id)
-               last_hit[cpu] = binary_search(id);
-       return last_hit[cpu];
-}
-
-static uint64_t        kd_last_timstamp;
-
-static void
-kdebug_serial_print(
-       uint32_t        cpunum,
-       uint32_t        debugid,
-       uint64_t        timestamp,
-       uintptr_t       arg1,
-       uintptr_t       arg2,
-       uintptr_t       arg3,
-       uintptr_t       arg4,
-       uintptr_t       threadid
-       )
-{
-       char            kprintf_line[192];
-       char            event[40];
-       uint64_t        us = timestamp / NSEC_PER_USEC;
-       uint64_t        us_tenth = (timestamp % NSEC_PER_USEC) / 100;
-       uint64_t        delta = timestamp - kd_last_timstamp;
-       uint64_t        delta_us = delta / NSEC_PER_USEC;
-       uint64_t        delta_us_tenth = (delta % NSEC_PER_USEC) / 100;
-       uint32_t        event_id = debugid & KDBG_EVENTID_MASK;
-       const char      *command;
-       const char      *bra;
-       const char      *ket;
-       kd_event_t      *ep;
-
-       /* event time and delta from last */
-       snprintf(kprintf_line, sizeof(kprintf_line),
-               "%11llu.%1llu %8llu.%1llu ",
-               us, us_tenth, delta_us, delta_us_tenth);
-
-
-       /* event (id or name) - start prefixed by "[", end postfixed by "]" */
-       bra = (debugid & DBG_FUNC_START) ? "[" : " ";
-       ket = (debugid & DBG_FUNC_END)   ? "]" : " ";
-       ep = event_lookup_cache(cpunum, event_id);
-       if (ep) {
-               if (strlen(ep->name) < sizeof(event) - 3)
-                       snprintf(event, sizeof(event), "%s%s%s",
-                                bra, ep->name, ket);
-               else
-                       snprintf(event, sizeof(event), "%s%x(name too long)%s",
-                                bra, event_id, ket);
-       } else {
-               snprintf(event, sizeof(event), "%s%x%s",
-                        bra, event_id, ket);
-       }
-       snprintf(kprintf_line + strlen(kprintf_line),
-                sizeof(kprintf_line) - strlen(kprintf_line),
-                "%-40s  ", event);
-
-       /* arg1 .. arg4 with special cases for strings */
-       switch (event_id) {
-           case VFS_LOOKUP:
-           case VFS_LOOKUP_DONE:
-               if (debugid & DBG_FUNC_START) {
-                       /* arg1 hex then arg2..arg4 chars */
-                       snprintf(kprintf_line + strlen(kprintf_line),
-                               sizeof(kprintf_line) - strlen(kprintf_line),
-                               "%-16lx %-8s%-8s%-8s                          ",
-                               arg1, (char*)&arg2, (char*)&arg3, (char*)&arg4);
-                       break;
-               }
-               /* else fall through for arg1..arg4 chars */
-           case TRACE_STRING_EXEC:
-           case TRACE_STRING_NEWTHREAD:
-           case TRACE_INFO_STRING:
-               snprintf(kprintf_line + strlen(kprintf_line),
-                       sizeof(kprintf_line) - strlen(kprintf_line),
-                       "%-8s%-8s%-8s%-8s                                   ",
-                       (char*)&arg1, (char*)&arg2, (char*)&arg3, (char*)&arg4);
-               break;
-           default:
-               snprintf(kprintf_line + strlen(kprintf_line),
-                       sizeof(kprintf_line) - strlen(kprintf_line),
-                       "%-16lx %-16lx %-16lx %-16lx",
-                       arg1, arg2, arg3, arg4);
-       }
-
-       /* threadid, cpu and command name */
-       if (threadid == (uintptr_t)thread_tid(current_thread()) &&
-           current_proc() &&
-           current_proc()->p_comm[0])
-               command = current_proc()->p_comm;
-       else
-               command = "-";
-       snprintf(kprintf_line + strlen(kprintf_line),
-               sizeof(kprintf_line) - strlen(kprintf_line),
-               "  %-16lx  %-2d %s\n",
-               threadid, cpunum, command);
-       
-       kprintf("%s", kprintf_line);
-       kd_last_timstamp = timestamp;
-}
-
-#endif
+    CTLTYPE_QUAD | CTLFLAG_RD | CTLFLAG_LOCKED,
+    &kd_ctrl_page.oldest_time,
+    "Find the oldest timestamp still in trace");