yet another batch of perf_counter patches
Subsystems (6)
cover yet another batch of perf_counter patches
- fixes an NMI race in the new context clock.
- puts misc bits in the header
- updates kerneltop
- provides simple userspace profiling tools
- provides PERF_RECORD_ADDR to record the data address that triggered the event (pagefaults only for now).
PATCH 1/9 perf_counter: fix NMI race in task clock
We should not be updating ctx->time from NMI context, work around that.
--- kernel/perf_counter.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
kernel/perf_counter.c +16 -9
@@ -319,8 +319,6 @@ static void __perf_counter_disable(voidspin_lock_irqsave (&ctx->lock, flags); -update_context_time (ctx); -/* * If the counter is on, turn it off. * If it is in error state, leave it in error state.
@@ -2335,13 +2333,11 @@ static const struct hw_perf_counter_ops* Software counter: task time clock */ -static void task_clock_perf_counter_update (struct perf_counter *counter) +static void task_clock_perf_counter_update (struct perf_counter *counter,u64 now) { -u64 prev, now; +u64 prev;s64 delta; - now = counter->ctx->time; - prev =atomic64_xchg (&counter->hw.prev_count, now); delta = now - prev;atomic64_add (delta, &counter->count);
@@ -2369,13 +2365,24 @@ static int task_clock_perf_counter_enablstatic void task_clock_perf_counter_disable (struct perf_counter *counter) {hrtimer_cancel (&counter->hw.hrtimer); -task_clock_perf_counter_update (counter); +task_clock_perf_counter_update (counter, counter->ctx->time); + }static void task_clock_perf_counter_read (struct perf_counter *counter) { -update_context_time (counter->ctx); -task_clock_perf_counter_update (counter); +u64 time; + +if (!in_nmi ()) { +update_context_time (counter->ctx); + time = counter->ctx->time; + }else { +u64 now =perf_clock (); +u64 delta = now - counter->ctx->timestamp; + time = counter->ctx->time + delta; + } + +task_clock_perf_counter_update (counter, time); }static const struct hw_perf_counter_ops perf_ops_task_clock = {
[tip:perfcounters/core] perf_counter: fix NMI race in task clock
Commit-ID: e30e08f65c7ef6c230424264f09c3d53f117f58b Gitweb: http://git.kernel.org/tip/e30e08f65c7ef6c230424264f09c3d53f117f58b Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:25 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:27 +0200
perf_counter: fix NMI race in task clock
We should not be updating ctx->time from NMI context, work around that.
LKML-Reference: <[email protected]>
--- kernel/perf_counter.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-)
kernel/perf_counter.c +16 -9
@@ -319,8 +319,6 @@ static void __perf_counter_disable(void *info)spin_lock_irqsave (&ctx->lock, flags); -update_context_time (ctx); -/* * If the counter is on, turn it off. * If it is in error state, leave it in error state.
@@ -2335,13 +2333,11 @@ static const struct hw_perf_counter_ops perf_ops_cpu_clock = {* Software counter: task time clock */ -static void task_clock_perf_counter_update (struct perf_counter *counter) +static void task_clock_perf_counter_update (struct perf_counter *counter,u64 now) { -u64 prev, now; +u64 prev;s64 delta; - now = counter->ctx->time; - prev =atomic64_xchg (&counter->hw.prev_count, now); delta = now - prev;atomic64_add (delta, &counter->count);
@@ -2369,13 +2365,24 @@ static int task_clock_perf_counter_enable(struct perf_counter *counter)static void task_clock_perf_counter_disable (struct perf_counter *counter) {hrtimer_cancel (&counter->hw.hrtimer); -task_clock_perf_counter_update (counter); +task_clock_perf_counter_update (counter, counter->ctx->time); + }static void task_clock_perf_counter_read (struct perf_counter *counter) { -update_context_time (counter->ctx); -task_clock_perf_counter_update (counter); +u64 time; + +if (!in_nmi ()) { +update_context_time (counter->ctx); + time = counter->ctx->time; + }else { +u64 now =perf_clock (); +u64 delta = now - counter->ctx->timestamp; + time = counter->ctx->time + delta; + } + +task_clock_perf_counter_update (counter, time); }static const struct hw_perf_counter_ops perf_ops_task_clock = {
PATCH 2/9 perf_counter: provide misc bits in the event header
In reply to Peter ZijlstraLimit the size of each record to 64k (or should we count in multiples of u64 and have a 512K limit?), this gives 16 bits or spare room in the header, which we can use for misc bits, so as to not have to grow the record with u64 every time we have a few bits to report.
--- include/linux/perf_counter.h | 6 +++++- kernel/perf_counter.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-)
include/linux/perf_counter.h +5 -1
@@ -201,9 +201,13 @@ struct perf_counter_mmap_page {__u32 data_head;/* head in the data section */ }; +#define PERF_EVENT_MISC_KERNEL (1 << 0) +#define PERF_EVENT_MISC_USER (1 << 1) +struct perf_event_header {__u32 type; -__u32 size; +__u16 misc; +__u16 size; };enum perf_event_type {
kernel/perf_counter.c +3 -0
@@ -1831,6 +1831,9 @@ static void perf_counter_output(struct p header.type =PERF_EVENT_COUNTER_OVERFLOW ; header.size =sizeof (header); + header.misc =user_mode (regs) ? +PERF_EVENT_MISC_USER :PERF_EVENT_MISC_KERNEL ; +if (record_type &PERF_RECORD_IP ) { ip =instruction_pointer (regs); header.type |= __PERF_EVENT_IP;
[tip:perfcounters/core] perf_counter: provide misc bits in the event header
Commit-ID: 6fab01927e8bdbbc77bafba2abb4810c5591ad52 Gitweb: http://git.kernel.org/tip/6fab01927e8bdbbc77bafba2abb4810c5591ad52 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:26 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:27 +0200
perf_counter: provide misc bits in the event header
Limit the size of each record to 64k (or should we count in multiples of u64 and have a 512K limit?), this gives 16 bits or spare room in the header, which we can use for misc bits, so as to not have to grow the record with u64 every time we have a few bits to report.
LKML-Reference: <[email protected]>
--- include/linux/perf_counter.h | 6 +++++- kernel/perf_counter.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-)
include/linux/perf_counter.h +5 -1
@@ -201,9 +201,13 @@ struct perf_counter_mmap_page {__u32 data_head;/* head in the data section */ }; +#define PERF_EVENT_MISC_KERNEL (1 << 0) +#define PERF_EVENT_MISC_USER (1 << 1) +struct perf_event_header {__u32 type; -__u32 size; +__u16 misc; +__u16 size; };enum perf_event_type {
kernel/perf_counter.c +3 -0
@@ -1831,6 +1831,9 @@ static void perf_counter_output(struct perf_counter *counter, header.type =PERF_EVENT_COUNTER_OVERFLOW ; header.size =sizeof (header); + header.misc =user_mode (regs) ? +PERF_EVENT_MISC_USER :PERF_EVENT_MISC_KERNEL ; +if (record_type &PERF_RECORD_IP ) { ip =instruction_pointer (regs); header.type |= __PERF_EVENT_IP;
PATCH 3/9 perf_counter: use misc field to widen type
In reply to Peter ZijlstraPush the PERF_EVENT_COUNTER_OVERFLOW bit into the misc field so that we can have the full 32bit for PERF_RECORD_ bits.
--- include/linux/perf_counter.h | 28 ++++++++++------------------ kernel/perf_counter.c | 15 ++++++++------- 2 files changed, 18 insertions(+), 25 deletions(-)
include/linux/perf_counter.h +10 -18
@@ -201,8 +201,9 @@ struct perf_counter_mmap_page {__u32 data_head;/* head in the data section */ }; -#define PERF_EVENT_MISC_KERNEL (1 << 0) -#define PERF_EVENT_MISC_USER (1 << 1) +#define PERF_EVENT_MISC_KERNEL (1 << 0) +#define PERF_EVENT_MISC_USER (1 << 1) +#define PERF_EVENT_MISC_OVERFLOW (1 << 2)struct perf_event_header {__u32 type;
@@ -230,36 +231,27 @@ enum perf_event_type { PERF_EVENT_MUNMAP = 2,/* -* Half the event type space is reserved for the counter overflow -* bitfields, as found in hw_event.record_type. -* -* These events will have types of the form: -* PERF_EVENT_COUNTER_OVERFLOW { | __PERF_EVENT_* } * +* When header.misc & PERF_EVENT_MISC_OVERFLOW the event_type field +* will be PERF_RECORD_* * * struct { * struct perf_event_header header; * -* { u64 ip; } && __PERF_EVENT_IP -* { u32 pid, tid; } && __PERF_EVENT_TID +* { u64 ip; } && PERF_RECORD_IP +* { u32 pid, tid; } && PERF_RECORD_TID * * { u64 nr; -* { u64 event, val; } cnt[nr]; } && __PERF_EVENT_GROUP +* { u64 event, val; } cnt[nr]; } && PERF_RECORD_GROUP * * { u16 nr, * hv, * kernel, * user; -* u64 ips[nr]; } && __PERF_EVENT_CALLCHAIN +* u64 ips[nr]; } && PERF_RECORD_CALLCHAIN * -* { u64 time; } && __PERF_EVENT_TIME +* { u64 time; } && PERF_RECORD_TIME * }; */ -PERF_EVENT_COUNTER_OVERFLOW =1UL <<31 , - __PERF_EVENT_IP =PERF_RECORD_IP , - __PERF_EVENT_TID =PERF_RECORD_TID , - __PERF_EVENT_GROUP =PERF_RECORD_GROUP , - __PERF_EVENT_CALLCHAIN =PERF_RECORD_CALLCHAIN , - __PERF_EVENT_TIME = PERF_RECORD_TIME, };#ifdef __KERNEL__
kernel/perf_counter.c +8 -7
@@ -1828,15 +1828,16 @@ static void perf_counter_output(struct pint callchain_size =0 ;u64 time; - header.type =PERF_EVENT_COUNTER_OVERFLOW ; + header.type =0 ; header.size =sizeof (header); - header.misc =user_mode (regs) ? + header.misc =PERF_EVENT_MISC_OVERFLOW ; + header.misc |=user_mode (regs) ?PERF_EVENT_MISC_USER :PERF_EVENT_MISC_KERNEL ;if (record_type &PERF_RECORD_IP ) { ip =instruction_pointer (regs); - header.type |= __PERF_EVENT_IP; + header.type |=PERF_RECORD_IP ; header.size +=sizeof (ip); }
@@ -1845,12 +1846,12 @@ static void perf_counter_output(struct p tid_entry.pid = current->group_leader->pid; tid_entry.tid = current->pid; - header.type |= __PERF_EVENT_TID; + header.type |=PERF_RECORD_TID ; header.size +=sizeof (tid_entry); }if (record_type &PERF_RECORD_GROUP ) { - header.type |= __PERF_EVENT_GROUP; + header.type |=PERF_RECORD_GROUP ; header.size +=sizeof (u64) + counter->nr_siblings *sizeof (group_entry); }
@@ -1861,7 +1862,7 @@ static void perf_counter_output(struct pif (callchain) { callchain_size = (1 + callchain->nr) *sizeof (u64); - header.type |= __PERF_EVENT_CALLCHAIN; + header.type |=PERF_RECORD_CALLCHAIN ; header.size += callchain_size; } }
@@ -1872,7 +1873,7 @@ static void perf_counter_output(struct p*/ time =sched_clock (); - header.type |= __PERF_EVENT_TIME; + header.type |=PERF_RECORD_TIME ; header.size +=sizeof (u64); }
[tip:perfcounters/core] perf_counter: use misc field to widen type
Commit-ID: 6b6e5486b3a168f0328c82a8d4376caf901472b1 Gitweb: http://git.kernel.org/tip/6b6e5486b3a168f0328c82a8d4376caf901472b1 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:27 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:28 +0200
perf_counter: use misc field to widen type
Push the PERF_EVENT_COUNTER_OVERFLOW bit into the misc field so that we can have the full 32bit for PERF_RECORD_ bits.
LKML-Reference: <[email protected]>
--- include/linux/perf_counter.h | 28 ++++++++++------------------ kernel/perf_counter.c | 15 ++++++++------- 2 files changed, 18 insertions(+), 25 deletions(-)
include/linux/perf_counter.h +10 -18
@@ -201,8 +201,9 @@ struct perf_counter_mmap_page {__u32 data_head;/* head in the data section */ }; -#define PERF_EVENT_MISC_KERNEL (1 << 0) -#define PERF_EVENT_MISC_USER (1 << 1) +#define PERF_EVENT_MISC_KERNEL (1 << 0) +#define PERF_EVENT_MISC_USER (1 << 1) +#define PERF_EVENT_MISC_OVERFLOW (1 << 2)struct perf_event_header {__u32 type;
@@ -230,36 +231,27 @@ enum perf_event_type { PERF_EVENT_MUNMAP = 2,/* -* Half the event type space is reserved for the counter overflow -* bitfields, as found in hw_event.record_type. -* -* These events will have types of the form: -* PERF_EVENT_COUNTER_OVERFLOW { | __PERF_EVENT_* } * +* When header.misc & PERF_EVENT_MISC_OVERFLOW the event_type field +* will be PERF_RECORD_* * * struct { * struct perf_event_header header; * -* { u64 ip; } && __PERF_EVENT_IP -* { u32 pid, tid; } && __PERF_EVENT_TID +* { u64 ip; } && PERF_RECORD_IP +* { u32 pid, tid; } && PERF_RECORD_TID * * { u64 nr; -* { u64 event, val; } cnt[nr]; } && __PERF_EVENT_GROUP +* { u64 event, val; } cnt[nr]; } && PERF_RECORD_GROUP * * { u16 nr, * hv, * kernel, * user; -* u64 ips[nr]; } && __PERF_EVENT_CALLCHAIN +* u64 ips[nr]; } && PERF_RECORD_CALLCHAIN * -* { u64 time; } && __PERF_EVENT_TIME +* { u64 time; } && PERF_RECORD_TIME * }; */ -PERF_EVENT_COUNTER_OVERFLOW =1UL <<31 , - __PERF_EVENT_IP =PERF_RECORD_IP , - __PERF_EVENT_TID =PERF_RECORD_TID , - __PERF_EVENT_GROUP =PERF_RECORD_GROUP , - __PERF_EVENT_CALLCHAIN =PERF_RECORD_CALLCHAIN , - __PERF_EVENT_TIME = PERF_RECORD_TIME, };#ifdef __KERNEL__
kernel/perf_counter.c +8 -7
@@ -1828,15 +1828,16 @@ static void perf_counter_output(struct perf_counter *counter,int callchain_size =0 ;u64 time; - header.type =PERF_EVENT_COUNTER_OVERFLOW ; + header.type =0 ; header.size =sizeof (header); - header.misc =user_mode (regs) ? + header.misc =PERF_EVENT_MISC_OVERFLOW ; + header.misc |=user_mode (regs) ?PERF_EVENT_MISC_USER :PERF_EVENT_MISC_KERNEL ;if (record_type &PERF_RECORD_IP ) { ip =instruction_pointer (regs); - header.type |= __PERF_EVENT_IP; + header.type |=PERF_RECORD_IP ; header.size +=sizeof (ip); }
@@ -1845,12 +1846,12 @@ static void perf_counter_output(struct perf_counter *counter, tid_entry.pid = current->group_leader->pid; tid_entry.tid = current->pid; - header.type |= __PERF_EVENT_TID; + header.type |=PERF_RECORD_TID ; header.size +=sizeof (tid_entry); }if (record_type &PERF_RECORD_GROUP ) { - header.type |= __PERF_EVENT_GROUP; + header.type |=PERF_RECORD_GROUP ; header.size +=sizeof (u64) + counter->nr_siblings *sizeof (group_entry); }
@@ -1861,7 +1862,7 @@ static void perf_counter_output(struct perf_counter *counter,if (callchain) { callchain_size = (1 + callchain->nr) *sizeof (u64); - header.type |= __PERF_EVENT_CALLCHAIN; + header.type |=PERF_RECORD_CALLCHAIN ; header.size += callchain_size; } }
@@ -1872,7 +1873,7 @@ static void perf_counter_output(struct perf_counter *counter,*/ time =sched_clock (); - header.type |= __PERF_EVENT_TIME; + header.type |=PERF_RECORD_TIME ; header.size +=sizeof (u64); }
PATCH 4/9 perf_counter: kerneltop: keep up with ABI changes
In reply to Peter ZijlstraUpdate kerneltop to use PERF_EVENT_MISC_OVERFLOW
--- Documentation/perf_counter/kerneltop.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
Documentation/perf_counter/kerneltop.c +16 -16
@@ -1276,22 +1276,22 @@ static void mmap_read(struct mmap_data * old += size; -switch (event->header.type) { -case PERF_EVENT_COUNTER_OVERFLOW | __PERF_EVENT_IP: -case PERF_EVENT_COUNTER_OVERFLOW | __PERF_EVENT_IP | __PERF_EVENT_TID: -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 ; +if (event->header.misc &PERF_EVENT_MISC_OVERFLOW ) { +if (event->header.type &PERF_RECORD_IP ) +process_event (event->ip.ip, md->counter); + }else { +switch (event->header.type) { +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 ; + } } }
[tip:perfcounters/core] perf_counter: kerneltop: keep up with ABI changes
Commit-ID: 808382b33bb4c60df6379ec2db39f332cc56b82a Gitweb: http://git.kernel.org/tip/808382b33bb4c60df6379ec2db39f332cc56b82a Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:28 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:29 +0200
perf_counter: kerneltop: keep up with ABI changes
Update kerneltop to use PERF_EVENT_MISC_OVERFLOW
LKML-Reference: <[email protected]>
--- Documentation/perf_counter/kerneltop.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
Documentation/perf_counter/kerneltop.c +16 -16
@@ -1277,22 +1277,22 @@ static void mmap_read(struct mmap_data *md) old += size; -switch (event->header.type) { -case PERF_EVENT_COUNTER_OVERFLOW | __PERF_EVENT_IP: -case PERF_EVENT_COUNTER_OVERFLOW | __PERF_EVENT_IP | __PERF_EVENT_TID: -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 ; +if (event->header.misc &PERF_EVENT_MISC_OVERFLOW ) { +if (event->header.type &PERF_RECORD_IP ) +process_event (event->ip.ip, md->counter); + }else { +switch (event->header.type) { +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 ; + } } }
PATCH 5/9 perf_counter: add some comments
In reply to Peter ZijlstraAdd a few comments because I was forgetting what field what for what functionality.
--- include/linux/perf_counter.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
include/linux/perf_counter.h +6 -4
@@ -347,10 +347,12 @@ struct file;struct perf_mmap_data {struct rcu_head rcu_head; -int nr_pages; -atomic_t wakeup; -atomic_t head; -atomic_t events; +int nr_pages;/* nr of data pages */ + +atomic_t wakeup;/* POLL_ for wakeups */ +atomic_t head;/* write position */ +atomic_t events;/* event limit */ +struct perf_counter_mmap_page *user_page;void *data_pages[0 ]; };
[tip:perfcounters/core] perf_counter: add some comments
Commit-ID: 8740f9418c78dcad694b46ab25d1645d5aef1f5e Gitweb: http://git.kernel.org/tip/8740f9418c78dcad694b46ab25d1645d5aef1f5e Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:29 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:29 +0200
perf_counter: add some comments
Add a few comments because I was forgetting what field what for what functionality.
LKML-Reference: <[email protected]>
--- include/linux/perf_counter.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
include/linux/perf_counter.h +6 -4
@@ -344,10 +344,12 @@ struct file;struct perf_mmap_data {struct rcu_head rcu_head; -int nr_pages; -atomic_t wakeup; -atomic_t head; -atomic_t events; +int nr_pages;/* nr of data pages */ + +atomic_t wakeup;/* POLL_ for wakeups */ +atomic_t head;/* write position */ +atomic_t events;/* event limit */ +struct perf_counter_mmap_page *user_page;void *data_pages[0 ]; };
PATCH 6/9 perf_counter: track task-comm data
In reply to Peter ZijlstraSimilar to the mmap data stream, add one that tracks the task COMM field, so that the userspace reporting knows what to call a task.
--- fs/exec.c | 1 include/linux/perf_counter.h | 15 ++++++ kernel/perf_counter.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 1 deletion(-)
fs/exec.c +1 -0
@@ -951,6 +951,7 @@ void set_task_comm(struct task_struct *ttask_lock (tsk);strlcpy (tsk->comm, buf,sizeof (tsk->comm));task_unlock (tsk); +perf_counter_comm (tsk); }int flush_old_exec (struct linux_binprm * bprm)
include/linux/perf_counter.h +14 -1
@@ -142,8 +142,9 @@ struct perf_counter_hw_event { exclude_idle : 1, /* don't count when idle */ mmap : 1, /* include mmap data */ munmap : 1, /* include munmap data */ + comm : 1, /* include comm data */ - __reserved_1 : 53; + __reserved_1 : 52;__u32 extra_config_len;__u32 wakeup_events;/* wakeup every n events */
@@ -231,6 +232,16 @@ enum perf_event_type {PERF_EVENT_MUNMAP =2 ,/* +* struct { +* struct perf_event_header header; +* +* u32 pid, tid; +* char comm[]; +* }; +*/ + PERF_EVENT_COMM = 3, + +/* * When header.misc & PERF_EVENT_MISC_OVERFLOW the event_type field * will be PERF_RECORD_* *
@@ -545,6 +556,8 @@ extern void perf_counter_mmap(unsigned lextern void perf_counter_munmap (unsigned long addr,unsigned long len,unsigned long pgoff,struct file *file); +extern void perf_counter_comm (struct task_struct *tsk); +#define MAX_STACK_DEPTH 255struct perf_callchain_entry {
kernel/perf_counter.c +93 -0
99 lines not on this page · raw message
[tip:perfcounters/core] perf_counter: track task-comm data
Commit-ID: e278f3cdbd9cfb9c9e7e0d0b3a2844ceed84197c Gitweb: http://git.kernel.org/tip/e278f3cdbd9cfb9c9e7e0d0b3a2844ceed84197c Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:30 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:30 +0200
perf_counter: track task-comm data
Similar to the mmap data stream, add one that tracks the task COMM field, so that the userspace reporting knows what to call a task.
LKML-Reference: <[email protected]>
--- fs/exec.c | 1 + include/linux/perf_counter.h | 15 ++++++- kernel/perf_counter.c | 93 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 1 deletions(-)
fs/exec.c +1 -0
@@ -951,6 +951,7 @@ void set_task_comm(struct task_struct *tsk, char *buf)task_lock (tsk);strlcpy (tsk->comm, buf,sizeof (tsk->comm));task_unlock (tsk); +perf_counter_comm (tsk); }int flush_old_exec (struct linux_binprm * bprm)
include/linux/perf_counter.h +14 -1
@@ -142,8 +142,9 @@ struct perf_counter_hw_event { exclude_idle : 1, /* don't count when idle */ mmap : 1, /* include mmap data */ munmap : 1, /* include munmap data */ + comm : 1, /* include comm data */ - __reserved_1 : 53; + __reserved_1 : 52;__u32 extra_config_len;__u32 wakeup_events;/* wakeup every n events */
@@ -231,6 +232,16 @@ enum perf_event_type {PERF_EVENT_MUNMAP =2 ,/* +* struct { +* struct perf_event_header header; +* +* u32 pid, tid; +* char comm[]; +* }; +*/ + PERF_EVENT_COMM = 3, + +/* * When header.misc & PERF_EVENT_MISC_OVERFLOW the event_type field * will be PERF_RECORD_* *
@@ -545,6 +556,8 @@ extern void perf_counter_mmap(unsigned long addr, unsigned long len,extern void perf_counter_munmap (unsigned long addr,unsigned long len,unsigned long pgoff,struct file *file); +extern void perf_counter_comm (struct task_struct *tsk); +#define MAX_STACK_DEPTH 255struct perf_callchain_entry {
kernel/perf_counter.c +93 -0
99 lines not on this page · raw message
PATCH 1/1 perf_counter: fix track task-comm data
In reply to Peter ZijlstraQuoted 3 lines · Peter Zijlstra
plain text document attachment (perf_counter-comm.patch) Similar to the mmap data stream, add one that tracks the task COMM field, so that the userspace reporting knows what to call a task.
Seems I forgot the !PERF_COUNTER case.
--- include/linux/perf_counter.h | 1 + 1 file changed, 1 insertion(+)
include/linux/perf_counter.h +1 -0
@@ -597,6 +597,7 @@ static inline void perf_counter_munmap(unsigned long addr, unsigned long len, unsigned long pgoff, struct file *file) { } +static inline void perf_counter_comm (struct task_struct *tsk) { }#endif #endif /* __KERNEL__ */
[tip:perfcounters/core] perf_counter: track task-comm data
In reply to Peter ZijlstraCommit-ID: 8d1b2d9361b494bfc761700c348c65ebbe3deb5b Gitweb: http://git.kernel.org/tip/8d1b2d9361b494bfc761700c348c65ebbe3deb5b Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:30 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 19:05:47 +0200
perf_counter: track task-comm data
Similar to the mmap data stream, add one that tracks the task COMM field, so that the userspace reporting knows what to call a task.
LKML-Reference: <[email protected]>
--- fs/exec.c | 1 + include/linux/perf_counter.h | 16 +++++++- kernel/perf_counter.c | 93 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletions(-)
fs/exec.c +1 -0
@@ -951,6 +951,7 @@ void set_task_comm(struct task_struct *tsk, char *buf)task_lock (tsk);strlcpy (tsk->comm, buf,sizeof (tsk->comm));task_unlock (tsk); +perf_counter_comm (tsk); }int flush_old_exec (struct linux_binprm * bprm)
include/linux/perf_counter.h +15 -1
@@ -142,8 +142,9 @@ struct perf_counter_hw_event { exclude_idle : 1, /* don't count when idle */ mmap : 1, /* include mmap data */ munmap : 1, /* include munmap data */ + comm : 1, /* include comm data */ - __reserved_1 : 53; + __reserved_1 : 52;__u32 extra_config_len;__u32 wakeup_events;/* wakeup every n events */
@@ -231,6 +232,16 @@ enum perf_event_type {PERF_EVENT_MUNMAP =2 ,/* +* struct { +* struct perf_event_header header; +* +* u32 pid, tid; +* char comm[]; +* }; +*/ + PERF_EVENT_COMM = 3, + +/* * When header.misc & PERF_EVENT_MISC_OVERFLOW the event_type field * will be PERF_RECORD_* *
@@ -545,6 +556,8 @@ extern void perf_counter_mmap(unsigned long addr, unsigned long len,extern void perf_counter_munmap (unsigned long addr,unsigned long len,unsigned long pgoff,struct file *file); +extern void perf_counter_comm (struct task_struct *tsk); +#define MAX_STACK_DEPTH 255struct perf_callchain_entry {
@@ -583,6 +596,7 @@ static inline void perf_counter_munmap(unsigned long addr, unsigned long len, unsigned long pgoff, struct file *file) { } +static inline void perf_counter_comm (struct task_struct *tsk) { }#endif #endif /* __KERNEL__ */
kernel/perf_counter.c +93 -0
99 lines not on this page · raw message
PATCH 7/9 perf_counter: some simple userspace profiling
In reply to Peter Zijlstra# perf-record make -j4 kernel/ # perf-report | tail -15
0.39 cc1 [kernel] lock_acquired 0.42 cc1 [kernel] lock_acquire 0.51 cc1 [ user ] /lib64/libc-2.8.90.so: _int_free 0.51 as [kernel] clear_page_c 0.53 cc1 [ user ] /lib64/libc-2.8.90.so: memcpy 0.56 cc1 [ user ] /lib64/libc-2.8.90.so: _IO_vfprintf 0.63 cc1 [kernel] lock_release 0.67 cc1 [ user ] /lib64/libc-2.8.90.so: strlen 0.68 cc1 [kernel] debug_smp_processor_id 1.38 cc1 [ user ] /lib64/libc-2.8.90.so: _int_malloc 1.55 cc1 [ user ] /lib64/libc-2.8.90.so: memset 1.77 cc1 [kernel] __lock_acquire 1.88 cc1 [kernel] clear_page_c
3.61 as [ user ] /usr/bin/as: <unknown>
59.16 cc1 [ user ] /usr/libexec/gcc/x86_64-redhat-linux/4.3.2/cc1: <unknown>
--- Documentation/perf_counter/Makefile | 8 Documentation/perf_counter/perf-record.c | 530 ++++++++++++++++++++++++++++++ Documentation/perf_counter/perf-report.cc | 472 ++++++++++++++++++++++++++ 3 files changed, 1009 insertions(+), 1 deletion(-)
Documentation/perf_counter/Makefile +7 -1
@@ -1,10 +1,16 @@ -BINS = kerneltop perfstat +BINS = kerneltop perfstat perf-record perf-report all: $(BINS) kerneltop: kerneltop.c ../../include/linux/perf_counter.h cc -O6 -Wall -lrt -o $@ $< +perf-record: perf-record.c ../../include/linux/perf_counter.h + cc -O6 -Wall -lrt -o $@ $< + +perf-report: perf-report.cc ../../include/linux/perf_counter.h + g++ -O6 -Wall -lrt -o $@ $< + perfstat: kerneltop ln -sf kerneltop perfstat
Documentation/perf_counter/perf-record.c new file +530 -0
530 lines not on this page · raw message
Documentation/perf_counter/perf-report.cc new file +472 -0
472 lines not on this page · raw message
[tip:perfcounters/core] perf_counter: some simple userspace profiling
Commit-ID: 513162537b73d972206a3974594522c86b8a9238 Gitweb: http://git.kernel.org/tip/513162537b73d972206a3974594522c86b8a9238 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:31 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:30 +0200
perf_counter: some simple userspace profiling
# perf-record make -j4 kernel/ # perf-report | tail -15
0.39 cc1 [kernel] lock_acquired 0.42 cc1 [kernel] lock_acquire 0.51 cc1 [ user ] /lib64/libc-2.8.90.so: _int_free 0.51 as [kernel] clear_page_c 0.53 cc1 [ user ] /lib64/libc-2.8.90.so: memcpy 0.56 cc1 [ user ] /lib64/libc-2.8.90.so: _IO_vfprintf 0.63 cc1 [kernel] lock_release 0.67 cc1 [ user ] /lib64/libc-2.8.90.so: strlen 0.68 cc1 [kernel] debug_smp_processor_id 1.38 cc1 [ user ] /lib64/libc-2.8.90.so: _int_malloc 1.55 cc1 [ user ] /lib64/libc-2.8.90.so: memset 1.77 cc1 [kernel] __lock_acquire 1.88 cc1 [kernel] clear_page_c
3.61 as [ user ] /usr/bin/as: <unknown>
59.16 cc1 [ user ] /usr/libexec/gcc/x86_64-redhat-linux/4.3.2/cc1: <unknown>
LKML-Reference: <[email protected]>
--- Documentation/perf_counter/Makefile | 8 +- Documentation/perf_counter/perf-record.c | 530 +++++++++++++++++++++++++++++ Documentation/perf_counter/perf-report.cc | 472 +++++++++++++++++++++++++ 3 files changed, 1009 insertions(+), 1 deletions(-)
Documentation/perf_counter/Makefile +7 -1
@@ -1,10 +1,16 @@ -BINS = kerneltop perfstat +BINS = kerneltop perfstat perf-record perf-report all: $(BINS) kerneltop: kerneltop.c ../../include/linux/perf_counter.h cc -O6 -Wall -lrt -o $@ $< +perf-record: perf-record.c ../../include/linux/perf_counter.h + cc -O6 -Wall -lrt -o $@ $< + +perf-report: perf-report.cc ../../include/linux/perf_counter.h + g++ -O6 -Wall -lrt -o $@ $< + perfstat: kerneltop ln -sf kerneltop perfstat
Documentation/perf_counter/perf-record.c new file +530 -0
530 lines not on this page · raw message
Documentation/perf_counter/perf-report.cc new file +472 -0
472 lines not on this page · raw message
[tip:perfcounters/core] perf_counter: some simple userspace profiling
In reply to Peter ZijlstraCommit-ID: de9ac07bbf8f51e0ce40e5428c3a8f627bd237c2 Gitweb: http://git.kernel.org/tip/de9ac07bbf8f51e0ce40e5428c3a8f627bd237c2 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:31 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 19:05:54 +0200
perf_counter: some simple userspace profiling
# perf-record make -j4 kernel/ # perf-report | tail -15
0.39 cc1 [kernel] lock_acquired 0.42 cc1 [kernel] lock_acquire 0.51 cc1 [ user ] /lib64/libc-2.8.90.so: _int_free 0.51 as [kernel] clear_page_c 0.53 cc1 [ user ] /lib64/libc-2.8.90.so: memcpy 0.56 cc1 [ user ] /lib64/libc-2.8.90.so: _IO_vfprintf 0.63 cc1 [kernel] lock_release 0.67 cc1 [ user ] /lib64/libc-2.8.90.so: strlen 0.68 cc1 [kernel] debug_smp_processor_id 1.38 cc1 [ user ] /lib64/libc-2.8.90.so: _int_malloc 1.55 cc1 [ user ] /lib64/libc-2.8.90.so: memset 1.77 cc1 [kernel] __lock_acquire 1.88 cc1 [kernel] clear_page_c
3.61 as [ user ] /usr/bin/as: <unknown>
59.16 cc1 [ user ] /usr/libexec/gcc/x86_64-redhat-linux/4.3.2/cc1: <unknown>
LKML-Reference: <[email protected]>
--- Documentation/perf_counter/Makefile | 8 +- Documentation/perf_counter/perf-record.c | 530 +++++++++++++++++++++++++++++ Documentation/perf_counter/perf-report.cc | 472 +++++++++++++++++++++++++ 3 files changed, 1009 insertions(+), 1 deletions(-)
Documentation/perf_counter/Makefile +7 -1
@@ -1,10 +1,16 @@ -BINS = kerneltop perfstat +BINS = kerneltop perfstat perf-record perf-report all: $(BINS) kerneltop: kerneltop.c ../../include/linux/perf_counter.h cc -O6 -Wall -lrt -o $@ $< +perf-record: perf-record.c ../../include/linux/perf_counter.h + cc -O6 -Wall -lrt -o $@ $< + +perf-report: perf-report.cc ../../include/linux/perf_counter.h + g++ -O6 -Wall -lrt -o $@ $< + perfstat: kerneltop ln -sf kerneltop perfstat
Documentation/perf_counter/perf-record.c new file +530 -0
530 lines not on this page · raw message
Documentation/perf_counter/perf-report.cc new file +472 -0
472 lines not on this page · raw message
PATCH 8/9 perf_counter: move PERF_RECORD_TIME
In reply to Peter ZijlstraMove PERF_RECORD_TIME so that all the fixed length items vome before the variable length ones.
--- include/linux/perf_counter.h | 9 ++++----- kernel/perf_counter.c | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 18 deletions(-)
include/linux/perf_counter.h +4 -5
@@ -100,9 +100,9 @@ enum sw_event_ids {enum perf_counter_record_format {PERF_RECORD_IP =1U <<0 ,PERF_RECORD_TID =1U <<1 , -PERF_RECORD_GROUP =1U <<2 , -PERF_RECORD_CALLCHAIN =1U <<3 , -PERF_RECORD_TIME =1U <<4 , +PERF_RECORD_TIME =1U <<2 , +PERF_RECORD_GROUP =1U <<3 , +PERF_RECORD_CALLCHAIN =1U <<4 , };/*
@@ -250,6 +250,7 @@ enum perf_event_type {* * { u64 ip; } && PERF_RECORD_IP * { u32 pid, tid; } && PERF_RECORD_TID +* { u64 time; } && PERF_RECORD_TIME * * { u64 nr; * { u64 event, val; } cnt[nr]; } && PERF_RECORD_GROUP
@@ -259,8 +260,6 @@ enum perf_event_type {* kernel, * user; * u64 ips[nr]; } && PERF_RECORD_CALLCHAIN -* -* { u64 time; } && PERF_RECORD_TIME * }; */ };
kernel/perf_counter.c +13 -13
@@ -1850,6 +1850,16 @@ static void perf_counter_output(struct p header.size +=sizeof (tid_entry); } +if (record_type &PERF_RECORD_TIME ) { +/* +* Maybe do better on x86 and provide cpu_clock_nmi() +*/ + time =sched_clock (); + + header.type |=PERF_RECORD_TIME ; + header.size +=sizeof (u64); + } +if (record_type &PERF_RECORD_GROUP ) { header.type |=PERF_RECORD_GROUP ; header.size += sizeof(u64) +
@@ -1867,16 +1877,6 @@ static void perf_counter_output(struct p } } -if (record_type &PERF_RECORD_TIME ) { -/* -* Maybe do better on x86 and provide cpu_clock_nmi() -*/ - time =sched_clock (); - - header.type |=PERF_RECORD_TIME ; - header.size +=sizeof (u64); - } - ret =perf_output_begin (&handle, counter, header.size, nmi,1 );if (ret)return ;
@@ -1889,6 +1889,9 @@ static void perf_counter_output(struct pif (record_type &PERF_RECORD_TID )perf_output_put (&handle, tid_entry); +if (record_type &PERF_RECORD_TIME ) +perf_output_put (&handle, time); +if (record_type &PERF_RECORD_GROUP ) {struct perf_counter *leader, *sub;u64 nr = counter->nr_siblings;
@@ -1910,9 +1913,6 @@ static void perf_counter_output(struct pif (callchain)perf_output_copy (&handle, callchain, callchain_size); -if (record_type &PERF_RECORD_TIME ) -perf_output_put (&handle, time); -perf_output_end (&handle); }
[tip:perfcounters/core] perf_counter: move PERF_RECORD_TIME
Commit-ID: 58068ecf1953c1ffb315107255309ff3ee456ae5 Gitweb: http://git.kernel.org/tip/58068ecf1953c1ffb315107255309ff3ee456ae5 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:32 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:31 +0200
perf_counter: move PERF_RECORD_TIME
Move PERF_RECORD_TIME so that all the fixed length items come before the variable length ones.
LKML-Reference: <[email protected]>
--- include/linux/perf_counter.h | 9 ++++----- kernel/perf_counter.c | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 18 deletions(-)
include/linux/perf_counter.h +4 -5
@@ -100,9 +100,9 @@ enum sw_event_ids {enum perf_counter_record_format {PERF_RECORD_IP =1U <<0 ,PERF_RECORD_TID =1U <<1 , -PERF_RECORD_GROUP =1U <<2 , -PERF_RECORD_CALLCHAIN =1U <<3 , -PERF_RECORD_TIME =1U <<4 , +PERF_RECORD_TIME =1U <<2 , +PERF_RECORD_GROUP =1U <<3 , +PERF_RECORD_CALLCHAIN =1U <<4 , };/*
@@ -250,6 +250,7 @@ enum perf_event_type {* * { u64 ip; } && PERF_RECORD_IP * { u32 pid, tid; } && PERF_RECORD_TID +* { u64 time; } && PERF_RECORD_TIME * * { u64 nr; * { u64 event, val; } cnt[nr]; } && PERF_RECORD_GROUP
@@ -259,8 +260,6 @@ enum perf_event_type {* kernel, * user; * u64 ips[nr]; } && PERF_RECORD_CALLCHAIN -* -* { u64 time; } && PERF_RECORD_TIME * }; */ };
kernel/perf_counter.c +13 -13
@@ -1850,6 +1850,16 @@ static void perf_counter_output(struct perf_counter *counter, header.size +=sizeof (tid_entry); } +if (record_type &PERF_RECORD_TIME ) { +/* +* Maybe do better on x86 and provide cpu_clock_nmi() +*/ + time =sched_clock (); + + header.type |=PERF_RECORD_TIME ; + header.size +=sizeof (u64); + } +if (record_type &PERF_RECORD_GROUP ) { header.type |=PERF_RECORD_GROUP ; header.size += sizeof(u64) +
@@ -1867,16 +1877,6 @@ static void perf_counter_output(struct perf_counter *counter, } } -if (record_type &PERF_RECORD_TIME ) { -/* -* Maybe do better on x86 and provide cpu_clock_nmi() -*/ - time =sched_clock (); - - header.type |=PERF_RECORD_TIME ; - header.size +=sizeof (u64); - } - ret =perf_output_begin (&handle, counter, header.size, nmi,1 );if (ret)return ;
@@ -1889,6 +1889,9 @@ static void perf_counter_output(struct perf_counter *counter,if (record_type &PERF_RECORD_TID )perf_output_put (&handle, tid_entry); +if (record_type &PERF_RECORD_TIME ) +perf_output_put (&handle, time); +if (record_type &PERF_RECORD_GROUP ) {struct perf_counter *leader, *sub;u64 nr = counter->nr_siblings;
@@ -1910,9 +1913,6 @@ static void perf_counter_output(struct perf_counter *counter,if (callchain)perf_output_copy (&handle, callchain, callchain_size); -if (record_type &PERF_RECORD_TIME ) -perf_output_put (&handle, time); -perf_output_end (&handle); }
[tip:perfcounters/core] perf_counter: move PERF_RECORD_TIME
In reply to Peter ZijlstraCommit-ID: 4d855457d84b819fefcd1cd1b0a2a0a0ec475c07 Gitweb: http://git.kernel.org/tip/4d855457d84b819fefcd1cd1b0a2a0a0ec475c07 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:32 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 19:05:55 +0200
perf_counter: move PERF_RECORD_TIME
Move PERF_RECORD_TIME so that all the fixed length items come before the variable length ones.
LKML-Reference: <[email protected]>
--- include/linux/perf_counter.h | 9 ++++----- kernel/perf_counter.c | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 18 deletions(-)
include/linux/perf_counter.h +4 -5
@@ -100,9 +100,9 @@ enum sw_event_ids {enum perf_counter_record_format {PERF_RECORD_IP =1U <<0 ,PERF_RECORD_TID =1U <<1 , -PERF_RECORD_GROUP =1U <<2 , -PERF_RECORD_CALLCHAIN =1U <<3 , -PERF_RECORD_TIME =1U <<4 , +PERF_RECORD_TIME =1U <<2 , +PERF_RECORD_GROUP =1U <<3 , +PERF_RECORD_CALLCHAIN =1U <<4 , };/*
@@ -250,6 +250,7 @@ enum perf_event_type {* * { u64 ip; } && PERF_RECORD_IP * { u32 pid, tid; } && PERF_RECORD_TID +* { u64 time; } && PERF_RECORD_TIME * * { u64 nr; * { u64 event, val; } cnt[nr]; } && PERF_RECORD_GROUP
@@ -259,8 +260,6 @@ enum perf_event_type {* kernel, * user; * u64 ips[nr]; } && PERF_RECORD_CALLCHAIN -* -* { u64 time; } && PERF_RECORD_TIME * }; */ };
kernel/perf_counter.c +13 -13
@@ -1850,6 +1850,16 @@ static void perf_counter_output(struct perf_counter *counter, header.size +=sizeof (tid_entry); } +if (record_type &PERF_RECORD_TIME ) { +/* +* Maybe do better on x86 and provide cpu_clock_nmi() +*/ + time =sched_clock (); + + header.type |=PERF_RECORD_TIME ; + header.size +=sizeof (u64); + } +if (record_type &PERF_RECORD_GROUP ) { header.type |=PERF_RECORD_GROUP ; header.size += sizeof(u64) +
@@ -1867,16 +1877,6 @@ static void perf_counter_output(struct perf_counter *counter, } } -if (record_type &PERF_RECORD_TIME ) { -/* -* Maybe do better on x86 and provide cpu_clock_nmi() -*/ - time =sched_clock (); - - header.type |=PERF_RECORD_TIME ; - header.size +=sizeof (u64); - } - ret =perf_output_begin (&handle, counter, header.size, nmi,1 );if (ret)return ;
@@ -1889,6 +1889,9 @@ static void perf_counter_output(struct perf_counter *counter,if (record_type &PERF_RECORD_TID )perf_output_put (&handle, tid_entry); +if (record_type &PERF_RECORD_TIME ) +perf_output_put (&handle, time); +if (record_type &PERF_RECORD_GROUP ) {struct perf_counter *leader, *sub;u64 nr = counter->nr_siblings;
@@ -1910,9 +1913,6 @@ static void perf_counter_output(struct perf_counter *counter,if (callchain)perf_output_copy (&handle, callchain, callchain_size); -if (record_type &PERF_RECORD_TIME ) -perf_output_put (&handle, time); -perf_output_end (&handle); }
PATCH 9/9 perf_counter: allow for data addresses to be recorded
In reply to Peter ZijlstraPaul suggested we allow for data addresses to be recorded along with the traditional IPs as power can provide these.
For now, only the software pagefault events provide data addresses, but in the future power might as well for some events.
x86 doesn't seem capable of providing this atm.
--- arch/powerpc/kernel/perf_counter.c | 2 - arch/powerpc/mm/fault.c | 8 ++++-- arch/x86/kernel/cpu/perf_counter.c | 2 - arch/x86/mm/fault.c | 8 ++++-- include/linux/perf_counter.h | 14 ++++++----- kernel/perf_counter.c | 46 +++++++++++++++++++++++-------------- 6 files changed, 49 insertions(+), 31 deletions(-)
arch/powerpc/kernel/perf_counter.c +1 -1
@@ -732,7 +732,7 @@ static void record_and_restart(struct pe* Finally record data if requested. */ if (record) -perf_counter_overflow (counter,1 , regs); +perf_counter_overflow (counter,1 , regs,0 ); }/*
arch/powerpc/mm/fault.c +5 -3
@@ -171,7 +171,7 @@ int __kprobes do_page_fault(struct pt_redie ("Weird page fault" , regs,SIGSEGV ); } -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs, address);/* When running in the kernel we expect faults to occur only to * addresses in user space. All other faults represent errors in the
@@ -312,7 +312,8 @@ good_area: }if (ret &VM_FAULT_MAJOR ) { current->maj_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , + regs, address);#ifdef CONFIG_PPC_SMLPAR if (firmware_has_feature (FW_FEATURE_CMO )) {preempt_disable ();
@@ -322,7 +323,8 @@ good_area:#endif }else { current->min_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , + regs, address); }up_read (&mm->mmap_sem);return 0 ;
arch/x86/mm/fault.c +5 -3
@@ -1033,7 +1033,7 @@ do_page_fault(struct pt_regs *regs, unsiif (unlikely (error_code &PF_RSVD ))pgtable_bad (regs, error_code, address); -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs, address);/* * If we're in an interrupt, have no user context or are running
@@ -1130,10 +1130,12 @@ good_area:if (fault &VM_FAULT_MAJOR ) { tsk->maj_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , + regs, address); }else { tsk->min_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , + regs, address); }check_v8086_mode (regs, address, tsk);
include/linux/perf_counter.h +8 -6
@@ -101,8 +101,9 @@ enum perf_counter_record_format {PERF_RECORD_IP =1U <<0 ,PERF_RECORD_TID =1U <<1 ,PERF_RECORD_TIME =1U <<2 , -PERF_RECORD_GROUP =1U <<3 , - PERF_RECORD_CALLCHAIN = 1U << 4, +PERF_RECORD_ADDR =1U <<3 , +PERF_RECORD_GROUP =1U <<4 , + PERF_RECORD_CALLCHAIN = 1U << 5, };/*
@@ -251,6 +252,7 @@ enum perf_event_type {* { u64 ip; } && PERF_RECORD_IP * { u32 pid, tid; } && PERF_RECORD_TID * { u64 time; } && PERF_RECORD_TIME +* { u64 addr; } && PERF_RECORD_ADDR * * { u64 nr; * { u64 event, val; } cnt[nr]; } && PERF_RECORD_GROUP
@@ -537,7 +539,7 @@ extern int hw_perf_group_sched_in(structextern void perf_counter_update_userpage (struct perf_counter *counter);extern int perf_counter_overflow (struct perf_counter *counter, -int nmi,struct pt_regs *regs); +int nmi,struct pt_regs *regs,u64 addr);/* * Return 1 for a software counter, 0 for a hardware counter */
@@ -547,7 +549,7 @@ static inline int is_software_counter(stperf_event_type (&counter->hw_event) !=PERF_TYPE_HARDWARE ; } -extern void perf_swcounter_event (u32 ,u64 ,int ,struct pt_regs *); +extern void perf_swcounter_event (u32 ,u64 ,int ,struct pt_regs *,u64 );extern void perf_counter_mmap (unsigned long addr,unsigned long len,unsigned long pgoff,struct file *file);
@@ -584,8 +586,8 @@ static inline int perf_counter_task_disastatic inline int perf_counter_task_enable (void ) {return -EINVAL ; }static inline void -perf_swcounter_event (u32 event,u64 nr,int nmi,struct pt_regs *regs) { } - +perf_swcounter_event (u32 event,u64 nr,int nmi, +struct pt_regs *regs,u64 addr) { } static inline void perf_counter_mmap(unsigned long addr, unsigned long len,
kernel/perf_counter.c +29 -17
143 lines not on this page · raw message
arch/x86/kernel/cpu/perf_counter.c +1 -1
@@ -800,7 +800,7 @@ again:continue ;perf_save_and_restart (counter); -if (perf_counter_overflow (counter, nmi, regs)) +if (perf_counter_overflow (counter, nmi, regs,0 ))__pmc_generic_disable (counter, &counter->hw, bit); }
[tip:perfcounters/core] perf_counter: allow for data addresses to be recorded
Commit-ID: 50b74e78bb5bdc0cd9722850d38411e3b84fefa7 Gitweb: http://git.kernel.org/tip/50b74e78bb5bdc0cd9722850d38411e3b84fefa7 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:33 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 18:53:31 +0200
perf_counter: allow for data addresses to be recorded
Paul suggested we allow for data addresses to be recorded along with the traditional IPs as power can provide these.
For now, only the software pagefault events provide data addresses, but in the future power might as well for some events.
x86 doesn't seem capable of providing this atm.
LKML-Reference: <[email protected]>
--- arch/powerpc/kernel/perf_counter.c | 2 +- arch/powerpc/mm/fault.c | 8 ++++-- arch/x86/kernel/cpu/perf_counter.c | 2 +- arch/x86/mm/fault.c | 8 ++++-- include/linux/perf_counter.h | 14 ++++++---- kernel/perf_counter.c | 46 ++++++++++++++++++++++------------- 6 files changed, 49 insertions(+), 31 deletions(-)
arch/powerpc/kernel/perf_counter.c +1 -1
@@ -749,7 +749,7 @@ static void record_and_restart(struct perf_counter *counter, long val,* Finally record data if requested. */ if (record) -perf_counter_overflow (counter,1 , regs); +perf_counter_overflow (counter,1 , regs,0 ); }/*
arch/powerpc/mm/fault.c +5 -3
@@ -171,7 +171,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,die ("Weird page fault" , regs,SIGSEGV ); } -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs, address);/* When running in the kernel we expect faults to occur only to * addresses in user space. All other faults represent errors in the
@@ -312,7 +312,8 @@ good_area: }if (ret &VM_FAULT_MAJOR ) { current->maj_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , + regs, address);#ifdef CONFIG_PPC_SMLPAR if (firmware_has_feature (FW_FEATURE_CMO )) {preempt_disable ();
@@ -322,7 +323,8 @@ good_area:#endif }else { current->min_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , + regs, address); }up_read (&mm->mmap_sem);return 0 ;
arch/x86/kernel/cpu/perf_counter.c +1 -1
@@ -800,7 +800,7 @@ again:continue ;perf_save_and_restart (counter); -if (perf_counter_overflow (counter, nmi, regs)) +if (perf_counter_overflow (counter, nmi, regs,0 ))__pmc_generic_disable (counter, &counter->hw, bit); }
arch/x86/mm/fault.c +5 -3
@@ -1045,7 +1045,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)if (unlikely (error_code &PF_RSVD ))pgtable_bad (regs, error_code, address); -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs, address);/* * If we're in an interrupt, have no user context or are running
@@ -1142,10 +1142,12 @@ good_area:if (fault &VM_FAULT_MAJOR ) { tsk->maj_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , + regs, address); }else { tsk->min_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , + regs, address); }check_v8086_mode (regs, address, tsk);
include/linux/perf_counter.h +8 -6
@@ -101,8 +101,9 @@ enum perf_counter_record_format {PERF_RECORD_IP =1U <<0 ,PERF_RECORD_TID =1U <<1 ,PERF_RECORD_TIME =1U <<2 , -PERF_RECORD_GROUP =1U <<3 , - PERF_RECORD_CALLCHAIN = 1U << 4, +PERF_RECORD_ADDR =1U <<3 , +PERF_RECORD_GROUP =1U <<4 , + PERF_RECORD_CALLCHAIN = 1U << 5, };/*
@@ -251,6 +252,7 @@ enum perf_event_type {* { u64 ip; } && PERF_RECORD_IP * { u32 pid, tid; } && PERF_RECORD_TID * { u64 time; } && PERF_RECORD_TIME +* { u64 addr; } && PERF_RECORD_ADDR * * { u64 nr; * { u64 event, val; } cnt[nr]; } && PERF_RECORD_GROUP
@@ -537,7 +539,7 @@ extern int hw_perf_group_sched_in(struct perf_counter *group_leader,extern void perf_counter_update_userpage (struct perf_counter *counter);extern int perf_counter_overflow (struct perf_counter *counter, -int nmi,struct pt_regs *regs); +int nmi,struct pt_regs *regs,u64 addr);/* * Return 1 for a software counter, 0 for a hardware counter */
@@ -547,7 +549,7 @@ static inline int is_software_counter(struct perf_counter *counter)perf_event_type (&counter->hw_event) !=PERF_TYPE_HARDWARE ; } -extern void perf_swcounter_event (u32 ,u64 ,int ,struct pt_regs *); +extern void perf_swcounter_event (u32 ,u64 ,int ,struct pt_regs *,u64 );extern void perf_counter_mmap (unsigned long addr,unsigned long len,unsigned long pgoff,struct file *file);
@@ -584,8 +586,8 @@ static inline int perf_counter_task_disable(void) { return -EINVAL; }static inline int perf_counter_task_enable (void ) {return -EINVAL ; }static inline void -perf_swcounter_event (u32 event,u64 nr,int nmi,struct pt_regs *regs) { } - +perf_swcounter_event (u32 event,u64 nr,int nmi, +struct pt_regs *regs,u64 addr) { } static inline void perf_counter_mmap(unsigned long addr, unsigned long len,
kernel/perf_counter.c +29 -17
143 lines not on this page · raw message
[tip:perfcounters/core] perf_counter: allow for data addresses to be recorded
In reply to Peter ZijlstraCommit-ID: 78f13e9525ba777da25c4ddab89f28e9366a8b7c Gitweb: http://git.kernel.org/tip/78f13e9525ba777da25c4ddab89f28e9366a8b7c Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 8 Apr 2009 15:01:33 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 19:05:56 +0200
perf_counter: allow for data addresses to be recorded
Paul suggested we allow for data addresses to be recorded along with the traditional IPs as power can provide these.
For now, only the software pagefault events provide data addresses, but in the future power might as well for some events.
x86 doesn't seem capable of providing this atm.
LKML-Reference: <[email protected]>
--- arch/powerpc/kernel/perf_counter.c | 2 +- arch/powerpc/mm/fault.c | 8 ++++-- arch/x86/kernel/cpu/perf_counter.c | 2 +- arch/x86/mm/fault.c | 8 ++++-- include/linux/perf_counter.h | 14 ++++++---- kernel/perf_counter.c | 46 ++++++++++++++++++++++------------- 6 files changed, 49 insertions(+), 31 deletions(-)
arch/powerpc/kernel/perf_counter.c +1 -1
@@ -749,7 +749,7 @@ static void record_and_restart(struct perf_counter *counter, long val,* Finally record data if requested. */ if (record) -perf_counter_overflow (counter,1 , regs); +perf_counter_overflow (counter,1 , regs,0 ); }/*
arch/powerpc/mm/fault.c +5 -3
@@ -171,7 +171,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,die ("Weird page fault" , regs,SIGSEGV ); } -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs, address);/* When running in the kernel we expect faults to occur only to * addresses in user space. All other faults represent errors in the
@@ -312,7 +312,8 @@ good_area: }if (ret &VM_FAULT_MAJOR ) { current->maj_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , + regs, address);#ifdef CONFIG_PPC_SMLPAR if (firmware_has_feature (FW_FEATURE_CMO )) {preempt_disable ();
@@ -322,7 +323,8 @@ good_area:#endif }else { current->min_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , + regs, address); }up_read (&mm->mmap_sem);return 0 ;
arch/x86/kernel/cpu/perf_counter.c +1 -1
@@ -800,7 +800,7 @@ again:continue ;perf_save_and_restart (counter); -if (perf_counter_overflow (counter, nmi, regs)) +if (perf_counter_overflow (counter, nmi, regs,0 ))__pmc_generic_disable (counter, &counter->hw, bit); }
arch/x86/mm/fault.c +5 -3
@@ -1045,7 +1045,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)if (unlikely (error_code &PF_RSVD ))pgtable_bad (regs, error_code, address); -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS ,1 ,0 , regs, address);/* * If we're in an interrupt, have no user context or are running
@@ -1142,10 +1142,12 @@ good_area:if (fault &VM_FAULT_MAJOR ) { tsk->maj_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MAJ ,1 ,0 , + regs, address); }else { tsk->min_flt++; -perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , regs); +perf_swcounter_event (PERF_COUNT_PAGE_FAULTS_MIN ,1 ,0 , + regs, address); }check_v8086_mode (regs, address, tsk);
include/linux/perf_counter.h +8 -6
@@ -101,8 +101,9 @@ enum perf_counter_record_format {PERF_RECORD_IP =1U <<0 ,PERF_RECORD_TID =1U <<1 ,PERF_RECORD_TIME =1U <<2 , -PERF_RECORD_GROUP =1U <<3 , - PERF_RECORD_CALLCHAIN = 1U << 4, +PERF_RECORD_ADDR =1U <<3 , +PERF_RECORD_GROUP =1U <<4 , + PERF_RECORD_CALLCHAIN = 1U << 5, };/*
@@ -251,6 +252,7 @@ enum perf_event_type {* { u64 ip; } && PERF_RECORD_IP * { u32 pid, tid; } && PERF_RECORD_TID * { u64 time; } && PERF_RECORD_TIME +* { u64 addr; } && PERF_RECORD_ADDR * * { u64 nr; * { u64 event, val; } cnt[nr]; } && PERF_RECORD_GROUP
@@ -537,7 +539,7 @@ extern int hw_perf_group_sched_in(struct perf_counter *group_leader,extern void perf_counter_update_userpage (struct perf_counter *counter);extern int perf_counter_overflow (struct perf_counter *counter, -int nmi,struct pt_regs *regs); +int nmi,struct pt_regs *regs,u64 addr);/* * Return 1 for a software counter, 0 for a hardware counter */
@@ -547,7 +549,7 @@ static inline int is_software_counter(struct perf_counter *counter)perf_event_type (&counter->hw_event) !=PERF_TYPE_HARDWARE ; } -extern void perf_swcounter_event (u32 ,u64 ,int ,struct pt_regs *); +extern void perf_swcounter_event (u32 ,u64 ,int ,struct pt_regs *,u64 );extern void perf_counter_mmap (unsigned long addr,unsigned long len,unsigned long pgoff,struct file *file);
@@ -584,8 +586,8 @@ static inline int perf_counter_task_disable(void) { return -EINVAL; }static inline int perf_counter_task_enable (void ) {return -EINVAL ; }static inline void -perf_swcounter_event (u32 event,u64 nr,int nmi,struct pt_regs *regs) { } - +perf_swcounter_event (u32 event,u64 nr,int nmi, +struct pt_regs *regs,u64 addr) { } static inline void perf_counter_mmap(unsigned long addr, unsigned long len,
kernel/perf_counter.c +29 -17
143 lines not on this page · raw message