From b4be6b42be0efac6f51054c490f4d09dbd62c1ac Mon Sep 17 00:00:00 2001 From: zhaolei Date: Mon, 17 Dec 2007 06:23:07 +0000 Subject: 2007-12-17 Zhaolei From Bai Weidong * syscalls.stp: Add missed compat* probes in syscalls.stp. --- tapset/ChangeLog | 5 +++++ tapset/syscalls.stp | 32 ++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 936d9847..f98cc36d 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Zhaolei + + From Bai Weidong + * syscalls.stp: Add missed compat* probes in syscalls.stp. + 2007-12-12 Martin Hunt * syscalls2.stp (compat_sys_ptrace): Remove for now. diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index 67db2d82..06a2587f 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -1314,7 +1314,9 @@ probe syscall.compat_getitimer.return = kernel.function("compat_sys_getitimer"). # unsigned long addr, # unsigned long flags) # -probe syscall.get_mempolicy = kernel.function("sys_get_mempolicy") ? { +probe syscall.get_mempolicy = + kernel.function("sys_get_mempolicy") ? + kernel.function("compat_sys_get_mempolicy") ? { name = "get_mempolicy" policy_uaddr = $policy nmask_uaddr = $nmask @@ -1324,7 +1326,9 @@ probe syscall.get_mempolicy = kernel.function("sys_get_mempolicy") ? { argstr = sprintf("%p, %p, %d, %p, 0x%x", $policy, $nmask, $maxnode, $addr, $flags) } -probe syscall.get_mempolicy.return = kernel.function("sys_get_mempolicy").return ? { +probe syscall.get_mempolicy.return = + kernel.function("sys_get_mempolicy").return ? + kernel.function("compat_sys_get_mempolicy").return ? { name = "get_mempolicy" retstr = returnstr(1) } @@ -1882,7 +1886,9 @@ probe syscall.ioprio_set.return = kernel.function("sys_ioprio_set").return ? { # struct kexec_segment __user *segments, # unsigned long flags) # -probe syscall.kexec_load = kernel.function("sys_kexec_load") ? { +probe syscall.kexec_load = + kernel.function("sys_kexec_load") ? + kernel.function("compat_sys_kexec_load") ? { name = "kexec_load" entry = $entry nr_segments = $nr_segments @@ -1890,7 +1896,9 @@ probe syscall.kexec_load = kernel.function("sys_kexec_load") ? { flags = $flags argstr = sprintf("%p, %d, %p, %d", $entry, $nr_segments, $segments, $flags) } -probe syscall.kexec_load.return = kernel.function("sys_kexec_load").return ? { +probe syscall.kexec_load.return = + kernel.function("sys_kexec_load").return ? + kernel.function("compat_sys_kexec_load").return ?{ name = "kexec_load" retstr = returnstr(1) } @@ -2198,7 +2206,9 @@ probe syscall.madvise.return = kernel.function("sys_madvise").return ? { # unsigned long maxnode, # unsigned flags) # -probe syscall.mbind = kernel.function("sys_mbind") ? { +probe syscall.mbind = + kernel.function("sys_mbind") ? + kernel.function("compat_sys_mbind") ? { name = "mbind" start = $start len = $len @@ -2209,7 +2219,9 @@ probe syscall.mbind = kernel.function("sys_mbind") ? { argstr = sprintf("%d, %d, %d, %p, %d, 0x%x", $start, $len, $mode, $nmask, $maxnode, $flags) } -probe syscall.mbind.return = kernel.function("sys_mbind").return ? { +probe syscall.mbind.return = + kernel.function("sys_mbind").return ? + kernel.function("compat_sys_mbind").return ? { name = "mbind" retstr = returnstr(1) } @@ -2335,11 +2347,15 @@ probe syscall.modify_ldt.return = kernel.function("sys_modify_ldt").return ? { # const int __user *nodes, # int __user *status, int flags) # -probe syscall.move_pages = kernel.function("sys_move_pages") ? { +probe syscall.move_pages = + kernel.function("sys_move_pages") ? + kernel.function("compat_sys_move_pages") ? { name = "move_pages" argstr = sprintf("%d, %d, %p, %p, 0x%x", $pid, $nr_pages, $nodes, $status, $flags) } -probe syscall.move_pages.return = kernel.function("sys_move_pages").return ? { +probe syscall.move_pages.return = + kernel.function("sys_move_pages").return ? + kernel.function("compat_sys_move_pages").return ? { name = "move_pages" retstr = returnstr(1) } -- cgit From 86895434548ea957252932ceeac97fe0fbd6ce8d Mon Sep 17 00:00:00 2001 From: zhaolei Date: Mon, 17 Dec 2007 07:49:49 +0000 Subject: 2007-12-17 Zhaolei From Yang Zhiguo * Add new address family to _fam_num2str: IUCV and RXRPC. --- tapset/ChangeLog | 5 +++++ tapset/socket.stp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index f98cc36d..53cb7418 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Zhaolei + + From Yang Zhiguo + * Add new address family to _fam_num2str: IUCV and RXRPC. + 2007-12-17 Zhaolei From Bai Weidong diff --git a/tapset/socket.stp b/tapset/socket.stp index 1660dea3..54a7c71f 100644 --- a/tapset/socket.stp +++ b/tapset/socket.stp @@ -693,7 +693,7 @@ function msg_flags_num2str:string (flags:long) ########################### global _prot_num2str[138], _prot_str2num[138] -global _fam_num2str[32], _fam_str2num[32] +global _fam_num2str[34], _fam_str2num[34] global _state_num2str[5], _state_str2num[5] global _type_num2str[11], _type_str2num[11] @@ -869,6 +869,8 @@ probe begin(-1001) _fam_num2str[26] = "LLC" _fam_num2str[30] = "TIPC" _fam_num2str[31] = "BLUETOOTH" + _fam_num2str[32] = "IUCV" + _fam_num2str[33] = "RXRPC" foreach (num in _fam_num2str) _fam_str2num[_fam_num2str[num]] = num -- cgit From 378acbfa928b22d6759f8a47c18dd621566ea100 Mon Sep 17 00:00:00 2001 From: hunt Date: Mon, 17 Dec 2007 16:33:49 +0000 Subject: 2007-12-17 Martin Hunt * syscalls.stp (get_mempolicy): Fix syntax. Add prototype. (kexec_load): Ditto. (mbind): Ditto. (move_pages): Ditto. --- tapset/ChangeLog | 7 ++++++ tapset/syscalls.stp | 64 +++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 54 insertions(+), 17 deletions(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 53cb7418..084739b6 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,10 @@ +2007-12-17 Martin Hunt + + * syscalls.stp (get_mempolicy): Fix syntax. Add prototype. + (kexec_load): Ditto. + (mbind): Ditto. + (move_pages): Ditto. + 2007-12-17 Zhaolei From Yang Zhiguo diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index 06a2587f..500aff1a 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -1313,10 +1313,15 @@ probe syscall.compat_getitimer.return = kernel.function("compat_sys_getitimer"). # unsigned long maxnode, # unsigned long addr, # unsigned long flags) +# long compat_sys_get_mempolicy(int __user *policy, +# compat_ulong_t __user *nmask, +# compat_ulong_t maxnode, +# compat_ulong_t addr, compat_ulong_t flags) # probe syscall.get_mempolicy = - kernel.function("sys_get_mempolicy") ? - kernel.function("compat_sys_get_mempolicy") ? { + kernel.function("sys_get_mempolicy") ?, + kernel.function("compat_sys_get_mempolicy") ? +{ name = "get_mempolicy" policy_uaddr = $policy nmask_uaddr = $nmask @@ -1327,8 +1332,9 @@ probe syscall.get_mempolicy = $nmask, $maxnode, $addr, $flags) } probe syscall.get_mempolicy.return = - kernel.function("sys_get_mempolicy").return ? - kernel.function("compat_sys_get_mempolicy").return ? { + kernel.function("sys_get_mempolicy").return ?, + kernel.function("compat_sys_get_mempolicy").return ? +{ name = "get_mempolicy" retstr = returnstr(1) } @@ -1885,10 +1891,15 @@ probe syscall.ioprio_set.return = kernel.function("sys_ioprio_set").return ? { # unsigned long nr_segments, # struct kexec_segment __user *segments, # unsigned long flags) +# long compat_sys_kexec_load(unsigned long entry, +# unsigned long nr_segments, +# struct compat_kexec_segment __user *segments, +# unsigned long flags) # probe syscall.kexec_load = - kernel.function("sys_kexec_load") ? - kernel.function("compat_sys_kexec_load") ? { + kernel.function("sys_kexec_load") ?, + kernel.function("compat_sys_kexec_load") ? +{ name = "kexec_load" entry = $entry nr_segments = $nr_segments @@ -1897,8 +1908,9 @@ probe syscall.kexec_load = argstr = sprintf("%p, %d, %p, %d", $entry, $nr_segments, $segments, $flags) } probe syscall.kexec_load.return = - kernel.function("sys_kexec_load").return ? - kernel.function("compat_sys_kexec_load").return ?{ + kernel.function("sys_kexec_load").return ?, + kernel.function("compat_sys_kexec_load").return ? +{ name = "kexec_load" retstr = returnstr(1) } @@ -2206,9 +2218,17 @@ probe syscall.madvise.return = kernel.function("sys_madvise").return ? { # unsigned long maxnode, # unsigned flags) # +# long compat_sys_mbind(compat_ulong_t start, +# compat_ulong_t len, +# compat_ulong_t mode, +# compat_ulong_t __user *nmask, +# compat_ulong_t maxnode, +# compat_ulong_t flags) +# probe syscall.mbind = - kernel.function("sys_mbind") ? - kernel.function("compat_sys_mbind") ? { + kernel.function("sys_mbind") ?, + kernel.function("compat_sys_mbind") ? +{ name = "mbind" start = $start len = $len @@ -2220,8 +2240,9 @@ probe syscall.mbind = $nmask, $maxnode, $flags) } probe syscall.mbind.return = - kernel.function("sys_mbind").return ? - kernel.function("compat_sys_mbind").return ? { + kernel.function("sys_mbind").return ?, + kernel.function("compat_sys_mbind").return ? +{ name = "mbind" retstr = returnstr(1) } @@ -2345,17 +2366,26 @@ probe syscall.modify_ldt.return = kernel.function("sys_modify_ldt").return ? { # long sys_move_pages(pid_t pid, unsigned long nr_pages, # const void __user * __user *pages, # const int __user *nodes, -# int __user *status, int flags) +# int __user *status, +# int flags) +# +# long compat_sys_move_pages(pid_t pid, unsigned long nr_pages, +# compat_uptr_t __user *pages32, +# const int __user *nodes, +# int __user *status, +# int flags) # probe syscall.move_pages = - kernel.function("sys_move_pages") ? - kernel.function("compat_sys_move_pages") ? { + kernel.function("sys_move_pages") ?, + kernel.function("compat_sys_move_pages") ? +{ name = "move_pages" argstr = sprintf("%d, %d, %p, %p, 0x%x", $pid, $nr_pages, $nodes, $status, $flags) } probe syscall.move_pages.return = - kernel.function("sys_move_pages").return ? - kernel.function("compat_sys_move_pages").return ? { + kernel.function("sys_move_pages").return ?, + kernel.function("compat_sys_move_pages").return ? +{ name = "move_pages" retstr = returnstr(1) } -- cgit