PR20333/mlock

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index e0a6498e5d3ce21f6d86c71cfe9ff5d63347d267..80b13cae154442b0ee99185441810b87a7057182 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,22 +1,4 @@
 
-# mlock ______________________________________________________
-#
-# long sys_mlock(unsigned long start, size_t len)
-#
-probe nd_syscall.mlock = kprobe.function("sys_mlock") ?
-{
-       name = "mlock"
-       asmlinkage()
-       addr = ulong_arg(1)
-       len = ulong_arg(2)
-       argstr = sprintf("%p, %u", addr, len)
-}
-probe nd_syscall.mlock.return = kprobe.function("sys_mlock").return ?
-{
-       name = "mlock"
-       retstr = returnstr(1)
-}
-
 # mlock2 _____________________________________________________
 #
 # long sys_mlock2(unsigned long start, size_t len, int flags)

diff --git a/tapset/linux/sysc_mlock.stp b/tapset/linux/sysc_mlock.stp
new file mode 100644 (file)
index 0000000..6355f6c
--- /dev/null
+++ b/tapset/linux/sysc_mlock.stp
@@ -0,0 +1,47 @@
+# mlock ______________________________________________________
+# long sys_mlock(unsigned long start, size_t len)
+#
+
+@define _SYSCALL_MLOCK_NAME
+%(
+       name = "mlock"
+%)
+
+@define _SYSCALL_MLOCK_ARGSTR
+%(
+       argstr = sprintf("%p, %u", addr, len)
+%)
+
+probe syscall.mlock = dw_syscall.mlock !, nd_syscall.mlock {}
+probe syscall.mlock.return = dw_syscall.mlock.return !, nd_syscall.mlock.return {}
+
+# dw_mlock _____________________________________________________
+
+probe dw_syscall.mlock = kernel.function("sys_mlock").call ?
+{
+       @_SYSCALL_MLOCK_NAME
+       addr = __ulong($start)
+       len = __ulong($len)
+       @_SYSCALL_MLOCK_ARGSTR
+}
+probe dw_syscall.mlock.return = kernel.function("sys_mlock").return ?
+{
+       @_SYSCALL_MLOCK_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_mlock _____________________________________________________
+
+probe nd_syscall.mlock = kprobe.function("sys_mlock") ?
+{
+       @_SYSCALL_MLOCK_NAME
+       asmlinkage()
+       addr = ulong_arg(1)
+       len = ulong_arg(2)
+       @_SYSCALL_MLOCK_ARGSTR
+}
+probe nd_syscall.mlock.return = kprobe.function("sys_mlock").return ?
+{
+       @_SYSCALL_MLOCK_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index 52d8da5c14bf72949c05422a8862afacc6ca7dfb..7a6df04cb3f568e36ed746c1fe6d33db66683a73 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,21 +1,4 @@
 
-# mlock ______________________________________________________
-#
-# long sys_mlock(unsigned long start, size_t len)
-#
-probe syscall.mlock = kernel.function("sys_mlock").call ?
-{
-       name = "mlock"
-       addr = __ulong($start)
-       len = __ulong($len)
-       argstr = sprintf("%p, %u", addr, len)
-}
-probe syscall.mlock.return = kernel.function("sys_mlock").return ?
-{
-       name = "mlock"
-       retstr = return_str(1, $return)
-}
-
 # mlock2 _____________________________________________________
 #
 # long sys_mlock2(unsigned long start, size_t len, int flags)