Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Split <sys/debug.h> header 

To avoid symbol conflicts with dependent packages the debug
header must be split in to several parts.  The <sys/debug.h>
header now only contains the Solaris macro's such as ASSERT
and VERIFY.  The spl-debug.h header contain the spl specific
debugging infrastructure and should be included by any package
which needs to use the spl logging.  Finally the spl-trace.h
header contains internal data structures only used for the log
facility and should not be included by anythign by spl-debug.c.

This way dependent packages can include the standard Solaris
headers without picking up any SPL debug macros.  However, if
the dependant package want to integrate with the SPL debugging
subsystem they can then explicitly include spl-debug.h.

Along with this change I have dropped the CHECK_STACK macros
because the upstream Linux kernel now has much better stack
depth checking built in and we don't need this complexity.

Additionally SBUG has been replaced with PANIC and provided as
part of the Solaris macro set.  While the Solaris version is
really panic() that conflicts with the Linux kernel so we'll
just have to make due to PANIC.  It should rarely be called
directly, the prefered usage would be an ASSERT or VERIFY.

There's lots of change here but this cleanup was overdue.
This commit is contained in:
Brian Behlendorf 2010-07-19 14:16:05 -07:00
parent 8f813bb168
commit 55abb0929e
25 changed files with 460 additions and 458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/file_compat.h
View File

@ -25,6 +25,7 @@
#ifndef _SPL_FILE_COMPAT_H #ifndef _SPL_FILE_COMPAT_H
#define _SPL_FILE_COMPAT_H #define _SPL_FILE_COMPAT_H
#include <linux/fs.h>
#ifdef HAVE_FDTABLE_HEADER #ifdef HAVE_FDTABLE_HEADER
#include <linux/fdtable.h> #include <linux/fdtable.h>
#endif #endif

181
include/spl-debug.h Normal file
View File

@ -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 <behlendorf1@llnl.gov>.
* UCRL-CODE-235197
*
* This file is part of the SPL, Solaris Porting Layer.
* For details, see <http://github.com/behlendorf/spl/>.
*
* 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 <http://www.gnu.org/licenses/>.
\*****************************************************************************/
/*
* 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 <linux/limits.h>
#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 */

132
include/spl-trace.h Normal file
View File

@ -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 <behlendorf1@llnl.gov>.
* UCRL-CODE-235197
*
* This file is part of the SPL, Solaris Porting Layer.
* For details, see <http://github.com/behlendorf/spl/>.
*
* 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 <http://www.gnu.org/licenses/>.
\*****************************************************************************/
#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 */

462
include/sys/debug.h
View File

@ -22,420 +22,118 @@
* with the SPL. If not, see <http://www.gnu.org/licenses/>. * with the SPL. If not, see <http://www.gnu.org/licenses/>.
\*****************************************************************************/ \*****************************************************************************/
/*
* 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 #ifndef _SPL_DEBUG_H
#define _SPL_DEBUG_H #define _SPL_DEBUG_H
#include <linux/sched.h> /* THREAD_SIZE */ #ifdef NDEBUG /* Debugging Disabled */
#include <linux/proc_fs.h>
extern unsigned long spl_debug_mask; #define PANIC(fmt, a...) \
extern unsigned long spl_debug_subsys; do { \
printk(KERN_EMERG fmt, ## a); \
#define S_UNDEFINED 0x00000001 spl_debug_bug(__FILE__, __FUNCTION__, __LINE__, 0); \
#define S_ATOMIC 0x00000002 } while (0)
#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 __ASSERT(x) ((void)0) #define __ASSERT(x) ((void)0)
#define __ASSERT_TAGE_INVARIANT(x) ((void)0)
#define ASSERT(x) ((void)0) #define ASSERT(x) ((void)0)
#define ASSERTF(x, y, z...) ((void)0) #define ASSERTF(x, y, z...) ((void)0)
#define ASSERTV(x) #define ASSERTV(x)
#define VERIFY(cond) \ #define VERIFY(cond) \
do { \ do { \
if (unlikely(!(cond))) { \ if (unlikely(!(cond))) \
printk(KERN_ERR "VERIFY(" #cond ") failed\n"); \ PANIC("VERIFY(" #cond ") failed\n"); \
SBUG(); \
} \
} while (0) } while (0)
#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ #define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \
do { \ do { \
if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \ if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) \
printk(KERN_ERR \ PANIC("VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "failed (" FMT " " #OP " " FMT ")\n", \
"failed (" FMT " " #OP " " FMT ")\n", \ CAST (LEFT), CAST (RIGHT)); \
CAST (LEFT), CAST (RIGHT)); \
SBUG(); \
} \
} while (0) } while (0)
#define VERIFY3S(x,y,z) VERIFY3_IMPL(x, y, z, int64_t, "%lld", (long long)) #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", \ #define VERIFY3U(x,y,z) VERIFY3_IMPL(x, y, z, uint64_t, "%llu", \
(unsigned long long)) (unsigned long long))
#define VERIFY3P(x,y,z) VERIFY3_IMPL(x, y, z, uintptr_t, "%p", (void *)) #define VERIFY3P(x,y,z) VERIFY3_IMPL(x, y, z, uintptr_t, "%p", (void *))
#define ASSERT3S(x,y,z) ((void)0) #define ASSERT3S(x,y,z) ((void)0)
#define ASSERT3U(x,y,z) ((void)0) #define ASSERT3U(x,y,z) ((void)0)
#define ASSERT3P(x,y,z) ((void)0) #define ASSERT3P(x,y,z) ((void)0)
#else /* NDEBUG */ #else /* Debugging Enabled */
#ifdef __ia64__ #define PANIC(fmt, a...) \
#define CDEBUG_STACK() (THREAD_SIZE - \ do { \
((unsigned long)__builtin_dwarf_cfa() & \ spl_debug_msg(NULL, 0, 0, \
(THREAD_SIZE - 1))) __FILE__, __FUNCTION__, __LINE__, fmt, ## a); \
#else spl_debug_bug(__FILE__, __FUNCTION__, __LINE__, 0); \
#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); \
} \
} \
} while (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 */ /* ASSERTION that is safe to use within the debug system */
#define __ASSERT(cond) \ #define __ASSERT(cond) \
do { \ do { \
if (unlikely(!(cond))) { \ if (unlikely(!(cond))) { \
printk(KERN_ERR "ASSERTION(" #cond ") failed\n"); \ printk(KERN_EMERG "ASSERTION(" #cond ") failed\n"); \
BUG(); \ BUG(); \
} \ } \
} while (0) } 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 */ /* ASSERTION that will debug log used outside the debug sysytem */
#define ASSERT(cond) \ #define ASSERT(cond) \
do { \ do { \
CHECK_STACK(); \ if (unlikely(!(cond))) \
\ PANIC("ASSERTION(" #cond ") failed\n"); \
if (unlikely(!(cond))) { \
spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \
__FILE__, __FUNCTION__, __LINE__, \
"ASSERTION(" #cond ") failed\n"); \
SBUG(); \
} \
} while (0) } while (0)
#define ASSERTF(cond, fmt, a...) \ #define ASSERTF(cond, fmt, a...) \
do { \ do { \
CHECK_STACK(); \ if (unlikely(!(cond))) \
\ PANIC("ASSERTION(" #cond ") failed: " fmt, ## a); \
if (unlikely(!(cond))) { \
spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \
__FILE__, __FUNCTION__, __LINE__, \
"ASSERTION(" #cond ") failed: " fmt, \
## a); \
SBUG(); \
} \
} while (0) } while (0)
#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ #define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \
do { \ do { \
CHECK_STACK(); \ if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) \
\ PANIC("VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \ "failed (" FMT " " #OP " " FMT ")\n", \
spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \ CAST (LEFT), CAST (RIGHT)); \
__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (" FMT " " #OP " " FMT ")\n", \
CAST (LEFT), CAST (RIGHT)); \
SBUG(); \
} \
} while (0) } while (0)
#define VERIFY3S(x,y,z) VERIFY3_IMPL(x, y, z, int64_t, "%lld", (long long)) #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", \ #define VERIFY3U(x,y,z) VERIFY3_IMPL(x, y, z, uint64_t, "%llu", \
(unsigned long long)) (unsigned long long))
#define VERIFY3P(x,y,z) VERIFY3_IMPL(x, y, z, uintptr_t, "%p", (void *)) #define VERIFY3P(x,y,z) VERIFY3_IMPL(x, y, z, uintptr_t, "%p", (void *))
#define ASSERT3S(x,y,z) VERIFY3S(x, y, z) #define ASSERT3S(x,y,z) VERIFY3S(x, y, z)
#define ASSERT3U(x,y,z) VERIFY3U(x, y, z) #define ASSERT3U(x,y,z) VERIFY3U(x, y, z)
#define ASSERT3P(x,y,z) VERIFY3P(x, y, z) #define ASSERT3P(x,y,z) VERIFY3P(x, y, z)
#define ASSERTV(x) x #define ASSERTV(x) x
#define VERIFY(x) ASSERT(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 */ #endif /* NDEBUG */
#define spl_debug_msg(cdls, subsys, mask, file, fn, line, format, a...) \ extern void spl_debug_bug(char *file, const char *fn, const int line, int fl);
spl_debug_vmsg(cdls, subsys, mask, file, fn, \ extern int spl_debug_msg(void *arg, int subsys, int mask, const char *file,
line, NULL, NULL, format, ##a) const char *fn, const int line, const char *format, ...);
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);
#endif /* SPL_DEBUG_H */ #endif /* SPL_DEBUG_H */

1
include/sys/kmem.h
View File

@ -35,7 +35,6 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/debug.h>
#include <sys/vmsystm.h> #include <sys/vmsystm.h>
#include <sys/kstat.h> #include <sys/kstat.h>

4
include/sys/rwlock.h
View File

@ -156,7 +156,7 @@ RW_LOCK_HELD(krwlock_t *rwp)
spl_rw_set_owner(rwp); \ spl_rw_set_owner(rwp); \
break; \ break; \
default: \ default: \
SBUG(); \ VERIFY(0); \
} \ } \
_rc_; \ _rc_; \
}) })
@ -172,7 +172,7 @@ RW_LOCK_HELD(krwlock_t *rwp)
spl_rw_set_owner(rwp); \ spl_rw_set_owner(rwp); \
break; \ break; \
default: \ default: \
SBUG(); \ VERIFY(0); \
} \ } \
}) })

2
include/sys/signal.h
View File

@ -25,6 +25,8 @@
#ifndef _SPL_SIGNAL_H #ifndef _SPL_SIGNAL_H
#define _SPL_SIGNAL_H #define _SPL_SIGNAL_H
#include <linux/sched.h>
#define FORREAL 0 /* Usual side-effects */ #define FORREAL 0 /* Usual side-effects */
#define JUSTLOOKING 1 /* Don't stop the process */ #define JUSTLOOKING 1 /* Don't stop the process */

2
include/sys/sunddi.h
View File

@ -268,7 +268,6 @@ ddi_create_minor_node(dev_info_t *di, char *name, int spec_type,
rc = PTR_ERR(di->di_class); rc = PTR_ERR(di->di_class);
di->di_class = NULL; di->di_class = NULL;
ddi_remove_minor_node(di, name); ddi_remove_minor_node(di, name);
CERROR("Error creating %s class, %d\n", name, rc);
return DDI_FAILURE; return DDI_FAILURE;
} }
@ -285,7 +284,6 @@ ddi_create_minor_node(dev_info_t *di, char *name, int spec_type,
if (name) { if (name) {
rc = __mod_mknod(di->di_name, "c", di->di_major, di->di_minor); rc = __mod_mknod(di->di_name, "c", di->di_major, di->di_minor);
if (rc) { if (rc) {
CERROR("Error mknod %s, %d\n", di->di_name, rc);
ddi_remove_minor_node(di, name); ddi_remove_minor_node(di, name);
} }
} }

2
include/sys/thread.h
View File

@ -48,7 +48,7 @@ typedef void (*thread_func_t)(void *);
__thread_create(stk, stksize, (thread_func_t)func, \ __thread_create(stk, stksize, (thread_func_t)func, \
#func, arg, len, pp, state, pri) #func, arg, len, pp, state, pri)
#define thread_exit() __thread_exit() #define thread_exit() __thread_exit()
#define thread_join(t) SBUG() #define thread_join(t) VERIFY(0)
#define curthread get_current() #define curthread get_current()
extern kthread_t *__thread_create(caddr_t stk, size_t stksize, extern kthread_t *__thread_create(caddr_t stk, size_t stksize,

1
module/spl/spl-condvar.c
View File

@ -25,6 +25,7 @@
\*****************************************************************************/ \*****************************************************************************/
#include <sys/condvar.h> #include <sys/condvar.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM

70
module/spl/spl-debug.c
View File

@ -37,7 +37,8 @@
#include <linux/proc_compat.h> #include <linux/proc_compat.h>
#include <linux/file_compat.h> #include <linux/file_compat.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <sys/debug.h> #include <spl-debug.h>
#include <spl-trace.h>
#include <spl-ctl.h> #include <spl-ctl.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
@ -48,17 +49,17 @@
unsigned long spl_debug_subsys = ~0; unsigned long spl_debug_subsys = ~0;
EXPORT_SYMBOL(spl_debug_subsys); 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."); MODULE_PARM_DESC(spl_debug_subsys, "Subsystem debugging level mask.");
unsigned long spl_debug_mask = (D_EMERG | D_ERROR | D_WARNING | D_CONSOLE); unsigned long spl_debug_mask = (D_EMERG | D_ERROR | D_WARNING | D_CONSOLE);
EXPORT_SYMBOL(spl_debug_mask); 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."); MODULE_PARM_DESC(spl_debug_mask, "Debugging level mask.");
unsigned long spl_debug_printk = D_CANTMASK; unsigned long spl_debug_printk = D_CANTMASK;
EXPORT_SYMBOL(spl_debug_printk); 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."); MODULE_PARM_DESC(spl_debug_printk, "Console printk level mask.");
int spl_debug_mb = -1; int spl_debug_mb = -1;
@ -74,7 +75,7 @@ EXPORT_SYMBOL(spl_debug_catastrophe);
unsigned int spl_debug_panic_on_bug = 0; unsigned int spl_debug_panic_on_bug = 0;
EXPORT_SYMBOL(spl_debug_panic_on_bug); 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"); MODULE_PARM_DESC(spl_debug_panic_on_bug, "Panic on BUG");
static char spl_debug_file_name[PATH_MAX]; static char spl_debug_file_name[PATH_MAX];
@ -633,10 +634,10 @@ trace_get_tage(struct trace_cpu_data *tcd, unsigned long len)
} }
int int
spl_debug_vmsg(spl_debug_limit_state_t *cdls, int subsys, int mask, spl_debug_msg(void *arg, int subsys, int mask, const char *file,
const char *file, const char *fn, const int line, const char *fn, const int line, const char *format, ...)
const char *format1, va_list args, const char *format2, ...)
{ {
spl_debug_limit_state_t *cdls = arg;
struct trace_cpu_data *tcd = NULL; struct trace_cpu_data *tcd = NULL;
struct spl_debug_header header = { 0, }; struct spl_debug_header header = { 0, };
struct trace_page *tage; struct trace_page *tage;
@ -650,10 +651,16 @@ spl_debug_vmsg(spl_debug_limit_state_t *cdls, int subsys, int mask,
int i; int i;
int remain; int remain;
if (subsys == 0)
subsys = DEBUG_SUBSYSTEM;
if (mask == 0)
mask = D_EMERG;
if (strchr(file, '/')) if (strchr(file, '/'))
file = strrchr(file, '/') + 1; 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(); tcd = trace_get_tcd();
if (tcd == NULL) if (tcd == NULL)
@ -698,19 +705,14 @@ spl_debug_vmsg(spl_debug_limit_state_t *cdls, int subsys, int mask,
} }
needed = 0; needed = 0;
if (format1) { if (format) {
va_copy(ap, args);
needed = vsnprintf(string_buf, max_nob, format1, ap);
va_end(ap);
}
if (format2) {
remain = max_nob - needed; remain = max_nob - needed;
if (remain < 0) if (remain < 0)
remain = 0; remain = 0;
va_start(ap, format2); va_start(ap, format);
needed += vsnprintf(string_buf+needed, remain, format2, ap); needed += vsnprintf(string_buf+needed, remain,
format, ap);
va_end(ap); va_end(ap);
} }
@ -784,16 +786,12 @@ console:
string_buf = trace_get_console_buffer(); string_buf = trace_get_console_buffer();
needed = 0; needed = 0;
if (format1 != NULL) { if (format != NULL) {
va_copy(ap, args);
needed = vsnprintf(string_buf, TRACE_CONSOLE_BUFFER_SIZE, format1, ap);
va_end(ap);
}
if (format2 != NULL) {
remain = TRACE_CONSOLE_BUFFER_SIZE - needed; remain = TRACE_CONSOLE_BUFFER_SIZE - needed;
if (remain > 0) { if (remain > 0) {
va_start(ap, format2); va_start(ap, format);
needed += vsnprintf(string_buf+needed, remain, format2, ap); needed += vsnprintf(string_buf+needed, remain,
format, ap);
va_end(ap); va_end(ap);
} }
} }
@ -819,7 +817,7 @@ console:
return 0; 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 /* 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 * 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, list_for_each_entry_safe(tage, tmp, &pc->pc_pages,
linkage) { linkage) {
__ASSERT_TAGE_INVARIANT(tage);
if (tage->cpu != cpu || tage->type != i) if (tage->cpu != cpu || tage->type != i)
continue; continue;
@ -935,8 +930,6 @@ spl_debug_dump_all_pages(dumplog_priv_t *dp, char *filename)
set_fs(get_ds()); set_fs(get_ds());
list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) {
__ASSERT_TAGE_INVARIANT(tage);
rc = spl_filp_write(filp, page_address(tage->page), rc = spl_filp_write(filp, page_address(tage->page),
tage->used, spl_filp_poff(filp)); tage->used, spl_filp_poff(filp));
if (rc != (int)tage->used) { if (rc != (int)tage->used) {
@ -979,7 +972,6 @@ spl_debug_flush_pages(void)
collect_pages(&dp, &pc); collect_pages(&dp, &pc);
list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) { list_for_each_entry_safe(tage, tmp, &pc.pc_pages, linkage) {
__ASSERT_TAGE_INVARIANT(tage);
list_del(&tage->linkage); list_del(&tage->linkage);
tage_free(tage); 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) void spl_debug_bug(char *file, const char *func, const int line, int flags)
{ {
spl_debug_catastrophe = 1; 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()) { if (in_interrupt())
panic("SBUG in interrupt.\n"); panic("SPL PANIC in interrupt.\n");
/* not reached */
}
if (in_atomic() || irqs_disabled()) if (in_atomic() || irqs_disabled())
flags |= DL_NOTHREAD; 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); spl_debug_dumplog(flags);
if (spl_debug_panic_on_bug) if (spl_debug_panic_on_bug)
panic("SBUG"); panic("SPL PANIC");
set_task_state(current, TASK_UNINTERRUPTIBLE); set_task_state(current, TASK_UNINTERRUPTIBLE);
while (1) while (1)
@ -1208,8 +1198,6 @@ trace_cleanup_on_all_cpus(void)
list_for_each_entry_safe(tage, tmp, &tcd->tcd_pages, list_for_each_entry_safe(tage, tmp, &tcd->tcd_pages,
linkage) { linkage) {
__ASSERT_TAGE_INVARIANT(tage);
list_del(&tage->linkage); list_del(&tage->linkage);
tage_free(tage); tage_free(tage);
} }

3
module/spl/spl-err.c
View File

@ -26,6 +26,7 @@
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <sys/cmn_err.h> #include <sys/cmn_err.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM
@ -44,7 +45,7 @@ vpanic(const char *fmt, va_list ap)
char msg[MAXMSGLEN]; char msg[MAXMSGLEN];
vsnprintf(msg, MAXMSGLEN - 1, fmt, ap); vsnprintf(msg, MAXMSGLEN - 1, fmt, ap);
panic("%s", msg); PANIC("%s", msg);
} /* vpanic() */ } /* vpanic() */
EXPORT_SYMBOL(vpanic); EXPORT_SYMBOL(vpanic);

5
module/spl/spl-generic.c
View File

@ -39,6 +39,7 @@
#include <sys/file.h> #include <sys/file.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/proc_compat.h> #include <linux/proc_compat.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef 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 * 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 * 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 * 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 void
__put_task_struct(struct task_struct *t) __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); EXPORT_SYMBOL(__put_task_struct);
#endif /* HAVE_PUT_TASK_STRUCT */ #endif /* HAVE_PUT_TASK_STRUCT */

1
module/spl/spl-kmem.c
View File

@ -25,6 +25,7 @@
\*****************************************************************************/ \*****************************************************************************/
#include <sys/kmem.h> #include <sys/kmem.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
# undef DEBUG_SUBSYSTEM # undef DEBUG_SUBSYSTEM

1
module/spl/spl-kobj.c
View File

@ -25,6 +25,7 @@
\*****************************************************************************/ \*****************************************************************************/
#include <sys/kobj.h> #include <sys/kobj.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM

13
module/spl/spl-kstat.c
View File

@ -24,8 +24,9 @@
* Solaris Porting Layer (SPL) Kstat Implementation. * Solaris Porting Layer (SPL) Kstat Implementation.
\*****************************************************************************/ \*****************************************************************************/
#include <sys/kstat.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <sys/kstat.h>
#include <spl-debug.h>
static spinlock_t kstat_lock; static spinlock_t kstat_lock;
static struct list_head kstat_list; static struct list_head kstat_list;
@ -72,7 +73,7 @@ kstat_seq_show_headers(struct seq_file *f)
"min", "max", "start", "stop"); "min", "max", "start", "stop");
break; break;
default: 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)); seq_printf(f, "%s", KSTAT_NAMED_STR_PTR(knp));
break; break;
default: default:
SBUG(); /* Unreachable */ PANIC("Undefined kstat data type %d\n", knp->data_type);
} }
seq_printf(f, "\n"); 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); rc = kstat_seq_show_timer(f, (kstat_timer_t *)p);
break; break;
default: default:
SBUG(); /* Unreachable */ PANIC("Undefined kstat type %d\n", ksp->ks_type);
} }
return rc; 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); rc = ksp->ks_data + n * sizeof(kstat_timer_t);
break; break;
default: default:
SBUG(); /* Unreachable */ PANIC("Undefined kstat type %d\n", ksp->ks_type);
} }
RETURN(rc); 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); ksp->ks_data_size = ks_ndata * sizeof(kstat_timer_t);
break; break;
default: default:
SBUG(); /* Unreachable */ PANIC("Undefined kstat type %d\n", ksp->ks_type);
} }
if (ksp->ks_flags & KSTAT_FLAG_VIRTUAL) { if (ksp->ks_flags & KSTAT_FLAG_VIRTUAL) {

2
module/spl/spl-module.c
View File

@ -24,8 +24,8 @@
* Solaris Porting Layer (SPL) Module Implementation. * Solaris Porting Layer (SPL) Module Implementation.
\*****************************************************************************/ \*****************************************************************************/
#include <sys/sysmacros.h>
#include <sys/sunddi.h> #include <sys/sunddi.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM

10
module/spl/spl-proc.c
View File

@ -29,6 +29,7 @@
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/proc_compat.h> #include <linux/proc_compat.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM
@ -297,13 +298,10 @@ SPL_PROC_HANDLER(proc_force_bug)
{ {
ENTRY; ENTRY;
if (write) { if (write)
CERROR("Crashing due to forced SBUG\n"); PANIC("Crashing due to forced panic\n");
SBUG(); else
/* Unreachable */
} else {
*lenp = 0; *lenp = 0;
}
RETURN(0); RETURN(0);
} }

13
module/spl/spl-taskq.c
View File

@ -26,6 +26,7 @@
#include <sys/taskq.h> #include <sys/taskq.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM
@ -90,8 +91,8 @@ retry:
RETURN(NULL); RETURN(NULL);
} }
/* Unreachable, TQ_SLEEP or TQ_NOSLEEP */ /* Unreachable, Neither TQ_SLEEP or TQ_NOSLEEP set */
SBUG(); PANIC("Neither TQ_SLEEP or TQ_NOSLEEP set");
} }
spin_unlock_irqrestore(&tq->tq_lock, tq->tq_lock_flags); 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))) if (!(flags & (TQ_SLEEP | TQ_NOSLEEP)))
flags |= TQ_SLEEP; flags |= TQ_SLEEP;
if (unlikely(in_atomic() && (flags & TQ_SLEEP))) { if (unlikely(in_atomic() && (flags & TQ_SLEEP)))
CERROR("May schedule while atomic: %s/0x%08x/%d\n", PANIC("May schedule while atomic: %s/0x%08x/%d\n",
current->comm, preempt_count(), current->pid); current->comm, preempt_count(), current->pid);
SBUG();
}
spin_lock_irqsave(&tq->tq_lock, tq->tq_lock_flags); spin_lock_irqsave(&tq->tq_lock, tq->tq_lock_flags);

1
module/spl/spl-thread.c
View File

@ -26,6 +26,7 @@
#include <sys/thread.h> #include <sys/thread.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM

3
module/spl/spl-vnode.c
View File

@ -24,9 +24,8 @@
* Solaris Porting Layer (SPL) Vnode Implementation. * Solaris Porting Layer (SPL) Vnode Implementation.
\*****************************************************************************/ \*****************************************************************************/
#include <sys/sysmacros.h>
#include <sys/vnode.h> #include <sys/vnode.h>
#include <spl-debug.h>
#ifdef DEBUG_SUBSYSTEM #ifdef DEBUG_SUBSYSTEM
#undef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM

3
module/spl/spl-xdr.c
View File

@ -22,13 +22,12 @@
\*****************************************************************************/ \*****************************************************************************/
#include <linux/string.h> #include <linux/string.h>
#include <sys/kmem.h> #include <sys/kmem.h>
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/types.h> #include <sys/types.h>
#include <rpc/types.h> #include <rpc/types.h>
#include <rpc/xdr.h> #include <rpc/xdr.h>
#include <spl-debug.h>
/* /*
* SPL's XDR mem implementation. * SPL's XDR mem implementation.

2
module/splat/splat-atomic.c
View File

@ -109,7 +109,7 @@ splat_atomic_work(void *priv)
atomic_sub_64_nv(&ap->ap_atomic, 5); atomic_sub_64_nv(&ap->ap_atomic, 5);
break; break;
default: default:
SBUG(); PANIC("Undefined op %d\n", op);
} }
} }

1
module/splat/splat-internal.h
View File

@ -66,6 +66,7 @@
#include <linux/cdev.h> #include <linux/cdev.h>
#include "spl-device.h" #include "spl-device.h"
#include "spl-debug.h"
#include "splat-ctl.h" #include "splat-ctl.h"
#define SPLAT_SUBSYSTEM_INIT(type) \ #define SPLAT_SUBSYSTEM_INIT(type) \

2
scripts/check.sh
View File

@ -62,7 +62,7 @@ if [ ! -f ${spl_module} ] || [ ! -f ${splat_module} ]; then
die "Source tree must be built, run 'make'" die "Source tree must be built, run 'make'"
fi 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}" echo "Loading ${spl_module}"
/sbin/insmod ${spl_module} ${spl_module_params} || die "Failed to load ${spl_module}" /sbin/insmod ${spl_module} ${spl_module_params} || die "Failed to load ${spl_module}"