diff options
author | John Levon <levon@movementarian.org> | 2005-06-24 01:02:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:06:27 -0400 |
commit | 0c0a400d1debb172c596b24ab82efab4975990a9 (patch) | |
tree | 58bd3604e46151662268bd558dce49ac8e72cca0 /drivers/oprofile | |
parent | 391cd727eac2e10be7685efd739a3ea9de87393c (diff) |
[PATCH] oprofile: report anonymous region samples
The below patch passes samples from anonymous regions to userspace instead
of just dropping them. This provides the support needed for reporting
anonymous-region code samples (today: basic accumulated results; later:
Java and other dynamically compiled code).
As this changes the format, an upgrade to the just-released 0.9 release of
the userspace tools is required.
This patch is based upon an earlier one by Will Cohen <wcohen@redhat.com>
Signed-off-by: John Levon <levon@movementarian.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/oprofile')
-rw-r--r-- | drivers/oprofile/buffer_sync.c | 29 | ||||
-rw-r--r-- | drivers/oprofile/event_buffer.h | 3 |
2 files changed, 21 insertions, 11 deletions
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c index 745a14183634..531b07313141 100644 --- a/drivers/oprofile/buffer_sync.c +++ b/drivers/oprofile/buffer_sync.c | |||
@@ -206,7 +206,7 @@ static inline unsigned long fast_get_dcookie(struct dentry * dentry, | |||
206 | */ | 206 | */ |
207 | static unsigned long get_exec_dcookie(struct mm_struct * mm) | 207 | static unsigned long get_exec_dcookie(struct mm_struct * mm) |
208 | { | 208 | { |
209 | unsigned long cookie = 0; | 209 | unsigned long cookie = NO_COOKIE; |
210 | struct vm_area_struct * vma; | 210 | struct vm_area_struct * vma; |
211 | 211 | ||
212 | if (!mm) | 212 | if (!mm) |
@@ -234,35 +234,42 @@ out: | |||
234 | */ | 234 | */ |
235 | static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, off_t * offset) | 235 | static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, off_t * offset) |
236 | { | 236 | { |
237 | unsigned long cookie = 0; | 237 | unsigned long cookie = NO_COOKIE; |
238 | struct vm_area_struct * vma; | 238 | struct vm_area_struct * vma; |
239 | 239 | ||
240 | for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) { | 240 | for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) { |
241 | 241 | ||
242 | if (!vma->vm_file) | ||
243 | continue; | ||
244 | |||
245 | if (addr < vma->vm_start || addr >= vma->vm_end) | 242 | if (addr < vma->vm_start || addr >= vma->vm_end) |
246 | continue; | 243 | continue; |
247 | 244 | ||
248 | cookie = fast_get_dcookie(vma->vm_file->f_dentry, | 245 | if (vma->vm_file) { |
249 | vma->vm_file->f_vfsmnt); | 246 | cookie = fast_get_dcookie(vma->vm_file->f_dentry, |
250 | *offset = (vma->vm_pgoff << PAGE_SHIFT) + addr - vma->vm_start; | 247 | vma->vm_file->f_vfsmnt); |
248 | *offset = (vma->vm_pgoff << PAGE_SHIFT) + addr - | ||
249 | vma->vm_start; | ||
250 | } else { | ||
251 | /* must be an anonymous map */ | ||
252 | *offset = addr; | ||
253 | } | ||
254 | |||
251 | break; | 255 | break; |
252 | } | 256 | } |
253 | 257 | ||
258 | if (!vma) | ||
259 | cookie = INVALID_COOKIE; | ||
260 | |||
254 | return cookie; | 261 | return cookie; |
255 | } | 262 | } |
256 | 263 | ||
257 | 264 | ||
258 | static unsigned long last_cookie = ~0UL; | 265 | static unsigned long last_cookie = INVALID_COOKIE; |
259 | 266 | ||
260 | static void add_cpu_switch(int i) | 267 | static void add_cpu_switch(int i) |
261 | { | 268 | { |
262 | add_event_entry(ESCAPE_CODE); | 269 | add_event_entry(ESCAPE_CODE); |
263 | add_event_entry(CPU_SWITCH_CODE); | 270 | add_event_entry(CPU_SWITCH_CODE); |
264 | add_event_entry(i); | 271 | add_event_entry(i); |
265 | last_cookie = ~0UL; | 272 | last_cookie = INVALID_COOKIE; |
266 | } | 273 | } |
267 | 274 | ||
268 | static void add_kernel_ctx_switch(unsigned int in_kernel) | 275 | static void add_kernel_ctx_switch(unsigned int in_kernel) |
@@ -317,7 +324,7 @@ static int add_us_sample(struct mm_struct * mm, struct op_sample * s) | |||
317 | 324 | ||
318 | cookie = lookup_dcookie(mm, s->eip, &offset); | 325 | cookie = lookup_dcookie(mm, s->eip, &offset); |
319 | 326 | ||
320 | if (!cookie) { | 327 | if (cookie == INVALID_COOKIE) { |
321 | atomic_inc(&oprofile_stats.sample_lost_no_mapping); | 328 | atomic_inc(&oprofile_stats.sample_lost_no_mapping); |
322 | return 0; | 329 | return 0; |
323 | } | 330 | } |
diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h index 442aaad391e0..018023630599 100644 --- a/drivers/oprofile/event_buffer.h +++ b/drivers/oprofile/event_buffer.h | |||
@@ -35,6 +35,9 @@ void wake_up_buffer_waiter(void); | |||
35 | #define TRACE_BEGIN_CODE 8 | 35 | #define TRACE_BEGIN_CODE 8 |
36 | #define TRACE_END_CODE 9 | 36 | #define TRACE_END_CODE 9 |
37 | 37 | ||
38 | #define INVALID_COOKIE ~0UL | ||
39 | #define NO_COOKIE 0UL | ||
40 | |||
38 | /* add data to the event buffer */ | 41 | /* add data to the event buffer */ |
39 | void add_event_entry(unsigned long data); | 42 | void add_event_entry(unsigned long data); |
40 | 43 | ||