mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-26 03:09:34 +03:00
8740cf4a2f
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 <behlendorf1@llnl.gov> Signed-off-by: Ned Bass <bass6@llnl.gov> Closes #6400
66 lines
2.0 KiB
C
66 lines
2.0 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License (the "License").
|
|
* You may not use this file except in compliance with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
|
|
/* Do not include this file directly. Please use <sys/trace.h> instead. */
|
|
#ifndef _SYS_TRACE_DBGMSG_INDIRECT
|
|
#error "trace_dbgmsg.h included directly"
|
|
#endif
|
|
|
|
/*
|
|
* This file defines tracepoint events for use by the dbgmsg(),
|
|
* dprintf(), and SET_ERROR() interfaces. These are grouped here because
|
|
* they all provide a way to store simple messages in the debug log (as
|
|
* opposed to events used by the DTRACE_PROBE interfaces which typically
|
|
* dump structured data).
|
|
*
|
|
* This header is included inside the trace.h multiple inclusion guard,
|
|
* and it is guarded above against direct inclusion, so it and need not
|
|
* be guarded separately.
|
|
*/
|
|
|
|
/*
|
|
* Generic support for one argument tracepoints of the form:
|
|
*
|
|
* DTRACE_PROBE1(...,
|
|
* const char *, ...);
|
|
*/
|
|
/* BEGIN CSTYLED */
|
|
DECLARE_EVENT_CLASS(zfs_dprintf_class,
|
|
TP_PROTO(const char *msg),
|
|
TP_ARGS(msg),
|
|
TP_STRUCT__entry(
|
|
__string(msg, msg)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(msg, 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 *msg), \
|
|
TP_ARGS(msg))
|
|
/* END CSTYLED */
|
|
DEFINE_DPRINTF_EVENT(zfs_zfs__dprintf);
|