Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
b=22625 Fix libcfs_debug_file_path module option
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
linux
/
linux-debug.c
diff --git
a/libcfs/libcfs/linux/linux-debug.c
b/libcfs/libcfs/linux/linux-debug.c
index
2ecdba5
..
d8b4b47
100644
(file)
--- a/
libcfs/libcfs/linux/linux-debug.c
+++ b/
libcfs/libcfs/linux/linux-debug.c
@@
-173,7
+173,8
@@
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");
@@
-192,7
+193,8
@@
void lbug_with_loc(const 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");
@@
-204,6
+206,54
@@
void lbug_with_loc(const char *file, const char *func, const int line)
#ifdef __KERNEL__
+#ifdef HAVE_DUMP_TRACE
+#include <linux/nmi.h>
+#include <asm/stacktrace.h>
+
+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__)
@@
-211,6
+261,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 *);
@@
-247,7
+311,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();