xnu-6153.11.26.tar.gz

[apple/xnu.git] / osfmk / kern / debug.c

diff --git a/osfmk/kern/debug.c b/osfmk/kern/debug.c
index a09bb897f1a4f2959fbd2a59439a4ddecacc631f..8578f687adbc7f8f2d76a1ee0f127f580eab4e36 100644 (file)
--- a/osfmk/kern/debug.c
+++ b/osfmk/kern/debug.c
@@ -1,8 +1,8 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,34 +22,34 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/* 
+/*

  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.

- * 
+ *

  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.

- * 
+ *

  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.

- * 
+ *

  * Carnegie Mellon requests users of this software to return to
  * Carnegie Mellon requests users of this software to return to

- * 
+ *

  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890

- * 
+ *

  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */


@@ -73,6 +73,7 @@
 #include <kern/kern_cdata.h>
 #include <kern/zalloc.h>
 #include <vm/vm_kern.h>
 #include <kern/kern_cdata.h>
 #include <kern/zalloc.h>
 #include <vm/vm_kern.h>

+#include <vm/vm_map.h>

 #include <vm/pmap.h>
 #include <stdarg.h>
 #include <stdatomic.h>
 #include <vm/pmap.h>
 #include <stdarg.h>
 #include <stdatomic.h>


@@ -85,6 +86,8 @@
 #include <kern/processor.h>
 
 #if defined(__i386__) || defined(__x86_64__)
 #include <kern/processor.h>
 
 #if defined(__i386__) || defined(__x86_64__)

+#include <IOKit/IOBSD.h>
+

 #include <i386/cpu_threads.h>
 #include <i386/pmCPU.h>
 #endif
 #include <i386/cpu_threads.h>
 #include <i386/pmCPU.h>
 #endif


@@ -96,6 +99,7 @@
 #include <libkern/OSKextLibPrivate.h>
 #include <libkern/OSAtomic.h>
 #include <libkern/kernel_mach_header.h>
 #include <libkern/OSKextLibPrivate.h>
 #include <libkern/OSAtomic.h>
 #include <libkern/kernel_mach_header.h>

+#include <libkern/section_keywords.h>

 #include <uuid/uuid.h>
 #include <mach_debug/zone_info.h>
 
 #include <uuid/uuid.h>
 #include <mach_debug/zone_info.h>
 


@@ -108,14 +112,21 @@
 extern volatile struct xnu_hw_shmem_dbg_command_info *hwsd_info;
 #endif
 
 extern volatile struct xnu_hw_shmem_dbg_command_info *hwsd_info;
 #endif
 

+#if CONFIG_XNUPOST
+#include <tests/xnupost.h>
+extern int vsnprintf(char *, size_t, const char *, va_list);
+#endif

 
 

-unsigned int   halt_in_debugger = 0;
-unsigned int   current_debugger = 0;
-unsigned int   active_debugger = 0;
-unsigned int   panicDebugging = FALSE;
-unsigned int   kdebug_serial = FALSE;
-unsigned int   kernel_debugger_entry_count = 0;
+unsigned int    halt_in_debugger = 0;
+unsigned int    current_debugger = 0;
+unsigned int    active_debugger = 0;
+unsigned int    panicDebugging = FALSE;
+unsigned int    kdebug_serial = FALSE;
+unsigned int    kernel_debugger_entry_count = 0;

 
 

+#if !defined (__x86_64__)
+struct additional_panic_data_buffer *panic_data_buffers = NULL;
+#endif

 
 #if defined(__arm__)
 #define TRAP_DEBUGGER __asm__ volatile("trap")
 
 #if defined(__arm__)
 #define TRAP_DEBUGGER __asm__ volatile("trap")


@@ -131,9 +142,9 @@ unsigned int        kernel_debugger_entry_count = 0;
 #endif
 
 #if defined(__i386__) || defined(__x86_64__)
 #endif
 
 #if defined(__i386__) || defined(__x86_64__)

-#define panic_stop()   pmCPUHalt(PM_HALT_PANIC)
+#define panic_stop()    pmCPUHalt(PM_HALT_PANIC)

 #else
 #else

-#define panic_stop()   panic_spin_forever()
+#define panic_stop()    panic_spin_forever()

 #endif
 
 #define CPUDEBUGGEROP PROCESSOR_DATA(current_processor(), debugger_state).db_current_op
 #endif
 
 #define CPUDEBUGGEROP PROCESSOR_DATA(current_processor(), debugger_state).db_current_op


@@ -141,44 +152,52 @@ unsigned int      kernel_debugger_entry_count = 0;
 #define CPUPANICSTR PROCESSOR_DATA(current_processor(), debugger_state).db_panic_str
 #define CPUPANICARGS PROCESSOR_DATA(current_processor(), debugger_state).db_panic_args
 #define CPUPANICOPTS PROCESSOR_DATA(current_processor(), debugger_state).db_panic_options
 #define CPUPANICSTR PROCESSOR_DATA(current_processor(), debugger_state).db_panic_str
 #define CPUPANICARGS PROCESSOR_DATA(current_processor(), debugger_state).db_panic_args
 #define CPUPANICOPTS PROCESSOR_DATA(current_processor(), debugger_state).db_panic_options

+#define CPUPANICDATAPTR PROCESSOR_DATA(current_processor(), debugger_state).db_panic_data_ptr

 #define CPUDEBUGGERSYNC PROCESSOR_DATA(current_processor(), debugger_state).db_proceed_on_sync_failure
 #define CPUDEBUGGERCOUNT PROCESSOR_DATA(current_processor(), debugger_state).db_entry_count
 #define CPUDEBUGGERRET PROCESSOR_DATA(current_processor(), debugger_state).db_op_return
 #define CPUPANICCALLER PROCESSOR_DATA(current_processor(), debugger_state).db_panic_caller
 
 #if DEVELOPMENT || DEBUG
 #define CPUDEBUGGERSYNC PROCESSOR_DATA(current_processor(), debugger_state).db_proceed_on_sync_failure
 #define CPUDEBUGGERCOUNT PROCESSOR_DATA(current_processor(), debugger_state).db_entry_count
 #define CPUDEBUGGERRET PROCESSOR_DATA(current_processor(), debugger_state).db_op_return
 #define CPUPANICCALLER PROCESSOR_DATA(current_processor(), debugger_state).db_panic_caller
 
 #if DEVELOPMENT || DEBUG

-#define DEBUGGER_DEBUGGING_NESTED_PANIC_IF_REQUESTED(requested)                                        \
-MACRO_BEGIN                                                                                    \
-       if (requested) {                                                                        \
-               volatile int *badpointer = (int *)4;                                                    \
-               *badpointer = 0;                                                                \
-       }                                                                                       \
+#define DEBUGGER_DEBUGGING_NESTED_PANIC_IF_REQUESTED(requested)                                 \
+MACRO_BEGIN                                                                                     \
+       if (requested) {                                                                        \
+               volatile int *badpointer = (int *)4;                                                    \
+               *badpointer = 0;                                                                \
+       }                                                                                       \

 MACRO_END
 #endif /* DEVELOPMENT || DEBUG */
 
 debugger_op debugger_current_op = DBOP_NONE;
 const char *debugger_panic_str = NULL;
 va_list *debugger_panic_args = NULL;
 MACRO_END
 #endif /* DEVELOPMENT || DEBUG */
 
 debugger_op debugger_current_op = DBOP_NONE;
 const char *debugger_panic_str = NULL;
 va_list *debugger_panic_args = NULL;

+void *debugger_panic_data = NULL;

 uint64_t debugger_panic_options = 0;
 const char *debugger_message = NULL;
 unsigned long debugger_panic_caller = 0;
 
 uint64_t debugger_panic_options = 0;
 const char *debugger_message = NULL;
 unsigned long debugger_panic_caller = 0;
 

-void panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args, unsigned int reason, void *ctx, uint64_t panic_options_mask, unsigned long panic_caller);
-static void kdp_machine_reboot_type(unsigned int type);
-__attribute__((noreturn)) void panic_spin_forever(void);
+void panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args,
+    unsigned int reason, void *ctx, uint64_t panic_options_mask, void *panic_data,
+    unsigned long panic_caller) __dead2;
+static void kdp_machine_reboot_type(unsigned int type, uint64_t debugger_flags);
+void panic_spin_forever(void) __dead2;

 extern kern_return_t do_stackshot(void);
 extern kern_return_t do_stackshot(void);

+extern void PE_panic_hook(const char*);

 
 

+#if CONFIG_NONFATAL_ASSERTS

 int mach_assert = 1;
 int mach_assert = 1;

+#endif

 
 #define NESTEDDEBUGGERENTRYMAX 5
 
 #define NESTEDDEBUGGERENTRYMAX 5

+static unsigned int max_debugger_entry_count = NESTEDDEBUGGERENTRYMAX;

 
 #if CONFIG_EMBEDDED
 #define DEBUG_BUF_SIZE (4096)
 #define KDBG_TRACE_PANIC_FILENAME "/var/log/panic.trace"
 #else
 
 #if CONFIG_EMBEDDED
 #define DEBUG_BUF_SIZE (4096)
 #define KDBG_TRACE_PANIC_FILENAME "/var/log/panic.trace"
 #else

-/*
- * DEBUG_BUF_SIZE can't grow without updates to SMC and iBoot to store larger panic logs on co-processor systems */

 #define DEBUG_BUF_SIZE ((3 * PAGE_SIZE) + offsetof(struct macos_panic_header, mph_data))
 #define DEBUG_BUF_SIZE ((3 * PAGE_SIZE) + offsetof(struct macos_panic_header, mph_data))

+/* EXTENDED_DEBUG_BUF_SIZE definition is now in debug.h */
+static_assert(((EXTENDED_DEBUG_BUF_SIZE % PANIC_FLUSH_BOUNDARY) == 0), "Extended debug buf size must match SMC alignment requirements");

 #define KDBG_TRACE_PANIC_FILENAME "/var/tmp/panic.trace"
 #endif
 
 #define KDBG_TRACE_PANIC_FILENAME "/var/tmp/panic.trace"
 #endif
 


@@ -198,7 +217,9 @@ char *debug_buf_ptr = (debug_buf + offsetof(struct macos_panic_header, mph_data)
  * On co-processor platforms, we lose sizeof(struct macos_panic_header) bytes from the end of
  * the end of the log because we only support writing (3*PAGESIZE) bytes.
  */
  * On co-processor platforms, we lose sizeof(struct macos_panic_header) bytes from the end of
  * the end of the log because we only support writing (3*PAGESIZE) bytes.
  */

-const unsigned int debug_buf_size = (DEBUG_BUF_SIZE - offsetof(struct macos_panic_header, mph_data));
+unsigned int debug_buf_size = (DEBUG_BUF_SIZE - offsetof(struct macos_panic_header, mph_data));
+
+boolean_t extended_debug_log_enabled = FALSE;

 #endif
 
 /* Debugger state */
 #endif
 
 /* Debugger state */


@@ -210,6 +231,10 @@ unsigned int   debugger_context = 0;
 static char model_name[64];
 unsigned char *kernel_uuid;
 
 static char model_name[64];
 unsigned char *kernel_uuid;
 

+boolean_t kernelcache_uuid_valid = FALSE;
+uuid_t kernelcache_uuid;
+uuid_string_t kernelcache_uuid_string;
+

 /*
  * By default we treat Debugger() the same as calls to panic(), unless
  * we have debug boot-args present and the DB_KERN_DUMP_ON_NMI *NOT* set.
 /*
  * By default we treat Debugger() the same as calls to panic(), unless
  * we have debug boot-args present and the DB_KERN_DUMP_ON_NMI *NOT* set.


@@ -219,20 +244,33 @@ unsigned char *kernel_uuid;
  */
 static boolean_t debugger_is_panic = TRUE;
 
  */
 static boolean_t debugger_is_panic = TRUE;
 

+#if DEVELOPMENT || DEBUG
+boolean_t debug_boot_arg_inited = FALSE;
+#endif
+
+SECURITY_READ_ONLY_LATE(unsigned int) debug_boot_arg;

 
 char kernel_uuid_string[37]; /* uuid_string_t */
 
 char kernel_uuid_string[37]; /* uuid_string_t */

+char kernelcache_uuid_string[37]; /* uuid_string_t */

 char   panic_disk_error_description[512];
 size_t panic_disk_error_description_size = sizeof(panic_disk_error_description);
 
 extern unsigned int write_trace_on_panic;
 char   panic_disk_error_description[512];
 size_t panic_disk_error_description_size = sizeof(panic_disk_error_description);
 
 extern unsigned int write_trace_on_panic;

-

 int kext_assertions_enable =
 #if DEBUG || DEVELOPMENT
 int kext_assertions_enable =
 #if DEBUG || DEVELOPMENT

-                       TRUE;
+    TRUE;

 #else
 #else

-                       FALSE;
+    FALSE;

 #endif
 
 #endif
 

+/*
+ * Maintain the physically-contiguous carveout for the `phys_carveout_mb`
+ * boot-arg.
+ */
+SECURITY_READ_ONLY_LATE(vm_offset_t) phys_carveout = 0;
+SECURITY_READ_ONLY_LATE(uintptr_t) phys_carveout_pa = 0;
+SECURITY_READ_ONLY_LATE(size_t) phys_carveout_size = 0;
+

 void
 panic_init(void)
 {
 void
 panic_init(void)
 {


@@ -245,19 +283,97 @@ panic_init(void)
                uuid_unparse_upper(*(uuid_t *)uuid, kernel_uuid_string);
        }
 
                uuid_unparse_upper(*(uuid_t *)uuid, kernel_uuid_string);
        }
 

+#if CONFIG_NONFATAL_ASSERTS

        if (!PE_parse_boot_argn("assertions", &mach_assert, sizeof(mach_assert))) {
                mach_assert = 1;
        }
        if (!PE_parse_boot_argn("assertions", &mach_assert, sizeof(mach_assert))) {
                mach_assert = 1;
        }

+#endif

 
 

-#if !CONFIG_EMBEDDED
-       uint32_t debug_flags = 0;
+       /*
+        * Initialize the value of the debug boot-arg
+        */
+       debug_boot_arg = 0;
+#if ((CONFIG_EMBEDDED && MACH_KDP) || defined(__x86_64__))
+       if (PE_parse_boot_argn("debug", &debug_boot_arg, sizeof(debug_boot_arg))) {
+#if DEVELOPMENT || DEBUG
+               if (debug_boot_arg & DB_HALT) {
+                       halt_in_debugger = 1;
+               }
+#endif
+
+#if CONFIG_EMBEDDED
+               if (debug_boot_arg & DB_NMI) {
+                       panicDebugging  = TRUE;
+               }
+#else
+               panicDebugging = TRUE;
+#if KDEBUG_MOJO_TRACE
+               if (debug_boot_arg & DB_PRT_KDEBUG) {
+                       kdebug_serial = TRUE;
+               }
+#endif
+#endif /* CONFIG_EMBEDDED */
+       }

 
 

-       if (PE_i_can_has_debugger(&debug_flags) && !(debug_flags & DB_KERN_DUMP_ON_NMI)) {
+       if (!PE_parse_boot_argn("nested_panic_max", &max_debugger_entry_count, sizeof(max_debugger_entry_count))) {
+               max_debugger_entry_count = NESTEDDEBUGGERENTRYMAX;
+       }
+
+#endif /* ((CONFIG_EMBEDDED && MACH_KDP) || defined(__x86_64__)) */
+
+#if DEVELOPMENT || DEBUG
+       debug_boot_arg_inited = TRUE;
+#endif
+
+#if !CONFIG_EMBEDDED
+       /*
+        * By default we treat Debugger() the same as calls to panic(), unless
+        * we have debug boot-args present and the DB_KERN_DUMP_ON_NMI *NOT* set.
+        * If DB_KERN_DUMP_ON_NMI is *NOT* set, return from Debugger() is supported.
+        * This is because writing an on-device corefile is a destructive operation.
+        *
+        * Return from Debugger() is currently only implemented on x86
+        */
+       if (PE_i_can_has_debugger(NULL) && !(debug_boot_arg & DB_KERN_DUMP_ON_NMI)) {

                debugger_is_panic = FALSE;
        }
 #endif
                debugger_is_panic = FALSE;
        }
 #endif

+}
+
+#if defined (__x86_64__)
+void
+extended_debug_log_init(void)
+{
+       assert(coprocessor_paniclog_flush);
+       /*
+        * Allocate an extended panic log buffer that has space for the panic
+        * stackshot at the end. Update the debug buf pointers appropriately
+        * to point at this new buffer.
+        */
+       char *new_debug_buf = kalloc(EXTENDED_DEBUG_BUF_SIZE);
+       /*
+        * iBoot pre-initializes the panic region with the NULL character. We set this here
+        * so we can accurately calculate the CRC for the region without needing to flush the
+        * full region over SMC.
+        */
+       memset(new_debug_buf, '\0', EXTENDED_DEBUG_BUF_SIZE);
+
+       panic_info = (struct macos_panic_header *)new_debug_buf;
+       debug_buf_ptr = debug_buf_base = (new_debug_buf + offsetof(struct macos_panic_header, mph_data));
+       debug_buf_size = (EXTENDED_DEBUG_BUF_SIZE - offsetof(struct macos_panic_header, mph_data));

 
 

+       extended_debug_log_enabled = TRUE;
+
+       /*
+        * Insert a compiler barrier so we don't free the other panic stackshot buffer
+        * until after we've marked the new one as available
+        */
+       __compiler_barrier();
+       kmem_free(kernel_map, panic_stackshot_buf, panic_stackshot_buf_len);
+       panic_stackshot_buf = 0;
+       panic_stackshot_buf_len = 0;

 }
 }

+#endif /* defined (__x86_64__) */

 
 void
 debug_log_init(void)
 
 void
 debug_log_init(void)


@@ -272,13 +388,64 @@ debug_log_init(void)
        debug_buf_ptr = debug_buf_base;
        debug_buf_size = gPanicSize - sizeof(struct embedded_panic_header);
 #else
        debug_buf_ptr = debug_buf_base;
        debug_buf_size = gPanicSize - sizeof(struct embedded_panic_header);
 #else

+       kern_return_t kr = KERN_SUCCESS;
+       bzero(panic_info, DEBUG_BUF_SIZE);
+

        assert(debug_buf_base != NULL);
        assert(debug_buf_ptr != NULL);
        assert(debug_buf_size != 0);
        assert(debug_buf_base != NULL);
        assert(debug_buf_ptr != NULL);
        assert(debug_buf_size != 0);

-       bzero(debug_buf, sizeof(debug_buf));
+
+       /*
+        * We allocate a buffer to store a panic time stackshot. If we later discover that this is a
+        * system that supports flushing a stackshot via an extended debug log (see above), we'll free this memory
+        * as it's not necessary on this platform. This information won't be available until the IOPlatform has come
+        * up.
+        */
+       kr = kmem_alloc(kernel_map, &panic_stackshot_buf, PANIC_STACKSHOT_BUFSIZE, VM_KERN_MEMORY_DIAG);
+       assert(kr == KERN_SUCCESS);
+       if (kr == KERN_SUCCESS) {
+               panic_stackshot_buf_len = PANIC_STACKSHOT_BUFSIZE;
+       }

 #endif
 }
 
 #endif
 }
 

+void
+phys_carveout_init(void)
+{
+       if (!PE_i_can_has_debugger(NULL)) {
+               return;
+       }
+
+       unsigned int phys_carveout_mb = 0;
+
+       if (!PE_parse_boot_argn("phys_carveout_mb", &phys_carveout_mb,
+           sizeof(phys_carveout_mb))) {
+               return;
+       }
+       if (phys_carveout_mb == 0) {
+               return;
+       }
+
+       size_t size = 0;
+       if (os_mul_overflow(phys_carveout_mb, 1024 * 1024, &size)) {
+               printf("phys_carveout_mb size overflowed (%uMB)\n",
+                   phys_carveout_mb);
+               return;
+       }
+
+       kern_return_t kr = kmem_alloc_contig(kernel_map, &phys_carveout, size,
+           VM_MAP_PAGE_MASK(kernel_map), 0, 0, KMA_NOPAGEWAIT,
+           VM_KERN_MEMORY_DIAG);
+       if (kr != KERN_SUCCESS) {
+               printf("failed to allocate %uMB for phys_carveout_mb: %u\n",
+                   phys_carveout_mb, (unsigned int)kr);
+               return;
+       }
+
+       phys_carveout_pa = kvtophys(phys_carveout);
+       phys_carveout_size = size;
+}
+

 static void
 DebuggerLock()
 {
 static void
 DebuggerLock()
 {


@@ -286,11 +453,11 @@ DebuggerLock()
        int debugger_exp_cpu = DEBUGGER_NO_CPU;
        assert(ml_get_interrupts_enabled() == FALSE);
 
        int debugger_exp_cpu = DEBUGGER_NO_CPU;
        assert(ml_get_interrupts_enabled() == FALSE);
 

-       if (debugger_cpu == my_cpu) {
+       if (atomic_load(&debugger_cpu) == my_cpu) {

                return;
        }
 
                return;
        }
 

-       while(!atomic_compare_exchange_strong(&debugger_cpu, &debugger_exp_cpu, my_cpu)) {
+       while (!atomic_compare_exchange_strong(&debugger_cpu, &debugger_exp_cpu, my_cpu)) {

                debugger_exp_cpu = DEBUGGER_NO_CPU;
        }
 
                debugger_exp_cpu = DEBUGGER_NO_CPU;
        }
 


@@ -300,7 +467,7 @@ DebuggerLock()
 static void
 DebuggerUnlock()
 {
 static void
 DebuggerUnlock()
 {

-       assert(debugger_cpu == cpu_number());
+       assert(atomic_load_explicit(&debugger_cpu, memory_order_relaxed) == cpu_number());

 
        /*
         * We don't do an atomic exchange here in case
 
        /*
         * We don't do an atomic exchange here in case


@@ -309,7 +476,7 @@ DebuggerUnlock()
         * lock so we can simply store DEBUGGER_NO_CPU and follow with
         * a barrier.
         */
         * lock so we can simply store DEBUGGER_NO_CPU and follow with
         * a barrier.
         */

-       debugger_cpu = DEBUGGER_NO_CPU;
+       atomic_store(&debugger_cpu, DEBUGGER_NO_CPU);

        OSMemoryBarrier();
 
        return;
        OSMemoryBarrier();
 
        return;


@@ -339,8 +506,8 @@ DebuggerResumeOtherCores()
 
 static void
 DebuggerSaveState(debugger_op db_op, const char *db_message, const char *db_panic_str,
 
 static void
 DebuggerSaveState(debugger_op db_op, const char *db_message, const char *db_panic_str,

-               va_list *db_panic_args, uint64_t db_panic_options,
-               boolean_t db_proceed_on_sync_failure, unsigned long db_panic_caller)
+    va_list *db_panic_args, uint64_t db_panic_options, void *db_panic_data_ptr,
+    boolean_t db_proceed_on_sync_failure, unsigned long db_panic_caller)

 {
        CPUDEBUGGEROP = db_op;
 
 {
        CPUDEBUGGEROP = db_op;
 


@@ -349,9 +516,13 @@ DebuggerSaveState(debugger_op db_op, const char *db_message, const char *db_pani
                CPUDEBUGGERMSG = db_message;
                CPUPANICSTR = db_panic_str;
                CPUPANICARGS = db_panic_args;
                CPUDEBUGGERMSG = db_message;
                CPUPANICSTR = db_panic_str;
                CPUPANICARGS = db_panic_args;

+               CPUPANICDATAPTR = db_panic_data_ptr;

                CPUPANICCALLER = db_panic_caller;
        } else if (CPUDEBUGGERCOUNT > 1 && db_panic_str != NULL) {
                CPUPANICCALLER = db_panic_caller;
        } else if (CPUDEBUGGERCOUNT > 1 && db_panic_str != NULL) {

-               kprintf("Nested panic detected: %s", db_panic_str);
+               kprintf("Nested panic detected:");
+               if (db_panic_str != NULL) {
+                       _doprnt(db_panic_str, db_panic_args, PE_kputc, 0);
+               }

        }
 
        CPUDEBUGGERSYNC = db_proceed_on_sync_failure;
        }
 
        CPUDEBUGGERSYNC = db_proceed_on_sync_failure;


@@ -369,36 +540,38 @@ DebuggerSaveState(debugger_op db_op, const char *db_message, const char *db_pani
  */
 kern_return_t
 DebuggerTrapWithState(debugger_op db_op, const char *db_message, const char *db_panic_str,
  */
 kern_return_t
 DebuggerTrapWithState(debugger_op db_op, const char *db_message, const char *db_panic_str,

-               va_list *db_panic_args, uint64_t db_panic_options,
-               boolean_t db_proceed_on_sync_failure, unsigned long db_panic_caller)
+    va_list *db_panic_args, uint64_t db_panic_options, void *db_panic_data_ptr,
+    boolean_t db_proceed_on_sync_failure, unsigned long db_panic_caller)

 {
        kern_return_t ret;
 
        assert(ml_get_interrupts_enabled() == FALSE);
 {
        kern_return_t ret;
 
        assert(ml_get_interrupts_enabled() == FALSE);

-       DebuggerSaveState(db_op, db_message, db_panic_str,
-               db_panic_args, db_panic_options, db_proceed_on_sync_failure,
-               db_panic_caller);
+       DebuggerSaveState(db_op, db_message, db_panic_str, db_panic_args,
+           db_panic_options, db_panic_data_ptr,
+           db_proceed_on_sync_failure, db_panic_caller);

 
        TRAP_DEBUGGER;
 
        ret = CPUDEBUGGERRET;
 
 
        TRAP_DEBUGGER;
 
        ret = CPUDEBUGGERRET;
 

-       DebuggerSaveState(DBOP_NONE, NULL, NULL, NULL, 0, FALSE, 0);
+       DebuggerSaveState(DBOP_NONE, NULL, NULL, NULL, 0, NULL, FALSE, 0);

 
        return ret;
 }
 
 void __attribute__((noinline))
 Assert(
 
        return ret;
 }
 
 void __attribute__((noinline))
 Assert(

-       const char      *file,
-       int             line,
-       const char      *expression
-      )
+       const char      *file,
+       int             line,
+       const char      *expression
+       )

 {
 {

+#if CONFIG_NONFATAL_ASSERTS

        if (!mach_assert) {
                kprintf("%s:%d non-fatal Assertion: %s", file, line, expression);
                return;
        }
        if (!mach_assert) {
                kprintf("%s:%d non-fatal Assertion: %s", file, line, expression);
                return;
        }

+#endif

 
        panic_plain("%s:%d Assertion failed: %s", file, line, expression);
 }
 
        panic_plain("%s:%d Assertion failed: %s", file, line, expression);
 }


@@ -412,7 +585,7 @@ Debugger(const char *message)
 
 void
 DebuggerWithContext(unsigned int reason, void *ctx, const char *message,
 
 void
 DebuggerWithContext(unsigned int reason, void *ctx, const char *message,

-       uint64_t debugger_options_mask)
+    uint64_t debugger_options_mask)

 {
        spl_t previous_interrupts_state;
        boolean_t old_doprnt_hide_pointers = doprnt_hide_pointers;
 {
        spl_t previous_interrupts_state;
        boolean_t old_doprnt_hide_pointers = doprnt_hide_pointers;


@@ -422,7 +595,7 @@ DebuggerWithContext(unsigned int reason, void *ctx, const char *message,
 
        CPUDEBUGGERCOUNT++;
 
 
        CPUDEBUGGERCOUNT++;
 

-       if (CPUDEBUGGERCOUNT > NESTEDDEBUGGERENTRYMAX) {
+       if (CPUDEBUGGERCOUNT > max_debugger_entry_count) {

                static boolean_t in_panic_kprintf = FALSE;
 
                /* Notify any listeners that we've started a panic */
                static boolean_t in_panic_kprintf = FALSE;
 
                /* Notify any listeners that we've started a panic */


@@ -431,12 +604,12 @@ DebuggerWithContext(unsigned int reason, void *ctx, const char *message,
                if (!in_panic_kprintf) {
                        in_panic_kprintf = TRUE;
                        kprintf("Detected nested debugger entry count exceeding %d\n",
                if (!in_panic_kprintf) {
                        in_panic_kprintf = TRUE;
                        kprintf("Detected nested debugger entry count exceeding %d\n",

-                               NESTEDDEBUGGERENTRYMAX);
+                           max_debugger_entry_count);

                        in_panic_kprintf = FALSE;
                }
 
                if (!panicDebugging) {
                        in_panic_kprintf = FALSE;
                }
 
                if (!panicDebugging) {

-                       kdp_machine_reboot_type(kPEPanicRestartCPU);
+                       kdp_machine_reboot_type(kPEPanicRestartCPU, debugger_options_mask);

                }
 
                panic_spin_forever();
                }
 
                panic_spin_forever();


@@ -450,13 +623,13 @@ DebuggerWithContext(unsigned int reason, void *ctx, const char *message,
 
        if (ctx != NULL) {
                DebuggerSaveState(DBOP_DEBUGGER, message,
 
        if (ctx != NULL) {
                DebuggerSaveState(DBOP_DEBUGGER, message,

-                       NULL, NULL, debugger_options_mask, TRUE, 0);
+                   NULL, NULL, debugger_options_mask, NULL, TRUE, 0);

                handle_debugger_trap(reason, 0, 0, ctx);
                DebuggerSaveState(DBOP_NONE, NULL, NULL,
                handle_debugger_trap(reason, 0, 0, ctx);
                DebuggerSaveState(DBOP_NONE, NULL, NULL,

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

        } else {
                DebuggerTrapWithState(DBOP_DEBUGGER, message,
        } else {
                DebuggerTrapWithState(DBOP_DEBUGGER, message,

-                       NULL, NULL, debugger_options_mask, TRUE, 0);
+                   NULL, NULL, debugger_options_mask, NULL, TRUE, 0);

        }
 
        CPUDEBUGGERCOUNT--;
        }
 
        CPUDEBUGGERCOUNT--;


@@ -482,8 +655,9 @@ kdp_register_callout(kdp_callout_fn_t fn, void * arg)
        struct kdp_callout * list_head;
 
        kcp = kalloc(sizeof(*kcp));
        struct kdp_callout * list_head;
 
        kcp = kalloc(sizeof(*kcp));

-       if (kcp == NULL)
+       if (kcp == NULL) {

                panic("kdp_register_callout() kalloc failed");
                panic("kdp_register_callout() kalloc failed");

+       }

 
        kcp->callout_fn = fn;
        kcp->callout_arg = arg;
 
        kcp->callout_fn = fn;
        kcp->callout_arg = arg;


@@ -499,7 +673,7 @@ kdp_register_callout(kdp_callout_fn_t fn, void * arg)
 static void
 kdp_callouts(kdp_event_t event)
 {
 static void
 kdp_callouts(kdp_event_t event)
 {

-       struct kdp_callout      *kcp = kdp_callout_list;
+       struct kdp_callout      *kcp = kdp_callout_list;

 
        while (kcp) {
                if (!kcp->callout_in_progress) {
 
        while (kcp) {
                if (!kcp->callout_in_progress) {


@@ -511,6 +685,46 @@ kdp_callouts(kdp_event_t event)
        }
 }
 
        }
 }
 

+#if !defined (__x86_64__)
+/*
+ * Register an additional buffer with data to include in the panic log
+ *
+ * <rdar://problem/50137705> tracks supporting more than one buffer
+ *
+ * Note that producer_name and buf should never be de-allocated as we reference these during panic.
+ */
+void
+register_additional_panic_data_buffer(const char *producer_name, void *buf, int len)
+{
+       if (panic_data_buffers != NULL) {
+               panic("register_additional_panic_data_buffer called with buffer already registered");
+       }
+
+       if (producer_name == NULL || (strlen(producer_name) == 0)) {
+               panic("register_additional_panic_data_buffer called with invalid producer_name");
+       }
+
+       if (buf == NULL) {
+               panic("register_additional_panic_data_buffer called with invalid buffer pointer");
+       }
+
+       if ((len <= 0) || (len > ADDITIONAL_PANIC_DATA_BUFFER_MAX_LEN)) {
+               panic("register_additional_panic_data_buffer called with invalid length");
+       }
+
+       struct additional_panic_data_buffer *new_panic_data_buffer = kalloc(sizeof(struct additional_panic_data_buffer));
+       new_panic_data_buffer->producer_name = producer_name;
+       new_panic_data_buffer->buf = buf;
+       new_panic_data_buffer->len = len;
+
+       if (!OSCompareAndSwapPtr(NULL, new_panic_data_buffer, &panic_data_buffers)) {
+               panic("register_additional_panic_data_buffer called with buffer already registered");
+       }
+
+       return;
+}
+#endif /* !defined (__x86_64__) */
+

 /*
  * An overview of the xnu panic path:
  *
 /*
  * An overview of the xnu panic path:
  *


@@ -529,7 +743,7 @@ panic(const char *str, ...)
        va_list panic_str_args;
 
        va_start(panic_str_args, str);
        va_list panic_str_args;
 
        va_start(panic_str_args, str);

-       panic_trap_to_debugger(str, &panic_str_args, 0, NULL, 0, (unsigned long)(char *)__builtin_return_address(0));
+       panic_trap_to_debugger(str, &panic_str_args, 0, NULL, 0, NULL, (unsigned long)(char *)__builtin_return_address(0));

        va_end(panic_str_args);
 }
 
        va_end(panic_str_args);
 }
 


@@ -539,41 +753,62 @@ panic_with_options(unsigned int reason, void *ctx, uint64_t debugger_options_mas
        va_list panic_str_args;
 
        va_start(panic_str_args, str);
        va_list panic_str_args;
 
        va_start(panic_str_args, str);

-       panic_trap_to_debugger(str, &panic_str_args, reason, ctx, debugger_options_mask, (unsigned long)(char *)__builtin_return_address(0));
+       panic_trap_to_debugger(str, &panic_str_args, reason, ctx, (debugger_options_mask & ~DEBUGGER_INTERNAL_OPTIONS_MASK),
+           NULL, (unsigned long)(char *)__builtin_return_address(0));

        va_end(panic_str_args);
 }
 
        va_end(panic_str_args);
 }
 

+#if defined (__x86_64__)
+/*
+ * panic_with_thread_context() is used on x86 platforms to specify a different thread that should be backtraced in the paniclog.
+ * We don't generally need this functionality on embedded platforms because embedded platforms include a panic time stackshot
+ * from customer devices. We plumb the thread pointer via the debugger trap mechanism and backtrace the kernel stack from the
+ * thread when writing the panic log.
+ *
+ * NOTE: panic_with_thread_context() should be called with an explicit thread reference held on the passed thread.
+ */

 void
 void

-panic_context(unsigned int reason, void *ctx, const char *str, ...)
+panic_with_thread_context(unsigned int reason, void *ctx, uint64_t debugger_options_mask, thread_t thread, const char *str, ...)

 {
        va_list panic_str_args;
 {
        va_list panic_str_args;

+       __assert_only os_ref_count_t th_ref_count;
+
+       assert_thread_magic(thread);
+       th_ref_count = os_ref_get_count(&thread->ref_count);
+       assertf(th_ref_count > 0, "panic_with_thread_context called with invalid thread %p with refcount %u", thread, th_ref_count);
+
+       /* Take a reference on the thread so it doesn't disappear by the time we try to backtrace it */
+       thread_reference(thread);

 
        va_start(panic_str_args, str);
 
        va_start(panic_str_args, str);

-       panic_trap_to_debugger(str, &panic_str_args, reason, ctx, 0, (unsigned long)(char *)__builtin_return_address(0));
+       panic_trap_to_debugger(str, &panic_str_args, reason, ctx, ((debugger_options_mask & ~DEBUGGER_INTERNAL_OPTIONS_MASK) | DEBUGGER_INTERNAL_OPTION_THREAD_BACKTRACE),
+           thread, (unsigned long)(char *)__builtin_return_address(0));
+

        va_end(panic_str_args);
 }
        va_end(panic_str_args);
 }

+#endif /* defined (__x86_64__) */

 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wmissing-noreturn"
 void
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wmissing-noreturn"
 void

-panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args, unsigned int reason, void
-                       *ctx, uint64_t panic_options_mask, unsigned long panic_caller)
+panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args, unsigned int reason, void *ctx,
+    uint64_t panic_options_mask, void *panic_data_ptr, unsigned long panic_caller)

 {
 #pragma clang diagnostic pop
 
 {
 #pragma clang diagnostic pop
 

+#if defined(__x86_64__) && (DEVELOPMENT || DEBUG)
+       /* Turn off I/O tracing once we've panicked */
+       mmiotrace_enabled = 0;
+#endif
+

        if (ml_wants_panic_trap_to_debugger()) {
                ml_panic_trap_to_debugger(panic_format_str, panic_args, reason, ctx, panic_options_mask, panic_caller);
        if (ml_wants_panic_trap_to_debugger()) {
                ml_panic_trap_to_debugger(panic_format_str, panic_args, reason, ctx, panic_options_mask, panic_caller);

-
-               /*
-                * This should not return, but we return here for the tail call
-                * as it simplifies the backtrace.
-                */
-               return;
+               __builtin_trap();

        }
 
        CPUDEBUGGERCOUNT++;
 
        }
 
        CPUDEBUGGERCOUNT++;
 

-       if (CPUDEBUGGERCOUNT > NESTEDDEBUGGERENTRYMAX) {
+       if (CPUDEBUGGERCOUNT > max_debugger_entry_count) {

                static boolean_t in_panic_kprintf = FALSE;
 
                /* Notify any listeners that we've started a panic */
                static boolean_t in_panic_kprintf = FALSE;
 
                /* Notify any listeners that we've started a panic */


@@ -582,12 +817,12 @@ panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args, unsign
                if (!in_panic_kprintf) {
                        in_panic_kprintf = TRUE;
                        kprintf("Detected nested debugger entry count exceeding %d\n",
                if (!in_panic_kprintf) {
                        in_panic_kprintf = TRUE;
                        kprintf("Detected nested debugger entry count exceeding %d\n",

-                               NESTEDDEBUGGERENTRYMAX);
+                           max_debugger_entry_count);

                        in_panic_kprintf = FALSE;
                }
 
                if (!panicDebugging) {
                        in_panic_kprintf = FALSE;
                }
 
                if (!panicDebugging) {

-                       kdp_machine_reboot_type(kPEPanicRestartCPU);
+                       kdp_machine_reboot_type(kPEPanicRestartCPU, panic_options_mask);

                }
 
                panic_spin_forever();
                }
 
                panic_spin_forever();


@@ -597,10 +832,7 @@ panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args, unsign
        DEBUGGER_DEBUGGING_NESTED_PANIC_IF_REQUESTED((panic_options_mask & DEBUGGER_OPTION_RECURPANIC_ENTRY));
 #endif
 
        DEBUGGER_DEBUGGING_NESTED_PANIC_IF_REQUESTED((panic_options_mask & DEBUGGER_OPTION_RECURPANIC_ENTRY));
 #endif
 

-#if CONFIG_EMBEDDED
-       if (PE_arm_debug_panic_hook)
-               PE_arm_debug_panic_hook(panic_format_str);
-#endif
+       PE_panic_hook(panic_format_str);

 
 #if defined (__x86_64__)
        plctrace_disable();
 
 #if defined (__x86_64__)
        plctrace_disable();


@@ -609,7 +841,7 @@ panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args, unsign
        if (write_trace_on_panic && kdebug_enable) {
                if (get_preemption_level() == 0 && !ml_at_interrupt_context()) {
                        ml_set_interrupts_enabled(TRUE);
        if (write_trace_on_panic && kdebug_enable) {
                if (get_preemption_level() == 0 && !ml_at_interrupt_context()) {
                        ml_set_interrupts_enabled(TRUE);

-                       KDBG(TRACE_PANIC);
+                       KDBG_RELEASE(TRACE_PANIC);

                        kdbg_dump_trace_to_file(KDBG_TRACE_PANIC_FILENAME);
                }
        }
                        kdbg_dump_trace_to_file(KDBG_TRACE_PANIC_FILENAME);
                }
        }


@@ -630,8 +862,8 @@ panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args, unsign
                 * state on the current CPU and then jump to handle_debugger_trap.
                 */
                DebuggerSaveState(DBOP_PANIC, "panic",
                 * state on the current CPU and then jump to handle_debugger_trap.
                 */
                DebuggerSaveState(DBOP_PANIC, "panic",

-                               panic_format_str, panic_args,
-                               panic_options_mask, TRUE, panic_caller);
+                   panic_format_str, panic_args,
+                   panic_options_mask, panic_data_ptr, TRUE, panic_caller);

                handle_debugger_trap(reason, 0, 0, ctx);
        }
 
                handle_debugger_trap(reason, 0, 0, ctx);
        }
 


@@ -639,39 +871,44 @@ panic_trap_to_debugger(const char *panic_format_str, va_list *panic_args, unsign
        /*
         *  Signal to fastsim that it should open debug ports (nop on hardware)
         */
        /*
         *  Signal to fastsim that it should open debug ports (nop on hardware)
         */

-       __asm__         volatile("HINT 0x45");
+       __asm__         volatile ("HINT 0x45");

 #endif /* defined(__arm64__) */
 
        DebuggerTrapWithState(DBOP_PANIC, "panic", panic_format_str,
 #endif /* defined(__arm64__) */
 
        DebuggerTrapWithState(DBOP_PANIC, "panic", panic_format_str,

-                       panic_args, panic_options_mask, TRUE, panic_caller);
+           panic_args, panic_options_mask, panic_data_ptr, TRUE, panic_caller);

 
        /*
         * Not reached.
         */
        panic_stop();
 
        /*
         * Not reached.
         */
        panic_stop();

+       __builtin_unreachable();

 }
 
 }
 

-__attribute__((noreturn))

 void
 void

-panic_spin_forever()
+panic_spin_forever(void)

 {
        paniclog_append_noflush("\nPlease go to https://panic.apple.com to report this panic\n");
 
 {
        paniclog_append_noflush("\nPlease go to https://panic.apple.com to report this panic\n");
 

-       for (;;) { }
+       for (;;) {
+       }

 }
 
 static void
 }
 
 static void

-kdp_machine_reboot_type(unsigned int type)
+kdp_machine_reboot_type(unsigned int type, uint64_t debugger_flags)

 {
        printf("Attempting system restart...");
 {
        printf("Attempting system restart...");

-       PEHaltRestart(type);
+       if ((type == kPEPanicRestartCPU) && (debugger_flags & DEBUGGER_OPTION_SKIP_PANICEND_CALLOUTS)) {
+               PEHaltRestart(kPEPanicRestartCPUNoPanicEndCallouts);
+       } else {
+               PEHaltRestart(type);
+       }

        halt_all_cpus(TRUE);
 }
 
 void
 kdp_machine_reboot(void)
 {
        halt_all_cpus(TRUE);
 }
 
 void
 kdp_machine_reboot(void)
 {

-       kdp_machine_reboot_type(kPEPanicRestartCPU);
+       kdp_machine_reboot_type(kPEPanicRestartCPU, 0);

 }
 
 /*
 }
 
 /*


@@ -692,7 +929,7 @@ debugger_collect_diagnostics(unsigned int exception, unsigned int code, unsigned
 #endif
 
 #if defined(__x86_64__)
 #endif
 
 #if defined(__x86_64__)

-       kprintf("Debugger called: <%s>\n", debugger_message);
+       kprintf("Debugger called: <%s>\n", debugger_message ? debugger_message : "");

 #endif
        /*
         * DB_HALT (halt_in_debugger) can be requested on startup, we shouldn't generate
 #endif
        /*
         * DB_HALT (halt_in_debugger) can be requested on startup, we shouldn't generate


@@ -707,7 +944,7 @@ debugger_collect_diagnostics(unsigned int exception, unsigned int code, unsigned
        }
 
        if ((debugger_current_op == DBOP_PANIC) ||
        }
 
        if ((debugger_current_op == DBOP_PANIC) ||

-               (debugger_current_op == DBOP_DEBUGGER && debugger_is_panic)) {
+           ((debugger_current_op == DBOP_DEBUGGER) && debugger_is_panic)) {

                /*
                 * Attempt to notify listeners once and only once that we've started
                 * panicking. Only do this for Debugger() calls if we're treating
                /*
                 * Attempt to notify listeners once and only once that we've started
                 * panicking. Only do this for Debugger() calls if we're treating


@@ -745,14 +982,17 @@ debugger_collect_diagnostics(unsigned int exception, unsigned int code, unsigned
                }
                paniclog_append_noflush("\n");
        }
                }
                paniclog_append_noflush("\n");
        }

+#if defined(__x86_64__)
+       else if (((debugger_current_op == DBOP_DEBUGGER) && debugger_is_panic)) {
+               paniclog_append_noflush("Debugger called: <%s>\n", debugger_message ? debugger_message : "");
+       }

 
        /*
         * Debugger() is treated like panic() on embedded -- for example we use it for WDT
         * panics (so we need to write a paniclog). On desktop Debugger() is used in the
         * conventional sense.
         */
 
        /*
         * Debugger() is treated like panic() on embedded -- for example we use it for WDT
         * panics (so we need to write a paniclog). On desktop Debugger() is used in the
         * conventional sense.
         */

-#if defined(__x86_64__)
-       if (debugger_current_op == DBOP_PANIC)
+       if (debugger_current_op == DBOP_PANIC || ((debugger_current_op == DBOP_DEBUGGER) && debugger_is_panic))

 #endif
        {
                kdp_callouts(KDP_EVENT_PANICLOG);
 #endif
        {
                kdp_callouts(KDP_EVENT_PANICLOG);


@@ -762,60 +1002,83 @@ debugger_collect_diagnostics(unsigned int exception, unsigned int code, unsigned
                 * TODO: Need to clear panic log when return from debugger
                 * hooked up for embedded
                 */
                 * TODO: Need to clear panic log when return from debugger
                 * hooked up for embedded
                 */

-               SavePanicInfo(debugger_message, debugger_panic_options);
+               SavePanicInfo(debugger_message, debugger_panic_data, debugger_panic_options);

 
 #if DEVELOPMENT || DEBUG
                DEBUGGER_DEBUGGING_NESTED_PANIC_IF_REQUESTED((debugger_panic_options & DEBUGGER_OPTION_RECURPANIC_POSTLOG));
 #endif
 
                /* DEBUGGER_OPTION_PANICLOGANDREBOOT is used for two finger resets on embedded so we get a paniclog */
 
 #if DEVELOPMENT || DEBUG
                DEBUGGER_DEBUGGING_NESTED_PANIC_IF_REQUESTED((debugger_panic_options & DEBUGGER_OPTION_RECURPANIC_POSTLOG));
 #endif
 
                /* DEBUGGER_OPTION_PANICLOGANDREBOOT is used for two finger resets on embedded so we get a paniclog */

-               if (debugger_panic_options & DEBUGGER_OPTION_PANICLOGANDREBOOT)
-                       PEHaltRestart(kPEPanicRestartCPU);
+               if (debugger_panic_options & DEBUGGER_OPTION_PANICLOGANDREBOOT) {
+                       PEHaltRestart(kPEPanicRestartCPUNoCallouts);
+               }

        }
 
 #if CONFIG_KDP_INTERACTIVE_DEBUGGING
        }
 
 #if CONFIG_KDP_INTERACTIVE_DEBUGGING

-       uint32_t debug_flags = 0;
-       PE_i_can_has_debugger(&debug_flags);
-

        /*
         * If reboot on panic is enabled and the caller of panic indicated that we should skip
         * local coredumps, don't try to write these and instead go straight to reboot. This
         * allows us to persist any data that's stored in the panic log.
         */
        if ((debugger_panic_options & DEBUGGER_OPTION_SKIP_LOCAL_COREDUMP) &&
        /*
         * If reboot on panic is enabled and the caller of panic indicated that we should skip
         * local coredumps, don't try to write these and instead go straight to reboot. This
         * allows us to persist any data that's stored in the panic log.
         */
        if ((debugger_panic_options & DEBUGGER_OPTION_SKIP_LOCAL_COREDUMP) &&

-               (debug_flags & DB_REBOOT_POST_CORE)) {
-               kdp_machine_reboot_type(kPEPanicRestartCPU);
+           (debug_boot_arg & DB_REBOOT_POST_CORE)) {
+               kdp_machine_reboot_type(kPEPanicRestartCPU, debugger_panic_options);

        }
 
        /*
         * Consider generating a local corefile if the infrastructure is configured
         * and we haven't disabled on-device coredumps.
         */
        }
 
        /*
         * Consider generating a local corefile if the infrastructure is configured
         * and we haven't disabled on-device coredumps.
         */

-       if (kdp_has_polled_corefile() && !(debug_flags & DB_DISABLE_LOCAL_CORE)) {
-               int ret = -1;
+       if (on_device_corefile_enabled()) {
+               if (!kdp_has_polled_corefile()) {
+                       if (debug_boot_arg & (DB_KERN_DUMP_ON_PANIC | DB_KERN_DUMP_ON_NMI)) {
+                               paniclog_append_noflush("skipping local kernel core because core file could not be opened prior to panic (error : 0x%x)",
+                                   kdp_polled_corefile_error());
+#if CONFIG_EMBEDDED
+                               panic_info->eph_panic_flags |= EMBEDDED_PANIC_HEADER_FLAG_COREDUMP_FAILED;
+                               paniclog_flush();
+#else /* CONFIG_EMBEDDED */
+                               if (panic_info->mph_panic_log_offset != 0) {
+                                       panic_info->mph_panic_flags |= MACOS_PANIC_HEADER_FLAG_COREDUMP_FAILED;
+                                       paniclog_flush();
+                               }
+#endif /* CONFIG_EMBEDDED */
+                       }
+               } else {
+                       int ret = -1;

 
 #if defined (__x86_64__)
 
 #if defined (__x86_64__)

-               /* On x86 we don't do a coredump on Debugger unless the DB_KERN_DUMP_ON_NMI boot-arg is specified. */
-               if (debugger_current_op != DBOP_DEBUGGER || (debug_flags & DB_KERN_DUMP_ON_NMI))
+                       /* On x86 we don't do a coredump on Debugger unless the DB_KERN_DUMP_ON_NMI boot-arg is specified. */
+                       if (debugger_current_op != DBOP_DEBUGGER || (debug_boot_arg & DB_KERN_DUMP_ON_NMI))

 #endif
 #endif

-               {
-                       /*
-                        * Doing an on-device coredump leaves the disk driver in a state
-                        * that can not be resumed.
-                        */
-                       debugger_safe_to_return = FALSE;
-                       begin_panic_transfer();
-                       ret = kern_dump(KERN_DUMP_DISK);
-                       abort_panic_transfer();
+                       {
+                               /*
+                                * Doing an on-device coredump leaves the disk driver in a state
+                                * that can not be resumed.
+                                */
+                               debugger_safe_to_return = FALSE;
+                               begin_panic_transfer();
+                               ret = kern_dump(KERN_DUMP_DISK);
+                               abort_panic_transfer();

 
 #if DEVELOPMENT || DEBUG
 
 #if DEVELOPMENT || DEBUG

-                       DEBUGGER_DEBUGGING_NESTED_PANIC_IF_REQUESTED((debugger_panic_options & DEBUGGER_OPTION_RECURPANIC_POSTCORE));
+                               DEBUGGER_DEBUGGING_NESTED_PANIC_IF_REQUESTED((debugger_panic_options & DEBUGGER_OPTION_RECURPANIC_POSTCORE));

 #endif
 #endif

+                       }
+
+                       /*
+                        * If DB_REBOOT_POST_CORE is set, then reboot if coredump is sucessfully saved
+                        * or if option to ignore failures is set.
+                        */
+                       if ((debug_boot_arg & DB_REBOOT_POST_CORE) &&
+                           ((ret == 0) || (debugger_panic_options & DEBUGGER_OPTION_ATTEMPTCOREDUMPANDREBOOT))) {
+                               kdp_machine_reboot_type(kPEPanicRestartCPU, debugger_panic_options);
+                       }

                }
                }

+       }

 
 

-               /* If we wrote a corefile and DB_REBOOT_POST_CORE is set, reboot */
-               if (ret == 0 && (debug_flags & DB_REBOOT_POST_CORE))
-                       kdp_machine_reboot_type(kPEPanicRestartCPU);
+       if (debug_boot_arg & DB_REBOOT_ALWAYS) {
+               kdp_machine_reboot_type(kPEPanicRestartCPU, debugger_panic_options);

        }
 
        /* If KDP is configured, try to trap to the debugger */
        }
 
        /* If KDP is configured, try to trap to the debugger */


@@ -824,11 +1087,11 @@ debugger_collect_diagnostics(unsigned int exception, unsigned int code, unsigned
                /*
                 * Only return if we entered via Debugger and it's safe to return
                 * (we halted the other cores successfully, this isn't a nested panic, etc)
                /*
                 * Only return if we entered via Debugger and it's safe to return
                 * (we halted the other cores successfully, this isn't a nested panic, etc)

-               */
+                */

                if (debugger_current_op == DBOP_DEBUGGER &&
                if (debugger_current_op == DBOP_DEBUGGER &&

-                               debugger_safe_to_return &&
-                               kernel_debugger_entry_count == 1 &&
-                               !debugger_is_panic) {
+                   debugger_safe_to_return &&
+                   kernel_debugger_entry_count == 1 &&
+                   !debugger_is_panic) {

                        return;
                }
        }
                        return;
                }
        }


@@ -842,7 +1105,7 @@ debugger_collect_diagnostics(unsigned int exception, unsigned int code, unsigned
 #endif /* CONFIG_KDP_INTERACTIVE_DEBUGGING */
 
        if (!panicDebugging) {
 #endif /* CONFIG_KDP_INTERACTIVE_DEBUGGING */
 
        if (!panicDebugging) {

-               kdp_machine_reboot_type(kPEPanicRestartCPU);
+               kdp_machine_reboot_type(kPEPanicRestartCPU, debugger_panic_options);

        }
 
        panic_spin_forever();
        }
 
        panic_spin_forever();


@@ -894,7 +1157,7 @@ handle_debugger_trap(unsigned int exception, unsigned int code, unsigned int sub
        } else {
                /* Not safe to return from a nested panic/debugger call */
                if (debugger_current_op == DBOP_PANIC ||
        } else {
                /* Not safe to return from a nested panic/debugger call */
                if (debugger_current_op == DBOP_PANIC ||

-                       debugger_current_op == DBOP_DEBUGGER) {
+                   debugger_current_op == DBOP_DEBUGGER) {

                        debugger_safe_to_return = FALSE;
                }
 
                        debugger_safe_to_return = FALSE;
                }
 


@@ -904,6 +1167,7 @@ handle_debugger_trap(unsigned int exception, unsigned int code, unsigned int sub
                if (debugger_panic_str == NULL) {
                        debugger_panic_str = CPUPANICSTR;
                        debugger_panic_args = CPUPANICARGS;
                if (debugger_panic_str == NULL) {
                        debugger_panic_str = CPUPANICSTR;
                        debugger_panic_args = CPUPANICARGS;

+                       debugger_panic_data = CPUPANICDATAPTR;

                        debugger_message = CPUDEBUGGERMSG;
                        debugger_panic_caller = CPUPANICCALLER;
                }
                        debugger_message = CPUDEBUGGERMSG;
                        debugger_panic_caller = CPUPANICCALLER;
                }


@@ -929,7 +1193,7 @@ handle_debugger_trap(unsigned int exception, unsigned int code, unsigned int sub
        } else if (debugger_current_op == DBOP_STACKSHOT) {
                CPUDEBUGGERRET = do_stackshot();
 #if PGO
        } else if (debugger_current_op == DBOP_STACKSHOT) {
                CPUDEBUGGERRET = do_stackshot();
 #if PGO

-       } else if (debugger_current_op == DBOP_RESET_PGO_COUNTERS) {
+       } else if (debugger_current_op == DBOP_RESET_PGO_COUNTERS) {

                CPUDEBUGGERRET = do_pgo_reset_counters();
 #endif
        } else {
                CPUDEBUGGERRET = do_pgo_reset_counters();
 #endif
        } else {


@@ -946,6 +1210,7 @@ handle_debugger_trap(unsigned int exception, unsigned int code, unsigned int sub
        if (debugger_current_op != DBOP_BREAKPOINT) {
                debugger_panic_str = NULL;
                debugger_panic_args = NULL;
        if (debugger_current_op != DBOP_BREAKPOINT) {
                debugger_panic_str = NULL;
                debugger_panic_args = NULL;

+               debugger_panic_data = NULL;

                debugger_panic_options = 0;
                debugger_message = NULL;
        }
                debugger_panic_options = 0;
                debugger_message = NULL;
        }


@@ -966,18 +1231,19 @@ handle_debugger_trap(unsigned int exception, unsigned int code, unsigned int sub
        return;
 }
 
        return;
 }
 

-__attribute__((noinline,not_tail_called))
-void log(__unused int level, char *fmt, ...)
+__attribute__((noinline, not_tail_called))
+void
+log(__unused int level, char *fmt, ...)

 {
        void *caller = __builtin_return_address(0);
 {
        void *caller = __builtin_return_address(0);

-       va_list listp;
-       va_list listp2;
+       va_list listp;
+       va_list listp2;

 
 
 #ifdef lint
        level++;
 #endif /* lint */
 
 
 #ifdef lint
        level++;
 #endif /* lint */

-#ifdef MACH_BSD
+#ifdef  MACH_BSD

        va_start(listp, fmt);
        va_copy(listp2, listp);
 
        va_start(listp, fmt);
        va_copy(listp2, listp);
 


@@ -1004,39 +1270,40 @@ void log(__unused int level, char *fmt, ...)
  */
 
 boolean_t
  */
 
 boolean_t

-oslog_is_safe(void) {
-       return (kernel_debugger_entry_count == 0 &&
-               not_in_kdp == 1 &&
-               get_preemption_level() == 0 &&
-               ml_get_interrupts_enabled() == TRUE);
+oslog_is_safe(void)
+{
+       return kernel_debugger_entry_count == 0 &&
+              not_in_kdp == 1 &&
+              get_preemption_level() == 0 &&
+              ml_get_interrupts_enabled() == TRUE;

 }
 
 boolean_t
 debug_mode_active(void)
 {
 }
 
 boolean_t
 debug_mode_active(void)
 {

-       return ((0 != kernel_debugger_entry_count != 0) || (0 == not_in_kdp));
+       return (0 != kernel_debugger_entry_count != 0) || (0 == not_in_kdp);

 }
 
 void
 debug_putc(char c)
 {
        if ((debug_buf_size != 0) &&
 }
 
 void
 debug_putc(char c)
 {
        if ((debug_buf_size != 0) &&

-               ((debug_buf_ptr - debug_buf_base) < (int)debug_buf_size)) {
-               *debug_buf_ptr=c;
+           ((debug_buf_ptr - debug_buf_base) < (int)debug_buf_size)) {
+               *debug_buf_ptr = c;

                debug_buf_ptr++;
        }
 }
 
 #if defined (__x86_64__)
 struct pasc {
                debug_buf_ptr++;
        }
 }
 
 #if defined (__x86_64__)
 struct pasc {

-  unsigned a: 7;
-  unsigned b: 7;
-  unsigned c: 7;
-  unsigned d: 7;
-  unsigned e: 7;
-  unsigned f: 7;
-  unsigned g: 7;
-  unsigned h: 7;
+       unsigned a: 7;
+       unsigned b: 7;
+       unsigned c: 7;
+       unsigned d: 7;
+       unsigned e: 7;
+       unsigned f: 7;
+       unsigned g: 7;
+       unsigned h: 7;

 }  __attribute__((packed));
 
 typedef struct pasc pasc_t;
 }  __attribute__((packed));
 
 typedef struct pasc pasc_t;


@@ -1048,25 +1315,24 @@ typedef struct pasc pasc_t;
 int
 packA(char *inbuf, uint32_t length, uint32_t buflen)
 {
 int
 packA(char *inbuf, uint32_t length, uint32_t buflen)
 {

-  unsigned int i, j = 0;
-  pasc_t pack;
-  
-  length = MIN(((length + 7) & ~7), buflen);
-
-  for (i = 0; i < length; i+=8)
-    {
-      pack.a = inbuf[i];
-      pack.b = inbuf[i+1];
-      pack.c = inbuf[i+2];
-      pack.d = inbuf[i+3];
-      pack.e = inbuf[i+4];
-      pack.f = inbuf[i+5];
-      pack.g = inbuf[i+6];
-      pack.h = inbuf[i+7];
-      bcopy ((char *) &pack, inbuf + j, 7);
-      j += 7;
-    }
-  return j;
+       unsigned int i, j = 0;
+       pasc_t pack;
+
+       length = MIN(((length + 7) & ~7), buflen);
+
+       for (i = 0; i < length; i += 8) {
+               pack.a = inbuf[i];
+               pack.b = inbuf[i + 1];
+               pack.c = inbuf[i + 2];
+               pack.d = inbuf[i + 3];
+               pack.e = inbuf[i + 4];
+               pack.f = inbuf[i + 5];
+               pack.g = inbuf[i + 6];
+               pack.h = inbuf[i + 7];
+               bcopy((char *) &pack, inbuf + j, 7);
+               j += 7;
+       }
+       return j;

 }
 
 void
 }
 
 void


@@ -1074,19 +1340,19 @@ unpackA(char *inbuf, uint32_t length)
 {
        pasc_t packs;
        unsigned i = 0;
 {
        pasc_t packs;
        unsigned i = 0;

-       length = (length * 8)/7;
+       length = (length * 8) / 7;

 
        while (i < length) {
 
        while (i < length) {

-         packs = *(pasc_t *)&inbuf[i];
-         bcopy(&inbuf[i+7], &inbuf[i+8], MAX(0, (int) (length - i - 8)));
-         inbuf[i++] = packs.a;
-         inbuf[i++] = packs.b;
-         inbuf[i++] = packs.c;
-         inbuf[i++] = packs.d;
-         inbuf[i++] = packs.e;
-         inbuf[i++] = packs.f;
-         inbuf[i++] = packs.g;
-         inbuf[i++] = packs.h;
+               packs = *(pasc_t *)&inbuf[i];
+               bcopy(&inbuf[i + 7], &inbuf[i + 8], MAX(0, (int) (length - i - 8)));
+               inbuf[i++] = packs.a;
+               inbuf[i++] = packs.b;
+               inbuf[i++] = packs.c;
+               inbuf[i++] = packs.d;
+               inbuf[i++] = packs.e;
+               inbuf[i++] = packs.f;
+               inbuf[i++] = packs.g;
+               inbuf[i++] = packs.h;

        }
 }
 #endif /* defined (__x86_64__) */
        }
 }
 #endif /* defined (__x86_64__) */


@@ -1094,55 +1360,68 @@ unpackA(char *inbuf, uint32_t length)
 extern void *proc_name_address(void *p);
 
 static void
 extern void *proc_name_address(void *p);
 
 static void

-panic_display_process_name(void) {
+panic_display_process_name(void)
+{

        /* because of scoping issues len(p_comm) from proc_t is hard coded here */
        char proc_name[17] = "Unknown";
        task_t ctask = 0;
        void *cbsd_info = 0;
 
        /* because of scoping issues len(p_comm) from proc_t is hard coded here */
        char proc_name[17] = "Unknown";
        task_t ctask = 0;
        void *cbsd_info = 0;
 

-       if (ml_nofault_copy((vm_offset_t)&current_thread()->task, (vm_offset_t) &ctask, sizeof(task_t)) == sizeof(task_t))
-               if(ml_nofault_copy((vm_offset_t)&ctask->bsd_info, (vm_offset_t)&cbsd_info, sizeof(cbsd_info)) == sizeof(cbsd_info))
-                       if (cbsd_info && (ml_nofault_copy((vm_offset_t) proc_name_address(cbsd_info), (vm_offset_t) &proc_name, sizeof(proc_name)) > 0))
+       if (ml_nofault_copy((vm_offset_t)&current_thread()->task, (vm_offset_t) &ctask, sizeof(task_t)) == sizeof(task_t)) {
+               if (ml_nofault_copy((vm_offset_t)&ctask->bsd_info, (vm_offset_t)&cbsd_info, sizeof(cbsd_info)) == sizeof(cbsd_info)) {
+                       if (cbsd_info && (ml_nofault_copy((vm_offset_t) proc_name_address(cbsd_info), (vm_offset_t) &proc_name, sizeof(proc_name)) > 0)) {

                                proc_name[sizeof(proc_name) - 1] = '\0';
                                proc_name[sizeof(proc_name) - 1] = '\0';

+                       }
+               }
+       }

        paniclog_append_noflush("\nBSD process name corresponding to current thread: %s\n", proc_name);
 }
 
 unsigned
        paniclog_append_noflush("\nBSD process name corresponding to current thread: %s\n", proc_name);
 }
 
 unsigned

-panic_active(void) {
-       return ((debugger_panic_str != (char *) 0));
+panic_active(void)
+{
+       return debugger_panic_str != (char *) 0;

 }
 
 void
 }
 
 void

-populate_model_name(char *model_string) {
+populate_model_name(char *model_string)
+{

        strlcpy(model_name, model_string, sizeof(model_name));
 }
 
 void
        strlcpy(model_name, model_string, sizeof(model_name));
 }
 
 void

-panic_display_model_name(void) {
+panic_display_model_name(void)
+{

        char tmp_model_name[sizeof(model_name)];
 
        char tmp_model_name[sizeof(model_name)];
 

-       if (ml_nofault_copy((vm_offset_t) &model_name, (vm_offset_t) &tmp_model_name, sizeof(model_name)) != sizeof(model_name))
+       if (ml_nofault_copy((vm_offset_t) &model_name, (vm_offset_t) &tmp_model_name, sizeof(model_name)) != sizeof(model_name)) {

                return;
                return;

+       }

 
        tmp_model_name[sizeof(tmp_model_name) - 1] = '\0';
 
 
        tmp_model_name[sizeof(tmp_model_name) - 1] = '\0';
 

-       if (tmp_model_name[0] != 0)
+       if (tmp_model_name[0] != 0) {

                paniclog_append_noflush("System model name: %s\n", tmp_model_name);
                paniclog_append_noflush("System model name: %s\n", tmp_model_name);

+       }

 }
 
 void
 }
 
 void

-panic_display_kernel_uuid(void) {
+panic_display_kernel_uuid(void)
+{

        char tmp_kernel_uuid[sizeof(kernel_uuid_string)];
 
        char tmp_kernel_uuid[sizeof(kernel_uuid_string)];
 

-       if (ml_nofault_copy((vm_offset_t) &kernel_uuid_string, (vm_offset_t) &tmp_kernel_uuid, sizeof(kernel_uuid_string)) != sizeof(kernel_uuid_string))
+       if (ml_nofault_copy((vm_offset_t) &kernel_uuid_string, (vm_offset_t) &tmp_kernel_uuid, sizeof(kernel_uuid_string)) != sizeof(kernel_uuid_string)) {

                return;
                return;

+       }

 
 

-       if (tmp_kernel_uuid[0] != '\0')
+       if (tmp_kernel_uuid[0] != '\0') {

                paniclog_append_noflush("Kernel UUID: %s\n", tmp_kernel_uuid);
                paniclog_append_noflush("Kernel UUID: %s\n", tmp_kernel_uuid);

+       }

 }
 
 void
 }
 
 void

-panic_display_kernel_aslr(void) {
+panic_display_kernel_aslr(void)
+{

        if (vm_kernel_slide) {
                paniclog_append_noflush("Kernel slide:     0x%016lx\n", (unsigned long) vm_kernel_slide);
                paniclog_append_noflush("Kernel text base: %p\n", (void *) vm_kernel_stext);
        if (vm_kernel_slide) {
                paniclog_append_noflush("Kernel slide:     0x%016lx\n", (unsigned long) vm_kernel_slide);
                paniclog_append_noflush("Kernel text base: %p\n", (void *) vm_kernel_stext);


@@ -1150,28 +1429,47 @@ panic_display_kernel_aslr(void) {
 }
 
 void
 }
 
 void

-panic_display_hibb(void) {
+panic_display_hibb(void)
+{

 #if defined(__i386__) || defined (__x86_64__)
        paniclog_append_noflush("__HIB  text base: %p\n", (void *) vm_hib_base);
 #endif
 }
 
 static void
 #if defined(__i386__) || defined (__x86_64__)
        paniclog_append_noflush("__HIB  text base: %p\n", (void *) vm_hib_base);
 #endif
 }
 
 static void

-panic_display_uptime(void) {
-       uint64_t        uptime;
+panic_display_uptime(void)
+{
+       uint64_t        uptime;

        absolutetime_to_nanoseconds(mach_absolute_time(), &uptime);
 
        paniclog_append_noflush("\nSystem uptime in nanoseconds: %llu\n", uptime);
 }
 
 static void
        absolutetime_to_nanoseconds(mach_absolute_time(), &uptime);
 
        paniclog_append_noflush("\nSystem uptime in nanoseconds: %llu\n", uptime);
 }
 
 static void

-panic_display_disk_errors(void) {
-
+panic_display_disk_errors(void)
+{

        if (panic_disk_error_description[0]) {
                panic_disk_error_description[sizeof(panic_disk_error_description) - 1] = '\0';
                paniclog_append_noflush("Root disk errors: \"%s\"\n", panic_disk_error_description);
        }
        if (panic_disk_error_description[0]) {
                panic_disk_error_description[sizeof(panic_disk_error_description) - 1] = '\0';
                paniclog_append_noflush("Root disk errors: \"%s\"\n", panic_disk_error_description);
        }

-};
+}
+
+static void
+panic_display_shutdown_status(void)
+{
+#if defined(__i386__) || defined(__x86_64__)
+       paniclog_append_noflush("System shutdown begun: %s\n", IOPMRootDomainGetWillShutdown() ? "YES" : "NO");
+       if (gIOPolledCoreFileMode == kIOPolledCoreFileModeNotInitialized) {
+               paniclog_append_noflush("Panic diags file unavailable, panic occurred prior to initialization\n");
+       } else if (gIOPolledCoreFileMode != kIOPolledCoreFileModeDisabled) {
+               /*
+                * If we haven't marked the corefile as explicitly disabled, and we've made it past initialization, then we know the current
+                * system was configured to use disk based diagnostics at some point.
+                */
+               paniclog_append_noflush("Panic diags file available: %s (0x%x)\n", (gIOPolledCoreFileMode != kIOPolledCoreFileModeClosed) ? "YES" : "NO", kdp_polled_corefile_error());
+       }
+#endif
+}

 
 extern const char version[];
 extern char osversion[];
 
 extern const char version[];
 extern char osversion[];


@@ -1179,16 +1477,19 @@ extern char osversion[];
 static volatile uint32_t config_displayed = 0;
 
 __private_extern__ void
 static volatile uint32_t config_displayed = 0;
 
 __private_extern__ void

-panic_display_system_configuration(boolean_t launchd_exit) {
-
-       if (!launchd_exit) panic_display_process_name();
+panic_display_system_configuration(boolean_t launchd_exit)
+{
+       if (!launchd_exit) {
+               panic_display_process_name();
+       }

        if (OSCompareAndSwap(0, 1, &config_displayed)) {
                char buf[256];
        if (OSCompareAndSwap(0, 1, &config_displayed)) {
                char buf[256];

-               if (!launchd_exit && strlcpy(buf, PE_boot_args(), sizeof(buf)))
+               if (!launchd_exit && strlcpy(buf, PE_boot_args(), sizeof(buf))) {

                        paniclog_append_noflush("Boot args: %s\n", buf);
                        paniclog_append_noflush("Boot args: %s\n", buf);

+               }

                paniclog_append_noflush("\nMac OS version:\n%s\n",
                    (osversion[0] != 0) ? osversion : "Not yet set");
                paniclog_append_noflush("\nMac OS version:\n%s\n",
                    (osversion[0] != 0) ? osversion : "Not yet set");

-               paniclog_append_noflush("\nKernel version:\n%s\n",version);
+               paniclog_append_noflush("\nKernel version:\n%s\n", version);

                panic_display_kernel_uuid();
                if (!launchd_exit) {
                        panic_display_kernel_aslr();
                panic_display_kernel_uuid();
                if (!launchd_exit) {
                        panic_display_kernel_aslr();


@@ -1197,6 +1498,7 @@ panic_display_system_configuration(boolean_t launchd_exit) {
                }
                panic_display_model_name();
                panic_display_disk_errors();
                }
                panic_display_model_name();
                panic_display_disk_errors();

+               panic_display_shutdown_status();

                if (!launchd_exit) {
                        panic_display_uptime();
                        panic_display_zprint();
                if (!launchd_exit) {
                        panic_display_uptime();
                        panic_display_zprint();


@@ -1208,11 +1510,11 @@ panic_display_system_configuration(boolean_t launchd_exit) {
        }
 }
 
        }
 }
 

-extern unsigned int    stack_total;
+extern unsigned int     stack_total;

 extern unsigned long long stack_allocs;
 
 #if defined (__x86_64__)
 extern unsigned long long stack_allocs;
 
 #if defined (__x86_64__)

-extern unsigned int    inuse_ptepages_count;
+extern unsigned int     inuse_ptepages_count;

 extern long long alloc_ptepages_count;
 #endif
 
 extern long long alloc_ptepages_count;
 #endif
 


@@ -1223,24 +1525,23 @@ extern vm_size_t panic_kext_memory_size;
 __private_extern__ void
 panic_display_zprint()
 {
 __private_extern__ void
 panic_display_zprint()
 {

-       if(panic_include_zprint == TRUE) {
-
-               unsigned int    i;
-               struct zone     zone_copy;
+       if (panic_include_zprint == TRUE) {
+               unsigned int    i;
+               struct zone     zone_copy;

 
                paniclog_append_noflush("%-20s %10s %10s\n", "Zone Name", "Cur Size", "Free Size");
                for (i = 0; i < num_zones; i++) {
 
                paniclog_append_noflush("%-20s %10s %10s\n", "Zone Name", "Cur Size", "Free Size");
                for (i = 0; i < num_zones; i++) {

-                       if(ml_nofault_copy((vm_offset_t)(&zone_array[i]), (vm_offset_t)&zone_copy, sizeof(struct zone)) == sizeof(struct zone)) {
-                               if(zone_copy.cur_size > (1024*1024)) {
-                                       paniclog_append_noflush("%-20s %10lu %10lu\n",zone_copy.zone_name, (uintptr_t)zone_copy.cur_size,(uintptr_t)(zone_copy.countfree * zone_copy.elem_size));
+                       if (ml_nofault_copy((vm_offset_t)(&zone_array[i]), (vm_offset_t)&zone_copy, sizeof(struct zone)) == sizeof(struct zone)) {
+                               if (zone_copy.cur_size > (1024 * 1024)) {
+                                       paniclog_append_noflush("%-20s %10lu %10lu\n", zone_copy.zone_name, (uintptr_t)zone_copy.cur_size, (uintptr_t)(zone_copy.countfree * zone_copy.elem_size));

                                }
                                }

-                       }               
+                       }

                }
 
                paniclog_append_noflush("%-20s %10lu\n", "Kernel Stacks", (uintptr_t)(kernel_stack_size * stack_total));
 
 #if defined (__x86_64__)
                }
 
                paniclog_append_noflush("%-20s %10lu\n", "Kernel Stacks", (uintptr_t)(kernel_stack_size * stack_total));
 
 #if defined (__x86_64__)

-               paniclog_append_noflush("%-20s %10lu\n", "PageTables",(uintptr_t)(PAGE_SIZE * inuse_ptepages_count));
+               paniclog_append_noflush("%-20s %10lu\n", "PageTables", (uintptr_t)(PAGE_SIZE * inuse_ptepages_count));

 #endif
 
                paniclog_append_noflush("%-20s %10lu\n", "Kalloc.Large", (uintptr_t)kalloc_large_total);
 #endif
 
                paniclog_append_noflush("%-20s %10lu\n", "Kalloc.Large", (uintptr_t)kalloc_large_total);


@@ -1258,7 +1559,7 @@ panic_display_zprint()
 
 #if CONFIG_ECC_LOGGING
 __private_extern__ void
 
 #if CONFIG_ECC_LOGGING
 __private_extern__ void

-panic_display_ecc_errors() 
+panic_display_ecc_errors()

 {
        uint32_t count = ecc_log_get_correction_count();
 
 {
        uint32_t count = ecc_log_get_correction_count();
 


@@ -1269,7 +1570,7 @@ panic_display_ecc_errors()
 #endif /* CONFIG_ECC_LOGGING */
 
 #if CONFIG_ZLEAKS
 #endif /* CONFIG_ECC_LOGGING */
 
 #if CONFIG_ZLEAKS

-extern boolean_t       panic_include_ztrace;
+extern boolean_t        panic_include_ztrace;

 extern struct ztrace* top_ztrace;
 void panic_print_symbol_name(vm_address_t search);
 
 extern struct ztrace* top_ztrace;
 void panic_print_symbol_name(vm_address_t search);
 


@@ -1280,18 +1581,18 @@ void panic_print_symbol_name(vm_address_t search);
 __private_extern__ void
 panic_display_ztrace(void)
 {
 __private_extern__ void
 panic_display_ztrace(void)
 {

-       if(panic_include_ztrace == TRUE) {
+       if (panic_include_ztrace == TRUE) {

                unsigned int i = 0;
                unsigned int i = 0;

-               boolean_t keepsyms = FALSE;
+               boolean_t keepsyms = FALSE;

 
 

-               PE_parse_boot_argn("keepsyms", &keepsyms, sizeof (keepsyms));
+               PE_parse_boot_argn("keepsyms", &keepsyms, sizeof(keepsyms));

                struct ztrace top_ztrace_copy;
                struct ztrace top_ztrace_copy;

-               
+

                /* Make sure not to trip another panic if there's something wrong with memory */
                /* Make sure not to trip another panic if there's something wrong with memory */

-               if(ml_nofault_copy((vm_offset_t)top_ztrace, (vm_offset_t)&top_ztrace_copy, sizeof(struct ztrace)) == sizeof(struct ztrace)) {
+               if (ml_nofault_copy((vm_offset_t)top_ztrace, (vm_offset_t)&top_ztrace_copy, sizeof(struct ztrace)) == sizeof(struct ztrace)) {

                        paniclog_append_noflush("\nBacktrace suspected of leaking: (outstanding bytes: %lu)\n", (uintptr_t)top_ztrace_copy.zt_size);
                        /* Print the backtrace addresses */
                        paniclog_append_noflush("\nBacktrace suspected of leaking: (outstanding bytes: %lu)\n", (uintptr_t)top_ztrace_copy.zt_size);
                        /* Print the backtrace addresses */

-                       for (i = 0; (i < top_ztrace_copy.zt_depth && i < MAX_ZTRACE_DEPTH) ; i++) {
+                       for (i = 0; (i < top_ztrace_copy.zt_depth && i < MAX_ZTRACE_DEPTH); i++) {

                                paniclog_append_noflush("%p ", top_ztrace_copy.zt_stack[i]);
                                if (keepsyms) {
                                        panic_print_symbol_name((vm_address_t)top_ztrace_copy.zt_stack[i]);
                                paniclog_append_noflush("%p ", top_ztrace_copy.zt_stack[i]);
                                if (keepsyms) {
                                        panic_print_symbol_name((vm_address_t)top_ztrace_copy.zt_stack[i]);


@@ -1300,8 +1601,7 @@ panic_display_ztrace(void)
                        }
                        /* Print any kexts in that backtrace, along with their link addresses so we can properly blame them */
                        kmod_panic_dump((vm_offset_t *)&top_ztrace_copy.zt_stack[0], top_ztrace_copy.zt_depth);
                        }
                        /* Print any kexts in that backtrace, along with their link addresses so we can properly blame them */
                        kmod_panic_dump((vm_offset_t *)&top_ztrace_copy.zt_stack[0], top_ztrace_copy.zt_depth);

-               }
-               else {
+               } else {

                        paniclog_append_noflush("\nCan't access top_ztrace...\n");
                }
                paniclog_append_noflush("\n");
                        paniclog_append_noflush("\nCan't access top_ztrace...\n");
                }
                paniclog_append_noflush("\n");


@@ -1321,10 +1621,13 @@ telemetry_gather(user_addr_t buffer __unused, uint32_t *length __unused, boolean
 
 uint32_t kern_feature_overrides = 0;
 
 
 uint32_t kern_feature_overrides = 0;
 

-boolean_t kern_feature_override(uint32_t fmask) {
+boolean_t
+kern_feature_override(uint32_t fmask)
+{

        if (kern_feature_overrides == 0) {
                uint32_t fdisables = 0;
        if (kern_feature_overrides == 0) {
                uint32_t fdisables = 0;

-               /* Expected to be first invoked early, in a single-threaded
+               /*
+                * Expected to be first invoked early, in a single-threaded

                 * environment
                 */
                if (PE_parse_boot_argn("validation_disables", &fdisables, sizeof(fdisables))) {
                 * environment
                 */
                if (PE_parse_boot_argn("validation_disables", &fdisables, sizeof(fdisables))) {


@@ -1334,5 +1637,34 @@ boolean_t kern_feature_override(uint32_t fmask) {
                        kern_feature_overrides |= KF_INITIALIZED;
                }
        }
                        kern_feature_overrides |= KF_INITIALIZED;
                }
        }

-       return ((kern_feature_overrides & fmask) == fmask);
+       return (kern_feature_overrides & fmask) == fmask;
+}
+
+boolean_t
+on_device_corefile_enabled(void)
+{
+       assert(debug_boot_arg_inited);
+#if CONFIG_KDP_INTERACTIVE_DEBUGGING
+       if ((debug_boot_arg != 0) && !(debug_boot_arg & DB_DISABLE_LOCAL_CORE)) {
+               return TRUE;
+       }
+#endif
+       return FALSE;
+}
+
+boolean_t
+panic_stackshot_to_disk_enabled(void)
+{
+       assert(debug_boot_arg_inited);
+#if defined(__x86_64__)
+       if (PEGetCoprocessorVersion() < kCoprocessorVersion2) {
+               /* Only enabled on pre-Gibraltar machines where it hasn't been disabled explicitly */
+               if ((debug_boot_arg != 0) && (debug_boot_arg & DB_DISABLE_STACKSHOT_TO_DISK)) {
+                       return FALSE;
+               }
+
+               return TRUE;
+       }
+#endif
+       return FALSE;

 }
 }