Loading...
--- xnu/xnu-1228/libkern/gen/OSDebug.cpp
+++ xnu/xnu-3248.60.10/libkern/gen/OSDebug.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2005-2012 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
@@ -28,39 +28,44 @@
// NOTE: This file is only c++ so I can get static initialisers going
#include <libkern/OSDebug.h>
+#include <IOKit/IOLib.h>
#include <sys/cdefs.h>
#include <stdarg.h>
#include <mach/mach_types.h>
#include <mach/kmod.h>
-#include <kern/lock.h>
+#include <kern/locks.h>
#include <libkern/libkern.h> // From bsd's libkern directory
#include <mach/vm_param.h>
#include <sys/kdebug.h>
+#include <kern/thread.h>
+
extern int etext;
__BEGIN_DECLS
// From osmfk/kern/thread.h but considered to be private
extern vm_offset_t min_valid_stack_address(void);
extern vm_offset_t max_valid_stack_address(void);
+// From osfmk/kern/printf.c
+extern boolean_t doprnt_hide_pointers;
+
// From osfmk/kmod.c
-extern void kmod_dump_log(vm_offset_t *addr, unsigned int cnt);
+extern void kmod_dump_log(vm_offset_t *addr, unsigned int cnt, boolean_t doUnslide);
extern addr64_t kvtophys(vm_offset_t va);
-#if __arm__
-extern int copyinframe(vm_address_t fp, uint32_t *frame);
-#endif
__END_DECLS
-static mutex_t *sOSReportLock = mutex_alloc(0);
+extern lck_grp_t *IOLockGroup;
+
+static lck_mtx_t *sOSReportLock = lck_mtx_alloc_init(IOLockGroup, LCK_ATTR_NULL);
/* Use kernel_debug() to log a backtrace */
void
-trace_backtrace(unsigned int debugid, unsigned int debugid2, int size, int data) {
+trace_backtrace(uint32_t debugid, uint32_t debugid2, uintptr_t size, uintptr_t data) {
void *bt[16];
const unsigned cnt = sizeof(bt) / sizeof(bt[0]);
unsigned i;
@@ -81,7 +86,7 @@
*/
if (!found) i=2;
-#define safe_bt(a) (int)(a<cnt ? bt[a] : 0)
+#define safe_bt(a) (uintptr_t)(a<cnt ? bt[a] : 0)
kernel_debug(debugid, data, size, safe_bt(i), safe_bt(i+1), 0);
kernel_debug(debugid2, safe_bt(i+2), safe_bt(i+3), safe_bt(i+4), safe_bt(i+5), 0);
}
@@ -102,27 +107,39 @@
vsnprintf(buf, sizeof(buf), str, listp);
va_end(listp);
- mutex_lock(sOSReportLock);
+ lck_mtx_lock(sOSReportLock);
{
- printf("%s\nBacktrace %p %p %p %p %p %p %p\n",
- buf, bt[2], bt[3], bt[4], bt[5], bt[6], bt[7], bt[8]);
- kmod_dump_log((vm_offset_t *) &bt[2], cnt - 2);
+ boolean_t old_doprnt_hide_pointers = doprnt_hide_pointers;
+ doprnt_hide_pointers = FALSE;
+ printf("%s\nBacktrace 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n", buf,
+ (unsigned long) VM_KERNEL_UNSLIDE(bt[2]), (unsigned long) VM_KERNEL_UNSLIDE(bt[3]),
+ (unsigned long) VM_KERNEL_UNSLIDE(bt[4]), (unsigned long) VM_KERNEL_UNSLIDE(bt[5]),
+ (unsigned long) VM_KERNEL_UNSLIDE(bt[6]), (unsigned long) VM_KERNEL_UNSLIDE(bt[7]),
+ (unsigned long) VM_KERNEL_UNSLIDE(bt[8]));
+ kmod_dump_log((vm_offset_t *) &bt[2], cnt - 2, TRUE);
+ doprnt_hide_pointers = old_doprnt_hide_pointers;
}
- mutex_unlock(sOSReportLock);
+ lck_mtx_unlock(sOSReportLock);
}
static vm_offset_t minstackaddr = min_valid_stack_address();
static vm_offset_t maxstackaddr = max_valid_stack_address();
-#if __i386__
-#define i386_RETURN_OFFSET 4
-
+
+#if __x86_64__
+#define x86_64_RETURN_OFFSET 8
static unsigned int
-i386_validate_stackptr(vm_offset_t stackptr)
+x86_64_validate_raddr(vm_offset_t raddr)
+{
+ return ((raddr > VM_MIN_KERNEL_AND_KEXT_ADDRESS) &&
+ (raddr < VM_MAX_KERNEL_ADDRESS));
+}
+static unsigned int
+x86_64_validate_stackptr(vm_offset_t stackptr)
{
/* Existence and alignment check
*/
- if (!stackptr || (stackptr & 0x3))
+ if (!stackptr || (stackptr & 0x7) || !x86_64_validate_raddr(stackptr))
return 0;
/* Is a virtual->physical translation present?
@@ -133,66 +150,44 @@
/* Check if the return address lies on the same page;
* If not, verify that a translation exists.
*/
- if (((PAGE_SIZE - (stackptr & PAGE_MASK)) < i386_RETURN_OFFSET) &&
- !kvtophys(stackptr + i386_RETURN_OFFSET))
+ if (((PAGE_SIZE - (stackptr & PAGE_MASK)) < x86_64_RETURN_OFFSET) &&
+ !kvtophys(stackptr + x86_64_RETURN_OFFSET))
return 0;
return 1;
}
-
-static unsigned int
-i386_validate_raddr(vm_offset_t raddr)
-{
- return ((raddr > VM_MIN_KERNEL_ADDRESS) &&
- (raddr < VM_MAX_KERNEL_ADDRESS));
-}
#endif
+void
+OSPrintBacktrace(void)
+{
+ void * btbuf[20];
+ int tmp = OSBacktrace(btbuf, 20);
+ int i;
+ for(i=0;i<tmp;i++)
+ {
+ kprintf("bt[%.2d] = %p\n", i, btbuf[i]);
+ }
+}
+
unsigned OSBacktrace(void **bt, unsigned maxAddrs)
{
unsigned frame;
-
-#if __ppc__
- vm_offset_t stackptr, stackptr_prev;
- const vm_offset_t * const mem = (vm_offset_t *) 0;
- unsigned i = 0;
-
- __asm__ volatile("mflr %0" : "=r" (stackptr));
- bt[i++] = (void *) stackptr;
-
- __asm__ volatile("mr %0,r1" : "=r" (stackptr));
- for ( ; i < maxAddrs; i++) {
- // Validate we have a reasonable stackptr
- if ( !(minstackaddr <= stackptr && stackptr < maxstackaddr)
- || (stackptr & 3))
- break;
-
- stackptr_prev = stackptr;
- stackptr = mem[stackptr_prev >> 2];
- if ((stackptr_prev ^ stackptr) > 8 * 1024) // Sanity check
- break;
-
- vm_offset_t addr = mem[(stackptr >> 2) + 2];
- if ((addr & 3) || (addr < 0x8000)) // More sanity checks
- break;
- bt[i] = (void *) addr;
- }
- frame = i;
-
- for ( ; i < maxAddrs; i++)
- bt[i] = (void *) 0;
-#elif __i386__
-#define SANE_i386_FRAME_SIZE 8*1024
+ if (!current_thread()) return 0;
+
+#if __x86_64__
+#define SANE_x86_64_FRAME_SIZE (kernel_stack_size >> 1)
vm_offset_t stackptr, stackptr_prev, raddr;
unsigned frame_index = 0;
/* Obtain current frame pointer */
- __asm__ volatile("movl %%ebp, %0" : "=m" (stackptr));
-
- if (!i386_validate_stackptr(stackptr))
+
+ __asm__ volatile("movq %%rbp, %0" : "=m" (stackptr));
+
+ if (!x86_64_validate_stackptr(stackptr))
goto pad;
- raddr = *((vm_offset_t *) (stackptr + i386_RETURN_OFFSET));
-
- if (!i386_validate_raddr(raddr))
+ raddr = *((vm_offset_t *) (stackptr + x86_64_RETURN_OFFSET));
+
+ if (!x86_64_validate_raddr(raddr))
goto pad;
bt[frame_index++] = (void *) raddr;
@@ -201,18 +196,18 @@
stackptr_prev = stackptr;
stackptr = *((vm_offset_t *) stackptr_prev);
- if (!i386_validate_stackptr(stackptr))
+ if (!x86_64_validate_stackptr(stackptr))
break;
/* Stack grows downwards */
if (stackptr < stackptr_prev)
break;
- if ((stackptr_prev ^ stackptr) > SANE_i386_FRAME_SIZE)
- break;
-
- raddr = *((vm_offset_t *) (stackptr + i386_RETURN_OFFSET));
-
- if (!i386_validate_raddr(raddr))
+ if ((stackptr - stackptr_prev) > SANE_x86_64_FRAME_SIZE)
+ break;
+
+ raddr = *((vm_offset_t *) (stackptr + x86_64_RETURN_OFFSET));
+
+ if (!x86_64_validate_raddr(raddr))
break;
bt[frame_index] = (void *) raddr;
@@ -222,30 +217,6 @@
for ( ; frame_index < maxAddrs; frame_index++)
bt[frame_index] = (void *) 0;
-#elif __arm__
- uint32_t i= 0;
- uint32_t frameb[2];
- uint32_t fp= 0;
-
- // get the current frame pointer for this thread
- __asm__ volatile("mov %0,r7" : "=r" (fp));
-
- // now crawl up the stack recording the link value of each frame
- do {
- // check bounds
- if ((fp == 0) || ((fp & 3) != 0) || (fp > VM_MAX_KERNEL_ADDRESS) || (fp < VM_MIN_KERNEL_ADDRESS)) {
- break;
- }
- // safely read frame
- if (copyinframe(fp, frameb) != 0) {
- break;
- }
-
- // No need to use copyin as this is always a kernel address, see check above
- bt[i] = (void*)frameb[1]; // link register
- fp = frameb[0];
- } while (++i < maxAddrs);
- frame= i;
#else
#error arch
#endif