diff options
| -rw-r--r-- | tapset/ChangeLog | 10 | ||||
| -rw-r--r-- | tapset/memory.stp | 10 | ||||
| -rw-r--r-- | tapset/task.stp | 12 | ||||
| -rw-r--r-- | testsuite/ChangeLog | 11 | ||||
| -rwxr-xr-x | testsuite/buildok/twentythree.stp | 6 | ||||
| -rwxr-xr-x | testsuite/buildok/twentytwo.stp | 4 |
6 files changed, 40 insertions, 13 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index b33e598b..4aedbfc5 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,13 @@ +2007-07-25 Mike Mason <mmlnx@us.ibm.com> + + PR 4386 + * memory.stp (vm.pagefault, vm.pagefault.return): + __handle_mm_fault renamed back to handle_mm_fault in 2.6.23. + Changed probes to look for either name in mm/memory.c and removed + kernel version check. + * task.stp (task_cpu): thread_info in task_struct changed + to stack in 2.6.23. Usage appears to be the same as before. + 2007-07-17 Mike Mason <mmlnx@us.ibm.com> * socket.stp: changed initialization of *num2str arrays to diff --git a/tapset/memory.stp b/tapset/memory.stp index 93e0bb1f..5173bf8c 100644 --- a/tapset/memory.stp +++ b/tapset/memory.stp @@ -18,9 +18,8 @@ * address - the address of the faulting memory access. * write_access - indicates whether this was a write */ -probe vm.pagefault = kernel.function( - %( kernel_v >= "2.6.13" %? "__handle_mm_fault" %: "handle_mm_fault" %) - ) +probe vm.pagefault = kernel.function("__handle_mm_fault@mm/memory.c") ?, + kernel.function("handle_mm_fault@mm/memory.c") ? { write_access = $write_access address = $address @@ -40,9 +39,8 @@ probe vm.pagefault = kernel.function( * VM_FAULT_MINOR 2 no blocking operation to handle fault * VM_FAULT_MAJOR 3 required blocking operation to handle fault */ -probe vm.pagefault.return = kernel.function( - %( kernel_v >= "2.6.13" %? "__handle_mm_fault" %: "handle_mm_fault" %) - ).return +probe vm.pagefault.return = kernel.function("__handle_mm_fault@mm/memory.c").return ?, + kernel.function("handle_mm_fault@mm/memory.c").return ? { fault_type = $return } diff --git a/tapset/task.stp b/tapset/task.stp index 2f183838..1a7699d0 100644 --- a/tapset/task.stp +++ b/tapset/task.stp @@ -109,9 +109,19 @@ function task_nice:long (task:long) %{ /* pure */ // Return the scheduled cpu for the given task -function task_cpu:long (task:long) %{ /* pure */ +function task_cpu:long (task:long) +%( kernel_v >= "2.6.23" %? +%{ /* pure */ + struct task_struct *t = (struct task_struct *)(long)THIS->task; + struct thread_info *ti = kread(&(t->stack)); + THIS->__retvalue = kread(&(ti->cpu)); + CATCH_DEREF_FAULT(); +%} +%: +%{ /* pure */ struct task_struct *t = (struct task_struct *)(long)THIS->task; struct thread_info *ti = kread(&(t->thread_info)); THIS->__retvalue = kread(&(ti->cpu)); CATCH_DEREF_FAULT(); %} +%) diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 852e6bac..2e7f454c 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2007-07-25 Mike Mason <mmlnx@us.ibm.com> + + PR 4836 + * buildok/twentytwo.stp, buildok/twentythree.stp: + Changed free_task() probes to deactivate_super() probes. Changed + references to timestamp in task_struct to s_maxbytes in super_block. + timestamp was removed from task_struct in 2.6.23. s_maxbytes is an + unsigned long long in every kernel I checked back to 2.4.18. + 2007-07-12 David Smith <dsmith@redhat.com> * systemtap.maps/pmap_agg_overflow.exp: On single processor @@ -180,7 +189,7 @@ * systemtap.samples/profile.exp Increased timeout from 30 to 60 sec to fix intermittent failures on s390x. -2007-0-2 Mike Mason <mmlnx@us.ibm.com> +2007-04-25 Mike Mason <mmlnx@us.ibm.com> * buildok/socket.stp: Adapted to changes in 2.6.19 socket routines. diff --git a/testsuite/buildok/twentythree.stp b/testsuite/buildok/twentythree.stp index 4aebe7bc..4eba64f4 100755 --- a/testsuite/buildok/twentythree.stp +++ b/testsuite/buildok/twentythree.stp @@ -2,8 +2,8 @@ # Test for writing 64-bit target variable, PR 1271 -probe kernel.function("free_task") +probe kernel.function("deactivate_super") { - $tsk->timestamp = 22; - printf("set to 22 => %d\n", $tsk->timestamp); + $s->s_maxbytes = 22; + printf("set to 22 => %d\n", $s->s_maxbytes) } diff --git a/testsuite/buildok/twentytwo.stp b/testsuite/buildok/twentytwo.stp index 88a0b57b..ef73ad76 100755 --- a/testsuite/buildok/twentytwo.stp +++ b/testsuite/buildok/twentytwo.stp @@ -2,9 +2,9 @@ # Test for reading 64-bit target variable, PR 1271 -probe kernel.function("free_task") +probe kernel.function("deactivate_super") { - printf("timestamp %d\n", $tsk->timestamp) + printf("s_maxbytes %d\n", $s->s_maxbytes) } probe kernel.function("vfs_llseek") |