performance counters fixes/updates
Subsystems (4)
Linus,
Please pull the latest perfcounters-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perfcounters-fixes-for-linus
Some 'perf timechart' finishing touches, plus fixes.
Thanks,
Ingo
------------------>
Arjan van de Ven (4):
perf timechart: Show the name of the waker/wakee in timechart perf timechart: Show the duration of scheduler delays in the SVG perf util: Make the timechart SVG width dynamic
perf util: SVG performance improvements
Paul Mackerras (1):
perf_counter, powerpc, sparc: Fix compilation after perf_counter_overflow() change
Peter Zijlstra (1):
perf_counter: x86: Fix PMU resource leak
arch/powerpc/kernel/perf_counter.c | 3 +- arch/sparc/kernel/perf_counter.c | 3 +- arch/x86/kernel/cpu/perf_counter.c | 9 +- include/linux/perf_counter.h | 17 --- tools/perf/Documentation/perf-timechart.txt | 3 + tools/perf/builtin-timechart.c | 23 +++-- tools/perf/util/svghelper.c | 170 +++++++++++++++++++++----- tools/perf/util/svghelper.h | 11 +- 8 files changed, 170 insertions(+), 69 deletions(-)
arch/powerpc/kernel/perf_counter.c +1 -2
@@ -1162,7 +1162,6 @@ static void record_and_restart(struct perf_counter *counter, unsigned long val,*/ if (record) {struct perf_sample_data data = { - .regs = regs, .addr =0 , .period = counter->hw.last_period, };
@@ -1170,7 +1169,7 @@ static void record_and_restart(struct perf_counter *counter, unsigned long val,if (counter->attr.sample_type &PERF_SAMPLE_ADDR )perf_get_data_addr (regs, &data.addr); -if (perf_counter_overflow (counter, nmi, &data)) { +if (perf_counter_overflow (counter, nmi, &data, regs)) {/* * Interrupts are coming too fast - throttle them * by setting the counter to 0, so it will be
arch/sparc/kernel/perf_counter.c +1 -2
@@ -493,7 +493,6 @@ static int __kprobes perf_counter_nmi_handler(struct notifier_block *self, regs = args->regs; - data.regs = regs; data.addr =0 ; cpuc = &__get_cpu_var (cpu_hw_counters);
@@ -513,7 +512,7 @@ static int __kprobes perf_counter_nmi_handler(struct notifier_block *self,if (!sparc_perf_counter_set_period (counter, hwc, idx))continue ; -if (perf_counter_overflow (counter,1 , &data)) +if (perf_counter_overflow (counter,1 , &data, regs))sparc_pmu_disable_counter (hwc, idx); }
arch/x86/kernel/cpu/perf_counter.c +6 -3
@@ -924,6 +924,8 @@ static int __hw_perf_counter_init(struct perf_counter *counter)if (err)return err; + counter->destroy = hw_perf_counter_destroy; +/* * Generate PMC IRQs: * (keep 'enabled' bit clear for now)
@@ -953,8 +955,6 @@ static int __hw_perf_counter_init(struct perf_counter *counter)return -EOPNOTSUPP ; } - counter->destroy = hw_perf_counter_destroy; -/* * Raw event type provide the config in the event structure */
@@ -2107,8 +2107,11 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter)int err; err =__hw_perf_counter_init (counter); -if (err) +if (err) { +if (counter->destroy) + counter->destroy (counter);return ERR_PTR (err); + }return &pmu; }
include/linux/perf_counter.h +0 -17
@@ -849,23 +849,6 @@ static inline void perf_counter_comm(struct task_struct *tsk) { }static inline void perf_counter_fork (struct task_struct *tsk) { }static inline void perf_counter_init (void ) { } -static inline int -perf_output_begin (struct perf_output_handle *handle,struct perf_counter *c, -unsigned int size,int nmi,int sample) { } -static inline void perf_output_end (struct perf_output_handle *handle) { } -static inline void -perf_output_copy (struct perf_output_handle *handle, -const void *buf,unsigned int len) { } -static inline void -perf_output_sample (struct perf_output_handle *handle, -struct perf_event_header *header, -struct perf_sample_data *data, -struct perf_counter *counter) { } -static inline void -perf_prepare_sample (struct perf_event_header *header, -struct perf_sample_data *data, -struct perf_counter *counter, -struct pt_regs *regs) { }#endif #define perf_output_put (handle, x) \
tools/perf/Documentation/perf-timechart.txt +3 -0
@@ -28,6 +28,9 @@ OPTIONS -i:: --input=:: Select the input file (default: perf.data) +-w:: +--width=:: + Select the width of the SVG file (default: 1000) SEE ALSO
tools/perf/builtin-timechart.c +15 -8
@@ -752,6 +752,7 @@ static void draw_wakeups(void) we = wake_events;while (we) {int from =0 , to =0 ; +char *task_from =NULL , *task_to =NULL ;/* locate the column of the waker and wakee */ p = all_data;
@@ -760,10 +761,14 @@ static void draw_wakeups(void) c = p->all;while (c) {if (c->Y && c->start_time <= we->time && c->end_time >= we->time) { -if (p->pid == we->waker) +if (p->pid == we->waker) { from = c->Y; -if (p->pid == we->wakee) + task_from = c->comm; + } +if (p->pid == we->wakee) { to = c->Y; + task_to = c->comm; + } } c = c->next; }
@@ -776,7 +781,7 @@ static void draw_wakeups(void)else if (from && to &&abs (from - to) ==1 )svg_wakeline (we->time, from, to);else -svg_partial_wakeline (we->time, from, to); +svg_partial_wakeline (we->time, from, task_from, to, task_to); we = we->next; } }
@@ -822,15 +827,15 @@ static void draw_process_bars(void)continue ; } -svg_box (Y , p->start_time, p->end_time,"process" ); +svg_box (Y , c->start_time, c->end_time,"process" ); sample = c->samples;while (sample) {if (sample->type ==TYPE_RUNNING ) -svg_sample (Y , sample->cpu, sample->start_time, sample->end_time,"sample" ); +svg_sample (Y , sample->cpu, sample->start_time, sample->end_time);if (sample->type ==TYPE_BLOCKED )svg_box (Y , sample->start_time, sample->end_time,"blocked" );if (sample->type ==TYPE_WAITING ) -svg_box (Y , sample->start_time, sample->end_time,"waiting" ); +svg_waiting (Y , sample->start_time, sample->end_time); sample = sample->next; }
@@ -910,9 +915,9 @@ static void write_svg_file(const char *filename)if (count <15 ) count =determine_display_tasks (TIME_THRESH /10 ); -open_svg (filename, numcpus, count); +open_svg (filename, numcpus, count, first_time, last_time); -svg_time_grid (first_time, last_time); +svg_time_grid ();svg_legenda ();for (i =0 ; i < numcpus; i++)
@@ -1127,6 +1132,8 @@ static const struct option options[] = { "input file name"),OPT_STRING ('o' ,"output" , &output_name,"file" ,"output file name" ), +OPT_INTEGER ('w' ,"width" , &svg_page_width, +"page width" ), OPT_END() };
tools/perf/util/svghelper.c +137 -33
296 lines not on this page · raw message
tools/perf/util/svghelper.h +7 -4
@@ -3,9 +3,10 @@#include "types.h" -extern void open_svg (const char *filename,int cpus,int rows); +extern void open_svg (const char *filename,int cpus,int rows,u64 start,u64 end);extern void svg_box (int Yslot,u64 start,u64 end,const char *type); -extern void svg_sample (int Yslot,int cpu,u64 start,u64 end,const char *type); +extern void svg_sample (int Yslot,int cpu,u64 start,u64 end); +extern void svg_waiting (int Yslot,u64 start,u64 end);extern void svg_cpu_box (int cpu,u64 max_frequency,u64 turbo_frequency);
@@ -14,12 +15,14 @@ extern void svg_cstate(int cpu, u64 start, u64 end, int type);extern void svg_pstate (int cpu,u64 start,u64 end,u64 freq); -extern void svg_time_grid (u64 start,u64 end); +extern void svg_time_grid (void );extern void svg_legenda (void );extern void svg_wakeline (u64 start,int row1,int row2); -extern void svg_partial_wakeline (u64 start,int row1,int row2); +extern void svg_partial_wakeline (u64 start,int row1,char *desc1,int row2,char *desc2);extern void svg_interrupt (u64 start,int row);extern void svg_text (int Yslot,u64 start,const char *text);extern void svg_close (void ); +extern int svg_page_width; +#endif