c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Linux 6.10 compat: Fix tracepoints definitions

Browse Source 
__string field definition includes the source variable for a value
of the string when the TP hits; in 6.10+ kernels, __assign_str()
uses that to copy a value from src to the string, with older
kernels, __assign_str still accepted src as a second parameter.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Pavel Snajdr <snajpa@snajpa.net>
Co-authored-by: Tony Hutter <hutter2@llnl.gov>
Closes #16475
Closes #16515
This commit is contained in:
Pavel Snajdr
2024-09-17 22:38:02 +02:00
committed by Tony Hutter
parent f4e66db401
commit b2bef90465
6 changed files with 131 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/os/linux/zfs/sys/trace_dbgmsg.h
+2 -1
View File
@@ -32,6 +32,7 @@
#define _TRACE_DBGMSG_H
#include <linux/tracepoint.h>
#include <sys/types.h>
/*
* This file defines tracepoint events for use by the dbgmsg(),
@@ -59,7 +60,7 @@ DECLARE_EVENT_CLASS(zfs_dprintf_class,
__string(msg, msg)
),
TP_fast_assign(
__assign_str(msg, msg);
__assign_str_impl(msg, msg);
),
TP_printk("%s", __get_str(msg))
);
include/os/linux/zfs/sys/trace_dbuf.h
+11 -18
View File
@@ -45,9 +45,13 @@
* dmu_buf_impl_t *, ...,
* zio_t *, ...);
*/
#define DBUF_TP_STRUCT_ENTRY_OS_SPA \
(db != NULL && \
POINTER_IS_VALID(DB_DNODE(db)->dn_objset)) \
? spa_name(DB_DNODE(db)->dn_objset->os_spa) : "NULL"
#define DBUF_TP_STRUCT_ENTRY \
__dynamic_array(char, os_spa, TRACE_DBUF_MSG_MAX) \
__string(os_spa, DBUF_TP_STRUCT_ENTRY_OS_SPA) \
__field(uint64_t, ds_object) \
__field(uint64_t, db_object) \
__field(uint64_t, db_level) \
@@ -55,18 +59,11 @@
__field(uint64_t, db_offset) \
__field(uint64_t, db_size) \
__field(uint64_t, db_state) \
__field(int64_t, db_holds) \
__dynamic_array(char, msg, TRACE_DBUF_MSG_MAX)
__field(int64_t, db_holds)
#define DBUF_TP_FAST_ASSIGN \
if (db != NULL) { \
if (POINTER_IS_VALID(DB_DNODE(db)->dn_objset)) { \
__assign_str(os_spa, \
spa_name(DB_DNODE(db)->dn_objset->os_spa)); \
} else { \
__assign_str(os_spa, "NULL"); \
} \
\
__assign_str_impl(os_spa, DBUF_TP_STRUCT_ENTRY_OS_SPA); \
__entry->ds_object = db->db_objset->os_dsl_dataset ? \
db->db_objset->os_dsl_dataset->ds_object : 0; \
\
@@ -77,10 +74,8 @@
__entry->db_size = db->db.db_size; \
__entry->db_state = db->db_state; \
__entry->db_holds = zfs_refcount_count(&db->db_holds); \
snprintf(__get_str(msg), TRACE_DBUF_MSG_MAX, \
DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS); \
} else { \
__assign_str(os_spa, "NULL"); \
__assign_str_impl(os_spa, DBUF_TP_STRUCT_ENTRY_OS_SPA); \
__entry->ds_object = 0; \
__entry->db_object = 0; \
__entry->db_level = 0; \
@@ -89,8 +84,6 @@
__entry->db_size = 0; \
__entry->db_state = 0; \
__entry->db_holds = 0; \
snprintf(__get_str(msg), TRACE_DBUF_MSG_MAX, \
"dbuf { NULL }"); \
}
#define DBUF_TP_PRINTK_FMT \
@@ -109,7 +102,7 @@ DECLARE_EVENT_CLASS(zfs_dbuf_class,
TP_ARGS(db, zio),
TP_STRUCT__entry(DBUF_TP_STRUCT_ENTRY),
TP_fast_assign(DBUF_TP_FAST_ASSIGN),
TP_printk("%s", __get_str(msg))
TP_printk(DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS)
);
DECLARE_EVENT_CLASS(zfs_dbuf_state_class,
@@ -117,7 +110,7 @@ DECLARE_EVENT_CLASS(zfs_dbuf_state_class,
TP_ARGS(db, why),
TP_STRUCT__entry(DBUF_TP_STRUCT_ENTRY),
TP_fast_assign(DBUF_TP_FAST_ASSIGN),
TP_printk("%s", __get_str(msg))
TP_printk(DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS)
);
/* END CSTYLED */
@@ -139,7 +132,7 @@ DECLARE_EVENT_CLASS(zfs_dbuf_evict_one_class,
TP_ARGS(db, mls),
TP_STRUCT__entry(DBUF_TP_STRUCT_ENTRY),
TP_fast_assign(DBUF_TP_FAST_ASSIGN),
TP_printk("%s", __get_str(msg))
TP_printk(DBUF_TP_PRINTK_FMT, DBUF_TP_PRINTK_ARGS)
);
/* END CSTYLED */