ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update debuggerd to use libbacktrace."

Browse source
This commit is contained in:
Christopher Ferris 2013-10-04 22:37:35 +00:00 • committed by Gerrit Code Review
commit 7dbe96602c
8 changed files with 172 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debuggerd/Android.mk
View file

@ -24,11 +24,11 @@ LOCAL_CFLAGS += -DWITH_VFP_D32
endif # ARCH_ARM_HAVE_VFP_D32 endif # ARCH_ARM_HAVE_VFP_D32
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbacktrace \
libc \
libcutils \ libcutils \
liblog \ liblog \
libc \ libselinux \
libcorkscrew \
libselinux
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

44
debuggerd/arm/machine.c
View file

@ -42,7 +42,7 @@
#endif #endif
#endif #endif
static void dump_memory(log_t* log, pid_t tid, uintptr_t addr, int scopeFlags) { static void dump_memory(log_t* log, pid_t tid, uintptr_t addr, int scope_flags) {
char code_buffer[64]; /* actual 8+1+((8+1)*4) + 1 == 45 */ char code_buffer[64]; /* actual 8+1+((8+1)*4) + 1 == 45 */
char ascii_buffer[32]; /* actual 16 + 1 == 17 */ char ascii_buffer[32]; /* actual 16 + 1 == 17 */
uintptr_t p, end; uintptr_t p, end;
@ -102,7 +102,7 @@ static void dump_memory(log_t* log, pid_t tid, uintptr_t addr, int scopeFlags) {
p += 4; p += 4;
} }
*asc_out = '\0'; *asc_out = '\0';
_LOG(log, scopeFlags, " %s %s\n", code_buffer, ascii_buffer); _LOG(log, scope_flags, " %s %s\n", code_buffer, ascii_buffer);
} }
} }
@ -110,16 +110,13 @@ static void dump_memory(log_t* log, pid_t tid, uintptr_t addr, int scopeFlags) {
* If configured to do so, dump memory around *all* registers * If configured to do so, dump memory around *all* registers
* for the crashing thread. * for the crashing thread.
*/ */
void dump_memory_and_code(const ptrace_context_t* context __attribute((unused)), void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) {
log_t* log, pid_t tid, bool at_fault) {
struct pt_regs regs; struct pt_regs regs;
if(ptrace(PTRACE_GETREGS, tid, 0, &regs)) { if(ptrace(PTRACE_GETREGS, tid, 0, &regs)) {
return; return;
} }
int scopeFlags = at_fault ? SCOPE_AT_FAULT : 0; if (IS_AT_FAULT(scope_flags) && DUMP_MEMORY_FOR_ALL_REGISTERS) {
if (at_fault && DUMP_MEMORY_FOR_ALL_REGISTERS) {
static const char REG_NAMES[] = "r0r1r2r3r4r5r6r7r8r9slfpipsp"; static const char REG_NAMES[] = "r0r1r2r3r4r5r6r7r8r9slfpipsp";
for (int reg = 0; reg < 14; reg++) { for (int reg = 0; reg < 14; reg++) {
@ -134,39 +131,36 @@ void dump_memory_and_code(const ptrace_context_t* context __attribute((unused)),
continue; continue;
} }
_LOG(log, scopeFlags | SCOPE_SENSITIVE, "\nmemory near %.2s:\n", &REG_NAMES[reg * 2]); _LOG(log, scope_flags | SCOPE_SENSITIVE, "\nmemory near %.2s:\n", &REG_NAMES[reg * 2]);
dump_memory(log, tid, addr, scopeFlags | SCOPE_SENSITIVE); dump_memory(log, tid, addr, scope_flags | SCOPE_SENSITIVE);
} }
} }
/* explicitly allow upload of code dump logging */ /* explicitly allow upload of code dump logging */
_LOG(log, scopeFlags, "\ncode around pc:\n"); _LOG(log, scope_flags, "\ncode around pc:\n");
dump_memory(log, tid, (uintptr_t)regs.ARM_pc, scopeFlags); dump_memory(log, tid, (uintptr_t)regs.ARM_pc, scope_flags);
if (regs.ARM_pc != regs.ARM_lr) { if (regs.ARM_pc != regs.ARM_lr) {
_LOG(log, scopeFlags, "\ncode around lr:\n"); _LOG(log, scope_flags, "\ncode around lr:\n");
dump_memory(log, tid, (uintptr_t)regs.ARM_lr, scopeFlags); dump_memory(log, tid, (uintptr_t)regs.ARM_lr, scope_flags);
} }
} }
void dump_registers(const ptrace_context_t* context __attribute((unused)), void dump_registers(log_t* log, pid_t tid, int scope_flags)
log_t* log, pid_t tid, bool at_fault)
{ {
struct pt_regs r; struct pt_regs r;
int scopeFlags = at_fault ? SCOPE_AT_FAULT : 0;
if(ptrace(PTRACE_GETREGS, tid, 0, &r)) { if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {
_LOG(log, scopeFlags, "cannot get registers: %s\n", strerror(errno)); _LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno));
return; return;
} }
_LOG(log, scopeFlags, " r0 %08x r1 %08x r2 %08x r3 %08x\n", _LOG(log, scope_flags, " r0 %08x r1 %08x r2 %08x r3 %08x\n",
(uint32_t)r.ARM_r0, (uint32_t)r.ARM_r1, (uint32_t)r.ARM_r2, (uint32_t)r.ARM_r3); (uint32_t)r.ARM_r0, (uint32_t)r.ARM_r1, (uint32_t)r.ARM_r2, (uint32_t)r.ARM_r3);
_LOG(log, scopeFlags, " r4 %08x r5 %08x r6 %08x r7 %08x\n", _LOG(log, scope_flags, " r4 %08x r5 %08x r6 %08x r7 %08x\n",
(uint32_t)r.ARM_r4, (uint32_t)r.ARM_r5, (uint32_t)r.ARM_r6, (uint32_t)r.ARM_r7); (uint32_t)r.ARM_r4, (uint32_t)r.ARM_r5, (uint32_t)r.ARM_r6, (uint32_t)r.ARM_r7);
_LOG(log, scopeFlags, " r8 %08x r9 %08x sl %08x fp %08x\n", _LOG(log, scope_flags, " r8 %08x r9 %08x sl %08x fp %08x\n",
(uint32_t)r.ARM_r8, (uint32_t)r.ARM_r9, (uint32_t)r.ARM_r10, (uint32_t)r.ARM_fp); (uint32_t)r.ARM_r8, (uint32_t)r.ARM_r9, (uint32_t)r.ARM_r10, (uint32_t)r.ARM_fp);
_LOG(log, scopeFlags, " ip %08x sp %08x lr %08x pc %08x cpsr %08x\n", _LOG(log, scope_flags, " ip %08x sp %08x lr %08x pc %08x cpsr %08x\n",
(uint32_t)r.ARM_ip, (uint32_t)r.ARM_sp, (uint32_t)r.ARM_lr, (uint32_t)r.ARM_ip, (uint32_t)r.ARM_sp, (uint32_t)r.ARM_lr,
(uint32_t)r.ARM_pc, (uint32_t)r.ARM_cpsr); (uint32_t)r.ARM_pc, (uint32_t)r.ARM_cpsr);
@ -175,14 +169,14 @@ void dump_registers(const ptrace_context_t* context __attribute((unused)),
int i; int i;
if(ptrace(PTRACE_GETVFPREGS, tid, 0, &vfp_regs)) { if(ptrace(PTRACE_GETVFPREGS, tid, 0, &vfp_regs)) {
_LOG(log, scopeFlags, "cannot get registers: %s\n", strerror(errno)); _LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno));
return; return;
} }
for (i = 0; i < NUM_VFP_REGS; i += 2) { for (i = 0; i < NUM_VFP_REGS; i += 2) {
_LOG(log, scopeFlags, " d%-2d %016llx d%-2d %016llx\n", _LOG(log, scope_flags, " d%-2d %016llx d%-2d %016llx\n",
i, vfp_regs.fpregs[i], i+1, vfp_regs.fpregs[i+1]); i, vfp_regs.fpregs[i], i+1, vfp_regs.fpregs[i+1]);
} }
_LOG(log, scopeFlags, " scr %08lx\n", vfp_regs.fpscr); _LOG(log, scope_flags, " scr %08lx\n", vfp_regs.fpscr);
#endif #endif
} }

41
debuggerd/backtrace.c
View file

@ -27,13 +27,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <corkscrew/backtrace.h> #include <backtrace/backtrace.h>
#include "tombstone.h" #include "backtrace.h"
#include "utility.h" #include "utility.h"
#define STACK_DEPTH 32
static void dump_process_header(log_t* log, pid_t pid) { static void dump_process_header(log_t* log, pid_t pid) {
char path[PATH_MAX]; char path[PATH_MAX];
char procnamebuf[1024]; char procnamebuf[1024];
@ -62,7 +60,7 @@ static void dump_process_footer(log_t* log, pid_t pid) {
_LOG(log, SCOPE_AT_FAULT, "\n----- end %d -----\n", pid); _LOG(log, SCOPE_AT_FAULT, "\n----- end %d -----\n", pid);
} }
static void dump_thread(log_t* log, pid_t tid, ptrace_context_t* context, bool attached, static void dump_thread(log_t* log, pid_t tid, bool attached,
bool* detach_failed, int* total_sleep_time_usec) { bool* detach_failed, int* total_sleep_time_usec) {
char path[PATH_MAX]; char path[PATH_MAX];
char threadnamebuf[1024]; char threadnamebuf[1024];
@ -91,20 +89,12 @@ static void dump_thread(log_t* log, pid_t tid, ptrace_context_t* context, bool a
wait_for_stop(tid, total_sleep_time_usec); wait_for_stop(tid, total_sleep_time_usec);
backtrace_frame_t backtrace[STACK_DEPTH]; backtrace_t backtrace;
ssize_t frames = unwind_backtrace_ptrace(tid, context, backtrace, 0, STACK_DEPTH); if (!backtrace_get_data(&backtrace, tid)) {
if (frames <= 0) { _LOG(log, SCOPE_AT_FAULT, "Could not create backtrace context.\n");
_LOG(log, SCOPE_AT_FAULT, "Could not obtain stack trace for thread.\n");
} else { } else {
backtrace_symbol_t backtrace_symbols[STACK_DEPTH]; dump_backtrace_to_log(&backtrace, log, SCOPE_AT_FAULT, " ");
get_backtrace_symbols_ptrace(context, backtrace, frames, backtrace_symbols); backtrace_free_data(&backtrace);
for (size_t i = 0; i < (size_t)frames; i++) {
char line[MAX_BACKTRACE_LINE_LENGTH];
format_backtrace_line(i, &backtrace[i], &backtrace_symbols[i],
line, MAX_BACKTRACE_LINE_LENGTH);
_LOG(log, SCOPE_AT_FAULT, " %s\n", line);
}
free_backtrace_symbols(backtrace_symbols, frames);
} }
if (!attached && ptrace(PTRACE_DETACH, tid, 0, 0) != 0) { if (!attached && ptrace(PTRACE_DETACH, tid, 0, 0) != 0) {
@ -120,9 +110,8 @@ void dump_backtrace(int fd, int amfd, pid_t pid, pid_t tid, bool* detach_failed,
log.amfd = amfd; log.amfd = amfd;
log.quiet = true; log.quiet = true;
ptrace_context_t* context = load_ptrace_context(tid);
dump_process_header(&log, pid); dump_process_header(&log, pid);
dump_thread(&log, tid, context, true, detach_failed, total_sleep_time_usec); dump_thread(&log, tid, true, detach_failed, total_sleep_time_usec);
char task_path[64]; char task_path[64];
snprintf(task_path, sizeof(task_path), "/proc/%d/task", pid); snprintf(task_path, sizeof(task_path), "/proc/%d/task", pid);
@ -140,11 +129,19 @@ void dump_backtrace(int fd, int amfd, pid_t pid, pid_t tid, bool* detach_failed,
continue; continue;
} }
dump_thread(&log, new_tid, context, false, detach_failed, total_sleep_time_usec); dump_thread(&log, new_tid, false, detach_failed, total_sleep_time_usec);
} }
closedir(d); closedir(d);
} }
dump_process_footer(&log, pid); dump_process_footer(&log, pid);
free_ptrace_context(context); }
void dump_backtrace_to_log(const backtrace_t* backtrace, log_t* log,
int scope_flags, const char* prefix) {
char buf[512];
for (size_t i = 0; i < backtrace->num_frames; i++) {
backtrace_format_frame_data(&backtrace->frames[i], i, buf, sizeof(buf));
_LOG(log, scope_flags, "%s%s\n", prefix, buf);
}
} }

8
debuggerd/backtrace.h
View file

@ -21,11 +21,17 @@
#include <stdbool.h> #include <stdbool.h>
#include <sys/types.h> #include <sys/types.h>
#include <corkscrew/ptrace.h> #include <backtrace/backtrace.h>
#include "utility.h"
/* Dumps a backtrace using a format similar to what Dalvik uses so that the result /* Dumps a backtrace using a format similar to what Dalvik uses so that the result
* can be intermixed in a bug report. */ * can be intermixed in a bug report. */
void dump_backtrace(int fd, int amfd, pid_t pid, pid_t tid, bool* detach_failed, void dump_backtrace(int fd, int amfd, pid_t pid, pid_t tid, bool* detach_failed,
int* total_sleep_time_usec); int* total_sleep_time_usec);
/* Dumps the backtrace in the backtrace data structure to the log. */
void dump_backtrace_to_log(const backtrace_t* backtrace, log_t* log,
int scope_flags, const char* prefix);
#endif // _DEBUGGERD_BACKTRACE_H #endif // _DEBUGGERD_BACKTRACE_H

8
debuggerd/machine.h
View file

@ -17,15 +17,11 @@
#ifndef _DEBUGGERD_MACHINE_H #ifndef _DEBUGGERD_MACHINE_H
#define _DEBUGGERD_MACHINE_H #define _DEBUGGERD_MACHINE_H
#include <stddef.h>
#include <stdbool.h>
#include <sys/types.h> #include <sys/types.h>
#include <corkscrew/ptrace.h>
#include "utility.h" #include "utility.h"
void dump_memory_and_code(const ptrace_context_t* context, log_t* log, pid_t tid, bool at_fault); void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags);
void dump_registers(const ptrace_context_t* context, log_t* log, pid_t tid, bool at_fault); void dump_registers(log_t* log, pid_t tid, int scope_flags);
#endif // _DEBUGGERD_MACHINE_H #endif // _DEBUGGERD_MACHINE_H

47
debuggerd/mips/machine.c
View file

@ -36,7 +36,7 @@
#define R(x) ((unsigned int)(x)) #define R(x) ((unsigned int)(x))
static void dump_memory(log_t* log, pid_t tid, uintptr_t addr, int scopeFlags) { static void dump_memory(log_t* log, pid_t tid, uintptr_t addr, int scope_flags) {
char code_buffer[64]; /* actual 8+1+((8+1)*4) + 1 == 45 */ char code_buffer[64]; /* actual 8+1+((8+1)*4) + 1 == 45 */
char ascii_buffer[32]; /* actual 16 + 1 == 17 */ char ascii_buffer[32]; /* actual 16 + 1 == 17 */
uintptr_t p, end; uintptr_t p, end;
@ -92,7 +92,7 @@ static void dump_memory(log_t* log, pid_t tid, uintptr_t addr, int scopeFlags) {
p += 4; p += 4;
} }
*asc_out = '\0'; *asc_out = '\0';
_LOG(log, scopeFlags, " %s %s\n", code_buffer, ascii_buffer); _LOG(log, scope_flags, " %s %s\n", code_buffer, ascii_buffer);
} }
} }
@ -100,15 +100,13 @@ static void dump_memory(log_t* log, pid_t tid, uintptr_t addr, int scopeFlags) {
* If configured to do so, dump memory around *all* registers * If configured to do so, dump memory around *all* registers
* for the crashing thread. * for the crashing thread.
*/ */
void dump_memory_and_code(const ptrace_context_t* context __attribute((unused)), void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) {
log_t* log, pid_t tid, bool at_fault) {
pt_regs_mips_t r; pt_regs_mips_t r;
if(ptrace(PTRACE_GETREGS, tid, 0, &r)) { if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {
return; return;
} }
int scopeFlags = at_fault ? SCOPE_AT_FAULT : 0; if (IS_AT_FAULT(scope_flags) && DUMP_MEMORY_FOR_ALL_REGISTERS) {
if (at_fault && DUMP_MEMORY_FOR_ALL_REGISTERS) {
static const char REG_NAMES[] = "$0atv0v1a0a1a2a3t0t1t2t3t4t5t6t7s0s1s2s3s4s5s6s7t8t9k0k1gpsps8ra"; static const char REG_NAMES[] = "$0atv0v1a0a1a2a3t0t1t2t3t4t5t6t7s0s1s2s3s4s5s6s7t8t9k0k1gpsps8ra";
for (int reg = 0; reg < 32; reg++) { for (int reg = 0; reg < 32; reg++) {
@ -130,50 +128,47 @@ void dump_memory_and_code(const ptrace_context_t* context __attribute((unused)),
continue; continue;
} }
_LOG(log, scopeFlags | SCOPE_SENSITIVE, "\nmemory near %.2s:\n", &REG_NAMES[reg * 2]); _LOG(log, scope_flags | SCOPE_SENSITIVE, "\nmemory near %.2s:\n", &REG_NAMES[reg * 2]);
dump_memory(log, tid, addr, scopeFlags | SCOPE_SENSITIVE); dump_memory(log, tid, addr, scope_flags | SCOPE_SENSITIVE);
} }
} }
unsigned int pc = R(r.cp0_epc); unsigned int pc = R(r.cp0_epc);
unsigned int ra = R(r.regs[31]); unsigned int ra = R(r.regs[31]);
_LOG(log, scopeFlags, "\ncode around pc:\n"); _LOG(log, scope_flags, "\ncode around pc:\n");
dump_memory(log, tid, (uintptr_t)pc, scopeFlags); dump_memory(log, tid, (uintptr_t)pc, scope_flags);
if (pc != ra) { if (pc != ra) {
_LOG(log, scopeFlags, "\ncode around ra:\n"); _LOG(log, scope_flags, "\ncode around ra:\n");
dump_memory(log, tid, (uintptr_t)ra, scopeFlags); dump_memory(log, tid, (uintptr_t)ra, scope_flags);
} }
} }
void dump_registers(const ptrace_context_t* context __attribute((unused)), void dump_registers(log_t* log, pid_t tid, int scope_flags)
log_t* log, pid_t tid, bool at_fault)
{ {
pt_regs_mips_t r; pt_regs_mips_t r;
int scopeFlags = at_fault ? SCOPE_AT_FAULT : 0;
if(ptrace(PTRACE_GETREGS, tid, 0, &r)) { if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {
_LOG(log, scopeFlags, "cannot get registers: %s\n", strerror(errno)); _LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno));
return; return;
} }
_LOG(log, scopeFlags, " zr %08x at %08x v0 %08x v1 %08x\n", _LOG(log, scope_flags, " zr %08x at %08x v0 %08x v1 %08x\n",
R(r.regs[0]), R(r.regs[1]), R(r.regs[2]), R(r.regs[3])); R(r.regs[0]), R(r.regs[1]), R(r.regs[2]), R(r.regs[3]));
_LOG(log, scopeFlags, " a0 %08x a1 %08x a2 %08x a3 %08x\n", _LOG(log, scope_flags, " a0 %08x a1 %08x a2 %08x a3 %08x\n",
R(r.regs[4]), R(r.regs[5]), R(r.regs[6]), R(r.regs[7])); R(r.regs[4]), R(r.regs[5]), R(r.regs[6]), R(r.regs[7]));
_LOG(log, scopeFlags, " t0 %08x t1 %08x t2 %08x t3 %08x\n", _LOG(log, scope_flags, " t0 %08x t1 %08x t2 %08x t3 %08x\n",
R(r.regs[8]), R(r.regs[9]), R(r.regs[10]), R(r.regs[11])); R(r.regs[8]), R(r.regs[9]), R(r.regs[10]), R(r.regs[11]));
_LOG(log, scopeFlags, " t4 %08x t5 %08x t6 %08x t7 %08x\n", _LOG(log, scope_flags, " t4 %08x t5 %08x t6 %08x t7 %08x\n",
R(r.regs[12]), R(r.regs[13]), R(r.regs[14]), R(r.regs[15])); R(r.regs[12]), R(r.regs[13]), R(r.regs[14]), R(r.regs[15]));
_LOG(log, scopeFlags, " s0 %08x s1 %08x s2 %08x s3 %08x\n", _LOG(log, scope_flags, " s0 %08x s1 %08x s2 %08x s3 %08x\n",
R(r.regs[16]), R(r.regs[17]), R(r.regs[18]), R(r.regs[19])); R(r.regs[16]), R(r.regs[17]), R(r.regs[18]), R(r.regs[19]));
_LOG(log, scopeFlags, " s4 %08x s5 %08x s6 %08x s7 %08x\n", _LOG(log, scope_flags, " s4 %08x s5 %08x s6 %08x s7 %08x\n",
R(r.regs[20]), R(r.regs[21]), R(r.regs[22]), R(r.regs[23])); R(r.regs[20]), R(r.regs[21]), R(r.regs[22]), R(r.regs[23]));
_LOG(log, scopeFlags, " t8 %08x t9 %08x k0 %08x k1 %08x\n", _LOG(log, scope_flags, " t8 %08x t9 %08x k0 %08x k1 %08x\n",
R(r.regs[24]), R(r.regs[25]), R(r.regs[26]), R(r.regs[27])); R(r.regs[24]), R(r.regs[25]), R(r.regs[26]), R(r.regs[27]));
_LOG(log, scopeFlags, " gp %08x sp %08x s8 %08x ra %08x\n", _LOG(log, scope_flags, " gp %08x sp %08x s8 %08x ra %08x\n",
R(r.regs[28]), R(r.regs[29]), R(r.regs[30]), R(r.regs[31])); R(r.regs[28]), R(r.regs[29]), R(r.regs[30]), R(r.regs[31]));
_LOG(log, scopeFlags, " hi %08x lo %08x bva %08x epc %08x\n", _LOG(log, scope_flags, " hi %08x lo %08x bva %08x epc %08x\n",
R(r.hi), R(r.lo), R(r.cp0_badvaddr), R(r.cp0_epc)); R(r.hi), R(r.lo), R(r.cp0_badvaddr), R(r.cp0_epc));
} }

204
debuggerd/tombstone.c
View file

@ -32,8 +32,7 @@
#include <cutils/logger.h> #include <cutils/logger.h>
#include <cutils/properties.h> #include <cutils/properties.h>
#include <corkscrew/demangle.h> #include <backtrace/backtrace.h>
#include <corkscrew/backtrace.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <linux/un.h> #include <linux/un.h>
@ -42,9 +41,8 @@
#include "machine.h" #include "machine.h"
#include "tombstone.h" #include "tombstone.h"
#include "utility.h" #include "backtrace.h"
#define STACK_DEPTH 32
#define STACK_WORDS 16 #define STACK_WORDS 16
#define MAX_TOMBSTONES 10 #define MAX_TOMBSTONES 10
@ -193,7 +191,7 @@ static void dump_fault_addr(log_t* log, pid_t tid, int sig)
} }
} }
static void dump_thread_info(log_t* log, pid_t pid, pid_t tid, bool at_fault) { static void dump_thread_info(log_t* log, pid_t pid, pid_t tid, int scope_flags) {
char path[64]; char path[64];
char threadnamebuf[1024]; char threadnamebuf[1024];
char* threadname = NULL; char* threadname = NULL;
@ -211,7 +209,7 @@ static void dump_thread_info(log_t* log, pid_t pid, pid_t tid, bool at_fault) {
} }
} }
if (at_fault) { if (IS_AT_FAULT(scope_flags)) {
char procnamebuf[1024]; char procnamebuf[1024];
char* procname = NULL; char* procname = NULL;
@ -230,64 +228,46 @@ static void dump_thread_info(log_t* log, pid_t pid, pid_t tid, bool at_fault) {
} }
} }
static void dump_backtrace(const ptrace_context_t* context __attribute((unused)), static void dump_stack_segment(const backtrace_t* backtrace, log_t* log,
log_t* log, pid_t tid __attribute((unused)), bool at_fault, int scope_flags, uintptr_t *sp, size_t words, int label) {
const backtrace_frame_t* backtrace, size_t frames) {
int scopeFlags = at_fault ? SCOPE_AT_FAULT : 0;
_LOG(log, scopeFlags, "\nbacktrace:\n");
backtrace_symbol_t backtrace_symbols[STACK_DEPTH];
get_backtrace_symbols_ptrace(context, backtrace, frames, backtrace_symbols);
for (size_t i = 0; i < frames; i++) {
char line[MAX_BACKTRACE_LINE_LENGTH];
format_backtrace_line(i, &backtrace[i], &backtrace_symbols[i],
line, MAX_BACKTRACE_LINE_LENGTH);
_LOG(log, scopeFlags, " %s\n", line);
}
free_backtrace_symbols(backtrace_symbols, frames);
}
static void dump_stack_segment(const ptrace_context_t* context, log_t* log, pid_t tid,
int scopeFlags, uintptr_t* sp, size_t words, int label) {
for (size_t i = 0; i < words; i++) { for (size_t i = 0; i < words; i++) {
uint32_t stack_content; uint32_t stack_content;
if (!try_get_word_ptrace(tid, *sp, &stack_content)) { if (!backtrace_read_word(backtrace, *sp, &stack_content)) {
break; break;
} }
const map_info_t* mi; const char* map_name = backtrace_get_map_info(backtrace, stack_content, NULL);
const symbol_t* symbol; if (!map_name) {
find_symbol_ptrace(context, stack_content, &mi, &symbol); map_name = "";
}
if (symbol) { uintptr_t offset = 0;
char* demangled_name = demangle_symbol_name(symbol->name); char* proc_name = backtrace_get_proc_name(backtrace, stack_content, &offset);
const char* symbol_name = demangled_name ? demangled_name : symbol->name; if (proc_name) {
uint32_t offset = stack_content - (mi->start + symbol->start);
if (!i && label >= 0) { if (!i && label >= 0) {
if (offset) { if (offset) {
_LOG(log, scopeFlags, " #%02d %08x %08x %s (%s+%u)\n", _LOG(log, scope_flags, " #%02d %08x %08x %s (%s+%u)\n",
label, *sp, stack_content, mi ? mi->name : "", symbol_name, offset); label, *sp, stack_content, map_name, proc_name, offset);
} else { } else {
_LOG(log, scopeFlags, " #%02d %08x %08x %s (%s)\n", _LOG(log, scope_flags, " #%02d %08x %08x %s (%s)\n",
label, *sp, stack_content, mi ? mi->name : "", symbol_name); label, *sp, stack_content, map_name, proc_name);
} }
} else { } else {
if (offset) { if (offset) {
_LOG(log, scopeFlags, " %08x %08x %s (%s+%u)\n", _LOG(log, scope_flags, " %08x %08x %s (%s+%u)\n",
*sp, stack_content, mi ? mi->name : "", symbol_name, offset); *sp, stack_content, map_name, proc_name, offset);
} else { } else {
_LOG(log, scopeFlags, " %08x %08x %s (%s)\n", _LOG(log, scope_flags, " %08x %08x %s (%s)\n",
*sp, stack_content, mi ? mi->name : "", symbol_name); *sp, stack_content, map_name, proc_name);
} }
} }
free(demangled_name); free(proc_name);
} else { } else {
if (!i && label >= 0) { if (!i && label >= 0) {
_LOG(log, scopeFlags, " #%02d %08x %08x %s\n", _LOG(log, scope_flags, " #%02d %08x %08x %s\n",
label, *sp, stack_content, mi ? mi->name : ""); label, *sp, stack_content, map_name);
} else { } else {
_LOG(log, scopeFlags, " %08x %08x %s\n", _LOG(log, scope_flags, " %08x %08x %s\n",
*sp, stack_content, mi ? mi->name : ""); *sp, stack_content, map_name);
} }
} }
@ -295,45 +275,42 @@ static void dump_stack_segment(const ptrace_context_t* context, log_t* log, pid_
} }
} }
static void dump_stack(const ptrace_context_t* context, log_t* log, pid_t tid, bool at_fault, static void dump_stack(const backtrace_t* backtrace, log_t* log, int scope_flags) {
const backtrace_frame_t* backtrace, size_t frames) { size_t first = 0, last;
bool have_first = false; for (size_t i = 0; i < backtrace->num_frames; i++) {
size_t first, last; if (backtrace->frames[i].sp) {
for (size_t i = 0; i < frames; i++) { if (!first) {
if (backtrace[i].stack_top) { first = i+1;
if (!have_first) {
have_first = true;
first = i;
} }
last = i; last = i;
} }
} }
if (!have_first) { if (!first) {
return; return;
} }
first--;
int scopeFlags = SCOPE_SENSITIVE | (at_fault ? SCOPE_AT_FAULT : 0); scope_flags |= SCOPE_SENSITIVE;
_LOG(log, scopeFlags, "\nstack:\n");
// Dump a few words before the first frame. // Dump a few words before the first frame.
uintptr_t sp = backtrace[first].stack_top - STACK_WORDS * sizeof(uint32_t); uintptr_t sp = backtrace->frames[first].sp - STACK_WORDS * sizeof(uint32_t);
dump_stack_segment(context, log, tid, scopeFlags, &sp, STACK_WORDS, -1); dump_stack_segment(backtrace, log, scope_flags, &sp, STACK_WORDS, -1);
// Dump a few words from all successive frames. // Dump a few words from all successive frames.
// Only log the first 3 frames, put the rest in the tombstone. // Only log the first 3 frames, put the rest in the tombstone.
for (size_t i = first; i <= last; i++) { for (size_t i = first; i <= last; i++) {
const backtrace_frame_t* frame = &backtrace[i]; const backtrace_frame_data_t* frame = &backtrace->frames[i];
if (sp != frame->stack_top) { if (sp != frame->sp) {
_LOG(log, scopeFlags, " ........ ........\n"); _LOG(log, scope_flags, " ........ ........\n");
sp = frame->stack_top; sp = frame->sp;
} }
if (i - first == 3) { if (i - first == 3) {
scopeFlags &= (~SCOPE_AT_FAULT); scope_flags &= (~SCOPE_AT_FAULT);
} }
if (i == last) { if (i == last) {
dump_stack_segment(context, log, tid, scopeFlags, &sp, STACK_WORDS, i); dump_stack_segment(backtrace, log, scope_flags, &sp, STACK_WORDS, i);
if (sp < frame->stack_top + frame->stack_size) { if (sp < frame->sp + frame->stack_size) {
_LOG(log, scopeFlags, " ........ ........\n"); _LOG(log, scope_flags, " ........ ........\n");
} }
} else { } else {
size_t words = frame->stack_size / sizeof(uint32_t); size_t words = frame->stack_size / sizeof(uint32_t);
@ -342,39 +319,40 @@ static void dump_stack(const ptrace_context_t* context, log_t* log, pid_t tid, b
} else if (words > STACK_WORDS) { } else if (words > STACK_WORDS) {
words = STACK_WORDS; words = STACK_WORDS;
} }
dump_stack_segment(context, log, tid, scopeFlags, &sp, words, i); dump_stack_segment(backtrace, log, scope_flags, &sp, words, i);
} }
} }
} }
static void dump_backtrace_and_stack(const ptrace_context_t* context, log_t* log, pid_t tid, static void dump_backtrace_and_stack(const backtrace_t* backtrace, log_t* log,
bool at_fault) { int scope_flags) {
backtrace_frame_t backtrace[STACK_DEPTH]; if (backtrace->num_frames) {
ssize_t frames = unwind_backtrace_ptrace(tid, context, backtrace, 0, STACK_DEPTH); _LOG(log, scope_flags, "\nbacktrace:\n");
if (frames > 0) { dump_backtrace_to_log(backtrace, log, scope_flags, " ");
dump_backtrace(context, log, tid, at_fault, backtrace, frames);
dump_stack(context, log, tid, at_fault, backtrace, frames); _LOG(log, scope_flags, "\nstack:\n");
dump_stack(backtrace, log, scope_flags);
} }
} }
static void dump_map(log_t* log, map_info_t* m, const char* what, int scopeFlags) { static void dump_map(log_t* log, const backtrace_map_info_t* m, const char* what, int scope_flags) {
if (m != NULL) { if (m != NULL) {
_LOG(log, scopeFlags, " %08x-%08x %c%c%c %s\n", m->start, m->end, _LOG(log, scope_flags, " %08x-%08x %c%c%c %s\n", m->start, m->end,
m->is_readable ? 'r' : '-', m->is_readable ? 'r' : '-',
m->is_writable ? 'w' : '-', m->is_writable ? 'w' : '-',
m->is_executable ? 'x' : '-', m->is_executable ? 'x' : '-',
m->name); m->name);
} else { } else {
_LOG(log, scopeFlags, " (no %s)\n", what); _LOG(log, scope_flags, " (no %s)\n", what);
} }
} }
static void dump_nearby_maps(const ptrace_context_t* context, log_t* log, pid_t tid, bool at_fault) { static void dump_nearby_maps(const backtrace_map_info_t* map_info_list, log_t* log, pid_t tid, int scope_flags) {
int scopeFlags = SCOPE_SENSITIVE | (at_fault ? SCOPE_AT_FAULT : 0); scope_flags |= SCOPE_SENSITIVE;
siginfo_t si; siginfo_t si;
memset(&si, 0, sizeof(si)); memset(&si, 0, sizeof(si));
if (ptrace(PTRACE_GETSIGINFO, tid, 0, &si)) { if (ptrace(PTRACE_GETSIGINFO, tid, 0, &si)) {
_LOG(log, scopeFlags, "cannot get siginfo for %d: %s\n", _LOG(log, scope_flags, "cannot get siginfo for %d: %s\n",
tid, strerror(errno)); tid, strerror(errno));
return; return;
} }
@ -388,15 +366,15 @@ static void dump_nearby_maps(const ptrace_context_t* context, log_t* log, pid_t
return; return;
} }
_LOG(log, scopeFlags, "\nmemory map around fault addr %08x:\n", (int)si.si_addr); _LOG(log, scope_flags, "\nmemory map around fault addr %08x:\n", (int)si.si_addr);
/* /*
* Search for a match, or for a hole where the match would be. The list * Search for a match, or for a hole where the match would be. The list
* is backward from the file content, so it starts at high addresses. * is backward from the file content, so it starts at high addresses.
*/ */
map_info_t* map = context->map_info_list; const backtrace_map_info_t* map = map_info_list;
map_info_t *next = NULL; const backtrace_map_info_t* next = NULL;
map_info_t *prev = NULL; const backtrace_map_info_t* prev = NULL;
while (map != NULL) { while (map != NULL) {
if (addr >= map->start && addr < map->end) { if (addr >= map->start && addr < map->end) {
next = map->next; next = map->next;
@ -416,31 +394,31 @@ static void dump_nearby_maps(const ptrace_context_t* context, log_t* log, pid_t
* Show "next" then "match" then "prev" so that the addresses appear in * Show "next" then "match" then "prev" so that the addresses appear in
* ascending order (like /proc/pid/maps). * ascending order (like /proc/pid/maps).
*/ */
dump_map(log, next, "map below", scopeFlags); dump_map(log, next, "map below", scope_flags);
dump_map(log, map, "map for address", scopeFlags); dump_map(log, map, "map for address", scope_flags);
dump_map(log, prev, "map above", scopeFlags); dump_map(log, prev, "map above", scope_flags);
} }
static void dump_thread(const ptrace_context_t* context, log_t* log, pid_t tid, bool at_fault, static void dump_thread(const backtrace_t* backtrace, log_t* log, int scope_flags,
int* total_sleep_time_usec) { int* total_sleep_time_usec) {
wait_for_stop(tid, total_sleep_time_usec); wait_for_stop(backtrace->tid, total_sleep_time_usec);
dump_registers(context, log, tid, at_fault); dump_registers(log, backtrace->tid, scope_flags);
dump_backtrace_and_stack(context, log, tid, at_fault); dump_backtrace_and_stack(backtrace, log, scope_flags);
if (at_fault) { if (IS_AT_FAULT(scope_flags)) {
dump_memory_and_code(context, log, tid, at_fault); dump_memory_and_code(log, backtrace->tid, scope_flags);
dump_nearby_maps(context, log, tid, at_fault); dump_nearby_maps(backtrace->map_info_list, log, backtrace->tid, scope_flags);
} }
} }
/* Return true if some thread is not detached cleanly */ /* Return true if some thread is not detached cleanly */
static bool dump_sibling_thread_report(const ptrace_context_t* context, static bool dump_sibling_thread_report(
log_t* log, pid_t pid, pid_t tid, int* total_sleep_time_usec) { log_t* log, pid_t pid, pid_t tid, int* total_sleep_time_usec) {
char task_path[64]; char task_path[64];
snprintf(task_path, sizeof(task_path), "/proc/%d/task", pid); snprintf(task_path, sizeof(task_path), "/proc/%d/task", pid);
DIR* d = opendir(task_path); DIR* d = opendir(task_path);
/* Bail early if cannot open the task directory */ /* Bail early if the task directory cannot be opened */
if (d == NULL) { if (d == NULL) {
XLOG("Cannot open /proc/%d/task\n", pid); XLOG("Cannot open /proc/%d/task\n", pid);
return false; return false;
@ -467,8 +445,12 @@ static bool dump_sibling_thread_report(const ptrace_context_t* context,
} }
_LOG(log, 0, "--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---\n"); _LOG(log, 0, "--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---\n");
dump_thread_info(log, pid, new_tid, false); dump_thread_info(log, pid, new_tid, 0);
dump_thread(context, log, new_tid, false, total_sleep_time_usec); backtrace_t new_backtrace;
if (backtrace_get_data(&new_backtrace, new_tid)) {
dump_thread(&new_backtrace, log, 0, total_sleep_time_usec);
}
backtrace_free_data(&new_backtrace);
if (ptrace(PTRACE_DETACH, new_tid, 0, 0) != 0) { if (ptrace(PTRACE_DETACH, new_tid, 0, 0) != 0) {
LOG("ptrace detach from %d failed: %s\n", new_tid, strerror(errno)); LOG("ptrace detach from %d failed: %s\n", new_tid, strerror(errno));
@ -624,7 +606,7 @@ static void dump_logs(log_t* log, pid_t pid, bool tailOnly)
dump_log_file(log, pid, "/dev/log/main", tailOnly); dump_log_file(log, pid, "/dev/log/main", tailOnly);
} }
static void dump_abort_message(log_t* log, pid_t tid, uintptr_t address) { static void dump_abort_message(const backtrace_t* backtrace, log_t* log, uintptr_t address) {
if (address == 0) { if (address == 0) {
return; return;
} }
@ -636,9 +618,10 @@ static void dump_abort_message(log_t* log, pid_t tid, uintptr_t address) {
char* p = &msg[0]; char* p = &msg[0];
while (p < &msg[sizeof(msg)]) { while (p < &msg[sizeof(msg)]) {
uint32_t data; uint32_t data;
if (!try_get_word_ptrace(tid, address, &data)) { if (!backtrace_read_word(backtrace, address, &data)) {
break; break;
} }
data = 0;
address += sizeof(uint32_t); address += sizeof(uint32_t);
if ((*p++ = (data >> 0) & 0xff) == 0) { if ((*p++ = (data >> 0) & 0xff) == 0) {
@ -686,14 +669,17 @@ static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal, uintptr_t a
"*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n"); "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n");
dump_build_info(log); dump_build_info(log);
dump_revision_info(log); dump_revision_info(log);
dump_thread_info(log, pid, tid, true); dump_thread_info(log, pid, tid, SCOPE_AT_FAULT);
if (signal) { if (signal) {
dump_fault_addr(log, tid, signal); dump_fault_addr(log, tid, signal);
} }
dump_abort_message(log, tid, abort_msg_address);
ptrace_context_t* context = load_ptrace_context(tid); backtrace_t backtrace;
dump_thread(context, log, tid, true, total_sleep_time_usec); if (backtrace_get_data(&backtrace, tid)) {
dump_abort_message(&backtrace, log, abort_msg_address);
dump_thread(&backtrace, log, SCOPE_AT_FAULT, total_sleep_time_usec);
backtrace_free_data(&backtrace);
}
if (want_logs) { if (want_logs) {
dump_logs(log, pid, true); dump_logs(log, pid, true);
@ -701,11 +687,9 @@ static bool dump_crash(log_t* log, pid_t pid, pid_t tid, int signal, uintptr_t a
bool detach_failed = false; bool detach_failed = false;
if (dump_sibling_threads) { if (dump_sibling_threads) {
detach_failed = dump_sibling_thread_report(context, log, pid, tid, total_sleep_time_usec); detach_failed = dump_sibling_thread_report(log, pid, tid, total_sleep_time_usec);
} }
free_ptrace_context(context);
if (want_logs) { if (want_logs) {
dump_logs(log, pid, false); dump_logs(log, pid, false);
} }

18
debuggerd/x86/machine.c
View file

@ -31,28 +31,24 @@
#include "../utility.h" #include "../utility.h"
#include "../machine.h" #include "../machine.h"
void dump_memory_and_code(const ptrace_context_t* context __attribute((unused)), void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) {
log_t* log, pid_t tid, bool at_fault) {
} }
void dump_registers(const ptrace_context_t* context __attribute((unused)), void dump_registers(log_t* log, pid_t tid, int scope_flags) {
log_t* log, pid_t tid, bool at_fault) {
struct pt_regs_x86 r; struct pt_regs_x86 r;
int scopeFlags = (at_fault ? SCOPE_AT_FAULT : 0);
if(ptrace(PTRACE_GETREGS, tid, 0, &r)) { if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {
_LOG(log, scopeFlags, "cannot get registers: %s\n", strerror(errno)); _LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno));
return; return;
} }
//if there is no stack, no print just like arm //if there is no stack, no print just like arm
if(!r.ebp) if(!r.ebp)
return; return;
_LOG(log, scopeFlags, " eax %08x ebx %08x ecx %08x edx %08x\n", _LOG(log, scope_flags, " eax %08x ebx %08x ecx %08x edx %08x\n",
r.eax, r.ebx, r.ecx, r.edx); r.eax, r.ebx, r.ecx, r.edx);
_LOG(log, scopeFlags, " esi %08x edi %08x\n", _LOG(log, scope_flags, " esi %08x edi %08x\n",
r.esi, r.edi); r.esi, r.edi);
_LOG(log, scopeFlags, " xcs %08x xds %08x xes %08x xfs %08x xss %08x\n", _LOG(log, scope_flags, " xcs %08x xds %08x xes %08x xfs %08x xss %08x\n",
r.xcs, r.xds, r.xes, r.xfs, r.xss); r.xcs, r.xds, r.xes, r.xfs, r.xss);
_LOG(log, scopeFlags, " eip %08x ebp %08x esp %08x flags %08x\n", _LOG(log, scope_flags, " eip %08x ebp %08x esp %08x flags %08x\n",
r.eip, r.ebp, r.esp, r.eflags); r.eip, r.ebp, r.esp, r.eflags);
} }