From 13045789c2760786a55f39ade4fe99109cd344ac Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Mon, 22 Mar 2010 13:14:18 -0500
Subject: Partial fix for pr 11388 by adding 'sys_mmap_pgoff' support.

* tapset/i386/nd_syscalls.stp: Add support for 'sys_mmap_pgoff' (which is
  what the mmap syscall uses).
* tapset/x86_64/nd_syscalls.stp: Ditto.
---
 tapset/i386/nd_syscalls.stp   | 6 ++++--
 tapset/x86_64/nd_syscalls.stp | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'tapset')

diff --git a/tapset/i386/nd_syscalls.stp b/tapset/i386/nd_syscalls.stp
index 2b13cbd7..36473175 100644
--- a/tapset/i386/nd_syscalls.stp
+++ b/tapset/i386/nd_syscalls.stp
@@ -72,7 +72,8 @@ probe nd_syscall.ipc.return = kprobe.function("sys_ipc").return ?
 #	  unsigned long prot, unsigned long flags,
 #	  unsigned long fd, unsigned long pgoff)
 #
-probe nd_syscall.mmap2 = kprobe.function("sys_mmap2") ?
+probe nd_syscall.mmap2 = kprobe.function("sys_mmap_pgoff") ?,
+                         kprobe.function("sys_mmap2") ?
 {
 	name = "mmap2"
 	// start = $addr
@@ -97,7 +98,8 @@ probe nd_syscall.mmap2 = kprobe.function("sys_mmap2") ?
 			length, _mprotect_prot_str(prot), _mmap_flags(flags),
 			fd, pgoffset)
 }
-probe nd_syscall.mmap2.return = kprobe.function("sys_mmap2").return ?
+probe nd_syscall.mmap2.return = kprobe.function("sys_mmap_pgoff").return ?,
+                                kprobe.function("sys_mmap2").return ?
 {
 	name = "mmap2"
 	retstr = returnstr(2)
diff --git a/tapset/x86_64/nd_syscalls.stp b/tapset/x86_64/nd_syscalls.stp
index b0b0686c..02a6af4d 100644
--- a/tapset/x86_64/nd_syscalls.stp
+++ b/tapset/x86_64/nd_syscalls.stp
@@ -87,7 +87,8 @@ probe nd_syscall.sysctl32.return = kprobe.function("sys32_sysctl").return ?
 # long sys_mmap(unsigned long addr, unsigned long len,
 #          unsigned long prot, unsigned long flags,
 #          unsigned long fd, unsigned long off)
-probe nd_syscall.mmap = kprobe.function("sys_mmap") ?
+probe nd_syscall.mmap = kprobe.function("sys_mmap") ?,
+                        kprobe.function("sys_mmap_pgoff") ?
 {
 	name = "mmap"
 	// start = $addr
@@ -111,7 +112,8 @@ probe nd_syscall.mmap = kprobe.function("sys_mmap") ?
 	argstr = sprintf("%p, %d, %s, %s, %d, %d", start, len,
 		_mprotect_prot_str(prot), _mmap_flags(flags), fd, offset)
 }
-probe nd_syscall.mmap.return = kprobe.function("sys_mmap").return ?
+probe nd_syscall.mmap.return = kprobe.function("sys_mmap").return ?,
+                               kprobe.function("sys_mmap_pgoff").return ?
 {
 	name = "mmap"
 	retstr = returnstr(2)
-- 
cgit