LU-14550 libcfs: fix setting of debug_path

[fs/lustre-release.git] / libcfs / libcfs / debug.c

diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index 512f64f..412a10c 100644 (file)
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -43,6 +43,7 @@
 #include <linux/kthread.h>
 #include <linux/stacktrace.h>
 #include <linux/utsname.h>
+#include <linux/kallsyms.h>
 #include "tracefile.h"
 
 static char debug_file_name[1024];
@@ -249,11 +250,9 @@ EXPORT_SYMBOL(libcfs_kmem);
 
 static DECLARE_COMPLETION(debug_complete);
 
-char libcfs_debug_file_path_arr[PATH_MAX] = LIBCFS_DEBUG_FILE_PATH_DEFAULT;
-EXPORT_SYMBOL(libcfs_debug_file_path_arr);
-
 /* We need to pass a pointer here, but elsewhere this must be a const */
-static char *libcfs_debug_file_path = LIBCFS_DEBUG_FILE_PATH_DEFAULT;
+char *libcfs_debug_file_path = LIBCFS_DEBUG_FILE_PATH_DEFAULT;
+EXPORT_SYMBOL(libcfs_debug_file_path);
 module_param(libcfs_debug_file_path, charp, 0644);
 MODULE_PARM_DESC(libcfs_debug_file_path,
                 "Path for dumping debug logs, set 'NONE' to prevent log dumping");
@@ -402,11 +401,11 @@ static void libcfs_debug_dumplog_internal(void *arg)
 
        current_time = ktime_get_real_seconds();
 
-       if (strncmp(libcfs_debug_file_path_arr, "NONE", 4) != 0 &&
+       if (strncmp(libcfs_debug_file_path, "NONE", 4) != 0 &&
            current_time > last_dump_time) {
                last_dump_time = current_time;
                snprintf(debug_file_name, sizeof(debug_file_name) - 1,
-                        "%s.%lld.%ld", libcfs_debug_file_path_arr,
+                        "%s.%lld.%ld", libcfs_debug_file_path,
                         (s64)current_time, (uintptr_t)arg);
                pr_alert("LustreError: dumping log to %s\n", debug_file_name);
                cfs_tracefile_dump_all_pages(debug_file_name);
@@ -486,6 +485,18 @@ do {                                                                              \
 } while (0)
 #endif
 
+static void cfs_print_stack_trace(unsigned long *entries, unsigned int nr)
+{
+       unsigned int i;
+
+       /* Prefer %pB for backtraced symbolic names since it was added in:
+        * Linux v2.6.38-6557-g0f77a8d37825
+        * vsprintf: Introduce %pB format specifier
+        */
+       for (i = 0; i < nr; i++)
+               pr_info("[<0>] %pB\n", (void *)entries[i]);
+}
+
 #define MAX_ST_ENTRIES 100
 static DEFINE_SPINLOCK(st_lock);
 
@@ -501,15 +512,20 @@ typedef unsigned int (stack_trace_save_tsk_t)(struct task_struct *task,
 static stack_trace_save_tsk_t *task_dump_stack;
 #endif
 
-static void libcfs_call_trace(struct task_struct *tsk)
+void __init cfs_debug_init(void)
 {
 #ifdef CONFIG_ARCH_STACKWALK
-       static unsigned long entries[MAX_ST_ENTRIES];
-       unsigned int i, nr_entries;
+       task_dump_stack = (void *)
+                       kallsyms_lookup_name("stack_trace_save_tsk");
 
-       if (!task_dump_stack)
-               task_dump_stack = (stack_trace_save_tsk_t *)
-                                 symbol_get("stack_trace_save_tsk");
+#endif
+}
+
+static void libcfs_call_trace(struct task_struct *tsk)
+{
+       static unsigned long entries[MAX_ST_ENTRIES];
+#ifdef CONFIG_ARCH_STACKWALK
+       unsigned int nr_entries;
 
        spin_lock(&st_lock);
        pr_info("Pid: %d, comm: %.20s %s %s\n", tsk->pid, tsk->comm,
@@ -517,13 +533,11 @@ static void libcfs_call_trace(struct task_struct *tsk)
        pr_info("Call Trace TBD:\n");
        if (task_dump_stack) {
                nr_entries = task_dump_stack(tsk, entries, MAX_ST_ENTRIES, 0);
-               for (i = 0; i < nr_entries; i++)
-                       pr_info("[<0>] %pB\n", (void *)entries[i]);
+               cfs_print_stack_trace(entries, nr_entries);
        }
        spin_unlock(&st_lock);
 #else
        struct stack_trace trace;
-       static unsigned long entries[MAX_ST_ENTRIES];
 
        trace.nr_entries = 0;
        trace.max_entries = MAX_ST_ENTRIES;
@@ -535,7 +549,7 @@ static void libcfs_call_trace(struct task_struct *tsk)
                init_utsname()->release, init_utsname()->version);
        pr_info("Call Trace:\n");
        save_stack_trace_tsk(tsk, &trace);
-       print_stack_trace(&trace, 0);
+       cfs_print_stack_trace(trace.entries, trace.nr_entries);
        spin_unlock(&st_lock);
 #endif
 }
@@ -621,6 +635,16 @@ static int panic_notifier(struct notifier_block *self, unsigned long unused1,
        libcfs_panic_in_progress = 1;
        mb();
 
+#ifdef LNET_DUMP_ON_PANIC
+       /* This is currently disabled because it spews far too much to the
+        * console on the rare cases it is ever triggered. */
+
+       if (in_interrupt()) {
+               cfs_trace_debug_print();
+       } else {
+               libcfs_debug_dumplog_internal((void *)(long)current->pid);
+       }
+#endif
        return 0;
 }
 
@@ -654,12 +678,6 @@ int libcfs_debug_init(unsigned long bufsize)
                libcfs_console_min_delay = CDEBUG_DEFAULT_MIN_DELAY;
        }
 
-       if (libcfs_debug_file_path) {
-               strlcpy(libcfs_debug_file_path_arr,
-                       libcfs_debug_file_path,
-                       sizeof(libcfs_debug_file_path_arr));
-       }
-
        /* If libcfs_debug_mb is uninitialized then just make the
         * total buffers smp_num_cpus * TCD_MAX_PAGES
         */