diff options
Diffstat (limited to 'tapset')
| -rw-r--r-- | tapset/ChangeLog | 14 | ||||
| -rw-r--r-- | tapset/syscalls.stp | 64 | ||||
| -rw-r--r-- | tapset/syscalls2.stp | 64 | ||||
| -rw-r--r-- | tapset/vfs.stp | 9 |
4 files changed, 138 insertions, 13 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 29c10507..b2592e1e 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,17 @@ + +2008-08-04 Wenji Huang <wenji.huang@oracle.com> + + * syscall.stp: Change $path to $pathname for 2.6.27. + * syscall2.stp: Ditto. + +2008-08-03 Wenji Huang <wenji.huang@oracle.com> + + * vfs.stp(add_to_page_cache): Correct for 2.6.27. + +2008-07-25 Zhaolei <zhaolei@cn.fujitsu.com> + + * syscalls2.stp: Add sys_unlinkat. + 2008-07-18 Zhaolei <zhaolei@cn.fujitsu.com> * syscalls2.stp: Add sys_symlinkat. diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index 11c2bdf7..7fd942af 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -1715,13 +1715,21 @@ probe syscall.getuid.return = # void __user *value, size_t size) probe syscall.getxattr = kernel.function("sys_getxattr") { name = "getxattr" +%( kernel_v > "2.6.26" %? + path = user_string($pathname) +%: path = user_string($path) +%) # FIXME name2 = user_string($name) value_uaddr = $value size = $size argstr = sprintf("%s, %s, %p, %d", +%( kernel_v > "2.6.26" %? + user_string_quoted($pathname), +%: user_string_quoted($path), +%) user_string_quoted($name), value_uaddr, size) } @@ -1754,11 +1762,18 @@ probe syscall.init_module.return = kernel.function("sys_init_module").return ? { probe syscall.inotify_add_watch = kernel.function("sys_inotify_add_watch") ? { name = "inotify_add_watch" fd = $fd + mask = $mask +%( kernel_v > "2.6.26" %? + path_uaddr = $pathname + path = user_string($pathname) + argstr = sprintf("%d, %s, %d", $fd, user_string_quoted($pathname), $mask) +%: path_uaddr = $path path = user_string($path) - mask = $mask argstr = sprintf("%d, %s, %d", $fd, user_string_quoted($path), $mask) +%) } + probe syscall.inotify_add_watch.return = kernel.function("sys_inotify_add_watch").return ? { name = "inotify_add_watch" retstr = returnstr(1) @@ -2081,13 +2096,21 @@ probe syscall.lchown16.return = kernel.function("sys_lchown16").return ? { # probe syscall.lgetxattr = kernel.function("sys_lgetxattr") { name = "lgetxattr" +%( kernel_v > "2.6.26" %? + path = user_string($pathname) +%: path = user_string($path) +%) # FIXME name2 = user_string($name) value_uaddr = $value size = $size argstr = sprintf("%s, %s, %p, %d", +%( kernel_v > "2.6.26" %? + user_string_quoted($pathname), +%: user_string_quoted($path), +%) user_string_quoted($name), value_uaddr, size) } @@ -2156,11 +2179,17 @@ probe syscall.listen.return = kernel.function("sys_listen").return ? { # probe syscall.listxattr = kernel.function("sys_listxattr") { name = "listxattr" - path_uaddr = $path - path = user_string($path) list_uaddr = $list size = $size +%( kernel_v > "2.6.26" %? + path_uaddr = $pathname + path = user_string($pathname) + argstr = sprintf("%s, %p, %d", user_string_quoted($pathname), $list, $size) +%: + path_uaddr = $path + path = user_string($path) argstr = sprintf("%s, %p, %d", user_string_quoted($path), $list, $size) +%) } probe syscall.listxattr.return = kernel.function("sys_listxattr").return { name = "listxattr" @@ -2172,11 +2201,17 @@ probe syscall.listxattr.return = kernel.function("sys_listxattr").return { # probe syscall.llistxattr = kernel.function("sys_llistxattr") { name = "llistxattr" - path_uaddr = $path - path = user_string($path) list_uaddr = $list size = $size +%( kernel_v > "2.6.26" %? + path_uaddr = $pathname + path = user_string($pathname) + argstr = sprintf("%s, %p, %d", user_string_quoted($pathname), $list, $size) +%: + path_uaddr = $path + path = user_string($path) argstr = sprintf("%s, %p, %d", user_string_quoted($path), $list, $size) +%) } probe syscall.llistxattr.return = kernel.function("sys_llistxattr").return { name = "llistxattr" @@ -2225,11 +2260,17 @@ probe syscall.lookup_dcookie.return = kernel.function("sys_lookup_dcookie").retu # probe syscall.lremovexattr = kernel.function("sys_lremovexattr") { name = "lremovexattr" - path_uaddr = $path - path = user_string($path) name_uaddr = $name name2 = user_string($name) +%( kernel_v > "2.6.26" %? + path_uaddr = $pathname + path = user_string($pathname) + argstr = sprintf("%s, %s", user_string_quoted($pathname), user_string_quoted($name)) +%: + path_uaddr = $path + path = user_string($path) argstr = sprintf("%s, %s", user_string_quoted($path), user_string_quoted($name)) +%) } probe syscall.lremovexattr.return = kernel.function("sys_lremovexattr").return { name = "lremovexattr" @@ -2261,15 +2302,24 @@ probe syscall.lseek.return = kernel.function("sys_lseek").return { # probe syscall.lsetxattr = kernel.function("sys_lsetxattr") { name = "lsetxattr" +%( kernel_v > "2.6.26" %? + path_uaddr = $pathname + path = user_string($pathname) +%: path_uaddr = $path path = user_string($path) +%) name_uaddr = $name name_str = user_string($name) value_uaddr = $value size = $size flags = $flags argstr = sprintf("%s, %s, %p, %d, %d", +%( kernel_v > "2.6.26" %? + user_string_quoted($pathname), +%: user_string_quoted($path), +%) user_string_quoted($name), value_uaddr, $size, $flags) } diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp index 910193ef..57d190e3 100644 --- a/tapset/syscalls2.stp +++ b/tapset/syscalls2.stp @@ -623,12 +623,17 @@ probe syscall.readlink.return = kernel.function("sys_readlink").return { probe syscall.readlinkat = kernel.function("sys_readlinkat") ? { name = "readlinkat" dfd = $dfd - path = user_string($path) buf_uaddr = $buf bufsiz = $bufsiz - argstr = sprintf("%s, %s, %p, %d", _dfd_str($dfd), user_string_quoted($path), - $buf, $bufsiz) +%( kernel_v > "2.6.26" %? + path = user_string($pathname) + argstr = sprintf("%s, %s, %p, %d", _dfd_str($dfd), user_string_quoted($pathname), $buf, $bufsiz) +%: + path = user_string($path) + argstr = sprintf("%s, %s, %p, %d", _dfd_str($dfd), user_string_quoted($path), $buf, $bufsiz) +%) } + probe syscall.readlinkat.return = kernel.function("sys_readlinkat").return ? { name = "readlinkat" retstr = returnstr(1) @@ -806,10 +811,17 @@ probe syscall.remap_file_pages.return = # probe syscall.removexattr = kernel.function("sys_removexattr") { name = "removexattr" - path = user_string($path) name_str = user_string($name) +%( kernel_v > "2.6.26" %? + path = user_string($pathname) + argstr = sprintf("%s, %s", user_string_quoted($pathname), + user_string_quoted($name)) +%: + path = user_string($path) argstr = sprintf("%s, %s", user_string_quoted($path), user_string_quoted($name)) +%) + } probe syscall.removexattr.return = kernel.function("sys_removexattr").return { name = "removexattr" @@ -1978,15 +1990,24 @@ probe syscall.setuid.return = # probe syscall.setxattr = kernel.function("sys_setxattr") { name = "setxattr" +%( kernel_v > "2.6.26" %? + path_uaddr = $pathname + path = user_string($pathname) +%: path_uaddr = $path path = user_string($path) +%) name_uaddr = $name name_str = user_string($name) value_uaddr = $value size = $size flags = $flags argstr = sprintf("%s, %s, %p, %d, %d", +%( kernel_v > "2.6.26" %? + user_string_quoted($pathname), +%: user_string_quoted($path), +%) user_string_quoted($name), value_uaddr, $size, $flags) } @@ -2376,10 +2397,16 @@ probe syscall.statfs = kernel.function("compat_sys_statfs") ? { name = "statfs" - path = user_string($path) buf_uaddr = $buf +%( kernel_v > "2.6.26" %? + path = user_string($pathname) + argstr = sprintf("%s, %p", user_string_quoted($pathname), $buf) +%: + path = user_string($path) argstr = sprintf("%s, %p", user_string_quoted($path), $buf) +%) } + probe syscall.statfs.return = kernel.function("sys_statfs").return, kernel.function("compat_sys_statfs").return ? @@ -2398,11 +2425,17 @@ probe syscall.statfs64 = kernel.function("compat_sys_statfs64") ? { name = "statfs" - path = user_string($path) sz = $sz buf_uaddr = $buf +%( kernel_v > "2.6.26" %? + path = user_string($pathname) + argstr = sprintf("%s, %d, %p", user_string_quoted($pathname), $sz, $buf) +%: + path = user_string($path) argstr = sprintf("%s, %d, %p", user_string_quoted($path), $sz, $buf) +%) } + probe syscall.statfs64.return = kernel.function("sys_statfs64").return ?, kernel.function("compat_sys_statfs64").return ? @@ -2899,6 +2932,25 @@ probe syscall.unlink.return = kernel.function("sys_unlink").return { retstr = returnstr(1) } +# unlinkat ___________________________________________________ +# new function with 2.6.16 +# long sys_unlinkat(int dfd, const char __user *pathname, +# int flag) +probe syscall.unlinkat = kernel.function("sys_unlinkat") ? { + name = "unlinkat" + dfd = $dfd + dfd_str = _dfd_str($dfd) + pathname = $pathname + pathname_str = user_string($pathname) + flag = $flag + flag_str = _at_flag_str($flag) + argstr = sprintf("%s, %s, %s", dfd_str, user_string_quoted($pathname), flag_str) +} +probe syscall.unlinkat.return = kernel.function("sys_unlinkat").return ? { + name = "unlinkat" + retstr = returnstr(1) +} + # unshare ____________________________________________________ # new function with 2.6.16 # long sys_unshare(unsigned long unshare_flags) diff --git a/tapset/vfs.stp b/tapset/vfs.stp index 46bc3d21..1ea8fc8e 100644 --- a/tapset/vfs.stp +++ b/tapset/vfs.stp @@ -744,7 +744,11 @@ probe vfs.do_mpage_readpage.return = kernel.function ("do_mpage_readpage").retur units = "pages" } +%( kernel_v > "2.6.26" %? +probe vfs.add_to_page_cache = kernel.function ("add_to_page_cache_locked") +%: probe vfs.add_to_page_cache = kernel.function ("add_to_page_cache") +%) { dev = $mapping->host->i_sb->s_dev devname = __find_bdevname(dev, $mapping->host->i_sb->s_bdev) @@ -756,7 +760,12 @@ probe vfs.add_to_page_cache = kernel.function ("add_to_page_cache") name = "vfs.add_to_page_cache" argstr = sprintf("%d, %d", ino, index) } + +%( kernel_v > "2.6.26" %? +probe vfs.add_to_page_cache.return = kernel.function ("add_to_page_cache_locked").return +%: probe vfs.add_to_page_cache.return = kernel.function ("add_to_page_cache").return +%) { name = "vfs.add_to_page_cache" retstr = sprintf("%d", $return) |