X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-debug.c;h=e046773e03047ae31528075787963f61f98182ea;hp=b8a49820eff7fe3845a5398c5ffa2a885bbcd067;hb=b7835ef5f56f439a522eca66350e698383f73165;hpb=6a2efe954715cef16683e3215094f855e654533b diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c index b8a4982..e046773 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. @@ -26,8 +24,10 @@ * 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, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,13 +38,6 @@ * Author: Phil Schwan */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif - -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include @@ -53,10 +46,11 @@ #include #include #include +#ifdef HAVE_KERNEL_LOCKED #include +#endif #include #include -#include #include #include @@ -73,9 +67,7 @@ #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"; @@ -151,40 +143,28 @@ 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); } -#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,24 +174,87 @@ 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__ +#ifdef HAVE_DUMP_TRACE +#include +#include + +#ifdef HAVE_STACKTRACE_WARNING +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); +} +#endif + +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 = { +#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 +}; +#endif + 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"); +#if 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_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 *); @@ -248,11 +291,12 @@ 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(); - +# ifdef HAVE_KERNEL_LOCKED + while (kernel_locked()) + unlock_kernel(); +# endif libcfs_debug_dumplog_internal((void *)(long)cfs_curproc_pid()); } #endif @@ -267,20 +311,12 @@ 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);