X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-debug.c;h=367a3f0b96c86aae2dad8651a3a03426ab27fd8a;hb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;hp=c25e6599b78766ee112dff030edea86a25400428;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c index c25e659..367a3f0 100644 --- a/libcfs/libcfs/linux/linux-debug.c +++ b/libcfs/libcfs/linux/linux-debug.c @@ -77,7 +77,48 @@ #include #endif +/* We need to pass a pointer here, but elsewhere this must be a const */ +static char *debug_file_path = &libcfs_debug_file_path_arr[0]; +CFS_MODULE_PARM(debug_file_path, "s", charp, 0644, + "Path for dumping debug logs (deprecated)"); + char lnet_upcall[1024] = "/usr/lib/lustre/lnet_upcall"; +char lnet_debug_log_upcall[1024] = "/usr/lib/lustre/lnet_debug_log_upcall"; + +/** + * Upcall function once a Lustre log has been dumped. + * + * \param file path of the dumped log + */ +void libcfs_run_debug_log_upcall(char *file) +{ + char *argv[3]; + int rc; + char *envp[] = { + "HOME=/", + "PATH=/sbin:/bin:/usr/sbin:/usr/bin", + NULL}; + ENTRY; + + argv[0] = lnet_debug_log_upcall; + + LASSERTF(file != NULL, "called on a null filename\n"); + argv[1] = file; //only need to pass the path of the file + + argv[2] = NULL; + + rc = USERMODEHELPER(argv[0], argv, envp); + if (rc < 0 && rc != -ENOENT) { + CERROR("Error %d invoking LNET debug log upcall %s %s; " + "check /proc/sys/lnet/debug_log_upcall\n", + rc, argv[0], argv[1]); + } else { + CDEBUG(D_HA, "Invoked LNET debug log upcall %s %s\n", + argv[0], argv[1]); + } + + EXIT; +} void libcfs_run_upcall(char **argv) { @@ -115,7 +156,7 @@ void libcfs_run_upcall(char **argv) } } -void libcfs_run_lbug_upcall(char *file, const char *fn, const int line) +void libcfs_run_lbug_upcall(const char *file, const char *fn, const int line) { char *argv[6]; char buf[32]; @@ -124,7 +165,7 @@ void libcfs_run_lbug_upcall(char *file, const char *fn, const int line) snprintf (buf, sizeof buf, "%d", line); argv[1] = "LBUG"; - argv[2] = file; + argv[2] = (char *)file; argv[3] = (char *)fn; argv[4] = buf; argv[5] = NULL; @@ -133,11 +174,12 @@ void libcfs_run_lbug_upcall(char *file, const char *fn, const int line) } #ifdef __arch_um__ -void lbug_with_loc(char *file, const char *func, const int line) +void lbug_with_loc(const char *file, const char *func, const int line) { libcfs_catastrophe = 1; libcfs_debug_msg(NULL, 0, D_EMERG, file, func, line, - "LBUG - trying to dump log to %s\n", debug_file_path); + "LBUG - trying to dump log to %s\n", + libcfs_debug_file_path); libcfs_debug_dumplog(); libcfs_run_lbug_upcall(file, func, line); asm("int $3"); @@ -145,7 +187,7 @@ void lbug_with_loc(char *file, const char *func, const int line) } #else /* coverity[+kill] */ -void lbug_with_loc(char *file, const char *func, const int line) +void lbug_with_loc(const char *file, const char *func, const int line) { libcfs_catastrophe = 1; libcfs_debug_msg(NULL, 0, D_EMERG, file, func, line, "LBUG\n"); @@ -156,7 +198,8 @@ void lbug_with_loc(char *file, const char *func, const int line) } libcfs_debug_dumpstack(NULL); - libcfs_debug_dumplog(); + if (!libcfs_panic_on_lbug) + libcfs_debug_dumplog(); libcfs_run_lbug_upcall(file, func, line); if (libcfs_panic_on_lbug) panic("LBUG"); @@ -168,6 +211,54 @@ void lbug_with_loc(char *file, const char *func, const int line) #ifdef __KERNEL__ +#ifdef HAVE_DUMP_TRACE +#include +#include + +static void +print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) +{ + printk("%s", (char *)data); + print_symbol(msg, symbol); + printk("\n"); +} + +static void print_trace_warning(void *data, char *msg) +{ + printk("%s%s\n", (char *)data, msg); +} + +static int print_trace_stack(void *data, char *name) +{ + printk(" <%s> ", name); + return 0; +} + +#ifdef HAVE_TRACE_ADDRESS_RELIABLE +# define RELIABLE reliable +# define DUMP_TRACE_CONST const +static void print_trace_address(void *data, unsigned long addr, int reliable) +#else +/* before 2.6.24 there was no reliable arg */ +# define RELIABLE 1 +# define DUMP_TRACE_CONST +static void print_trace_address(void *data, unsigned long addr) +#endif +{ + char fmt[32]; + touch_nmi_watchdog(); + sprintf(fmt, " [<%016lx>] %s%%s\n", addr, RELIABLE ? "": "? "); + __print_symbol(fmt, addr); +} + +static DUMP_TRACE_CONST struct stacktrace_ops print_trace_ops = { + .warning = print_trace_warning, + .warning_symbol = print_trace_warning_symbol, + .stack = print_trace_stack, + .address = print_trace_address, +}; +#endif + void libcfs_debug_dumpstack(struct task_struct *tsk) { #if defined(__arch_um__) @@ -175,6 +266,20 @@ void libcfs_debug_dumpstack(struct task_struct *tsk) CWARN("stack dump for pid %d (%d) requested; wake up gdb.\n", tsk->pid, UML_PID(tsk)); //asm("int $3"); +#elif defined(HAVE_DUMP_TRACE) + /* dump_stack() */ + /* show_trace() */ + if (tsk == NULL) + tsk = current; + printk("Pid: %d, comm: %.20s\n", tsk->pid, tsk->comm); + /* show_trace_log_lvl() */ + printk("\nCall Trace:\n"); + dump_trace(tsk, NULL, NULL, +#ifdef HAVE_TRACE_ADDRESS_RELIABLE + 0, +#endif /* HAVE_TRACE_ADDRESS_RELIABLE */ + &print_trace_ops, NULL); + printk("\n"); #elif defined(HAVE_SHOW_TASK) /* this is exported by lustre kernel version 42 */ extern void show_task(struct task_struct *); @@ -211,7 +316,7 @@ static int panic_notifier(struct notifier_block *self, unsigned long unused1, * console on the rare cases it is ever triggered. */ if (in_interrupt()) { - trace_debug_print(); + cfs_trace_debug_print(); } else { while (current->lock_depth >= 0) unlock_kernel();