X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-debug.c;h=46fbc2911821ba8aa92ed28b18b4cdc878f0f406;hb=4f6be250fdfa6530886597d13d3d1377c90e20a7;hp=a140d614c3a482df823ec2123ac18b4d3d94e3fe;hpb=5655ee76f5c7573c9ad076a92df6388f27b65196;p=fs%2Flustre-release.git diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c index a140d61..46fbc29 100644 --- a/libcfs/libcfs/linux/linux-debug.c +++ b/libcfs/libcfs/linux/linux-debug.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,27 +34,19 @@ * Author: Phil Schwan */ -#include +#include +#include +#include #include +#include #include -#include -#include -#include -#include -#include #ifdef HAVE_KERNEL_LOCKED #include #endif +#include #include -#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include # define DEBUG_SUBSYSTEM S_LNET @@ -66,9 +54,6 @@ #include "tracefile.h" -#include - -char lnet_upcall[1024] = "/usr/lib/lustre/lnet_upcall"; char lnet_debug_log_upcall[1024] = "/usr/lib/lustre/lnet_debug_log_upcall"; /** @@ -106,92 +91,64 @@ void libcfs_run_debug_log_upcall(char *file) EXIT; } -void libcfs_run_upcall(char **argv) +/* coverity[+kill] */ +void lbug_with_loc(struct libcfs_debug_msg_data *msgdata) { - int rc; - int argc; - char *envp[] = { - "HOME=/", - "PATH=/sbin:/bin:/usr/sbin:/usr/bin", - NULL}; - ENTRY; - - argv[0] = lnet_upcall; - argc = 1; - while (argv[argc] != NULL) - argc++; + libcfs_catastrophe = 1; + libcfs_debug_msg(msgdata, "LBUG\n"); - LASSERT(argc >= 2); + if (in_interrupt()) { + panic("LBUG in interrupt.\n"); + /* not reached */ + } - rc = call_usermodehelper(argv[0], argv, envp, 1); - if (rc < 0 && rc != -ENOENT) { - CERROR("Error %d invoking LNET upcall %s %s%s%s%s%s%s%s%s; " - "check /proc/sys/lnet/upcall\n", - rc, argv[0], argv[1], - argc < 3 ? "" : ",", argc < 3 ? "" : argv[2], - argc < 4 ? "" : ",", argc < 4 ? "" : argv[3], - argc < 5 ? "" : ",", argc < 5 ? "" : argv[4], - argc < 6 ? "" : ",..."); - } else { - CDEBUG(D_HA, "Invoked LNET upcall %s %s%s%s%s%s%s%s%s\n", - argv[0], argv[1], - argc < 3 ? "" : ",", argc < 3 ? "" : argv[2], - argc < 4 ? "" : ",", argc < 4 ? "" : argv[3], - argc < 5 ? "" : ",", argc < 5 ? "" : argv[4], - argc < 6 ? "" : ",..."); - } + libcfs_debug_dumpstack(NULL); + if (libcfs_panic_on_lbug) + panic("LBUG"); + else + libcfs_debug_dumplog(); + set_current_state(TASK_UNINTERRUPTIBLE); + while (1) + schedule(); } +EXPORT_SYMBOL(lbug_with_loc); -void libcfs_run_lbug_upcall(struct libcfs_debug_msg_data *msgdata) -{ - char *argv[6]; - char buf[32]; - - ENTRY; - snprintf (buf, sizeof buf, "%d", msgdata->msg_line); - - argv[1] = "LBUG"; - argv[2] = (char *)msgdata->msg_file; - argv[3] = (char *)msgdata->msg_fn; - argv[4] = buf; - argv[5] = NULL; +#ifdef CONFIG_STACKTRACE - libcfs_run_upcall (argv); -} +#define MAX_ST_ENTRIES 100 +static DEFINE_SPINLOCK(st_lock); -/* coverity[+kill] */ -void lbug_with_loc(struct libcfs_debug_msg_data *msgdata) +static void libcfs_call_trace(struct task_struct *tsk) { - libcfs_catastrophe = 1; - libcfs_debug_msg(msgdata, "LBUG\n"); - - if (in_interrupt()) { - panic("LBUG in interrupt.\n"); - /* not reached */ - } - - libcfs_debug_dumpstack(NULL); - if (!libcfs_panic_on_lbug) - libcfs_debug_dumplog(); - libcfs_run_lbug_upcall(msgdata); - if (libcfs_panic_on_lbug) - panic("LBUG"); - set_task_state(current, TASK_UNINTERRUPTIBLE); - while (1) - schedule(); + struct stack_trace trace; + static unsigned long entries[MAX_ST_ENTRIES]; + + trace.nr_entries = 0; + trace.max_entries = MAX_ST_ENTRIES; + trace.entries = entries; + trace.skip = 0; + + spin_lock(&st_lock); + pr_info("Pid: %d, comm: %.20s %s %s\n", tsk->pid, tsk->comm, + init_utsname()->release, init_utsname()->version); + pr_info("Call Trace:\n"); + save_stack_trace_tsk(tsk, &trace); + print_stack_trace(&trace, 0); + spin_unlock(&st_lock); } -#ifdef __KERNEL__ +#else /* !CONFIG_STACKTRACE */ #ifdef CONFIG_X86 #include #include +#ifdef HAVE_STACKTRACE_OPS #ifdef HAVE_STACKTRACE_WARNING static void print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) { - printk("%s", (char *)data); + printk("%s", (char *)data); print_symbol(msg, symbol); printk("\n"); } @@ -208,13 +165,21 @@ static int print_trace_stack(void *data, char *name) return 0; } -static void print_trace_address(void *data, unsigned long addr, int reliable) +#ifdef STACKTRACE_OPS_ADDRESS_RETURN_INT +static int +#else +static void +#endif +print_trace_address(void *data, unsigned long addr, int reliable) { char fmt[32]; touch_nmi_watchdog(); sprintf(fmt, " [<%016lx>] %s%%s\n", addr, reliable ? "": "? "); __print_symbol(fmt, addr); +#ifdef STACKTRACE_OPS_ADDRESS_RETURN_INT + return 0; +#endif } static const struct stacktrace_ops print_trace_ops = { @@ -228,22 +193,32 @@ static const struct stacktrace_ops print_trace_ops = { .walk_stack = print_context_stack, #endif }; +#endif /* HAVE_STACKTRACE_OPS */ static void libcfs_call_trace(struct task_struct *tsk) { +#ifdef HAVE_STACKTRACE_OPS + printk("Pid: %d, comm: %.20s\n", tsk->pid, tsk->comm); + printk("\nCall Trace:\n"); dump_trace(tsk, NULL, NULL, #ifdef HAVE_DUMP_TRACE_ADDRESS 0, #endif /* HAVE_DUMP_TRACE_ADDRESS */ &print_trace_ops, NULL); printk("\n"); +#else /* !HAVE_STACKTRACE_OPS */ + if (tsk == current) + dump_stack(); + else + CWARN("can't show stack: kernel doesn't export show_task\n"); +#endif /* HAVE_STACKTRACE_OPS */ } #else /* !CONFIG_X86 */ static void libcfs_call_trace(struct task_struct *tsk) { - if ((tsk == NULL) || (tsk == current)) + if (tsk == current) dump_stack(); else CWARN("can't show stack: kernel doesn't export show_task\n"); @@ -251,23 +226,13 @@ static void libcfs_call_trace(struct task_struct *tsk) #endif /* CONFIG_X86 */ -void libcfs_debug_dumpstack(struct task_struct *tsk) -{ - /* 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"); - libcfs_call_trace(tsk); -} +#endif /* CONFIG_STACKTRACE */ -struct task_struct *libcfs_current(void) +void libcfs_debug_dumpstack(struct task_struct *tsk) { - CWARN("current task struct is %p\n", current); - return current; + libcfs_call_trace(tsk ?: current); } +EXPORT_SYMBOL(libcfs_debug_dumpstack); static int panic_notifier(struct notifier_block *self, unsigned long unused1, void *unused2) @@ -296,9 +261,9 @@ static int panic_notifier(struct notifier_block *self, unsigned long unused1, } static struct notifier_block libcfs_panic_notifier = { - notifier_call : panic_notifier, - next : NULL, - priority : 10000 + .notifier_call = panic_notifier, + .next = NULL, + .priority = 10000 }; void libcfs_register_panic_notifier(void) @@ -310,12 +275,3 @@ void libcfs_unregister_panic_notifier(void) { atomic_notifier_chain_unregister(&panic_notifier_list, &libcfs_panic_notifier); } - -EXPORT_SYMBOL(libcfs_debug_dumpstack); -EXPORT_SYMBOL(libcfs_current); - -#endif /* __KERNEL__ */ - -EXPORT_SYMBOL(libcfs_run_upcall); -EXPORT_SYMBOL(libcfs_run_lbug_upcall); -EXPORT_SYMBOL(lbug_with_loc);