Patch "perf/x86/amd: Rework AMD PMU init code" has been added to the 3.10-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
perf/x86/amd: Rework AMD PMU init code
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-x86-amd-rework-amd-pmu-init-code.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
1b45adcd9a503428e6de6b39bc6892d86c9c1d41Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <[email protected]>
Date: Tue, 21 May 2013 13:05:37 +0200
Subject: perf/x86/amd: Rework AMD PMU init code
From: Peter Zijlstra <[email protected]>
commit 1b45adcd9a503428e6de6b39bc6892d86c9c1d41 upstream.
Josh reported that his QEMU is a bad hardware emulator and trips a WARN in the AMD PMU init code. He requested the WARN be turned into a pr_err() or similar.
While there, rework the code a little.
--- arch/x86/kernel/cpu/perf_event_amd.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
arch/x86/kernel/cpu/perf_event_amd.c +17 -17
@@ -648,48 +648,48 @@ static __initconst const struct x86_pmu .cpu_dead = amd_pmu_cpu_dead, }; -static int setup_event_constraints (void ) +static int __init amd_core_pmu_init (void ) { -if (boot_cpu_data.x86 ==0x15 ) +if (!cpu_has_perfctr_core) +return 0 ; + +switch (boot_cpu_data.x86) { +case 0x15 : +pr_cont ("Fam15h " ); x86_pmu.get_event_constraints = amd_get_event_constraints_f15h; -return 0 ; -} +break ; -static int setup_perfctr_core (void ) -{ -if (!cpu_has_perfctr_core) { -WARN (x86_pmu.get_event_constraints == amd_get_event_constraints_f15h, -KERN_ERR "Odd, counter constraints enabled but no core perfctrs detected!" ); +default : +pr_err ("core perfctr but no constraints; unknown hardware!\n" );return -ENODEV ; } -WARN (x86_pmu.get_event_constraints == amd_get_event_constraints, -KERN_ERR "hw perf events core counters need constraints handler!" ); -/* * If core performance counter extensions exists, we must use * MSR_F15H_PERF_CTL/MSR_F15H_PERF_CTR msrs. See also -* x86_pmu_addr_offset(). +* amd_pmu_addr_offset(). */ x86_pmu.eventsel =MSR_F15H_PERF_CTL ; x86_pmu.perfctr =MSR_F15H_PERF_CTR ; x86_pmu.num_counters =AMD64_NUM_COUNTERS_CORE ; -printk (KERN_INFO "perf: AMD core performance counters detected\n" ); - +pr_cont ("core perfctr, " );return 0 ; }__init int amd_pmu_init (void ) { +int ret; +/* Performance-monitoring supported from K7 and later: */ if (boot_cpu_data.x86 <6 )return -ENODEV ; x86_pmu = amd_pmu; -setup_event_constraints (); -setup_perfctr_core (); + ret =amd_core_pmu_init (); +if (ret) +return ret;/* Events are common for all AMDs */ memcpy(hw_cache_event_ids, amd_hw_cache_event_ids,
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/perf-x86-amd-rework-amd-pmu-init-code.patch