mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-27 11:29:36 +03:00
546f38433a
When debugging with tracepoints, we see string pointers:
zfs 3017 [006] 8878.728915: zfs:zfs_set__error: ffffffffa0eec3fc:3013:ffffffffa0ebcd60(): error 0x2
ffffffffa0e1ca43 spa_open_common (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa0e1cbe3 spa_open (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa0e6f6ef zfs_ioc_stable (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa0e6f2a9 zfsdev_ioctl (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffff811909dd do_vfs_ioctl ([kernel.kallsyms])
ffffffff81190c41 sys_ioctl ([kernel.kallsyms])
ffffffff8156e2e9 system_call_fastpath ([kernel.kallsyms])
7ff7d8be69c7 __GI___ioctl (/lib64/libc-2.19.so)
7ff7d90cac53 lzc_ioctl.constprop.3 (/lib64/libzfs_core.so.1.0.0)
636f695f637a6c00 [unknown] ([unknown])
Printing the actual strings is more convenient:
zfs 3461 [001] 10599.847692: zfs:zfs_set__error: spa.c:3013:spa_open_common(): error 0x2
ffffffffa116ba43 spa_open_common (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa116bbe3 spa_open (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa11be8df zfs_ioc_stable (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa11be499 zfsdev_ioctl (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffff811909dd do_vfs_ioctl ([kernel.kallsyms])
ffffffff81190c41 sys_ioctl ([kernel.kallsyms])
ffffffff8156e2e9 system_call_fastpath ([kernel.kallsyms])
7f11b843c9c7 __GI___ioctl (/lib64/libc-2.19.so)
7f11b8920c53 lzc_ioctl.constprop.3 (/lib64/libzfs_core.so.1.0.0)
636f695f637a6c00 [unknown] ([unknown])
A few other tracepoints have strings as well, so switch to printing
the actual string values at the same time.
Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4212
104 lines
3.1 KiB
C
104 lines
3.1 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
|
|
*/
|
|
|
|
#if defined(_KERNEL) && defined(HAVE_DECLARE_EVENT_CLASS)
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM zfs
|
|
|
|
#undef TRACE_SYSTEM_VAR
|
|
#define TRACE_SYSTEM_VAR zfs_dbuf
|
|
|
|
#if !defined(_TRACE_DBUF_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_DBUF_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include <sys/types.h>
|
|
|
|
/*
|
|
* Generic support for two argument tracepoints of the form:
|
|
*
|
|
* DTRACE_PROBE2(...,
|
|
* dmu_buf_impl_t *, ...,
|
|
* zio_t *, ...);
|
|
*/
|
|
|
|
#define DBUF_TP_STRUCT_ENTRY \
|
|
__string(os_spa, \
|
|
spa_name(DB_DNODE(db)->dn_objset->os_spa)) \
|
|
__field(uint64_t, ds_object) \
|
|
__field(uint64_t, db_object) \
|
|
__field(uint64_t, db_level) \
|
|
__field(uint64_t, db_blkid) \
|
|
__field(uint64_t, db_offset) \
|
|
__field(uint64_t, db_size) \
|
|
__field(uint64_t, db_state) \
|
|
__field(int64_t, db_holds) \
|
|
|
|
#define DBUF_TP_FAST_ASSIGN \
|
|
__assign_str(os_spa, \
|
|
spa_name(DB_DNODE(db)->dn_objset->os_spa)); \
|
|
\
|
|
__entry->ds_object = db->db_objset->os_dsl_dataset ? \
|
|
db->db_objset->os_dsl_dataset->ds_object : 0; \
|
|
\
|
|
__entry->db_object = db->db.db_object; \
|
|
__entry->db_level = db->db_level; \
|
|
__entry->db_blkid = db->db_blkid; \
|
|
__entry->db_offset = db->db.db_offset; \
|
|
__entry->db_size = db->db.db_size; \
|
|
__entry->db_state = db->db_state; \
|
|
__entry->db_holds = refcount_count(&db->db_holds);
|
|
|
|
#define DBUF_TP_PRINTK_FMT \
|
|
"dbuf { spa \"%s\" objset %llu object %llu level %llu " \
|
|
"blkid %llu offset %llu size %llu state %llu holds %lld }"
|
|
|
|
#define DBUF_TP_PRINTK_ARGS \
|
|
__get_str(os_spa), __entry->ds_object, \
|
|
__entry->db_object, __entry->db_level, \
|
|
__entry->db_blkid, __entry->db_offset, \
|
|
__entry->db_size, __entry->db_state, __entry->db_holds
|
|
|
|
DECLARE_EVENT_CLASS(zfs_dbuf_class,
|
|
TP_PROTO(dmu_buf_impl_t *db, zio_t *zio),
|
|
TP_ARGS(db, zio),
|
|
TP_STRUCT__entry(DBUF_TP_STRUCT_ENTRY),
|
|
TP_fast_assign(DBUF_TP_FAST_ASSIGN),
|
|
TP_printk(DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS)
|
|
);
|
|
|
|
#define DEFINE_DBUF_EVENT(name) \
|
|
DEFINE_EVENT(zfs_dbuf_class, name, \
|
|
TP_PROTO(dmu_buf_impl_t *db, zio_t *zio), \
|
|
TP_ARGS(db, zio))
|
|
DEFINE_DBUF_EVENT(zfs_blocked__read);
|
|
|
|
#endif /* _TRACE_DBUF_H */
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_PATH sys
|
|
#define TRACE_INCLUDE_FILE trace_dbuf
|
|
#include <trace/define_trace.h>
|
|
|
|
#endif /* _KERNEL && HAVE_DECLARE_EVENT_CLASS */
|