X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-debug.c;h=40ae258b1a6b87602f474b822edfedfe8b4ff8f5;hp=7bcb5d69e8cd340c492f00fb8738e7821b7525c4;hb=72057a3af19ee02d9a686bd7e7d074917e381310;hpb=df4803a118d3111cc656f5f541bce6d043619a6e diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c index 7bcb5d6..40ae258 100644 --- a/libcfs/libcfs/linux/linux-debug.c +++ b/libcfs/libcfs/linux/linux-debug.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -17,17 +15,15 @@ * * 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 */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,13 +34,6 @@ * Author: Phil Schwan */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif - -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include @@ -53,10 +42,11 @@ #include #include #include +#ifdef HAVE_KERNEL_LOCKED #include +#endif #include #include -#include #include #include @@ -69,13 +59,10 @@ # define DEBUG_SUBSYSTEM S_LNET #include -#include #include "tracefile.h" -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) #include -#endif char lnet_upcall[1024] = "/usr/lib/lustre/lnet_upcall"; char lnet_debug_log_upcall[1024] = "/usr/lib/lustre/lnet_debug_log_upcall"; @@ -102,7 +89,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", @@ -132,7 +119,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", @@ -151,40 +138,29 @@ void libcfs_run_upcall(char **argv) } } -void libcfs_run_lbug_upcall(const char *file, const char *fn, const int line) +void libcfs_run_lbug_upcall(struct libcfs_debug_msg_data *msgdata) { char *argv[6]; char buf[32]; ENTRY; - snprintf (buf, sizeof buf, "%d", line); + snprintf (buf, sizeof buf, "%d", msgdata->msg_line); argv[1] = "LBUG"; - argv[2] = (char *)file; - argv[3] = (char *)fn; + argv[2] = (char *)msgdata->msg_file; + argv[3] = (char *)msgdata->msg_fn; argv[4] = buf; argv[5] = NULL; libcfs_run_upcall (argv); } +EXPORT_SYMBOL(libcfs_run_lbug_upcall); -#ifdef __arch_um__ -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); - libcfs_debug_dumplog(); - libcfs_run_lbug_upcall(file, func, line); - asm("int $3"); - panic("LBUG"); -} -#else /* coverity[+kill] */ -void lbug_with_loc(const char *file, const char *func, const int line) +void lbug_with_loc(struct libcfs_debug_msg_data *msgdata) { libcfs_catastrophe = 1; - libcfs_debug_msg(NULL, 0, D_EMERG, file, func, line, "LBUG\n"); + libcfs_debug_msg(msgdata, "LBUG\n"); if (in_interrupt()) { panic("LBUG in interrupt.\n"); @@ -194,25 +170,24 @@ void lbug_with_loc(const char *file, const char *func, const int line) libcfs_debug_dumpstack(NULL); if (!libcfs_panic_on_lbug) libcfs_debug_dumplog(); - libcfs_run_lbug_upcall(file, func, line); + libcfs_run_lbug_upcall(msgdata); if (libcfs_panic_on_lbug) panic("LBUG"); set_task_state(current, TASK_UNINTERRUPTIBLE); while (1) schedule(); } -#endif /* __arch_um__ */ - -#ifdef __KERNEL__ +EXPORT_SYMBOL(lbug_with_loc); -#ifdef HAVE_DUMP_TRACE +#ifdef CONFIG_X86 #include #include +#ifdef HAVE_STACKTRACE_WARNING static void print_trace_warning_symbol(void *data, char *msg, unsigned long symbol) { - printk(data); + printk("%s", (char *)data); print_symbol(msg, symbol); printk("\n"); } @@ -221,6 +196,7 @@ static void print_trace_warning(void *data, char *msg) { printk("%s%s\n", (char *)data, msg); } +#endif static int print_trace_stack(void *data, char *name) { @@ -228,67 +204,71 @@ 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) +#ifdef STACKTRACE_OPS_ADDRESS_RETURN_INT +static int #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) +static void #endif +print_trace_address(void *data, unsigned long addr, int reliable) { - 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); +#ifdef STACKTRACE_OPS_ADDRESS_RETURN_INT + return 0; +#endif } -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, +#endif .stack = print_trace_stack, .address = print_trace_address, -}; +#ifdef STACKTRACE_OPS_HAVE_WALK_STACK + .walk_stack = print_context_stack, #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) + 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 *); - - 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); } +EXPORT_SYMBOL(libcfs_debug_dumpstack); -cfs_task_t *libcfs_current(void) +struct task_struct *libcfs_current(void) { CWARN("current task struct is %p\n", current); return current; @@ -308,12 +288,13 @@ 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(); - - 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; @@ -327,27 +308,10 @@ static struct notifier_block libcfs_panic_notifier = { void libcfs_register_panic_notifier(void) { -#ifdef HAVE_ATOMIC_PANIC_NOTIFIER atomic_notifier_chain_register(&panic_notifier_list, &libcfs_panic_notifier); -#else - notifier_chain_register(&panic_notifier_list, &libcfs_panic_notifier); -#endif } void libcfs_unregister_panic_notifier(void) { -#ifdef HAVE_ATOMIC_PANIC_NOTIFIER atomic_notifier_chain_unregister(&panic_notifier_list, &libcfs_panic_notifier); -#else - notifier_chain_unregister(&panic_notifier_list, &libcfs_panic_notifier); -#endif } - -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);