Skip to content

Commit

Permalink
Update the [nd_]syscall.clone probe aliases for rawhide.
Browse files Browse the repository at this point in the history
* tapset/linux/syscalls.stp: Add '_do_fork' as an alternate probe point
  for syscall.fork. Kernel commit 3033f14ab78c32 renamed 'do_fork' to
  '_do_fork'.
* tapset/linux/nd_syscalls.stp: Ditto.
  • Loading branch information
drsmith2 committed Jul 14, 2015
1 parent 546ac81 commit 4dde890
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
9 changes: 6 additions & 3 deletions tapset/linux/nd_syscalls.stp
Expand Up @@ -751,7 +751,8 @@ probe __nd_syscall.compat_clock_settime.return =
# we'll just probe do_fork(). The fork()/vfork()/clone() syscalls are
# just wrappers around do_fork(). We'll reject all probe hits that
# aren't really clone syscalls (such as calls to sys_fork(),
# sys_vfork(), and the kernel's internal use of do_fork()).
# sys_vfork(), and the kernel's internal use of do_fork()). Kernel
# commit 3033f14ab78c32 renamed 'do_fork' to '_do_fork'.
#
# For ia64, this is complicated by the fact that it has a clone2
# syscall.
Expand All @@ -770,7 +771,8 @@ probe __nd_syscall.compat_clock_settime.return =
# unsigned long stack_size,
# int __user *parent_tidptr,
# int __user *child_tidptr)
probe nd_syscall.clone = kprobe.function("do_fork").call
probe nd_syscall.clone = kprobe.function("_do_fork").call !,
kprobe.function("do_fork").call
{
%( arch != "ia64" %?
@__syscall_compat_gate(%{ __NR_clone %}, %{ __NR_compat_clone %})
Expand Down Expand Up @@ -815,7 +817,8 @@ probe nd_syscall.clone = kprobe.function("do_fork").call
stack_size, parent_tid_uaddr, child_tid_uaddr)
%)
}
probe nd_syscall.clone.return = kprobe.function("do_fork").return
probe nd_syscall.clone.return = kprobe.function("_do_fork").return !,
kprobe.function("do_fork").return
{
%( arch != "ia64" %?
@__syscall_compat_gate(%{ __NR_clone %}, %{ __NR_compat_clone %})
Expand Down
9 changes: 6 additions & 3 deletions tapset/linux/syscalls.stp
Expand Up @@ -711,12 +711,14 @@ probe __syscall.compat_clock_settime.return =
# we'll just probe do_fork(). The fork()/vfork()/clone() syscalls are
# just wrappers around do_fork(). We'll reject all probe hits that
# aren't really clone syscalls (such as calls to sys_fork(),
# sys_vfork(), and the kernel's internal use of do_fork()).
# sys_vfork(), and the kernel's internal use of do_fork()). Kernel
# commit 3033f14ab78c32 renamed 'do_fork' to '_do_fork'.
#
# For ia64, this is complicated by the fact that it has a clone2
# syscall.
#
probe syscall.clone = kernel.function("do_fork").call
probe syscall.clone = kernel.function("_do_fork").call !,
kernel.function("do_fork").call
{
%( arch != "ia64" %?
@__syscall_compat_gate(%{ __NR_clone %}, %{ __NR_compat_clone %})
Expand Down Expand Up @@ -751,7 +753,8 @@ probe syscall.clone = kernel.function("do_fork").call
$stack_size, $parent_tidptr, $child_tidptr)
%)
}
probe syscall.clone.return = kernel.function("do_fork").return
probe syscall.clone.return = kernel.function("_do_fork").return !,
kernel.function("do_fork").return
{
%( arch != "ia64" %?
@__syscall_compat_gate(%{ __NR_clone %}, %{ __NR_compat_clone %})
Expand Down

0 comments on commit 4dde890

Please sign in to comment.