PR20333/clock_adjtime

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index b285ea4d47d8117b7fe34dbcceca9794141715f4..349d18b476b9ec9daad70294e7fa15df63c244ad 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,46 +1,4 @@
 
-# clock_adjtime ______________________________________________
-# SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
-#                 struct timex __user *, utx)
-# long compat_sys_clock_adjtime(clockid_t which_clock,
-#                               struct compat_timex __user *utp)
-#
-probe nd_syscall.clock_adjtime = __nd_syscall.clock_adjtime ?,
-       __nd_syscall.compat_clock_adjtime ?
-{
-       name = "clock_adjtime"
-}
-probe __nd_syscall.clock_adjtime = kprobe.function("sys_clock_adjtime").call
-{
-       @__syscall_gate_compat_simple
-       asmlinkage()
-       clk_id = int_arg(1)
-       clk_id_str = _get_wc_str(clk_id)
-       tx_uaddr = pointer_arg(2)
-       argstr = sprintf("%s, %s", clk_id_str, _struct_timex_u(tx_uaddr))
-}
-probe __nd_syscall.compat_clock_adjtime =
-       kprobe.function("compat_sys_clock_adjtime").call ?
-{
-       asmlinkage()
-       clk_id = int_arg(1)
-       clk_id_str = _get_wc_str(clk_id)
-       tx_uaddr = pointer_arg(2)
-       argstr = sprintf("%s, %s", clk_id_str,
-                        _struct_compat_timex_u(tx_uaddr))
-}
-probe nd_syscall.clock_adjtime.return = __nd_syscall.clock_adjtime.return ?,
-       kprobe.function("compat_sys_clock_adjtime").return ?
-{
-       name = "clock_adjtime"
-       retstr = returnstr(1)
-}
-probe __nd_syscall.clock_adjtime.return =
-       kprobe.function("sys_clock_adjtime").return
-{
-       @__syscall_gate_compat_simple
-}
-
 # clock_getres _______________________________________________
 # long sys_clock_getres(clockid_t which_clock, struct timespec __user *tp)
 # long compat_clock_getres(clockid_t which_clock, struct compat_timespec __user *tp)

diff --git a/tapset/linux/sysc_clock_adjtime.stp b/tapset/linux/sysc_clock_adjtime.stp
new file mode 100644 (file)
index 0000000..252ec12
--- /dev/null
+++ b/tapset/linux/sysc_clock_adjtime.stp
@@ -0,0 +1,95 @@
+# clock_adjtime ______________________________________________
+# SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
+#                 struct timex __user *, utx)
+# long compat_sys_clock_adjtime(clockid_t which_clock,
+#                               struct compat_timex __user *utp)
+#
+
+@define _SYSCALL_CLOCK_ADJTIME_NAME
+%(
+       name = "clock_adjtime"
+%)
+
+@define _SYSCALL_CLOCK_ADJTIME_ARGSTR
+%(
+       argstr = sprintf("%s, %s", clk_id_str, tx_uaddr_str)
+%)
+
+probe syscall.clock_adjtime = dw_syscall.clock_adjtime !, nd_syscall.clock_adjtime {}
+probe syscall.clock_adjtime.return = dw_syscall.clock_adjtime.return !, nd_syscall.clock_adjtime.return {}
+
+# dw_clock_adjtime _____________________________________________________
+
+probe dw_syscall.clock_adjtime = __syscall.clock_adjtime ?,
+       __syscall.compat_clock_adjtime ?
+{
+       @_SYSCALL_CLOCK_ADJTIME_NAME
+}
+probe __syscall.clock_adjtime = kernel.function("sys_clock_adjtime").call
+{
+       @__syscall_gate_compat_simple
+       clk_id = __int32($which_clock)
+       clk_id_str = _get_wc_str(clk_id)
+       tx_uaddr = @choose_defined($utx, $ktx)
+       tx_uaddr_str = _struct_timex_u(tx_uaddr)
+       @_SYSCALL_CLOCK_ADJTIME_ARGSTR
+}
+probe __syscall.compat_clock_adjtime =
+       kernel.function("compat_sys_clock_adjtime").call ?
+{
+       clk_id = __int32($which_clock)
+       clk_id_str = _get_wc_str(clk_id)
+       tx_uaddr = $utp
+       tx_uaddr_str = _struct_compat_timex_u(tx_uaddr)
+       @_SYSCALL_CLOCK_ADJTIME_ARGSTR
+}
+probe dw_syscall.clock_adjtime.return = __syscall.clock_adjtime.return ?,
+       kernel.function("compat_sys_clock_adjtime").return ?
+{
+       @_SYSCALL_CLOCK_ADJTIME_NAME
+       retstr = return_str(1, $return)
+}
+probe __syscall.clock_adjtime.return =
+       kernel.function("sys_clock_adjtime").return
+{
+       @__syscall_gate_compat_simple
+}
+
+# nd_clock_adjtime _____________________________________________________
+
+probe nd_syscall.clock_adjtime = __nd_syscall.clock_adjtime ?,
+       __nd_syscall.compat_clock_adjtime ?
+{
+       @_SYSCALL_CLOCK_ADJTIME_NAME
+}
+probe __nd_syscall.clock_adjtime = kprobe.function("sys_clock_adjtime").call
+{
+       @__syscall_gate_compat_simple
+       asmlinkage()
+       clk_id = int_arg(1)
+       clk_id_str = _get_wc_str(clk_id)
+       tx_uaddr = pointer_arg(2)
+       tx_uaddr_str = _struct_timex_u(tx_uaddr)
+       @_SYSCALL_CLOCK_ADJTIME_ARGSTR
+}
+probe __nd_syscall.compat_clock_adjtime =
+       kprobe.function("compat_sys_clock_adjtime").call ?
+{
+       asmlinkage()
+       clk_id = int_arg(1)
+       clk_id_str = _get_wc_str(clk_id)
+       tx_uaddr = pointer_arg(2)
+       tx_uaddr_str = _struct_compat_timex_u(tx_uaddr)
+       @_SYSCALL_CLOCK_ADJTIME_ARGSTR
+}
+probe nd_syscall.clock_adjtime.return = __nd_syscall.clock_adjtime.return ?,
+       kprobe.function("compat_sys_clock_adjtime").return ?
+{
+       @_SYSCALL_CLOCK_ADJTIME_NAME
+       retstr = returnstr(1)
+}
+probe __nd_syscall.clock_adjtime.return =
+       kprobe.function("sys_clock_adjtime").return
+{
+       @__syscall_gate_compat_simple
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index ea34261b774f31e69f8c4c0c7f9bc4f98cef56e2..dd35d01e560610ea760227f79e852e2db2c5cd84 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,44 +1,4 @@
 
-# clock_adjtime ______________________________________________
-# SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
-#                 struct timex __user *, utx)
-# long compat_sys_clock_adjtime(clockid_t which_clock,
-#                               struct compat_timex __user *utp)
-#
-probe syscall.clock_adjtime = __syscall.clock_adjtime ?,
-       __syscall.compat_clock_adjtime ?
-{
-       name = "clock_adjtime"
-}
-probe __syscall.clock_adjtime = kernel.function("sys_clock_adjtime").call
-{
-       @__syscall_gate_compat_simple
-       clk_id = __int32($which_clock)
-       clk_id_str = _get_wc_str(clk_id)
-       tx_uaddr = @choose_defined($utx, $ktx)
-       argstr = sprintf("%s, %s", clk_id_str, _struct_timex_u(tx_uaddr))
-}
-probe __syscall.compat_clock_adjtime =
-       kernel.function("compat_sys_clock_adjtime").call ?
-{
-       clk_id = __int32($which_clock)
-       clk_id_str = _get_wc_str(clk_id)
-       tx_uaddr = $utp
-       argstr = sprintf("%s, %s", clk_id_str,
-                        _struct_compat_timex_u(tx_uaddr))
-}
-probe syscall.clock_adjtime.return = __syscall.clock_adjtime.return ?,
-       kernel.function("compat_sys_clock_adjtime").return ?
-{
-       name = "clock_adjtime"
-       retstr = return_str(1, $return)
-}
-probe __syscall.clock_adjtime.return =
-       kernel.function("sys_clock_adjtime").return
-{
-       @__syscall_gate_compat_simple
-}
-
 # clock_getres _______________________________________________
 # long sys_clock_getres(clockid_t which_clock, struct timespec __user *tp)
 # long compat_clock_getres(clockid_t which_clock, struct compat_timespec __user *tp)