* tapset/memory.stp: Add matching vm.pagefault.return

	* testsuite/buildok/memory.stp: Test vm.pagefault.return.

diff --git a/ChangeLog b/ChangeLog
index 3acc80678c8b232e74417713aa6c4cd6bd6a2a91..e41c60a68470e7a2db9e0e824800adeae7c003f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-24  Will Cohen  <wcohen@redhat.com>
+
+       * tapset/memory.stp:    Add matching vm.pagefault.return
+       * testsuite/buildok/memory.stp: Test vm.pagefault.return.
+
 2007-04-24  Martin Hunt  <hunt@redhat.com>
 
        * stp_check.in: More tweaking of mount statement.

diff --git a/tapset/memory.stp b/tapset/memory.stp
index a3ed628fb280e127adbdb9d3ac55fc97625bada9..61c77dff185dfed0f339ef3131b12903c00a5881 100644 (file)
--- a/tapset/memory.stp
+++ b/tapset/memory.stp
@@ -26,6 +26,23 @@ probe vm.pagefault = kernel.function(
        address =  $address
 }
 
+/* probe vm.pagefault.return
+ *
+ *  Records type of fault that occurred.
+ *
+ * Context:
+ *  The process which triggered the fault.
+ *
+ * Arguments:
+ *  fault_type - type of fault
+ */
+probe vm.pagefault.return = kernel.function(
+        %( kernel_v >= "2.6.13" %? "__handle_mm_fault" %: "handle_mm_fault" %)
+        ).return
+{
+       fault_type = $return
+}
+
 /* Return which node the given address belongs to in a NUMA system */
 function addr_to_node:long(addr:long)  /* pure */ 
 %{

diff --git a/testsuite/buildok/memory.stp b/testsuite/buildok/memory.stp
index ce9f28cb613b6498718e1847b44a568c882874f2..12d4e4a783bdcd2c4fb8d9bd0ba822a1e558db5a 100755 (executable)
--- a/testsuite/buildok/memory.stp
+++ b/testsuite/buildok/memory.stp
@@ -3,3 +3,8 @@ probe vm.pagefault
 {
        printf("ppname: %s, %d, %p\n", probefunc(), write_access, address)
 }
+
+probe vm.pagefault.return
+{
+       printf("ppname: %s, %d\n", probefunc(), fault_type)
+}