X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-debug.c;h=3fb9797d23991f856d1c5168efb916b8f019eb58;hp=0f61f2e8fe2de6ecf47682d235e7374748fd246f;hb=a2d036366d9248a60981ae31a2deb754ed2b962d;hpb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768 diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c index 0f61f2e..3fb9797 100644 --- a/libcfs/libcfs/linux/linux-debug.c +++ b/libcfs/libcfs/linux/linux-debug.c @@ -27,7 +27,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Whamcloud, Inc. + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,9 +38,6 @@ * Author: Phil Schwan */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include @@ -49,10 +46,11 @@ #include #include #include +#ifdef HAVE_KERNEL_LOCKED #include +#endif #include #include -#include #include #include @@ -96,7 +94,7 @@ void libcfs_run_debug_log_upcall(char *file) argv[2] = NULL; - rc = USERMODEHELPER(argv[0], argv, envp); + rc = call_usermodehelper(argv[0], argv, envp, 1); if (rc < 0 && rc != -ENOENT) { CERROR("Error %d invoking LNET debug log upcall %s %s; " "check /proc/sys/lnet/debug_log_upcall\n", @@ -126,7 +124,7 @@ void libcfs_run_upcall(char **argv) LASSERT(argc >= 2); - rc = USERMODEHELPER(argv[0], argv, envp); + 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", @@ -162,18 +160,6 @@ void libcfs_run_lbug_upcall(struct libcfs_debug_msg_data *msgdata) libcfs_run_upcall (argv); } -#ifdef __arch_um__ -void lbug_with_loc(struct libcfs_debug_msg_data *msgdata) -{ - libcfs_catastrophe = 1; - libcfs_debug_msg(msgdata, "LBUG - trying to dump log to %s\n", - libcfs_debug_file_path); - libcfs_debug_dumplog(); - libcfs_run_lbug_upcall(msgdata); - asm("int $3"); - panic("LBUG"); -} -#else /* coverity[+kill] */ void lbug_with_loc(struct libcfs_debug_msg_data *msgdata) { @@ -195,11 +181,10 @@ void lbug_with_loc(struct libcfs_debug_msg_data *msgdata) while (1) schedule(); } -#endif /* __arch_um__ */ #ifdef __KERNEL__ -#ifdef HAVE_DUMP_TRACE +#ifdef CONFIG_X86 #include #include @@ -224,24 +209,16 @@ static int print_trace_stack(void *data, char *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]; + char fmt[32]; + touch_nmi_watchdog(); - sprintf(fmt, " [<%016lx>] %s%%s\n", addr, RELIABLE ? "": "? "); + sprintf(fmt, " [<%016lx>] %s%%s\n", addr, reliable ? "": "? "); __print_symbol(fmt, addr); } -static DUMP_TRACE_CONST struct stacktrace_ops print_trace_ops = { +static const struct stacktrace_ops print_trace_ops = { #ifdef HAVE_STACKTRACE_WARNING .warning = print_trace_warning, .warning_symbol = print_trace_warning_symbol, @@ -252,16 +229,31 @@ static DUMP_TRACE_CONST struct stacktrace_ops print_trace_ops = { .walk_stack = print_context_stack, #endif }; -#endif + +static void libcfs_call_trace(struct task_struct *tsk) +{ + dump_trace(tsk, NULL, NULL, +#ifdef HAVE_DUMP_TRACE_ADDRESS + 0, +#endif /* HAVE_DUMP_TRACE_ADDRESS */ + &print_trace_ops, NULL); + printk("\n"); +} + +#else /* !CONFIG_X86 */ + +static void libcfs_call_trace(struct task_struct *tsk) +{ + if ((tsk == NULL) || (tsk == current)) + dump_stack(); + else + CWARN("can't show stack: kernel doesn't export show_task\n"); +} + +#endif /* CONFIG_X86 */ void libcfs_debug_dumpstack(struct task_struct *tsk) { -#if defined(__arch_um__) - if (tsk != NULL) - 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) @@ -269,29 +261,10 @@ void libcfs_debug_dumpstack(struct task_struct *tsk) 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_DUMP_TRACE_ADDRESS - 0, -#endif /* HAVE_DUMP_TRACE_ADDRESS */ - &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 *); - - if (tsk == NULL) - tsk = current; - CWARN("showing stack for process %d\n", tsk->pid); - show_task(tsk); -#else - if ((tsk == NULL) || (tsk == current)) - dump_stack(); - else - CWARN("can't show stack: kernel doesn't export show_task\n"); -#endif + libcfs_call_trace(tsk); } -cfs_task_t *libcfs_current(void) +struct task_struct *libcfs_current(void) { CWARN("current task struct is %p\n", current); return current; @@ -313,10 +286,11 @@ static int panic_notifier(struct notifier_block *self, unsigned long unused1, if (in_interrupt()) { cfs_trace_debug_print(); } else { - while (current->lock_depth >= 0) - unlock_kernel(); - - libcfs_debug_dumplog_internal((void *)(long)cfs_curproc_pid()); +#ifdef HAVE_KERNEL_LOCKED + while (kernel_locked()) + unlock_kernel(); +#endif + libcfs_debug_dumplog_internal((void *)(long)current_pid()); } #endif return 0;