Enable use of DTRACE_PROBE* macros in "spl" module

This change modifies some of the infrastructure for enabling the use of
the DTRACE_PROBE* macros, such that we can use tehm in the "spl" module.

Currently, when the DTRACE_PROBE* macros are used, they get expanded to
create new functions, and these dynamically generated functions become
part of the "zfs" module.

Since the "spl" module does not depend on the "zfs" module, the use of
DTRACE_PROBE* in the "spl" module would result in undefined symbols
being used in the "spl" module. Specifically, DTRACE_PROBE* would turn
into a function call, and the function being called would be a symbol
only contained in the "zfs" module; which results in a linker and/or
runtime error.

Thus, this change adds the necessary logic to the "spl" module, to
mirror the tracing functionality available to the "zfs" module. After
this change, we'll have a "trace_zfs.h" header file which defines the
probes available only to the "zfs" module, and a "trace_spl.h" header
file which defines the probes available only to the "spl" module.

Reviewed by: Brad Lewis <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Prakash Surya <[email protected]>
Closes #9525

19 files changed, 48 insertions, 15 deletions

diff --git a/module/os/linux/spl/Makefile.in b/module/os/linux/spl/Makefile.in
index a29c36a2a..94804bfed 100644
--- a/module/os/linux/spl/Makefile.in
+++ b/module/os/linux/spl/Makefile.in
@@ -11,6 +11,7 @@ $(MODULE)-objs += ../os/linux/spl/spl-proc.o
 $(MODULE)-objs += ../os/linux/spl/spl-procfs-list.o
 $(MODULE)-objs += ../os/linux/spl/spl-taskq.o
 $(MODULE)-objs += ../os/linux/spl/spl-thread.o
+$(MODULE)-objs += ../os/linux/spl/spl-trace.o
 $(MODULE)-objs += ../os/linux/spl/spl-tsd.o
 $(MODULE)-objs += ../os/linux/spl/spl-vmem.o
 $(MODULE)-objs += ../os/linux/spl/spl-vnode.o
diff --git a/module/os/linux/spl/spl-trace.c b/module/os/linux/spl/spl-trace.c
new file mode 100644
index 000000000..6415f9a91
--- /dev/null
+++ b/module/os/linux/spl/spl-trace.c
@@ -0,0 +1,30 @@
+/*
+ * 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
+ */
+
+/*
+ * Each DTRACE_PROBE must define its trace point in one (and only one)
+ * source file, so this dummy file exists for that purpose.
+ */
+
+#ifdef _KERNEL
+#define	CREATE_TRACE_POINTS
+#include <sys/trace.h>
+#endif
diff --git a/module/os/linux/zfs/arc_os.c b/module/os/linux/zfs/arc_os.c
index c9db31096..1e0cabd0a 100644
--- a/module/os/linux/zfs/arc_os.c
+++ b/module/os/linux/zfs/arc_os.c
@@ -54,7 +54,7 @@
 #include <sys/zthr.h>
 #include <zfs_fletcher.h>
 #include <sys/arc_impl.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 #include <sys/aggsum.h>
 
 int64_t last_free_memory;
diff --git a/module/os/linux/zfs/trace.c b/module/os/linux/zfs/trace.c
index 7b2f981ee..a690822ae 100644
--- a/module/os/linux/zfs/trace.c
+++ b/module/os/linux/zfs/trace.c
@@ -41,6 +41,7 @@
 #include <sys/trace.h>
 #include <sys/trace_acl.h>
 #include <sys/trace_arc.h>
+#include <sys/trace_dbgmsg.h>
 #include <sys/trace_dbuf.h>
 #include <sys/trace_dmu.h>
 #include <sys/trace_dnode.h>
diff --git a/module/os/linux/zfs/zfs_debug.c b/module/os/linux/zfs/zfs_debug.c
index 538533d27..a64971d0a 100644
--- a/module/os/linux/zfs/zfs_debug.c
+++ b/module/os/linux/zfs/zfs_debug.c
@@ -24,6 +24,7 @@
  */
 
 #include <sys/zfs_context.h>
+#include <sys/trace_zfs.h>
 
 typedef struct zfs_dbgmsg {
 	procfs_list_node_t	zdm_node;
diff --git a/module/os/linux/zfs/zio_os.c b/module/os/linux/zfs/zio_os.c
index 207484c4d..533e0cb45 100644
--- a/module/os/linux/zfs/zio_os.c
+++ b/module/os/linux/zfs/zio_os.c
@@ -29,7 +29,7 @@
 #include <sys/zio.h>
 #include <sys/zio_impl.h>
 #include <sys/time.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 
 void
 zio_delay_interrupt(zio_t *zio)
diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index 45211bc5c..6ed2a220d 100644
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -297,7 +297,7 @@
 #include <sys/zthr.h>
 #include <zfs_fletcher.h>
 #include <sys/arc_impl.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 #include <sys/aggsum.h>
 #include <sys/cityhash.h>
 
diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
index bf8b48d25..9c1132cfb 100644
--- a/module/zfs/dbuf.c
+++ b/module/zfs/dbuf.c
@@ -44,7 +44,7 @@
 #include <sys/zfeature.h>
 #include <sys/blkptr.h>
 #include <sys/range_tree.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 #include <sys/callb.h>
 #include <sys/abd.h>
 #include <sys/vdev.h>
diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
index 78c673433..f34429eee 100644
--- a/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
@@ -49,7 +49,7 @@
 #include <sys/sa.h>
 #include <sys/zfeature.h>
 #include <sys/abd.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 #include <sys/zfs_rlock.h>
 #ifdef _KERNEL
 #include <sys/vmsystm.h>
diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c
index 66dbb583a..958ae1dc7 100644
--- a/module/zfs/dmu_tx.c
+++ b/module/zfs/dmu_tx.c
@@ -37,7 +37,7 @@
 #include <sys/sa.h>
 #include <sys/sa_impl.h>
 #include <sys/zfs_context.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 
 typedef void (*dmu_tx_hold_func_t)(dmu_tx_t *tx, struct dnode *dn,
     uint64_t arg1, uint64_t arg2);
diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
index f03e88eb9..343aadbed 100644
--- a/module/zfs/dnode.c
+++ b/module/zfs/dnode.c
@@ -37,7 +37,7 @@
 #include <sys/zio.h>
 #include <sys/dmu_zfetch.h>
 #include <sys/range_tree.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 #include <sys/zfs_project.h>
 
 dnode_stats_t dnode_stats = {
diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c
index 59104e6d1..4083abb7e 100644
--- a/module/zfs/dsl_pool.c
+++ b/module/zfs/dsl_pool.c
@@ -48,7 +48,7 @@
 #include <sys/zfeature.h>
 #include <sys/zil_impl.h>
 #include <sys/dsl_userhold.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 #include <sys/mmp.h>
 
 /*
diff --git a/module/zfs/multilist.c b/module/zfs/multilist.c
index 73cf8cbbc..27b17c8f3 100644
--- a/module/zfs/multilist.c
+++ b/module/zfs/multilist.c
@@ -18,7 +18,7 @@
 
 #include <sys/zfs_context.h>
 #include <sys/multilist.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 
 /* needed for spa_get_random() */
 #include <sys/spa.h>
diff --git a/module/zfs/rrwlock.c b/module/zfs/rrwlock.c
index c48a5d3ed..c6d358b34 100644
--- a/module/zfs/rrwlock.c
+++ b/module/zfs/rrwlock.c
@@ -28,7 +28,7 @@
 
 #include <sys/refcount.h>
 #include <sys/rrwlock.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 
 /*
  * This file contains the implementation of a re-entrant read
diff --git a/module/zfs/txg.c b/module/zfs/txg.c
index ae96f5ec0..e972bcc25 100644
--- a/module/zfs/txg.c
+++ b/module/zfs/txg.c
@@ -33,7 +33,7 @@
 #include <sys/dsl_scan.h>
 #include <sys/zil.h>
 #include <sys/callb.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 
 /*
  * ZFS Transaction Groups
diff --git a/module/zfs/vdev_removal.c b/module/zfs/vdev_removal.c
index a4fac1cc5..8089571e1 100644
--- a/module/zfs/vdev_removal.c
+++ b/module/zfs/vdev_removal.c
@@ -47,7 +47,7 @@
 #include <sys/abd.h>
 #include <sys/vdev_initialize.h>
 #include <sys/vdev_trim.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 
 /*
  * This file contains the necessary logic to remove vdevs from a
diff --git a/module/zfs/zil.c b/module/zfs/zil.c
index 0a62ace14..6ca0bc73e 100644
--- a/module/zfs/zil.c
+++ b/module/zfs/zil.c
@@ -41,7 +41,7 @@
 #include <sys/dmu_tx.h>
 #include <sys/dsl_pool.h>
 #include <sys/metaslab.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 #include <sys/abd.h>
 
 /*
diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index 092262590..1ac2f52bb 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -44,7 +44,7 @@
 #include <sys/dsl_scan.h>
 #include <sys/metaslab_impl.h>
 #include <sys/time.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 #include <sys/abd.h>
 #include <sys/dsl_crypt.h>
 #include <sys/cityhash.h>
diff --git a/module/zfs/zrlock.c b/module/zfs/zrlock.c
index fe9044f2c..6deb25648 100644
--- a/module/zfs/zrlock.c
+++ b/module/zfs/zrlock.c
@@ -39,7 +39,7 @@
  * function calls.
  */
 #include <sys/zrlock.h>
-#include <sys/trace_defs.h>
+#include <sys/trace_zfs.h>
 
 /*
  * A ZRL can be locked only while there are zero references, so ZRL_LOCKED is