diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-03-30 13:07:05 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-06 03:30:38 -0400 |
commit | 0a4a93919bdc5cee48fe4367591e8e0449c1086c (patch) | |
tree | 0f0d7ac3ee4f61c1e7e53f0ba4e3b01e0e4ac728 /mm | |
parent | 195564390210977954fe4ef45b39cdee34f41b59 (diff) |
perf_counter: executable mmap() information
Currently the profiling information returns userspace IPs but no way
to correlate them to userspace code. Userspace could look into
/proc/$pid/maps but that might not be current or even present anymore
at the time of analyzing the IPs.
Therefore provide means to track the mmap information and provide it
in the output stream.
XXX: only covers mmap()/munmap(), mremap() and mprotect() are missing.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Orig-LKML-Reference: <20090330171023.417259499@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/mmap.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/mempolicy.h> | 28 | #include <linux/mempolicy.h> |
29 | #include <linux/rmap.h> | 29 | #include <linux/rmap.h> |
30 | #include <linux/mmu_notifier.h> | 30 | #include <linux/mmu_notifier.h> |
31 | #include <linux/perf_counter.h> | ||
31 | 32 | ||
32 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
33 | #include <asm/cacheflush.h> | 34 | #include <asm/cacheflush.h> |
@@ -1223,6 +1224,9 @@ munmap_back: | |||
1223 | if (correct_wcount) | 1224 | if (correct_wcount) |
1224 | atomic_inc(&inode->i_writecount); | 1225 | atomic_inc(&inode->i_writecount); |
1225 | out: | 1226 | out: |
1227 | if (vm_flags & VM_EXEC) | ||
1228 | perf_counter_mmap(addr, len, pgoff, file); | ||
1229 | |||
1226 | mm->total_vm += len >> PAGE_SHIFT; | 1230 | mm->total_vm += len >> PAGE_SHIFT; |
1227 | vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); | 1231 | vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); |
1228 | if (vm_flags & VM_LOCKED) { | 1232 | if (vm_flags & VM_LOCKED) { |
@@ -1756,6 +1760,12 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) | |||
1756 | do { | 1760 | do { |
1757 | long nrpages = vma_pages(vma); | 1761 | long nrpages = vma_pages(vma); |
1758 | 1762 | ||
1763 | if (vma->vm_flags & VM_EXEC) { | ||
1764 | perf_counter_munmap(vma->vm_start, | ||
1765 | nrpages << PAGE_SHIFT, | ||
1766 | vma->vm_pgoff, vma->vm_file); | ||
1767 | } | ||
1768 | |||
1759 | mm->total_vm -= nrpages; | 1769 | mm->total_vm -= nrpages; |
1760 | vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); | 1770 | vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); |
1761 | vma = remove_vma(vma); | 1771 | vma = remove_vma(vma); |