PR20333/io_destroy

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index 85eba078f3de9e44191e0785a7644dd573537811..b99aef39190bb2554f676b43a27296edee18df75 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,19 +1,4 @@
 
-# io_destroy _________________________________________________
-# long sys_io_destroy(aio_context_t ctx)
-probe nd_syscall.io_destroy = kprobe.function("sys_io_destroy") ?
-{
-       name = "io_destroy"
-       asmlinkage()
-       ctx = ulong_arg(1)
-       argstr = sprintf("%u", ctx)
-}
-probe nd_syscall.io_destroy.return = kprobe.function("sys_io_destroy").return ?
-{
-       name = "io_destroy"
-       retstr = returnstr(1)
-}
-
 # io_getevents _______________________________________________
 # long sys_io_getevents(aio_context_t ctx_id,
 #              long min_nr,

diff --git a/tapset/linux/sysc_io_destroy.stp b/tapset/linux/sysc_io_destroy.stp
new file mode 100644 (file)
index 0000000..2d8dd78
--- /dev/null
+++ b/tapset/linux/sysc_io_destroy.stp
@@ -0,0 +1,44 @@
+# io_destroy _________________________________________________
+# long sys_io_destroy(aio_context_t ctx)
+
+@define _SYSCALL_IO_DESTROY_NAME
+%(
+       name = "io_destroy"
+%)
+
+@define _SYSCALL_IO_DESTROY_ARGSTR
+%(
+       argstr = sprintf("%u", ctx)
+%)
+
+probe syscall.io_destroy = dw_syscall.io_destroy !, nd_syscall.io_destroy {}
+probe syscall.io_destroy.return = dw_syscall.io_destroy.return !, nd_syscall.io_destroy.return {}
+
+# dw_io_destroy _____________________________________________________
+
+probe dw_syscall.io_destroy = kernel.function("sys_io_destroy").call
+{
+       @_SYSCALL_IO_DESTROY_NAME
+       ctx = __ulong($ctx)
+       @_SYSCALL_IO_DESTROY_ARGSTR
+}
+probe dw_syscall.io_destroy.return = kernel.function("sys_io_destroy").return
+{
+       @_SYSCALL_IO_DESTROY_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_io_destroy _____________________________________________________
+
+probe nd_syscall.io_destroy = kprobe.function("sys_io_destroy") ?
+{
+       @_SYSCALL_IO_DESTROY_NAME
+       asmlinkage()
+       ctx = ulong_arg(1)
+       @_SYSCALL_IO_DESTROY_ARGSTR
+}
+probe nd_syscall.io_destroy.return = kprobe.function("sys_io_destroy").return ?
+{
+       @_SYSCALL_IO_DESTROY_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index 1336e93ad12fc8c59e98d30a5a010021e1e2428d..72866912381824af7aa558997af92ae64262169b 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,18 +1,4 @@
 
-# io_destroy _________________________________________________
-# long sys_io_destroy(aio_context_t ctx)
-probe syscall.io_destroy = kernel.function("sys_io_destroy").call
-{
-       name = "io_destroy"
-       ctx = __ulong($ctx)
-       argstr = sprintf("%u", ctx)
-}
-probe syscall.io_destroy.return = kernel.function("sys_io_destroy").return
-{
-       name = "io_destroy"
-       retstr = return_str(1, $return)
-}
-
 # io_getevents _______________________________________________
 # long sys_io_getevents(aio_context_t ctx_id,
 #              long min_nr,