perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: d7a702f0b1033cf402fef65bd6395072738f0844 perf/x86/intel/cqm: Do not access cpu_data() from CPU_UP_PREPARE handler
Misc fixes: PMU driver corner cases, tooling fixes, and an 'AUX' (Intel PT) race related core fix.
Thanks,
Ingo
------------------>
Andi Kleen (1):
perf stat: Fix transaction lenght metrics
Ben Hutchings (1):
perf: Fix double-free of the AUX buffer
Matt Fleming (1):
perf/x86/intel/cqm: Do not access cpu_data() from CPU_UP_PREPARE handler
Pawel Moll (1):
perf tools: Fix test build error when bindir contains double slash
Peter Zijlstra (4):
perf: Fix running time accounting
perf: Fix fasync handling on inherited events
perf: Fix PERF_EVENT_IOC_PERIOD migration race perf/x86/intel: Fix memory leak on hot-plug allocation fail
arch/x86/kernel/cpu/perf_event_intel.c | 23 +++++--- arch/x86/kernel/cpu/perf_event_intel_cqm.c | 8 +-- kernel/events/core.c | 91 ++++++++++++++++++++++-------- kernel/events/ring_buffer.c | 10 ++-- tools/perf/config/Makefile | 2 +- tools/perf/util/stat-shadow.c | 8 +-- 6 files changed, 96 insertions(+), 46 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +16 -7
@@ -2534,7 +2534,7 @@ static int intel_pmu_cpu_prepare(int cpu)if (x86_pmu.extra_regs || x86_pmu.lbr_sel_map) { cpuc->shared_regs =allocate_shared_regs (cpu);if (!cpuc->shared_regs) -return NOTIFY_BAD ; + goto err; }if (x86_pmu.flags &PMU_FL_EXCL_CNTRS ) {
@@ -2542,18 +2542,27 @@ static int intel_pmu_cpu_prepare(int cpu) cpuc->constraint_list =kzalloc (sz,GFP_KERNEL );if (!cpuc->constraint_list) -return NOTIFY_BAD ; + goto err_shared_regs; cpuc->excl_cntrs =allocate_excl_cntrs (cpu); -if (!cpuc->excl_cntrs) { -kfree (cpuc->constraint_list); -kfree (cpuc->shared_regs); -return NOTIFY_BAD ; - } +if (!cpuc->excl_cntrs) + goto err_constraint_list; + cpuc->excl_thread_id =0 ; }return NOTIFY_OK ; + +err_constraint_list: +kfree (cpuc->constraint_list); + cpuc->constraint_list =NULL ; + +err_shared_regs: +kfree (cpuc->shared_regs); + cpuc->shared_regs =NULL ; + +err: +return NOTIFY_BAD ; }static void intel_pmu_cpu_starting (int cpu)
arch/x86/kernel/cpu/perf_event_intel_cqm.c +3 -5
@@ -1255,7 +1255,7 @@ static inline void cqm_pick_event_reader(int cpu)cpumask_set_cpu (cpu, &cqm_cpumask); } -static void intel_cqm_cpu_prepare (unsigned int cpu) +static void intel_cqm_cpu_starting (unsigned int cpu) {struct intel_pqr_state *state = &per_cpu (pqr_state, cpu);struct cpuinfo_x86 *c = &cpu_data (cpu);
@@ -1296,13 +1296,11 @@ static int intel_cqm_cpu_notifier(struct notifier_block *nb,unsigned int cpu = (unsigned long )hcpu;switch (action & ~CPU_TASKS_FROZEN ) { -case CPU_UP_PREPARE : -intel_cqm_cpu_prepare (cpu); -break ;case CPU_DOWN_PREPARE :intel_cqm_cpu_exit (cpu);break ;case CPU_STARTING : +intel_cqm_cpu_starting (cpu);cqm_pick_event_reader (cpu);break ; }
@@ -1373,7 +1371,7 @@ static int __init intel_cqm_init(void) goto out;for_each_online_cpu (i) { -intel_cqm_cpu_prepare (i); +intel_cqm_cpu_starting (i);cqm_pick_event_reader (i); }
kernel/events/core.c +67 -24
139 lines not on this page · raw message
kernel/events/ring_buffer.c +6 -4
@@ -559,11 +559,13 @@ static void __rb_free_aux(struct ring_buffer *rb) rb->aux_priv =NULL ; } -for (pg =0 ; pg < rb->aux_nr_pages; pg++) -rb_free_aux_page (rb, pg); +if (rb->aux_nr_pages) { +for (pg =0 ; pg < rb->aux_nr_pages; pg++) +rb_free_aux_page (rb, pg); -kfree (rb->aux_pages); - rb->aux_nr_pages =0 ; +kfree (rb->aux_pages); + rb->aux_nr_pages =0 ; + } }void rb_free_aux (struct ring_buffer *rb)
tools/perf/config/Makefile +1 -1
@@ -638,7 +638,7 @@ ifndef DESTDIR prefix ?= $(HOME) endif bindir_relative = bin -bindir = $(prefix)/$(bindir_relative) +bindir = $(abspath $(prefix)/$(bindir_relative)) mandir = share/man infodir = share/info perfexecdir = libexec/perf-core
tools/perf/util/stat-shadow.c +3 -5
@@ -85,7 +85,7 @@ void perf_stat__update_shadow_stats(struct perf_evsel *counter, u64 *count,else if (perf_evsel__match (counter,HARDWARE ,HW_CPU_CYCLES ))update_stats (&runtime_cycles_stats[ctx][cpu], count[0 ]);else if (perf_stat_evsel__is (counter,CYCLES_IN_TX )) -update_stats (&runtime_transaction_stats[ctx][cpu], count[0 ]); +update_stats (&runtime_cycles_in_tx_stats[ctx][cpu], count[0 ]);else if (perf_stat_evsel__is (counter,TRANSACTION_START ))update_stats (&runtime_transaction_stats[ctx][cpu], count[0 ]);else if (perf_stat_evsel__is (counter,ELISION_START ))
@@ -398,20 +398,18 @@ void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel," # %5.2f%% aborted cycles " , 100.0 * ((total2-avg) / total)); }else if (perf_stat_evsel__is (evsel,TRANSACTION_START ) && - avg >0 && runtime_cycles_in_tx_stats[ctx][cpu].n !=0 ) { total =avg_stats (&runtime_cycles_in_tx_stats[ctx][cpu]); -if (total) +if (avg) ratio = total / avg;fprintf (out," # %8.0f cycles / transaction " , ratio); }else if (perf_stat_evsel__is (evsel,ELISION_START ) && - avg >0 && runtime_cycles_in_tx_stats[ctx][cpu].n !=0 ) { total =avg_stats (&runtime_cycles_in_tx_stats[ctx][cpu]); -if (total) +if (avg) ratio = total / avg;fprintf (out," # %8.0f cycles / elision " , ratio);