X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..94ff46dc2849db4d43eaaf144872decc522aafb4:/bsd/dev/dtrace/sdt_subr.c?ds=sidebyside

diff --git a/bsd/dev/dtrace/sdt_subr.c b/bsd/dev/dtrace/sdt_subr.c
index f57c5d614..c9c52fb6a 100644
--- a/bsd/dev/dtrace/sdt_subr.c
+++ b/bsd/dev/dtrace/sdt_subr.c
@@ -19,60 +19,58 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-/* #pragma ident	"@(#)sdt_subr.c	1.7	06/04/03 SMI" */
-
 #include <sys/sdt_impl.h>
 
 static dtrace_pattr_t vtrace_attr = {
-{ DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_UNSTABLE, DTRACE_STABILITY_UNSTABLE, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t info_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t fpu_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_CPU },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_CPU },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t fsinfo_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t stab_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
 };
 
 static dtrace_pattr_t sdt_attr = {
-{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
+	{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
 };
 
 sdt_provider_t sdt_providers[] = {
@@ -83,17 +81,28 @@ sdt_provider_t sdt_providers[] = {
 	{ "sched", "__sched____", &stab_attr, 0 },
 	{ "proc", "__proc____", &stab_attr, 0 },
 	{ "io", "__io____", &stab_attr, 0 },
+	{ "ip", "__ip____", &stab_attr, 0 },
+	{ "tcp", "__tcp____", &stab_attr, 0 },
+	{ "mptcp", "__mptcp____", &stab_attr, 0 },
 	{ "mib", "__mib____", &stab_attr, 0 },
 	{ "fsinfo", "__fsinfo____", &fsinfo_attr, 0 },
+	{ "nfsv3", "__nfsv3____", &stab_attr, 0 },
+	{ "nfsv4", "__nfsv4____", &stab_attr, 0 },
+	{ "sysevent", "__sysevent____", &stab_attr, 0 },
 	{ "sdt", "__sdt____", &sdt_attr, 0 },
-	{ NULL }
+	{ "boost", "__boost____", &stab_attr, 0},
+	{ "route", "__route____", &stab_attr, 0 },
+#if KASAN
+	{ "kasan", "__kasan____", &stab_attr, 0 },
+#endif
+	{ NULL, NULL, NULL, 0 }
 };
 
-#warning !!! Need xnu cognate for disp_t.
-#warning !!! Need translators for bufinfo_t, cpuinfo_t, devinfo_t, fileinfo_t.
+/* Warning:  Need xnu cognate for disp_t.  */
 sdt_argdesc_t sdt_args[] = {
+	/* provider probename arg# arg-mapping native-type translated-type */
 	{ "sched", "wakeup", 0, 0, "struct thread *", "lwpsinfo_t *" },
-	{ "sched", "wakeup", 1, 0, "struct proc *", "psinfo_t *" },
+	{ "sched", "wakeup", 1, 1, "struct proc *", "psinfo_t *" },
 	{ "sched", "dequeue", 0, 0, "struct thread *", "lwpsinfo_t *" },
 	{ "sched", "dequeue", 1, 0, "struct proc *", "psinfo_t *" },
 	{ "sched", "dequeue", 2, 1, "disp_t *", "cpuinfo_t *" },
@@ -101,8 +110,10 @@ sdt_argdesc_t sdt_args[] = {
 	{ "sched", "enqueue", 1, 0, "struct proc *", "psinfo_t *" },
 	{ "sched", "enqueue", 2, 1, "disp_t *", "cpuinfo_t *" },
 	{ "sched", "enqueue", 3, 2, "int", NULL },
+	/* sched:::sleep has no arguments */
+	/* sched:::on-cpu has no arguments */
 	{ "sched", "off-cpu", 0, 0, "struct thread *", "lwpsinfo_t *" },
-	{ "sched", "off-cpu", 1, 0, "struct proc *", "psinfo_t *" },
+	{ "sched", "off-cpu", 1, 1, "struct proc *", "psinfo_t *" },
 	{ "sched", "tick", 0, 0, "struct thread *", "lwpsinfo_t *" },
 	{ "sched", "tick", 1, 0, "struct proc *", "psinfo_t *" },
 	{ "sched", "change-pri", 0, 0, "struct thread *", "lwpsinfo_t *" },
@@ -116,16 +127,22 @@ sdt_argdesc_t sdt_args[] = {
 	{ "sched", "schedctl-yield", 0, 0, "int", NULL },
 	{ "sched", "surrender", 0, 0, "struct thread *", "lwpsinfo_t *" },
 	{ "sched", "surrender", 1, 0, "struct proc *", "psinfo_t *" },
+	{ "sched", "surrender", 1, 0, "kthread_t *", "psinfo_t *" },
+	{ "sched", "cpucaps-sleep", 0, 0, "kthread_t *", "lwpsinfo_t *" },
+	{ "sched", "cpucaps-sleep", 1, 0, "kthread_t *", "psinfo_t *" },
+	{ "sched", "cpucaps-wakeup", 0, 0, "kthread_t *", "lwpsinfo_t *" },
+	{ "sched", "cpucaps-wakeup", 1, 0, "kthread_t *", "psinfo_t *" },
 
 	{ "proc", "create", 0, 0, "struct proc *", "psinfo_t *" },
 	{ "proc", "exec", 0, 0, "string", NULL },
 	{ "proc", "exec-failure", 0, 0, "int", NULL },
 	/* proc:::exec-success has no arguments */
 	{ "proc", "exit", 0, 0, "int", NULL },
+	{ "proc", "exited", 0, 0, "struct proc *", "psinfo_t *"},
 	{ "proc", "fault", 0, 0, "int", NULL },
 	{ "proc", "fault", 1, 1, "siginfo_t *", NULL },
 	{ "proc", "lwp-create", 0, 0, "struct thread *", "lwpsinfo_t *" },
-	{ "proc", "lwp-create", 1, 1, "struct proc *", "psinfo_t *" },
+	{ "proc", "lwp-create", 1, 0, "struct thread *", "psinfo_t *" },
 	/* proc:::lwp-start has no arguments */
 	/* proc:::lwp-exit has no arguments */
 	{ "proc", "signal-clear", 0, 0, "int", NULL },
@@ -139,6 +156,11 @@ sdt_argdesc_t sdt_args[] = {
 	{ "proc", "signal-send", 0, 0, "struct thread *", "lwpsinfo_t *" },
 	{ "proc", "signal-send", 1, 1, "struct proc *", "psinfo_t *" },
 	{ "proc", "signal-send", 2, 2, "int", NULL },
+	/* proc:::spawn-success has no arguments */
+	{ "proc", "spawn-failure", 0, 0, "int", NULL },
+	{ "proc", "spawn-fd-failure", 0, 0, "int", NULL },
+	{ "proc", "spawn-open-failure", 0, 0, "string", NULL },
+	{ "proc", "spawn-port-failure", 0, 0, "int", NULL },
 	/* proc:::start has no arguments */
 
 	{ "io", "start", 0, 0, "struct buf *", "bufinfo_t *" },
@@ -154,41 +176,790 @@ sdt_argdesc_t sdt_args[] = {
 	{ "io", "wait-done", 1, 0, "struct buf *", "devinfo_t *" },
 	{ "io", "wait-done", 2, 0, "struct buf *", "fileinfo_t *" },
 
-	{ "vminfo", "anonfree", 0, 0, "int", NULL },
-	{ "vminfo", "anonpgin", 0, 0, "int", NULL },
-	{ "vminfo", "anonpgout", 0, 0, "int", NULL },
-	{ "vminfo", "as_fault", 0, 0, "int", NULL },
-	{ "vminfo", "cow_fault", 0, 0, "int", NULL },
-	{ "vminfo", "dfree", 0, 0, "int", NULL },
-	{ "vminfo", "execfree", 0, 0, "int", NULL },
-	{ "vminfo", "execpgin", 0, 0, "int", NULL },
-	{ "vminfo", "execpgout", 0, 0, "int", NULL },
-	{ "vminfo", "fsfree", 0, 0, "int", NULL },
-	{ "vminfo", "fspgin", 0, 0, "int", NULL },
-	{ "vminfo", "fspgout", 0, 0, "int", NULL },
-	{ "vminfo", "kerenl_asflt", 0, 0, "int", NULL },
-	{ "vminfo", "maj_fault", 0, 0, "int", NULL },
-	{ "vminfo", "pgfrec", 0, 0, "int", NULL },
-	{ "vminfo", "pgin", 0, 0, "int", NULL },
-	{ "vminfo", "pgout", 0, 0, "int", NULL },
-	{ "vminfo", "pgpgin", 0, 0, "int", NULL },
-	{ "vminfo", "pgpgout", 0, 0, "int", NULL },
-	{ "vminfo", "pgrec", 0, 0, "int", NULL },
-	{ "vminfo", "pgrrun", 0, 0, "int", NULL },
-	{ "vminfo", "pgswapin", 0, 0, "int", NULL },
-	{ "vminfo", "pgswapout", 0, 0, "int", NULL },
-	{ "vminfo", "prot_fault", 0, 0, "int", NULL },
-	{ "vminfo", "rev", 0, 0, "int", NULL },
-	{ "vminfo", "scan", 0, 0, "int", NULL },
-	{ "vminfo", "softlock", 0, 0, "int", NULL },
-	{ "vminfo", "swapin", 0, 0, "int", NULL },
-	{ "vminfo", "swapout", 0, 0, "int", NULL },
-	{ "vminfo", "zfod", 0, 0, "int", NULL },
+	/* APPLE NOTE: add vfs journaling support */
+	{ "io", "journal-start", 0, 0, "struct buf *", "bufinfo_t *" },
+	{ "io", "journal-start", 1, 0, "struct buf *", "devinfo_t *" },
+	{ "io", "journal-start", 2, 0, "struct buf *", "fileinfo_t *" },
+	{ "io", "journal-done", 0, 0, "struct buf *", "bufinfo_t *" },
+	{ "io", "journal-done", 1, 0, "struct buf *", "devinfo_t *" },
+	{ "io", "journal-done", 2, 0, "struct buf *", "fileinfo_t *" },
 
 	{ "mib", NULL, 0, 0, "int", NULL },
+
 	{ "fsinfo", NULL, 0, 0, "struct vnode *", "fileinfo_t *" },
-	{ "fsinfo", NULL, 1, 1, "int", "int" },
-	{ NULL }
+	{ "fsinfo", NULL, 1, 1, "int", NULL },
+
+	{ "nfsv3", "op-getattr-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-getattr-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-getattr-start", 2, 3, "GETATTR3args *", NULL },
+	{ "nfsv3", "op-getattr-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-getattr-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-getattr-done", 2, 3, "GETATTR3res *", NULL },
+	{ "nfsv3", "op-setattr-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-setattr-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-setattr-start", 2, 3, "SETATTR3args *", NULL },
+	{ "nfsv3", "op-setattr-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-setattr-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-setattr-done", 2, 3, "SETATTR3res *", NULL },
+	{ "nfsv3", "op-lookup-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-lookup-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-lookup-start", 2, 3, "LOOKUP3args *", NULL },
+	{ "nfsv3", "op-lookup-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-lookup-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-lookup-done", 2, 3, "LOOKUP3res *", NULL },
+	{ "nfsv3", "op-access-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-access-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-access-start", 2, 3, "ACCESS3args *", NULL },
+	{ "nfsv3", "op-access-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-access-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-access-done", 2, 3, "ACCESS3res *", NULL },
+	{ "nfsv3", "op-commit-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-commit-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-commit-start", 2, 3, "COMMIT3args *", NULL },
+	{ "nfsv3", "op-commit-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-commit-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-commit-done", 2, 3, "COMMIT3res *", NULL },
+	{ "nfsv3", "op-create-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-create-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-create-start", 2, 3, "CREATE3args *", NULL },
+	{ "nfsv3", "op-create-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-create-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-create-done", 2, 3, "CREATE3res *", NULL },
+	{ "nfsv3", "op-fsinfo-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-fsinfo-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-fsinfo-start", 2, 3, "FSINFO3args *", NULL },
+	{ "nfsv3", "op-fsinfo-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-fsinfo-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-fsinfo-done", 2, 3, "FSINFO3res *", NULL },
+	{ "nfsv3", "op-fsstat-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-fsstat-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-fsstat-start", 2, 3, "FSSTAT3args *", NULL },
+	{ "nfsv3", "op-fsstat-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-fsstat-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-fsstat-done", 2, 3, "FSSTAT3res *", NULL },
+	{ "nfsv3", "op-link-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-link-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-link-start", 2, 3, "LINK3args *", NULL },
+	{ "nfsv3", "op-link-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-link-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-link-done", 2, 3, "LINK3res *", NULL },
+	{ "nfsv3", "op-mkdir-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-mkdir-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-mkdir-start", 2, 3, "MKDIR3args *", NULL },
+	{ "nfsv3", "op-mkdir-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-mkdir-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-mkdir-done", 2, 3, "MKDIR3res *", NULL },
+	{ "nfsv3", "op-mknod-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-mknod-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-mknod-start", 2, 3, "MKNOD3args *", NULL },
+	{ "nfsv3", "op-mknod-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-mknod-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-mknod-done", 2, 3, "MKNOD3res *", NULL },
+	{ "nfsv3", "op-null-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-null-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-null-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-null-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-pathconf-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-pathconf-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-pathconf-start", 2, 3, "PATHCONF3args *", NULL },
+	{ "nfsv3", "op-pathconf-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-pathconf-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-pathconf-done", 2, 3, "PATHCONF3res *", NULL },
+	{ "nfsv3", "op-read-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-read-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-read-start", 2, 3, "READ3args *", NULL },
+	{ "nfsv3", "op-read-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-read-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-read-done", 2, 3, "READ3res *", NULL },
+	{ "nfsv3", "op-readdir-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-readdir-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-readdir-start", 2, 3, "READDIR3args *", NULL },
+	{ "nfsv3", "op-readdir-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-readdir-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-readdir-done", 2, 3, "READDIR3res *", NULL },
+	{ "nfsv3", "op-readdirplus-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-readdirplus-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-readdirplus-start", 2, 3, "READDIRPLUS3args *", NULL },
+	{ "nfsv3", "op-readdirplus-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-readdirplus-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-readdirplus-done", 2, 3, "READDIRPLUS3res *", NULL },
+	{ "nfsv3", "op-readlink-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-readlink-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-readlink-start", 2, 3, "READLINK3args *", NULL },
+	{ "nfsv3", "op-readlink-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-readlink-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-readlink-done", 2, 3, "READLINK3res *", NULL },
+	{ "nfsv3", "op-remove-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-remove-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-remove-start", 2, 3, "REMOVE3args *", NULL },
+	{ "nfsv3", "op-remove-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-remove-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-remove-done", 2, 3, "REMOVE3res *", NULL },
+	{ "nfsv3", "op-rename-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-rename-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-rename-start", 2, 3, "RENAME3args *", NULL },
+	{ "nfsv3", "op-rename-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-rename-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-rename-done", 2, 3, "RENAME3res *", NULL },
+	{ "nfsv3", "op-rmdir-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-rmdir-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-rmdir-start", 2, 3, "RMDIR3args *", NULL },
+	{ "nfsv3", "op-rmdir-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-rmdir-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-rmdir-done", 2, 3, "RMDIR3res *", NULL },
+	{ "nfsv3", "op-setattr-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-setattr-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-setattr-start", 2, 3, "SETATTR3args *", NULL },
+	{ "nfsv3", "op-setattr-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-setattr-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-setattr-done", 2, 3, "SETATTR3res *", NULL },
+	{ "nfsv3", "op-symlink-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-symlink-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-symlink-start", 2, 3, "SYMLINK3args *", NULL },
+	{ "nfsv3", "op-symlink-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-symlink-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-symlink-done", 2, 3, "SYMLINK3res *", NULL },
+	{ "nfsv3", "op-write-start", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-write-start", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-write-start", 2, 3, "WRITE3args *", NULL },
+	{ "nfsv3", "op-write-done", 0, 0, "struct svc_req *",
+	  "conninfo_t *" },
+	{ "nfsv3", "op-write-done", 1, 1, "nfsv3oparg_t *",
+	  "nfsv3opinfo_t *" },
+	{ "nfsv3", "op-write-done", 2, 3, "WRITE3res *", NULL },
+
+	{ "nfsv4", "null-start", 0, 0, "struct svc_req *", "conninfo_t *" },
+	{ "nfsv4", "null-done", 0, 0, "struct svc_req *", "conninfo_t *" },
+	{ "nfsv4", "compound-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "compound-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "compound-start", 2, 1, "COMPOUND4args *", NULL },
+	{ "nfsv4", "compound-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "compound-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "compound-done", 2, 1, "COMPOUND4res *", NULL },
+	{ "nfsv4", "op-access-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *"},
+	{ "nfsv4", "op-access-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-access-start", 2, 1, "ACCESS4args *", NULL },
+	{ "nfsv4", "op-access-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-access-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-access-done", 2, 1, "ACCESS4res *", NULL },
+	{ "nfsv4", "op-close-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-close-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-close-start", 2, 1, "CLOSE4args *", NULL },
+	{ "nfsv4", "op-close-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-close-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-close-done", 2, 1, "CLOSE4res *", NULL },
+	{ "nfsv4", "op-commit-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-commit-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-commit-start", 2, 1, "COMMIT4args *", NULL },
+	{ "nfsv4", "op-commit-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-commit-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-commit-done", 2, 1, "COMMIT4res *", NULL },
+	{ "nfsv4", "op-create-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-create-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-create-start", 2, 1, "CREATE4args *", NULL },
+	{ "nfsv4", "op-create-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-create-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-create-done", 2, 1, "CREATE4res *", NULL },
+	{ "nfsv4", "op-delegpurge-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-delegpurge-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-delegpurge-start", 2, 1, "DELEGPURGE4args *", NULL },
+	{ "nfsv4", "op-delegpurge-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-delegpurge-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-delegpurge-done", 2, 1, "DELEGPURGE4res *", NULL },
+	{ "nfsv4", "op-delegreturn-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-delegreturn-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-delegreturn-start", 2, 1, "DELEGRETURN4args *", NULL },
+	{ "nfsv4", "op-delegreturn-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-delegreturn-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-delegreturn-done", 2, 1, "DELEGRETURN4res *", NULL },
+	{ "nfsv4", "op-getattr-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-getattr-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-getattr-start", 2, 1, "GETATTR4args *", NULL },
+	{ "nfsv4", "op-getattr-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-getattr-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-getattr-done", 2, 1, "GETATTR4res *", NULL },
+	{ "nfsv4", "op-getfh-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-getfh-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-getfh-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-getfh-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-getfh-done", 2, 1, "GETFH4res *", NULL },
+	{ "nfsv4", "op-link-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-link-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-link-start", 2, 1, "LINK4args *", NULL },
+	{ "nfsv4", "op-link-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-link-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-link-done", 2, 1, "LINK4res *", NULL },
+	{ "nfsv4", "op-lock-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-lock-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-lock-start", 2, 1, "LOCK4args *", NULL },
+	{ "nfsv4", "op-lock-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-lock-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-lock-done", 2, 1, "LOCK4res *", NULL },
+	{ "nfsv4", "op-lockt-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-lockt-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-lockt-start", 2, 1, "LOCKT4args *", NULL },
+	{ "nfsv4", "op-lockt-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-lockt-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-lockt-done", 2, 1, "LOCKT4res *", NULL },
+	{ "nfsv4", "op-locku-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-locku-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-locku-start", 2, 1, "LOCKU4args *", NULL },
+	{ "nfsv4", "op-locku-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-locku-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-locku-done", 2, 1, "LOCKU4res *", NULL },
+	{ "nfsv4", "op-lookup-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-lookup-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-lookup-start", 2, 1, "LOOKUP4args *", NULL },
+	{ "nfsv4", "op-lookup-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-lookup-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-lookup-done", 2, 1, "LOOKUP4res *", NULL },
+	{ "nfsv4", "op-lookupp-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-lookupp-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-lookupp-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-lookupp-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-lookupp-done", 2, 1, "LOOKUPP4res *", NULL },
+	{ "nfsv4", "op-nverify-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-nverify-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-nverify-start", 2, 1, "NVERIFY4args *", NULL },
+	{ "nfsv4", "op-nverify-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-nverify-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-nverify-done", 2, 1, "NVERIFY4res *", NULL },
+	{ "nfsv4", "op-open-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-open-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-open-start", 2, 1, "OPEN4args *", NULL },
+	{ "nfsv4", "op-open-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-open-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-open-done", 2, 1, "OPEN4res *", NULL },
+	{ "nfsv4", "op-open-confirm-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-open-confirm-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-open-confirm-start", 2, 1, "OPEN_CONFIRM4args *", NULL },
+	{ "nfsv4", "op-open-confirm-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-open-confirm-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-open-confirm-done", 2, 1, "OPEN_CONFIRM4res *", NULL },
+	{ "nfsv4", "op-open-downgrade-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-open-downgrade-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-open-downgrade-start", 2, 1, "OPEN_DOWNGRADE4args *", NULL },
+	{ "nfsv4", "op-open-downgrade-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-open-downgrade-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-open-downgrade-done", 2, 1, "OPEN_DOWNGRADE4res *", NULL },
+	{ "nfsv4", "op-openattr-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-openattr-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-openattr-start", 2, 1, "OPENATTR4args *", NULL },
+	{ "nfsv4", "op-openattr-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-openattr-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-openattr-done", 2, 1, "OPENATTR4res *", NULL },
+	{ "nfsv4", "op-putfh-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-putfh-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-putfh-start", 2, 1, "PUTFH4args *", NULL },
+	{ "nfsv4", "op-putfh-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-putfh-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-putfh-done", 2, 1, "PUTFH4res *", NULL },
+	{ "nfsv4", "op-putpubfh-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-putpubfh-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-putpubfh-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-putpubfh-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-putpubfh-done", 2, 1, "PUTPUBFH4res *", NULL },
+	{ "nfsv4", "op-putrootfh-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-putrootfh-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-putrootfh-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-putrootfh-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-putrootfh-done", 2, 1, "PUTROOTFH4res *", NULL },
+	{ "nfsv4", "op-read-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-read-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-read-start", 2, 1, "READ4args *", NULL },
+	{ "nfsv4", "op-read-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-read-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-read-done", 2, 1, "READ4res *", NULL },
+	{ "nfsv4", "op-readdir-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-readdir-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-readdir-start", 2, 1, "READDIR4args *", NULL },
+	{ "nfsv4", "op-readdir-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-readdir-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-readdir-done", 2, 1, "READDIR4res *", NULL },
+	{ "nfsv4", "op-readlink-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-readlink-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-readlink-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-readlink-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-readlink-done", 2, 1, "READLINK4res *", NULL },
+	{ "nfsv4", "op-release-lockowner-start", 0, 0,
+	  "struct compound_state *", "conninfo_t *" },
+	{ "nfsv4", "op-release-lockowner-start", 1, 0,
+	  "struct compound_state *", "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-release-lockowner-start", 2, 1,
+	  "RELEASE_LOCKOWNER4args *", NULL },
+	{ "nfsv4", "op-release-lockowner-done", 0, 0,
+	  "struct compound_state *", "conninfo_t *" },
+	{ "nfsv4", "op-release-lockowner-done", 1, 0,
+	  "struct compound_state *", "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-release-lockowner-done", 2, 1,
+	  "RELEASE_LOCKOWNER4res *", NULL },
+	{ "nfsv4", "op-remove-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-remove-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-remove-start", 2, 1, "REMOVE4args *", NULL },
+	{ "nfsv4", "op-remove-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-remove-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-remove-done", 2, 1, "REMOVE4res *", NULL },
+	{ "nfsv4", "op-rename-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-rename-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-rename-start", 2, 1, "RENAME4args *", NULL },
+	{ "nfsv4", "op-rename-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-rename-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-rename-done", 2, 1, "RENAME4res *", NULL },
+	{ "nfsv4", "op-renew-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-renew-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-renew-start", 2, 1, "RENEW4args *", NULL },
+	{ "nfsv4", "op-renew-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-renew-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-renew-done", 2, 1, "RENEW4res *", NULL },
+	{ "nfsv4", "op-restorefh-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-restorefh-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-restorefh-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-restorefh-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-restorefh-done", 2, 1, "RESTOREFH4res *", NULL },
+	{ "nfsv4", "op-savefh-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-savefh-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-savefh-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-savefh-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-savefh-done", 2, 1, "SAVEFH4res *", NULL },
+	{ "nfsv4", "op-secinfo-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-secinfo-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-secinfo-start", 2, 1, "SECINFO4args *", NULL },
+	{ "nfsv4", "op-secinfo-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-secinfo-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-secinfo-done", 2, 1, "SECINFO4res *", NULL },
+	{ "nfsv4", "op-setattr-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-setattr-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-setattr-start", 2, 1, "SETATTR4args *", NULL },
+	{ "nfsv4", "op-setattr-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-setattr-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-setattr-done", 2, 1, "SETATTR4res *", NULL },
+	{ "nfsv4", "op-setclientid-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-setclientid-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-setclientid-start", 2, 1, "SETCLIENTID4args *", NULL },
+	{ "nfsv4", "op-setclientid-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-setclientid-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-setclientid-done", 2, 1, "SETCLIENTID4res *", NULL },
+	{ "nfsv4", "op-setclientid-confirm-start", 0, 0,
+	  "struct compound_state *", "conninfo_t *" },
+	{ "nfsv4", "op-setclientid-confirm-start", 1, 0,
+	  "struct compound_state *", "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-setclientid-confirm-start", 2, 1,
+	  "SETCLIENTID_CONFIRM4args *", NULL },
+	{ "nfsv4", "op-setclientid-confirm-done", 0, 0,
+	  "struct compound_state *", "conninfo_t *" },
+	{ "nfsv4", "op-setclientid-confirm-done", 1, 0,
+	  "struct compound_state *", "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-setclientid-confirm-done", 2, 1,
+	  "SETCLIENTID_CONFIRM4res *", NULL },
+	{ "nfsv4", "op-verify-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-verify-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-verify-start", 2, 1, "VERIFY4args *", NULL },
+	{ "nfsv4", "op-verify-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-verify-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-verify-done", 2, 1, "VERIFY4res *", NULL },
+	{ "nfsv4", "op-write-start", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-write-start", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-write-start", 2, 1, "WRITE4args *", NULL },
+	{ "nfsv4", "op-write-done", 0, 0, "struct compound_state *",
+	  "conninfo_t *" },
+	{ "nfsv4", "op-write-done", 1, 0, "struct compound_state *",
+	  "nfsv4opinfo_t *" },
+	{ "nfsv4", "op-write-done", 2, 1, "WRITE4res *", NULL },
+	{ "nfsv4", "cb-recall-start", 0, 0, "rfs4_client_t *",
+	  "conninfo_t *" },
+	{ "nfsv4", "cb-recall-start", 1, 1, "rfs4_deleg_state_t *",
+	  "nfsv4cbinfo_t *" },
+	{ "nfsv4", "cb-recall-start", 2, 2, "CB_RECALL4args *", NULL },
+	{ "nfsv4", "cb-recall-done", 0, 0, "rfs4_client_t *",
+	  "conninfo_t *" },
+	{ "nfsv4", "cb-recall-done", 1, 1, "rfs4_deleg_state_t *",
+	  "nfsv4cbinfo_t *" },
+	{ "nfsv4", "cb-recall-done", 2, 2, "CB_RECALL4res *", NULL },
+
+	{ "ip", "send", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "ip", "send", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "ip", "send", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "ip", "send", 3, 3, "struct ifnet *", "ifinfo_t *" },
+	{ "ip", "send", 4, 4, "struct ip *", "ipv4info_t *" },
+	{ "ip", "send", 5, 5, "struct ip6_hdr *", "ipv6info_t *" },
+	{ "ip", "receive", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "ip", "receive", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "ip", "receive", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "ip", "receive", 3, 3, "struct ifnet *", "ifinfo_t *" },
+	{ "ip", "receive", 4, 4, "struct ip *", "ipv4info_t *" },
+	{ "ip", "receive", 5, 5, "struct ip6_hdr *", "ipv6info_t *" },
+
+	{ "tcp", "connect-established", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "tcp", "connect-established", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "tcp", "connect-established", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "tcp", "connect-established", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "tcp", "connect-established", 4, 4, "struct tcphdr *", "tcpinfo_t *" },
+	{ "tcp", "connect-refused", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "tcp", "connect-refused", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "tcp", "connect-refused", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "tcp", "connect-refused", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "tcp", "connect-refused", 4, 4, "struct tcphdr *", "tcpinfo_t *" },
+	{ "tcp", "connect-request", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "tcp", "connect-request", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "tcp", "connect-request", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "tcp", "connect-request", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "tcp", "connect-request", 4, 4, "struct tcphdr *", "tcpinfo_t *" },
+	{ "tcp", "accept-established", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "tcp", "accept-established", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "tcp", "accept-established", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "tcp", "accept-established", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "tcp", "accept-established", 4, 4, "struct tcphdr *", "tcpinfo_t *" },
+	{ "tcp", "accept-refused", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "tcp", "accept-refused", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "tcp", "accept-refused", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "tcp", "accept-refused", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "tcp", "accept-refused", 4, 4, "struct tcphdr *", "tcpinfo_t *" },
+	{ "tcp", "state-change", 0, 0, "void", "void" },
+	{ "tcp", "state-change", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "tcp", "state-change", 2, 2, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "tcp", "state-change", 3, 3, "int32_t", "tcpnsinfo_t *" },
+	{ "tcp", "send", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "tcp", "send", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "tcp", "send", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "tcp", "send", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "tcp", "send", 4, 4, "struct tcphdr *", "tcpinfo_t *" },
+	{ "tcp", "receive", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "tcp", "receive", 1, 1, "struct inpcb *", "csinfo_t *" },
+	{ "tcp", "receive", 2, 2, "void_ip_t *", "ipinfo_t *" },
+	{ "tcp", "receive", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "tcp", "receive", 4, 4, "struct tcphdr *", "tcpinfo_t *" },
+	{ "tcp", "cc", 0, 0, "struct mbuf *", "pktinfo_t *"},
+	{ "tcp", "cc", 1, 1, "struct inpcb *", "csinfo_t *"},
+	{ "tcp", "cc", 2, 2, "struct tcpcb *", "tcpsinfo_t *"},
+	{ "tcp", "cc", 3, 3, "struct tcphdr *", "tcpinfo_t *"},
+	{ "tcp", "cc", 4, 4, "int32_t", "tcpccevent_t *"},
+	{ "tcp", "iaj", 0, 0, "struct tcpcb *", "tcpsinfo_t *"},
+	{ "tcp", "iaj", 1, 1, "uint32_t", NULL},
+	{ "tcp", "iaj", 2, 2, "uint32_t", NULL},
+	{ "sysevent", "post", 0, 0, "evch_bind_t *", "syseventchaninfo_t *" },
+	{ "sysevent", "post", 1, 1, "sysevent_impl_t *", "syseventinfo_t *" },
+	/* mptcp::input has no arguments */
+	{ "mptcp", "receive-degraded", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "mptcp", "receive-degraded", 1, 1, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "receive-degraded", 2, 2, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "receive-degraded", 3, 3, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "receive-degraded", 4, 4, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "receive", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "mptcp", "receive", 1, 1, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "receive", 2, 2, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "receive", 3, 3, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "receive", 4, 4, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "receive", 5, 5, "struct mptcb *", "mptsinfo_t *" },
+	{ "mptcp", "output", 0, 0, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "output", 1, 1, "struct mptsub *", "mptsubinfo_t *" },
+	{ "mptcp", "output", 2, 2, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "state-change", 0, 0, "struct mptcb *", "mptsinfo_t *" },
+	{ "mptcp", "state-change", 1, 1, "uint32_t", "uint32_t" },
+	{ "mptcp", "checksum-result", 0, 0, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "mptcp", "checksum-result", 1, 1, "struct mbuf *", "pktinfo_t *" },
+	{ "mptcp", "checksum-result", 2, 2, "uint32_t", "uint32_t" },
+	{ "mptcp", "session-create", 0, 0, "struct mppcb *", "mppsinfo_t *" },
+	{ "mptcp", "session-destroy", 0, 0, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "session-destroy", 1, 1, "struct mptcb *", "mptsinfo_t *" },
+	{ "mptcp", "subflow-create", 0, 0, "struct mptses *", "mptsesinfo_t *"},
+	{ "mptcp", "subflow-create", 1, 1, "struct mptsub *", "mptsubinfo_t *"},
+	{ "mptcp", "subflow-create", 2, 2, "int", "int" },
+	{ "mptcp", "subflow-create", 3, 3, "int", "int" },
+	{ "mptcp", "subflow-close", 0, 0, "struct mptsub *", "mptsubinfo_t *" },
+	{ "mptcp", "subflow-close", 1, 1, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "subflow-close", 2, 2, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "subflow-close", 3, 3, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "subflow-close", 4, 4, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "subflow-connect", 0, 0, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "subflow-connect", 1, 1, "struct mptsub *", "mptsubinfo_t *" },
+	{ "mptcp", "subflow-connect", 2, 2, "int", "int" },
+	{ "mptcp", "subflow-receive", 0, 0, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "subflow-receive", 1, 1, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "subflow-receive", 2, 2, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "subflow-input", 0, 0, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "subflow-input", 1, 1, "struct mptsub *", "mptsubinfo_t *" },
+	{ "mptcp", "subflow-output", 0, 0, "struct mptses *", "mptsesinfo_t *"},
+	{ "mptcp", "subflow-output", 1, 1, "struct mptsub *", "mptsubinfo_t *"},
+	{ "mptcp", "subflow-events", 0, 0, "struct mptses *", "mptsesinfo_t *"},
+	{ "mptcp", "subflow-events", 1, 1, "struct mptsub *", "mptsubinfo_t *"},
+	{ "mptcp", "subflow-events", 2, 2, "uint32_t", "uint32_t"},
+	{ "mptcp", "send", 0, 0, "struct mbuf *", "pktinfo_t *" },
+	{ "mptcp", "send", 1, 1, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "send", 2, 2, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "send", 3, 3, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "send", 4, 4, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "send", 5, 5, "struct mptsub *", "mptsubinfo_t *" },
+	{ "mptcp", "send", 6, 6, "size_t", "size_t" },
+	{ "mptcp", "dispose", 0, 0, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "dispose", 1, 1, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "dispose", 2, 2, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "dispose", 3, 3, "struct mppcb *", "mppsinfo_t *" },
+	{ "mptcp", "multipath-ready", 0, 0, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "multipath-ready", 1, 1, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "multipath-ready", 2, 2, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "multipath-ready", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "mptcp", "multipath-failed", 0, 0, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "multipath-failed", 1, 1, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "multipath-failed", 2, 2, "struct sockbuf *", "socketbuf_t *" },
+	{ "mptcp", "multipath-failed", 3, 3, "struct tcpcb *", "tcpsinfo_t *" },
+	{ "mptcp", "start-timer", 0, 0, "struct mptcb *", "mptsinfo_t *" },
+	{ "mptcp", "start-timer", 1, 1, "int", "int" },
+	{ "mptcp", "cancel-timer", 0, 0, "struct mptcb *", "mptsinfo_t *" },
+	{ "mptcp", "cancel-timer", 1, 1, "int", "int" },
+	{ "mptcp", "timer", 0, 0, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "timer", 1, 1, "struct mptcb *", "mptsinfo_t *" },
+	{ "mptcp", "error", 0, 0, "struct mptcb *", "mptsinfo_t *" },
+	{ "mptcp", "connectx", 0, 0, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "connectx", 1, 1, "sae_associd_t", "sae_associd_t" },
+	{ "mptcp", "connectx", 2, 2, "struct socket *", "socketinfo_t *" },
+	{ "mptcp", "disconnectx", 0, 0, "struct mptses *", "mptsesinfo_t *" },
+	{ "mptcp", "disconnectx", 1, 1, "sae_associd_t", "sae_associd_t" },
+	{ "mptcp", "disconnectx", 2, 2, "sae_connid_t", "sae_connid_t" },
+	{ "mptcp", "disconnectx", 3, 3, "struct socket *", "sockinfo_t *" },
+	{ "mptcp", "disconnectx", 4, 4, "struct mptcb *", "mptsinfo_t *" },
+	{"vminfo", "kalloc", 0, 0, "vm_size_t", "vm_size_t" },
+	{"vminfo", "kalloc", 1, 1, "vm_size_t", "vm_size_t" },
+	{"vminfo", "kalloc", 2, 2, "void*", "void*" },
+	{"vminfo", "kfree", 0, 0, "vm_size_t", "vm_size_t" },
+	{"vminfo", "kfree", 1, 1, "vm_size_t", "vm_size_t" },
+	{"vminfo", "kfree", 2, 2, "void*", "void*" },
+	{"vminfo", "zalloc", 0, 0, "zone_t", "zone_t" },
+	{"vminfo", "zalloc", 1, 1, "void*", "void*" },
+	{"vminfo", "zfree", 0, 0, "zone_t", "zone_t" },
+	{"vminfo", "zfree", 1, 1, "void*", "void*" },
+	{ NULL, NULL, 0, 0, NULL, NULL }
 };
 
 /*ARGSUSED*/
@@ -205,21 +976,26 @@ sdt_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc)
 	for (i = 0; sdt_args[i].sda_provider != NULL; i++) {
 		sdt_argdesc_t *a = &sdt_args[i];
 
-		if (strcmp(sdp->sdp_provider->sdtp_name, a->sda_provider) != 0)
+		if (strncmp(sdp->sdp_provider->sdtp_name, a->sda_provider, strlen(a->sda_provider) + 1) != 0) {
 			continue;
+		}
 
 		if (a->sda_name != NULL &&
-		    strcmp(sdp->sdp_name, a->sda_name) != 0)
+		    strncmp(sdp->sdp_name, a->sda_name, strlen(a->sda_name) + 1) != 0) {
 			continue;
+		}
 
-		if (desc->dtargd_ndx != a->sda_ndx)
+		if (desc->dtargd_ndx != a->sda_ndx) {
 			continue;
+		}
 
-		if (a->sda_native != NULL)
-			(void) strcpy(desc->dtargd_native, a->sda_native);
+		if (a->sda_native != NULL) {
+			(void) strlcpy(desc->dtargd_native, a->sda_native, DTRACE_ARGTYPELEN);
+		}
 
-		if (a->sda_xlate != NULL)
-			(void) strcpy(desc->dtargd_xlate, a->sda_xlate);
+		if (a->sda_xlate != NULL) {
+			(void) strlcpy(desc->dtargd_xlate, a->sda_xlate, DTRACE_ARGTYPELEN);
+		}
 
 		desc->dtargd_mapping = a->sda_mapping;
 		return;