From 8740cf4a2f5f7ff7fb6c214e0baf06356b2870b8 Mon Sep 17 00:00:00 2001 From: Ned Bass Date: Tue, 25 Jul 2017 23:09:48 -0700 Subject: Add line info and SET_ERROR() to ZFS debug log Redefine the SET_ERROR macro in terms of __dprintf() so the error return codes get logged as both tracepoint events (if tracepoints are enabled) and as ZFS debug log entries. This also allows us to use the same definition of SET_ERROR() in kernel and user space. Define a new debug flag ZFS_DEBUG_SET_ERROR=512 that may be bitwise or'd into zfs_flags. Setting this flag enables both dprintf() and SET_ERROR() messages in the debug log. That is, setting ZFS_DEBUG_SET_ERROR and ZFS_DEBUG_DPRINTF|ZFS_DEBUG_SET_ERROR are equivalent (this was done for sake of simplicity). Leaving ZFS_DEBUG_SET_ERROR unset suppresses the SET_ERROR() messages which helps avoid cluttering up the logs. To enable SET_ERROR() logging, run: echo 1 > /sys/module/zfs/parameters/zfs_dbgmsg_enable echo 512 > /sys/module/zfs/parameters/zfs_flags Remove the zfs_set_error_class tracepoints event class since SET_ERROR() now uses __dprintf(). This sacrifices a bit of granularity when selecting individual tracepoint events to enable but it makes the code simpler. Include file, function, and line number information in debug log entries. The information is now added to the message buffer in __dprintf() and as a result the zfs_dprintf_class tracepoints event class was changed from a 4 parameter interface to a single parameter. Reviewed-by: Brian Behlendorf Signed-off-by: Ned Bass Closes #6400 --- include/sys/trace_dbgmsg.h | 77 +++++----------------------------------------- 1 file changed, 7 insertions(+), 70 deletions(-) (limited to 'include/sys/trace_dbgmsg.h') diff --git a/include/sys/trace_dbgmsg.h b/include/sys/trace_dbgmsg.h index 08d96c59c..a4aab1e63 100644 --- a/include/sys/trace_dbgmsg.h +++ b/include/sys/trace_dbgmsg.h @@ -37,92 +37,29 @@ */ /* - * Generic support for four argument tracepoints of the form: + * Generic support for one argument tracepoints of the form: * - * DTRACE_PROBE4(..., - * const char *, ..., - * const char *, ..., - * int, ..., + * DTRACE_PROBE1(..., * const char *, ...); */ /* BEGIN CSTYLED */ DECLARE_EVENT_CLASS(zfs_dprintf_class, - TP_PROTO(const char *file, const char *function, int line, - const char *msg), - TP_ARGS(file, function, line, msg), + TP_PROTO(const char *msg), + TP_ARGS(msg), TP_STRUCT__entry( - __string(file, file) - __string(function, function) - __field(int, line) __string(msg, msg) ), TP_fast_assign( - __assign_str(file, strchr(file, '/') ? - strrchr(file, '/') + 1 : file) - __assign_str(function, function); - __entry->line = line; __assign_str(msg, msg); ), - TP_printk("%s:%d:%s(): %s", __get_str(file), __entry->line, - __get_str(function), __get_str(msg)) + TP_printk("%s", __get_str(msg)) ); /* END CSTYLED */ /* BEGIN CSTYLED */ #define DEFINE_DPRINTF_EVENT(name) \ DEFINE_EVENT(zfs_dprintf_class, name, \ - TP_PROTO(const char *file, const char *function, int line, \ - const char *msg), \ - TP_ARGS(file, function, line, msg)) + TP_PROTO(const char *msg), \ + TP_ARGS(msg)) /* END CSTYLED */ DEFINE_DPRINTF_EVENT(zfs_zfs__dprintf); - -/* - * Generic support for four argument tracepoints of the form: - * - * DTRACE_PROBE4(..., - * const char *, ..., - * const char *, ..., - * int, ..., - * uintptr_t, ...); - */ -/* BEGIN CSTYLED */ -DECLARE_EVENT_CLASS(zfs_set_error_class, - TP_PROTO(const char *file, const char *function, int line, - uintptr_t error), - TP_ARGS(file, function, line, error), - TP_STRUCT__entry( - __string(file, file) - __string(function, function) - __field(int, line) - __field(uintptr_t, error) - ), - TP_fast_assign( - __assign_str(file, strchr(file, '/') ? - strrchr(file, '/') + 1 : file) - __assign_str(function, function); - __entry->line = line; - __entry->error = error; - ), - TP_printk("%s:%d:%s(): error 0x%lx", __get_str(file), __entry->line, - __get_str(function), __entry->error) -); -/* END CSTYLED */ - -/* BEGIN CSTYLED */ -#ifdef TP_CONDITION -#define DEFINE_SET_ERROR_EVENT(name) \ -DEFINE_EVENT_CONDITION(zfs_set_error_class, name, \ - TP_PROTO(const char *file, const char *function, int line, \ - uintptr_t error), \ - TP_ARGS(file, function, line, error), \ - TP_CONDITION(error)) -#else -#define DEFINE_SET_ERROR_EVENT(name) \ -DEFINE_EVENT(zfs_set_error_class, name, \ - TP_PROTO(const char *file, const char *function, int line, \ - uintptr_t error), \ - TP_ARGS(file, function, line, error)) -#endif -/* END CSTYLED */ -DEFINE_SET_ERROR_EVENT(zfs_set__error); -- cgit v1.2.3