more perf_counter stuff
Subsystems (3)
cover more perf_counter stuff
mostly compile tested.. :-)
RFC PATCH 1/3 perf_counter: event overlow handling
Alternative method of mmap() data output handling that provides better overflow management.
Unlike the previous method, that didn't have any user->kernel feedback and relied on userspace keeping up, this method relies on userspace writing its last read position into the control page.
It will ensure new output doesn't overwrite not-yet read events, new events for which there is no space left are lost and the overflow counter is incremented, providing exact event loss numbers.
Untested -- not sure its really worth the overhead, the most important thing to know is _if_ you're loosing data, either method allows for that.
--- include/linux/perf_counter.h | 4 ++ kernel/perf_counter.c | 69 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 7 deletions(-)
include/linux/perf_counter.h +4 -0
@@ -165,6 +165,8 @@ struct perf_counter_mmap_page {__s64 offset;/* add to hardware counter value */ __u32 data_head;/* head in the data section */ +__u32 data_tail;/* user-space written tail */ +__u32 overflow;/* number of lost events */ };struct perf_event_header {
@@ -269,8 +271,10 @@ struct file;struct perf_mmap_data {struct rcu_head rcu_head;int nr_pages; +int writable;atomic_t wakeup;atomic_t head; +atomic_t overflow;struct perf_counter_mmap_page *user_page;void *data_pages[0 ]; };
kernel/perf_counter.c +62 -7
126 lines not on this page · raw message
RFC PATCH 2/3 perf_counter: executable mmap() information
In reply to Peter ZijlstraCurrently the profiling information returns userspace IPs but now 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.
--- include/linux/perf_counter.h | 22 ++++++- kernel/perf_counter.c | 135 +++++++++++++++++++++++++++++++++++++++++++ mm/mmap.c | 10 +++ 3 files changed, 166 insertions(+), 1 deletion(-)
include/linux/perf_counter.h +21 -1
@@ -137,7 +137,9 @@ struct perf_counter_hw_event { exclude_kernel : 1, /* ditto kernel */ exclude_hv : 1, /* ditto hypervisor */ exclude_idle : 1, /* don't count when idle */ - include_tid : 1, /* include the tid */ + include_tid : 1, /* include the tid */ + mmap : 1, /* include mmap data */ + munmap : 1, /* include munmap data */ __reserved_1 : 54;
@@ -178,6 +180,9 @@ enum perf_event_type {PERF_EVENT_IP =0 ,PERF_EVENT_GROUP =1 , +PERF_EVENT_MMAP =2 , +PERF_EVENT_MUNMAP =3 , + __PERF_EVENT_TID = 0x100, };
@@ -456,6 +461,12 @@ static inline int is_software_counter(stextern void perf_swcounter_event (u32 ,u64 ,int ,struct pt_regs *); +extern void perf_counter_mmap (unsigned long addr,unsigned long len, +unsigned long pgoff,struct file *file); + +extern void perf_counter_munmap (unsigned long addr,unsigned long len, +unsigned long pgoff,struct file *file); +#else static inline void perf_counter_task_sched_in (struct task_struct *task,int cpu) { }
@@ -475,6 +486,15 @@ static inline int perf_counter_task_enabstatic inline void perf_swcounter_event (u32 event,u64 nr,int nmi,struct pt_regs *regs) { } + +static inline void perf_counter_mmap (unsigned long addr,unsigned long len, +unsigned long pgoff,struct file *file) +{ } + +static inline void perf_counter_munmap (unsigned long addr,unsigned long len, +unsigned long pgoff,struct file *file) +{ } +#endif #endif /* __KERNEL__ */
kernel/perf_counter.c +135 -0
147 lines not on this page · raw message
mm/mmap.c +10 -0
@@ -27,6 +27,7 @@#include <linux/mempolicy.h> #include <linux/rmap.h> #include <linux/mmu_notifier.h> +#include <linux/perf_counter.h> #include <asm/uaccess.h> #include <asm/cacheflush.h>
@@ -1219,6 +1220,9 @@ munmap_back:if (correct_wcount)atomic_inc (&inode->i_writecount); out: +if (vm_flags &VM_EXEC ) +perf_counter_mmap (addr, len, pgoff, file); + mm->total_vm += len >>PAGE_SHIFT ;vm_stat_account (mm, vm_flags, file, len >>PAGE_SHIFT );if (vm_flags &VM_LOCKED ) {
@@ -1752,6 +1756,12 @@ static void remove_vma_list(struct mm_st do { long nrpages = vma_pages(vma); + if (vma->vm_flags & VM_EXEC) { + perf_counter_munmap(vma->vm_start, + nrpages << PAGE_SIZE, + vma->vm_pgoff, vma->vm_file); + } + mm->total_vm -= nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); vma = remove_vma(vma);
Re: [RFC][PATCH 2/3] perf_counter: executable mmap() information
include/linux/perf_counter.h struct perf_counter_hw_event { · line 144
Quoted 12 lines · Peter Zijlstra
include/linux/perf_counter.h +3
-1@@ -137,7 +137,9 @@ struct perf_counter_hw_event { exclude_kernel : 1, /* ditto kernel */ exclude_hv : 1, /* ditto hypervisor */ exclude_idle : 1, /* don't count when idle */ - include_tid : 1, /* include the tid */ + include_tid : 1, /* include the tid */ + mmap : 1, /* include mmap data */ + munmap : 1, /* include munmap data */ __reserved_1 : 54;
Nit: need to adjust the size of __reserved_1 here. Or maybe just get rid of it?
Paul.
Re: [RFC][PATCH 2/3] perf_counter: executable mmap() information
Quoted 13 lines · Paul Mackerras
Quoted 11 lines · Peter Zijlstra
include/linux/perf_counter.h +3
-1@@ -137,7 +137,9 @@ struct perf_counter_hw_event { exclude_kernel : 1, /* ditto kernel */ exclude_hv : 1, /* ditto hypervisor */ exclude_idle : 1, /* don't count when idle */ - include_tid : 1, /* include the tid */ + include_tid : 1, /* include the tid */ + mmap : 1, /* include mmap data */ + munmap : 1, /* include munmap data */
Quoted 4 lines
include/linux/perf_counter.h struct perf_counter_hw_event { · line 144
Quoted 1 line
include/linux/perf_counter.h +0
-0__reserved_1 :54 ;Nit: need to adjust the size of
__reserved_1here. Or maybe just get rid of it?
it's nice to have a constant reminder about how many bits there are left.
Ingo
Re: [RFC][PATCH 2/3] perf_counter: executable mmap() information
Quoted 15 lines · Ingo Molnar
Quoted 13 lines · Paul Mackerras
Quoted 11 lines · Peter Zijlstra
include/linux/perf_counter.h +3
-1@@ -137,7 +137,9 @@ struct perf_counter_hw_event { exclude_kernel : 1, /* ditto kernel */ exclude_hv : 1, /* ditto hypervisor */ exclude_idle : 1, /* don't count when idle */ - include_tid : 1, /* include the tid */ + include_tid : 1, /* include the tid */ + mmap : 1, /* include mmap data */ + munmap : 1, /* include munmap data */
Quoted 7 lines
Quoted 4 lines
include/linux/perf_counter.h struct perf_counter_hw_event { · line 144
Quoted 1 line
include/linux/perf_counter.h +0
-0__reserved_1 :54 ;Nit: need to adjust the size of
__reserved_1here. Or maybe just get rid of it?it's nice to have a constant reminder about how many bits there are left.
Fair enough, but as it stands, we've changed the ABI, so we need to fix it.
Paul.
Re: [RFC][PATCH 2/3] perf_counter: executable mmap() information
Quoted 2 lines · I wrote:
Fair enough, but as it stands, we've changed the ABI, so we need to fix it.
I meant of course that that patch would change the ABI if it were accepted...
Paul.
RFC PATCH 3/3 perf_counter: kerneltop: parse the mmap data stream
In reply to Peter Zijlstrafrob the kerneltop code to print the mmap data in the stream
--- Documentation/perf_counter/kerneltop.c | 39 ++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-)
Documentation/perf_counter/kerneltop.c +34 -5
@@ -1184,12 +1184,29 @@ static void mmap_read(struct mmap_data * last_read = this_read;for (; old != head;) { -struct event_struct { +struct ip_event {struct perf_event_header header;__u64 ip;__u32 pid, tid; - } *event = (struct event_struct *)&data[old & md->mask]; -struct event_struct event_copy; + }; +struct mmap_event { +struct perf_event_header header; +__u32 pid, tid; +__u64 start; +__u64 len; +__u64 pgoff; +char filename[PATH_MAX ]; + }; + +typedef union event_union { +struct perf_event_header header; +struct ip_event ip; +struct mmap_event mmap; + }event_t ; + +event_t *event = (event_t *)&data[old & md->mask]; + +event_t event_copy;unsigned int size = event->header.size;
@@ -1199,7 +1216,7 @@ static void mmap_read(struct mmap_data **/ if ((old & md->mask) + size != ((old + size) & md->mask)) {unsigned int offset = old; -unsigned int len =sizeof (*event), cpy; +unsigned int len =min (sizeof (*event), size), cpy;void *dst = &event_copy; do {
@@ -1218,7 +1235,18 @@ static void mmap_read(struct mmap_data *switch (event->header.type) {case PERF_EVENT_IP :case PERF_EVENT_IP | __PERF_EVENT_TID: -process_event (event->ip, md->counter); +process_event (event->ip.ip, md->counter); +break ; + +case PERF_EVENT_MMAP : +case PERF_EVENT_MUNMAP : +printf ("%s: %Lu %Lu %Lu %s\n" , + event->header.type ==PERF_EVENT_MMAP + ?"mmap" :"munmap" , + event->mmap.start, + event->mmap.len, + event->mmap.pgoff, + event->mmap.filename);break ; } }
@@ -1267,6 +1295,7 @@ int main(int argc, char *argv[]) hw_event.record_type =PERF_RECORD_IRQ ; hw_event.nmi = nmi; hw_event.include_tid =1 ; + hw_event.mmap =1 ; fd[i][counter] =sys_perf_counter_open (&hw_event, tid, cpu, group_fd,0 );if (fd[i][counter] <0 ) {