diff --git a/include/linux/file_compat.h b/include/linux/file_compat.h index b03373ebdc..77d5a27c3a 100644 --- a/include/linux/file_compat.h +++ b/include/linux/file_compat.h @@ -25,6 +25,7 @@ #ifndef _SPL_FILE_COMPAT_H #define _SPL_FILE_COMPAT_H +#include #ifdef HAVE_FDTABLE_HEADER #include #endif diff --git a/include/spl-debug.h b/include/spl-debug.h new file mode 100644 index 0000000000..b5ca64f87f --- /dev/null +++ b/include/spl-debug.h @@ -0,0 +1,181 @@ +/*****************************************************************************\ + * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007 The Regents of the University of California. + * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). + * Written by Brian Behlendorf . + * UCRL-CODE-235197 + * + * This file is part of the SPL, Solaris Porting Layer. + * For details, see . + * + * The SPL is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * The SPL is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with the SPL. If not, see . +\*****************************************************************************/ + +/* + * Available debug functions. These function should be used by any + * package which needs to integrate with the SPL log infrastructure. + * + * CDEBUG() - Log debug message with specified mask. + * CDEBUG_LIMIT() - Log just 1 debug message with specified mask. + * CWARN() - Log a warning message. + * CERROR() - Log an error message. + * CEMERG() - Log an emergency error message. + * CONSOLE() - Log a generic message to the console. + * + * ENTRY - Log entry point to a function. + * EXIT - Log exit point from a function. + * RETURN(x) - Log return from a function. + * GOTO(x, y) - Log goto within a function. + */ + +#ifndef _SPL_DEBUG_INTERNAL_H +#define _SPL_DEBUG_INTERNAL_H + +#include + +#define S_UNDEFINED 0x00000001 +#define S_ATOMIC 0x00000002 +#define S_KOBJ 0x00000004 +#define S_VNODE 0x00000008 +#define S_TIME 0x00000010 +#define S_RWLOCK 0x00000020 +#define S_THREAD 0x00000040 +#define S_CONDVAR 0x00000080 +#define S_MUTEX 0x00000100 +#define S_RNG 0x00000200 +#define S_TASKQ 0x00000400 +#define S_KMEM 0x00000800 +#define S_DEBUG 0x00001000 +#define S_GENERIC 0x00002000 +#define S_PROC 0x00004000 +#define S_MODULE 0x00008000 +#define S_CRED 0x00010000 + +#define D_TRACE 0x00000001 +#define D_INFO 0x00000002 +#define D_WARNING 0x00000004 +#define D_ERROR 0x00000008 +#define D_EMERG 0x00000010 +#define D_CONSOLE 0x00000020 +#define D_IOCTL 0x00000040 +#define D_DPRINTF 0x00000080 +#define D_OTHER 0x00000100 + +#define D_CANTMASK (D_ERROR | D_EMERG | D_WARNING | D_CONSOLE) +#define DEBUG_SUBSYSTEM S_UNDEFINED + +#ifdef NDEBUG /* Debugging Disabled */ + +#define CDEBUG(mask, fmt, a...) ((void)0) +#define CDEBUG_LIMIT(x, y, fmt, a...) ((void)0) +#define CWARN(fmt, a...) ((void)0) +#define CERROR(fmt, a...) ((void)0) +#define CEMERG(fmt, a...) ((void)0) +#define CONSOLE(mask, fmt, a...) ((void)0) + +#define ENTRY ((void)0) +#define EXIT ((void)0) +#define RETURN(x) return (x) +#define GOTO(x, y) { ((void)(y)); goto x; } + +#else /* Debugging Enabled */ + +#define __CDEBUG(cdls, subsys, mask, format, a...) \ +do { \ + if (((mask) & D_CANTMASK) != 0 || \ + ((spl_debug_mask & (mask)) != 0 && \ + (spl_debug_subsys & (subsys)) != 0)) \ + spl_debug_msg(cdls, subsys, mask, __FILE__, \ + __FUNCTION__, __LINE__, format, ## a); \ +} while (0) + +#define CDEBUG(mask, format, a...) \ + __CDEBUG(NULL, DEBUG_SUBSYSTEM, mask, format, ## a) + +#define __CDEBUG_LIMIT(subsys, mask, format, a...) \ +do { \ + static spl_debug_limit_state_t cdls; \ + \ + __CDEBUG(&cdls, subsys, mask, format, ## a); \ +} while (0) + +#define CDEBUG_LIMIT(mask, format, a...) \ + __CDEBUG_LIMIT(DEBUG_SUBSYSTEM, mask, format, ## a) + +#define CWARN(fmt, a...) CDEBUG_LIMIT(D_WARNING, fmt, ## a) +#define CERROR(fmt, a...) CDEBUG_LIMIT(D_ERROR, fmt, ## a) +#define CEMERG(fmt, a...) CDEBUG_LIMIT(D_EMERG, fmt, ## a) +#define CONSOLE(mask, fmt, a...) CDEBUG(D_CONSOLE | (mask), fmt, ## a) + +#define ENTRY CDEBUG(D_TRACE, "Process entered\n") +#define EXIT CDEBUG(D_TRACE, "Process leaving\n") + +#define RETURN(rc) \ +do { \ + typeof(rc) RETURN__ret = (rc); \ + CDEBUG(D_TRACE, "Process leaving (rc=%lu : %ld : %lx)\n", \ + (long)RETURN__ret, (long)RETURN__ret, (long)RETURN__ret); \ + return RETURN__ret; \ +} while (0) + +#define GOTO(label, rc) \ +do { \ + long GOTO__ret = (long)(rc); \ + CDEBUG(D_TRACE,"Process leaving via %s (rc=%lu : %ld : %lx)\n", \ + #label, (unsigned long)GOTO__ret, (signed long)GOTO__ret, \ + (signed long)GOTO__ret); \ + goto label; \ +} while (0) + +#endif /* NDEBUG */ + +typedef struct { + unsigned long cdls_next; + int cdls_count; + long cdls_delay; +} spl_debug_limit_state_t; + +/* Global debug variables */ +extern unsigned long spl_debug_subsys; +extern unsigned long spl_debug_mask; +extern unsigned long spl_debug_printk; +extern int spl_debug_mb; +extern unsigned int spl_debug_binary; +extern unsigned int spl_debug_catastrophe; +extern unsigned int spl_debug_panic_on_bug; +extern char spl_debug_file_path[PATH_MAX]; +extern unsigned int spl_console_ratelimit; +extern long spl_console_max_delay; +extern long spl_console_min_delay; +extern unsigned int spl_console_backoff; +extern unsigned int spl_debug_stack; + +/* Exported debug functions */ +extern int spl_debug_mask2str(char *str, int size, unsigned long mask, int ss); +extern int spl_debug_str2mask(unsigned long *mask, const char *str, int ss); +extern unsigned long spl_debug_set_mask(unsigned long mask); +extern unsigned long spl_debug_get_mask(void); +extern unsigned long spl_debug_set_subsys(unsigned long mask); +extern unsigned long spl_debug_get_subsys(void); +extern int spl_debug_set_mb(int mb); +extern int spl_debug_get_mb(void); +extern int spl_debug_dumplog(int flags); +extern void spl_debug_dumpstack(struct task_struct *tsk); +extern int spl_debug_clear_buffer(void); +extern int spl_debug_mark_buffer(char *text); + +int debug_init(void); +void debug_fini(void); + +#endif /* SPL_DEBUG_INTERNAL_H */ diff --git a/include/spl-trace.h b/include/spl-trace.h new file mode 100644 index 0000000000..709b1326e1 --- /dev/null +++ b/include/spl-trace.h @@ -0,0 +1,132 @@ +/*****************************************************************************\ + * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007 The Regents of the University of California. + * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). + * Written by Brian Behlendorf . + * UCRL-CODE-235197 + * + * This file is part of the SPL, Solaris Porting Layer. + * For details, see . + * + * The SPL is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * The SPL is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with the SPL. If not, see . +\*****************************************************************************/ + +#ifndef _SPL_TRACE_H +#define _SPL_TRACE_H + +#define TCD_MAX_PAGES (5 << (20 - PAGE_SHIFT)) +#define TCD_STOCK_PAGES (TCD_MAX_PAGES) +#define TRACE_CONSOLE_BUFFER_SIZE 1024 + +#define SPL_DEFAULT_MAX_DELAY (600 * HZ) +#define SPL_DEFAULT_MIN_DELAY ((HZ + 1) / 2) +#define SPL_DEFAULT_BACKOFF 2 + +#define DL_NOTHREAD 0x0001 /* Do not create a new thread */ +#define DL_SINGLE_CPU 0x0002 /* Collect pages from this CPU*/ + +typedef struct dumplog_priv { + wait_queue_head_t dp_waitq; + pid_t dp_pid; + int dp_flags; + atomic_t dp_done; +} dumplog_priv_t; + +/* Three trace data types */ +typedef enum { + TCD_TYPE_PROC, + TCD_TYPE_SOFTIRQ, + TCD_TYPE_IRQ, + TCD_TYPE_MAX +} tcd_type_t; + +union trace_data_union { + struct trace_cpu_data { + /* pages with trace records not yet processed by tracefiled */ + struct list_head tcd_pages; + /* number of pages on ->tcd_pages */ + unsigned long tcd_cur_pages; + /* Max number of pages allowed on ->tcd_pages */ + unsigned long tcd_max_pages; + + /* + * preallocated pages to write trace records into. Pages from + * ->tcd_stock_pages are moved to ->tcd_pages by spl_debug_msg(). + * + * This list is necessary, because on some platforms it's + * impossible to perform efficient atomic page allocation in a + * non-blockable context. + * + * Such platforms fill ->tcd_stock_pages "on occasion", when + * tracing code is entered in blockable context. + * + * trace_get_tage_try() tries to get a page from + * ->tcd_stock_pages first and resorts to atomic page + * allocation only if this queue is empty. ->tcd_stock_pages + * is replenished when tracing code is entered in blocking + * context (darwin-tracefile.c:trace_get_tcd()). We try to + * maintain TCD_STOCK_PAGES (40 by default) pages in this + * queue. Atomic allocation is only required if more than + * TCD_STOCK_PAGES pagesful are consumed by trace records all + * emitted in non-blocking contexts. Which is quite unlikely. + */ + struct list_head tcd_stock_pages; + /* number of pages on ->tcd_stock_pages */ + unsigned long tcd_cur_stock_pages; + + unsigned short tcd_shutting_down; + unsigned short tcd_cpu; + unsigned short tcd_type; + /* The factors to share debug memory. */ + unsigned short tcd_pages_factor; + + /* + * This spinlock is needed to workaround the problem of + * set_cpus_allowed() being GPL-only. Since we cannot + * schedule a thread on a specific CPU when dumping the + * pages, we must use the spinlock for mutual exclusion. + */ + spinlock_t tcd_lock; + unsigned long tcd_lock_flags; + } tcd; + char __pad[L1_CACHE_ALIGN(sizeof(struct trace_cpu_data))]; +}; + +extern union trace_data_union (*trace_data[TCD_TYPE_MAX])[NR_CPUS]; + +#define tcd_for_each(tcd, i, j) \ + for (i = 0; i < TCD_TYPE_MAX && trace_data[i]; i++) \ + for (j = 0, ((tcd) = &(*trace_data[i])[j].tcd); \ + j < num_possible_cpus(); j++, (tcd) = &(*trace_data[i])[j].tcd) + +#define tcd_for_each_type_lock(tcd, i, cpu) \ + for (i = 0; i < TCD_TYPE_MAX && trace_data[i] && \ + (tcd = &(*trace_data[i])[cpu].tcd) && \ + trace_lock_tcd(tcd); trace_unlock_tcd(tcd), i++) + +struct trace_page { + struct page *page; /* page itself */ + struct list_head linkage; /* Used by trace_data_union */ + unsigned int used; /* number of bytes used within this page */ + unsigned short cpu; /* cpu that owns this page */ + unsigned short type; /* type(context) of this page */ +}; + +struct page_collection { + struct list_head pc_pages; + spinlock_t pc_lock; + int pc_want_daemon_pages; +}; + +#endif /* SPL_TRACE_H */ diff --git a/include/sys/debug.h b/include/sys/debug.h index 848c885a6b..0da7e31bbf 100644 --- a/include/sys/debug.h +++ b/include/sys/debug.h @@ -22,420 +22,118 @@ * with the SPL. If not, see . \*****************************************************************************/ +/* + * Available Solaris debug functions. All of the ASSERT() macros will be + * compiled out when NDEBUG is defined, this is the default behavior for + * the SPL. To enable assertions use the --enable-debug with configure. + * The VERIFY() functions are never compiled out and cannot be disabled. + * + * PANIC() - Panic the node and print message. + * ASSERT() - Assert X is true, if not panic. + * ASSERTF() - Assert X is true, if not panic and print message. + * ASSERTV() - Wraps a variable declaration which is only used by ASSERT(). + * ASSERT3S() - Assert signed X OP Y is true, if not panic. + * ASSERT3U() - Assert unsigned X OP Y is true, if not panic. + * ASSERT3P() - Assert pointer X OP Y is true, if not panic. + * VERIFY() - Verify X is true, if not panic. + * VERIFY3S() - Verify signed X OP Y is true, if not panic. + * VERIFY3U() - Verify unsigned X OP Y is true, if not panic. + * VERIFY3P() - Verify pointer X OP Y is true, if not panic. + */ + #ifndef _SPL_DEBUG_H #define _SPL_DEBUG_H -#include /* THREAD_SIZE */ -#include +#ifdef NDEBUG /* Debugging Disabled */ -extern unsigned long spl_debug_mask; -extern unsigned long spl_debug_subsys; - -#define S_UNDEFINED 0x00000001 -#define S_ATOMIC 0x00000002 -#define S_KOBJ 0x00000004 -#define S_VNODE 0x00000008 -#define S_TIME 0x00000010 -#define S_RWLOCK 0x00000020 -#define S_THREAD 0x00000040 -#define S_CONDVAR 0x00000080 -#define S_MUTEX 0x00000100 -#define S_RNG 0x00000200 -#define S_TASKQ 0x00000400 -#define S_KMEM 0x00000800 -#define S_DEBUG 0x00001000 -#define S_GENERIC 0x00002000 -#define S_PROC 0x00004000 -#define S_MODULE 0x00008000 -#define S_CRED 0x00010000 - -#define D_TRACE 0x00000001 -#define D_INFO 0x00000002 -#define D_WARNING 0x00000004 -#define D_ERROR 0x00000008 -#define D_EMERG 0x00000010 -#define D_CONSOLE 0x00000020 -#define D_IOCTL 0x00000040 -#define D_DPRINTF 0x00000080 -#define D_OTHER 0x00000100 - -#define D_CANTMASK (D_ERROR | D_EMERG | D_WARNING | D_CONSOLE) -#define DEBUG_SUBSYSTEM S_UNDEFINED - -int debug_init(void); -void debug_fini(void); -int spl_debug_mask2str(char *str, int size, unsigned long mask, int is_subsys); -int spl_debug_str2mask(unsigned long *mask, const char *str, int is_subsys); - -extern unsigned long spl_debug_subsys; -extern unsigned long spl_debug_mask; -extern unsigned long spl_debug_printk; -extern int spl_debug_mb; -extern unsigned int spl_debug_binary; -extern unsigned int spl_debug_catastrophe; -extern unsigned int spl_debug_panic_on_bug; -extern char spl_debug_file_path[PATH_MAX]; -extern unsigned int spl_console_ratelimit; -extern long spl_console_max_delay; -extern long spl_console_min_delay; -extern unsigned int spl_console_backoff; -extern unsigned int spl_debug_stack; - -#define TCD_MAX_PAGES (5 << (20 - PAGE_SHIFT)) -#define TCD_STOCK_PAGES (TCD_MAX_PAGES) -#define TRACE_CONSOLE_BUFFER_SIZE 1024 - -#define SPL_DEFAULT_MAX_DELAY (600 * HZ) -#define SPL_DEFAULT_MIN_DELAY ((HZ + 1) / 2) -#define SPL_DEFAULT_BACKOFF 2 - -#define DL_NOTHREAD 0x0001 /* Do not create a new thread */ -#define DL_SINGLE_CPU 0x0002 /* Collect pages from this CPU */ - -typedef struct dumplog_priv { - wait_queue_head_t dp_waitq; - pid_t dp_pid; - int dp_flags; - atomic_t dp_done; -} dumplog_priv_t; - -typedef struct { - unsigned long cdls_next; - int cdls_count; - long cdls_delay; -} spl_debug_limit_state_t; - -/* Three trace data types */ -typedef enum { - TCD_TYPE_PROC, - TCD_TYPE_SOFTIRQ, - TCD_TYPE_IRQ, - TCD_TYPE_MAX -} tcd_type_t; - -union trace_data_union { - struct trace_cpu_data { - /* pages with trace records not yet processed by tracefiled */ - struct list_head tcd_pages; - /* number of pages on ->tcd_pages */ - unsigned long tcd_cur_pages; - /* Max number of pages allowed on ->tcd_pages */ - unsigned long tcd_max_pages; - - /* - * preallocated pages to write trace records into. Pages from - * ->tcd_stock_pages are moved to ->tcd_pages by spl_debug_msg(). - * - * This list is necessary, because on some platforms it's - * impossible to perform efficient atomic page allocation in a - * non-blockable context. - * - * Such platforms fill ->tcd_stock_pages "on occasion", when - * tracing code is entered in blockable context. - * - * trace_get_tage_try() tries to get a page from - * ->tcd_stock_pages first and resorts to atomic page - * allocation only if this queue is empty. ->tcd_stock_pages - * is replenished when tracing code is entered in blocking - * context (darwin-tracefile.c:trace_get_tcd()). We try to - * maintain TCD_STOCK_PAGES (40 by default) pages in this - * queue. Atomic allocation is only required if more than - * TCD_STOCK_PAGES pagesful are consumed by trace records all - * emitted in non-blocking contexts. Which is quite unlikely. - */ - struct list_head tcd_stock_pages; - /* number of pages on ->tcd_stock_pages */ - unsigned long tcd_cur_stock_pages; - - unsigned short tcd_shutting_down; - unsigned short tcd_cpu; - unsigned short tcd_type; - /* The factors to share debug memory. */ - unsigned short tcd_pages_factor; - - /* - * This spinlock is needed to workaround the problem of - * set_cpus_allowed() being GPL-only. Since we cannot - * schedule a thread on a specific CPU when dumping the - * pages, we must use the spinlock for mutual exclusion. - */ - spinlock_t tcd_lock; - unsigned long tcd_lock_flags; - } tcd; - char __pad[L1_CACHE_ALIGN(sizeof(struct trace_cpu_data))]; -}; - -extern union trace_data_union (*trace_data[TCD_TYPE_MAX])[NR_CPUS]; - -#define tcd_for_each(tcd, i, j) \ - for (i = 0; i < TCD_TYPE_MAX && trace_data[i]; i++) \ - for (j = 0, ((tcd) = &(*trace_data[i])[j].tcd); \ - j < num_possible_cpus(); j++, (tcd) = &(*trace_data[i])[j].tcd) - -#define tcd_for_each_type_lock(tcd, i, cpu) \ - for (i = 0; i < TCD_TYPE_MAX && trace_data[i] && \ - (tcd = &(*trace_data[i])[cpu].tcd) && \ - trace_lock_tcd(tcd); trace_unlock_tcd(tcd), i++) - -struct trace_page { - struct page * page; /* page itself */ - struct list_head linkage; /* Used by lists in trace_data_union */ - unsigned int used; /* number of bytes used within this page */ - unsigned short cpu; /* cpu that owns this page */ - unsigned short type; /* type(context) of this page */ -}; - -struct page_collection { - struct list_head pc_pages; - spinlock_t pc_lock; - int pc_want_daemon_pages; -}; - -#define SBUG() spl_debug_bug(__FILE__, __FUNCTION__, __LINE__, 0); - -#ifdef NDEBUG - -#define CDEBUG_STACK() (0) -#define CDEBUG_LIMIT(x, y, z, a...) ((void)0) -#define __CDEBUG_LIMIT(x, y, z, a...) ((void)0) -#define CDEBUG(mask, format, a...) ((void)0) -#define CWARN(fmt, a...) ((void)0) -#define CERROR(fmt, a...) ((void)0) -#define CEMERG(fmt, a...) ((void)0) -#define CONSOLE(mask, fmt, a...) ((void)0) - -#define ENTRY ((void)0) -#define EXIT ((void)0) -#define RETURN(x) return (x) -#define GOTO(x, y) { ((void)(y)); goto x; } +#define PANIC(fmt, a...) \ +do { \ + printk(KERN_EMERG fmt, ## a); \ + spl_debug_bug(__FILE__, __FUNCTION__, __LINE__, 0); \ +} while (0) #define __ASSERT(x) ((void)0) -#define __ASSERT_TAGE_INVARIANT(x) ((void)0) #define ASSERT(x) ((void)0) #define ASSERTF(x, y, z...) ((void)0) #define ASSERTV(x) -#define VERIFY(cond) \ -do { \ - if (unlikely(!(cond))) { \ - printk(KERN_ERR "VERIFY(" #cond ") failed\n"); \ - SBUG(); \ - } \ +#define VERIFY(cond) \ +do { \ + if (unlikely(!(cond))) \ + PANIC("VERIFY(" #cond ") failed\n"); \ } while (0) -#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ -do { \ - if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \ - printk(KERN_ERR \ - "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ - "failed (" FMT " " #OP " " FMT ")\n", \ - CAST (LEFT), CAST (RIGHT)); \ - SBUG(); \ - } \ +#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ +do { \ + if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) \ + PANIC("VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ + "failed (" FMT " " #OP " " FMT ")\n", \ + CAST (LEFT), CAST (RIGHT)); \ } while (0) -#define VERIFY3S(x,y,z) VERIFY3_IMPL(x, y, z, int64_t, "%lld", (long long)) -#define VERIFY3U(x,y,z) VERIFY3_IMPL(x, y, z, uint64_t, "%llu", \ - (unsigned long long)) -#define VERIFY3P(x,y,z) VERIFY3_IMPL(x, y, z, uintptr_t, "%p", (void *)) +#define VERIFY3S(x,y,z) VERIFY3_IMPL(x, y, z, int64_t, "%lld", (long long)) +#define VERIFY3U(x,y,z) VERIFY3_IMPL(x, y, z, uint64_t, "%llu", \ + (unsigned long long)) +#define VERIFY3P(x,y,z) VERIFY3_IMPL(x, y, z, uintptr_t, "%p", (void *)) -#define ASSERT3S(x,y,z) ((void)0) -#define ASSERT3U(x,y,z) ((void)0) -#define ASSERT3P(x,y,z) ((void)0) +#define ASSERT3S(x,y,z) ((void)0) +#define ASSERT3U(x,y,z) ((void)0) +#define ASSERT3P(x,y,z) ((void)0) -#else /* NDEBUG */ +#else /* Debugging Enabled */ -#ifdef __ia64__ -#define CDEBUG_STACK() (THREAD_SIZE - \ - ((unsigned long)__builtin_dwarf_cfa() & \ - (THREAD_SIZE - 1))) -#else -#define CDEBUG_STACK() (THREAD_SIZE - \ - ((unsigned long)__builtin_frame_address(0) & \ - (THREAD_SIZE - 1))) -# endif /* __ia64__ */ - -/* DL_SINGLE_CPU flag is passed to spl_debug_bug() because we are about - * to over run our stack and likely damage at least one other unknown - * thread stack. We must finish generating the needed debug info within - * this thread context because once we yeild the CPU its very likely - * the system will crash. - */ -#define __CHECK_STACK(file, func, line) \ -do { \ - if (unlikely(CDEBUG_STACK() > spl_debug_stack)) { \ - spl_debug_stack = CDEBUG_STACK(); \ - \ - if (unlikely(CDEBUG_STACK() > (4 * THREAD_SIZE) / 5)) { \ - spl_debug_msg(NULL, D_TRACE, D_WARNING, \ - file, func, line, "Error " \ - "exceeded maximum safe stack " \ - "size (%lu/%lu)\n", \ - CDEBUG_STACK(), THREAD_SIZE); \ - spl_debug_bug(file, func, line, DL_SINGLE_CPU); \ - } \ - } \ +#define PANIC(fmt, a...) \ +do { \ + spl_debug_msg(NULL, 0, 0, \ + __FILE__, __FUNCTION__, __LINE__, fmt, ## a); \ + spl_debug_bug(__FILE__, __FUNCTION__, __LINE__, 0); \ } while (0) -/* NOTE: The run time stack overflow checking is being disabled by default - * because it is not safe for use with 2.6.29 and latter kernels. These - * kernels do now have their own stack overflow checking so this support - * has become redundant anyway. It can be re-enabled for older kernels or - * arches without stack overflow checking by redefining CHECK_STACK(). - * - * #define CHECK_STACK() __CHECK_STACK(__FILE__, __func__, __LINE__) - */ -#define CHECK_STACK() ((void)0) - /* ASSERTION that is safe to use within the debug system */ -#define __ASSERT(cond) \ -do { \ - if (unlikely(!(cond))) { \ - printk(KERN_ERR "ASSERTION(" #cond ") failed\n"); \ - BUG(); \ - } \ +#define __ASSERT(cond) \ +do { \ + if (unlikely(!(cond))) { \ + printk(KERN_EMERG "ASSERTION(" #cond ") failed\n"); \ + BUG(); \ + } \ } while (0) -#define __ASSERT_TAGE_INVARIANT(tage) \ -do { \ - __ASSERT(tage != NULL); \ - __ASSERT(tage->page != NULL); \ - __ASSERT(tage->used <= PAGE_SIZE); \ - __ASSERT(page_count(tage->page) > 0); \ -} while(0) - /* ASSERTION that will debug log used outside the debug sysytem */ -#define ASSERT(cond) \ -do { \ - CHECK_STACK(); \ - \ - if (unlikely(!(cond))) { \ - spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \ - __FILE__, __FUNCTION__, __LINE__, \ - "ASSERTION(" #cond ") failed\n"); \ - SBUG(); \ - } \ +#define ASSERT(cond) \ +do { \ + if (unlikely(!(cond))) \ + PANIC("ASSERTION(" #cond ") failed\n"); \ } while (0) -#define ASSERTF(cond, fmt, a...) \ -do { \ - CHECK_STACK(); \ - \ - if (unlikely(!(cond))) { \ - spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \ - __FILE__, __FUNCTION__, __LINE__, \ - "ASSERTION(" #cond ") failed: " fmt, \ - ## a); \ - SBUG(); \ - } \ +#define ASSERTF(cond, fmt, a...) \ +do { \ + if (unlikely(!(cond))) \ + PANIC("ASSERTION(" #cond ") failed: " fmt, ## a); \ } while (0) -#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ -do { \ - CHECK_STACK(); \ - \ - if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \ - spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \ - __FILE__, __FUNCTION__, __LINE__, \ - "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ - "failed (" FMT " " #OP " " FMT ")\n", \ - CAST (LEFT), CAST (RIGHT)); \ - SBUG(); \ - } \ +#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ +do { \ + if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) \ + PANIC("VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ + "failed (" FMT " " #OP " " FMT ")\n", \ + CAST (LEFT), CAST (RIGHT)); \ } while (0) -#define VERIFY3S(x,y,z) VERIFY3_IMPL(x, y, z, int64_t, "%lld", (long long)) -#define VERIFY3U(x,y,z) VERIFY3_IMPL(x, y, z, uint64_t, "%llu", \ - (unsigned long long)) -#define VERIFY3P(x,y,z) VERIFY3_IMPL(x, y, z, uintptr_t, "%p", (void *)) +#define VERIFY3S(x,y,z) VERIFY3_IMPL(x, y, z, int64_t, "%lld", (long long)) +#define VERIFY3U(x,y,z) VERIFY3_IMPL(x, y, z, uint64_t, "%llu", \ + (unsigned long long)) +#define VERIFY3P(x,y,z) VERIFY3_IMPL(x, y, z, uintptr_t, "%p", (void *)) -#define ASSERT3S(x,y,z) VERIFY3S(x, y, z) -#define ASSERT3U(x,y,z) VERIFY3U(x, y, z) -#define ASSERT3P(x,y,z) VERIFY3P(x, y, z) +#define ASSERT3S(x,y,z) VERIFY3S(x, y, z) +#define ASSERT3U(x,y,z) VERIFY3U(x, y, z) +#define ASSERT3P(x,y,z) VERIFY3P(x, y, z) -#define ASSERTV(x) x -#define VERIFY(x) ASSERT(x) +#define ASSERTV(x) x +#define VERIFY(x) ASSERT(x) -#define __CDEBUG(cdls, subsys, mask, format, a...) \ -do { \ - CHECK_STACK(); \ - \ - if (((mask) & D_CANTMASK) != 0 || \ - ((spl_debug_mask & (mask)) != 0 && \ - (spl_debug_subsys & (subsys)) != 0)) \ - spl_debug_msg(cdls, subsys, mask, \ - __FILE__, __FUNCTION__, __LINE__, \ - format, ## a); \ -} while (0) - -#define CDEBUG(mask, format, a...) \ - __CDEBUG(NULL, DEBUG_SUBSYSTEM, mask, format, ## a) - -#define __CDEBUG_LIMIT(subsys, mask, format, a...) \ -do { \ - static spl_debug_limit_state_t cdls; \ - \ - __CDEBUG(&cdls, subsys, mask, format, ## a); \ -} while (0) - -#define CDEBUG_LIMIT(mask, format, a...) \ - __CDEBUG_LIMIT(DEBUG_SUBSYSTEM, mask, format, ## a) - -#define CWARN(fmt, a...) CDEBUG_LIMIT(D_WARNING, fmt, ## a) -#define CERROR(fmt, a...) CDEBUG_LIMIT(D_ERROR, fmt, ## a) -#define CEMERG(fmt, a...) CDEBUG_LIMIT(D_EMERG, fmt, ## a) -#define CONSOLE(mask, fmt, a...) CDEBUG(D_CONSOLE | (mask), fmt, ## a) - -#define GOTO(label, rc) \ -do { \ - long GOTO__ret = (long)(rc); \ - CDEBUG(D_TRACE,"Process leaving via %s (rc=%lu : %ld : %lx)\n", \ - #label, (unsigned long)GOTO__ret, (signed long)GOTO__ret,\ - (signed long)GOTO__ret); \ - goto label; \ -} while (0) - -#define RETURN(rc) \ -do { \ - typeof(rc) RETURN__ret = (rc); \ - CDEBUG(D_TRACE, "Process leaving (rc=%lu : %ld : %lx)\n", \ - (long)RETURN__ret, (long)RETURN__ret, (long)RETURN__ret);\ - return RETURN__ret; \ -} while (0) - -#define __ENTRY(subsys) \ -do { \ - __CDEBUG(NULL, subsys, D_TRACE, "Process entered\n"); \ -} while (0) - -#define __EXIT(subsys) \ -do { \ - __CDEBUG(NULL, subsys, D_TRACE, "Process leaving\n"); \ -} while(0) - -#define ENTRY __ENTRY(DEBUG_SUBSYSTEM) -#define EXIT __EXIT(DEBUG_SUBSYSTEM) #endif /* NDEBUG */ -#define spl_debug_msg(cdls, subsys, mask, file, fn, line, format, a...) \ - spl_debug_vmsg(cdls, subsys, mask, file, fn, \ - line, NULL, NULL, format, ##a) - -extern int spl_debug_vmsg(spl_debug_limit_state_t *cdls, int subsys, int mask, - const char *file, const char *fn, const int line, - const char *format1, va_list args, const char *format2, ...); - -extern unsigned long spl_debug_set_mask(unsigned long mask); -extern unsigned long spl_debug_get_mask(void); -extern unsigned long spl_debug_set_subsys(unsigned long mask); -extern unsigned long spl_debug_get_subsys(void); -extern int spl_debug_set_mb(int mb); -extern int spl_debug_get_mb(void); - -extern int spl_debug_dumplog(int flags); -extern void spl_debug_dumpstack(struct task_struct *tsk); -extern void spl_debug_bug(char *file, const char *func, const int line, int flags); - -extern int spl_debug_clear_buffer(void); -extern int spl_debug_mark_buffer(char *text); +extern void spl_debug_bug(char *file, const char *fn, const int line, int fl); +extern int spl_debug_msg(void *arg, int subsys, int mask, const char *file, + const char *fn, const int line, const char *format, ...); #endif /* SPL_DEBUG_H */ diff --git a/include/sys/kmem.h b/include/sys/kmem.h index a5758bd61e..17b3a22761 100644 --- a/include/sys/kmem.h +++ b/include/sys/kmem.h @@ -35,7 +35,6 @@ #include #include #include -#include #include #include diff --git a/include/sys/rwlock.h b/include/sys/rwlock.h index e2be77c548..eb763ec78a 100644 --- a/include/sys/rwlock.h +++ b/include/sys/rwlock.h @@ -156,7 +156,7 @@ RW_LOCK_HELD(krwlock_t *rwp) spl_rw_set_owner(rwp); \ break; \ default: \ - SBUG(); \ + VERIFY(0); \ } \ _rc_; \ }) @@ -172,7 +172,7 @@ RW_LOCK_HELD(krwlock_t *rwp) spl_rw_set_owner(rwp); \ break; \ default: \ - SBUG(); \ + VERIFY(0); \ } \ }) diff --git a/include/sys/signal.h b/include/sys/signal.h index c7e293968d..254bf06411 100644 --- a/include/sys/signal.h +++ b/include/sys/signal.h @@ -25,6 +25,8 @@ #ifndef _SPL_SIGNAL_H #define _SPL_SIGNAL_H +#include + #define FORREAL 0 /* Usual side-effects */ #define JUSTLOOKING 1 /* Don't stop the process */ diff --git a/include/sys/sunddi.h b/include/sys/sunddi.h index c48066b9c1..65df2a053c 100644 --- a/include/sys/sunddi.h +++ b/include/sys/sunddi.h @@ -268,7 +268,6 @@ ddi_create_minor_node(dev_info_t *di, char *name, int spec_type, rc = PTR_ERR(di->di_class); di->di_class = NULL; ddi_remove_minor_node(di, name); - CERROR("Error creating %s class, %d\n", name, rc); return DDI_FAILURE; } @@ -285,7 +284,6 @@ ddi_create_minor_node(dev_info_t *di, char *name, int spec_type, if (name) { rc = __mod_mknod(di->di_name, "c", di->di_major, di->di_minor); if (rc) { - CERROR("Error mknod %s, %d\n", di->di_name, rc); ddi_remove_minor_node(di, name); } } diff --git a/include/sys/thread.h b/include/sys/thread.h index e29715d830..06db6d4c9a 100644 --- a/include/sys/thread.h +++ b/include/sys/thread.h @@ -48,7 +48,7 @@ typedef void (*thread_func_t)(void *); __thread_create(stk, stksize, (thread_func_t)func, \ #func, arg, len, pp, state, pri) #define thread_exit() __thread_exit() -#define thread_join(t) SBUG() +#define thread_join(t) VERIFY(0) #define curthread get_current() extern kthread_t *__thread_create(caddr_t stk, size_t stksize, diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c index 269b0ab618..002dcdb45d 100644 --- a/module/spl/spl-condvar.c +++ b/module/spl/spl-condvar.c @@ -25,6 +25,7 @@ \*****************************************************************************/ #include +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM diff --git a/module/spl/spl-debug.c b/module/spl/spl-debug.c index 75778752b0..5284eb3394 100644 --- a/module/spl/spl-debug.c +++ b/module/spl/spl-debug.c @@ -37,7 +37,8 @@ #include #include #include -#include +#include +#include #include #ifdef DEBUG_SUBSYSTEM @@ -48,17 +49,17 @@ unsigned long spl_debug_subsys = ~0; EXPORT_SYMBOL(spl_debug_subsys); -module_param(spl_debug_subsys, long, 0644); +module_param(spl_debug_subsys, ulong, 0644); MODULE_PARM_DESC(spl_debug_subsys, "Subsystem debugging level mask."); unsigned long spl_debug_mask = (D_EMERG | D_ERROR | D_WARNING | D_CONSOLE); EXPORT_SYMBOL(spl_debug_mask); -module_param(spl_debug_mask, long, 0644); +module_param(spl_debug_mask, ulong, 0644); MODULE_PARM_DESC(spl_debug_mask, "Debugging level mask."); unsigned long spl_debug_printk = D_CANTMASK; EXPORT_SYMBOL(spl_debug_printk); -module_param(spl_debug_printk, long, 0644); +module_param(spl_debug_printk, ulong, 0644); MODULE_PARM_DESC(spl_debug_printk, "Console printk level mask."); int spl_debug_mb = -1; @@ -74,7 +75,7 @@ EXPORT_SYMBOL(spl_debug_catastrophe); unsigned int spl_debug_panic_on_bug = 0; EXPORT_SYMBOL(spl_debug_panic_on_bug); -module_param(spl_debug_panic_on_bug, int, 0644); +module_param(spl_debug_panic_on_bug, uint, 0644); MODULE_PARM_DESC(spl_debug_panic_on_bug, "Panic on BUG"); static char spl_debug_file_name[PATH_MAX]; @@ -633,10 +634,10 @@ trace_get_tage(struct trace_cpu_data *tcd, unsigned long len) } int -spl_debug_vmsg(spl_debug_limit_state_t *cdls, int subsys, int mask, - const char *file, const char *fn, const int line, - const char *format1, va_list args, const char *format2, ...) +spl_debug_msg(void *arg, int subsys, int mask, const char *file, + const char *fn, const int line, const char *format, ...) { + spl_debug_limit_state_t *cdls = arg; struct trace_cpu_data *tcd = NULL; struct spl_debug_header header = { 0, }; struct trace_page *tage; @@ -650,10 +651,16 @@ spl_debug_vmsg(spl_debug_limit_state_t *cdls, int subsys, int mask, int i; int remain; + if (subsys == 0) + subsys = DEBUG_SUBSYSTEM; + + if (mask == 0) + mask = D_EMERG; + if (strchr(file, '/')) file = strrchr(file, '/') + 1; - trace_set_debug_header(&header, subsys, mask, line, CDEBUG_STACK()); + trace_set_debug_header(&header, subsys, mask, line, 0); tcd = trace_get_tcd(); if (tcd == NULL) @@ -698,19 +705,14 @@ spl_debug_vmsg(spl_debug_limit_state_t *cdls, int subsys, int mask, } needed = 0; - if (format1) { - va_copy(ap, args); - needed = vsnprintf(string_buf, max_nob, format1, ap); - va_end(ap); - } - - if (format2) { + if (format) { remain = max_nob - needed; if (remain < 0) remain = 0; - va_start(ap, format2); - needed += vsnprintf(string_buf+needed, remain, format2, ap); + va_start(ap, format); + needed += vsnprintf(string_buf+needed, remain, + format, ap); va_end(ap); } @@ -784,16 +786,12 @@ console: string_buf = trace_get_console_buffer(); needed = 0; - if (format1 != NULL) { - va_copy(ap, args); - needed = vsnprintf(string_buf, TRACE_CONSOLE_BUFFER_SIZE, format1, ap); - va_end(ap); - } - if (format2 != NULL) { + if (format != NULL) { remain = TRACE_CONSOLE_BUFFER_SIZE - needed; if (remain > 0) { - va_start(ap, format2); - needed += vsnprintf(string_buf+needed, remain, format2, ap); + va_start(ap, format); + needed += vsnprintf(string_buf+needed, remain, + format, ap); va_end(ap); } } @@ -819,7 +817,7 @@ console: return 0; } -EXPORT_SYMBOL(spl_debug_vmsg); +EXPORT_SYMBOL(spl_debug_msg); /* Do the collect_pages job on a single CPU: assumes that all other * CPUs have been stopped during a panic. If this isn't true for @@ -881,9 +879,6 @@ put_pages_back_on_all_cpus(struct page_collection *pc) list_for_each_entry_safe(tage, tmp, &pc->pc_pages, linkage) { - - __ASSERT_TAGE_INVARIANT(tage); - if (tage->cpu != cpu || tage->type != i) continue; @@ -935,8 +930,6 @@ spl_debug_dump_all_pages(dumplog_priv_t *dp, char *filename) set_fs(get_ds()); list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { - __ASSERT_TAGE_INVARIANT(tage); - rc = spl_filp_write(filp, page_address(tage->page), tage->used, spl_filp_poff(filp)); if (rc != (int)tage->used) { @@ -979,7 +972,6 @@ spl_debug_flush_pages(void) collect_pages(&dp, &pc); list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { - __ASSERT_TAGE_INVARIANT(tage); list_del(&tage->linkage); tage_free(tage); } @@ -1077,12 +1069,10 @@ EXPORT_SYMBOL(spl_debug_dumpstack); void spl_debug_bug(char *file, const char *func, const int line, int flags) { spl_debug_catastrophe = 1; - spl_debug_msg(NULL, 0, D_EMERG, file, func, line, "SBUG\n"); + spl_debug_msg(NULL, 0, D_EMERG, file, func, line, "SPL PANIC\n"); - if (in_interrupt()) { - panic("SBUG in interrupt.\n"); - /* not reached */ - } + if (in_interrupt()) + panic("SPL PANIC in interrupt.\n"); if (in_atomic() || irqs_disabled()) flags |= DL_NOTHREAD; @@ -1095,7 +1085,7 @@ void spl_debug_bug(char *file, const char *func, const int line, int flags) spl_debug_dumplog(flags); if (spl_debug_panic_on_bug) - panic("SBUG"); + panic("SPL PANIC"); set_task_state(current, TASK_UNINTERRUPTIBLE); while (1) @@ -1208,8 +1198,6 @@ trace_cleanup_on_all_cpus(void) list_for_each_entry_safe(tage, tmp, &tcd->tcd_pages, linkage) { - __ASSERT_TAGE_INVARIANT(tage); - list_del(&tage->linkage); tage_free(tage); } diff --git a/module/spl/spl-err.c b/module/spl/spl-err.c index 1d52028270..1b059f0c8b 100644 --- a/module/spl/spl-err.c +++ b/module/spl/spl-err.c @@ -26,6 +26,7 @@ #include #include +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM @@ -44,7 +45,7 @@ vpanic(const char *fmt, va_list ap) char msg[MAXMSGLEN]; vsnprintf(msg, MAXMSGLEN - 1, fmt, ap); - panic("%s", msg); + PANIC("%s", msg); } /* vpanic() */ EXPORT_SYMBOL(vpanic); diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c index 6a3f49ae00..b875f7d7f6 100644 --- a/module/spl/spl-generic.c +++ b/module/spl/spl-generic.c @@ -39,6 +39,7 @@ #include #include #include +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM @@ -339,12 +340,12 @@ EXPORT_SYMBOL(ddi_copyout); * never be putting away the last reference on a task structure so this will * not be called. However, we still need to define it so the module does not * have undefined symbol at load time. That all said if this impossible - * thing does somehow happen SBUG() immediately so we know about it. + * thing does somehow happen PANIC immediately so we know about it. */ void __put_task_struct(struct task_struct *t) { - SBUG(); + PANIC("Unexpectly put last reference on task %d\n", (int)t->pid); } EXPORT_SYMBOL(__put_task_struct); #endif /* HAVE_PUT_TASK_STRUCT */ diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c index a348021d88..e0b7e12e2a 100644 --- a/module/spl/spl-kmem.c +++ b/module/spl/spl-kmem.c @@ -25,6 +25,7 @@ \*****************************************************************************/ #include +#include #ifdef DEBUG_SUBSYSTEM # undef DEBUG_SUBSYSTEM diff --git a/module/spl/spl-kobj.c b/module/spl/spl-kobj.c index 42a264172e..d58a9892bc 100644 --- a/module/spl/spl-kobj.c +++ b/module/spl/spl-kobj.c @@ -25,6 +25,7 @@ \*****************************************************************************/ #include +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c index 433f3e5b01..238f37ae3d 100644 --- a/module/spl/spl-kstat.c +++ b/module/spl/spl-kstat.c @@ -24,8 +24,9 @@ * Solaris Porting Layer (SPL) Kstat Implementation. \*****************************************************************************/ -#include #include +#include +#include static spinlock_t kstat_lock; static struct list_head kstat_list; @@ -72,7 +73,7 @@ kstat_seq_show_headers(struct seq_file *f) "min", "max", "start", "stop"); break; default: - SBUG(); /* Unreachable */ + PANIC("Undefined kstat type %d\n", ksp->ks_type); } } @@ -135,7 +136,7 @@ kstat_seq_show_named(struct seq_file *f, kstat_named_t *knp) seq_printf(f, "%s", KSTAT_NAMED_STR_PTR(knp)); break; default: - SBUG(); /* Unreachable */ + PANIC("Undefined kstat data type %d\n", knp->data_type); } seq_printf(f, "\n"); @@ -210,7 +211,7 @@ kstat_seq_show(struct seq_file *f, void *p) rc = kstat_seq_show_timer(f, (kstat_timer_t *)p); break; default: - SBUG(); /* Unreachable */ + PANIC("Undefined kstat type %d\n", ksp->ks_type); } return rc; @@ -239,7 +240,7 @@ kstat_seq_data_addr(kstat_t *ksp, loff_t n) rc = ksp->ks_data + n * sizeof(kstat_timer_t); break; default: - SBUG(); /* Unreachable */ + PANIC("Undefined kstat type %d\n", ksp->ks_type); } RETURN(rc); @@ -377,7 +378,7 @@ __kstat_create(const char *ks_module, int ks_instance, const char *ks_name, ksp->ks_data_size = ks_ndata * sizeof(kstat_timer_t); break; default: - SBUG(); /* Unreachable */ + PANIC("Undefined kstat type %d\n", ksp->ks_type); } if (ksp->ks_flags & KSTAT_FLAG_VIRTUAL) { diff --git a/module/spl/spl-module.c b/module/spl/spl-module.c index 37dd4f4c1b..787a4480e1 100644 --- a/module/spl/spl-module.c +++ b/module/spl/spl-module.c @@ -24,8 +24,8 @@ * Solaris Porting Layer (SPL) Module Implementation. \*****************************************************************************/ -#include #include +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c index 5a71f795ce..bc6dac5b88 100644 --- a/module/spl/spl-proc.c +++ b/module/spl/spl-proc.c @@ -29,6 +29,7 @@ #include #include #include +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM @@ -297,13 +298,10 @@ SPL_PROC_HANDLER(proc_force_bug) { ENTRY; - if (write) { - CERROR("Crashing due to forced SBUG\n"); - SBUG(); - /* Unreachable */ - } else { + if (write) + PANIC("Crashing due to forced panic\n"); + else *lenp = 0; - } RETURN(0); } diff --git a/module/spl/spl-taskq.c b/module/spl/spl-taskq.c index 9aca699c72..d9c83279cd 100644 --- a/module/spl/spl-taskq.c +++ b/module/spl/spl-taskq.c @@ -26,6 +26,7 @@ #include #include +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM @@ -90,8 +91,8 @@ retry: RETURN(NULL); } - /* Unreachable, TQ_SLEEP or TQ_NOSLEEP */ - SBUG(); + /* Unreachable, Neither TQ_SLEEP or TQ_NOSLEEP set */ + PANIC("Neither TQ_SLEEP or TQ_NOSLEEP set"); } spin_unlock_irqrestore(&tq->tq_lock, tq->tq_lock_flags); @@ -254,11 +255,9 @@ __taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t flags) if (!(flags & (TQ_SLEEP | TQ_NOSLEEP))) flags |= TQ_SLEEP; - if (unlikely(in_atomic() && (flags & TQ_SLEEP))) { - CERROR("May schedule while atomic: %s/0x%08x/%d\n", - current->comm, preempt_count(), current->pid); - SBUG(); - } + if (unlikely(in_atomic() && (flags & TQ_SLEEP))) + PANIC("May schedule while atomic: %s/0x%08x/%d\n", + current->comm, preempt_count(), current->pid); spin_lock_irqsave(&tq->tq_lock, tq->tq_lock_flags); diff --git a/module/spl/spl-thread.c b/module/spl/spl-thread.c index bce912c4d9..e28b1261a3 100644 --- a/module/spl/spl-thread.c +++ b/module/spl/spl-thread.c @@ -26,6 +26,7 @@ #include #include +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c index c67fc4c7fc..840bb67186 100644 --- a/module/spl/spl-vnode.c +++ b/module/spl/spl-vnode.c @@ -24,9 +24,8 @@ * Solaris Porting Layer (SPL) Vnode Implementation. \*****************************************************************************/ -#include #include - +#include #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM diff --git a/module/spl/spl-xdr.c b/module/spl/spl-xdr.c index 174f76f19d..375b74e536 100644 --- a/module/spl/spl-xdr.c +++ b/module/spl/spl-xdr.c @@ -22,13 +22,12 @@ \*****************************************************************************/ #include - #include #include #include - #include #include +#include /* * SPL's XDR mem implementation. diff --git a/module/splat/splat-atomic.c b/module/splat/splat-atomic.c index fd86a9fa86..6162d6abfe 100644 --- a/module/splat/splat-atomic.c +++ b/module/splat/splat-atomic.c @@ -109,7 +109,7 @@ splat_atomic_work(void *priv) atomic_sub_64_nv(&ap->ap_atomic, 5); break; default: - SBUG(); + PANIC("Undefined op %d\n", op); } } diff --git a/module/splat/splat-internal.h b/module/splat/splat-internal.h index ba1224fc19..c42e08d6f5 100644 --- a/module/splat/splat-internal.h +++ b/module/splat/splat-internal.h @@ -66,6 +66,7 @@ #include #include "spl-device.h" +#include "spl-debug.h" #include "splat-ctl.h" #define SPLAT_SUBSYSTEM_INIT(type) \ diff --git a/scripts/check.sh b/scripts/check.sh index 712605547a..b44b31333f 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -62,7 +62,7 @@ if [ ! -f ${spl_module} ] || [ ! -f ${splat_module} ]; then die "Source tree must be built, run 'make'" fi -spl_module_params="spl_debug_mask=-1 spl_debug_subsys=-1" +spl_module_params="spl_debug_mask=0xffffffff spl_debug_subsys=0xffffffff" echo "Loading ${spl_module}" /sbin/insmod ${spl_module} ${spl_module_params} || die "Failed to load ${spl_module}"