diff options
author | Anton Blanchard <anton@samba.org> | 2012-02-15 13:48:22 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-16 00:24:35 -0500 |
commit | 9a45a9407c69d068500923480884661e2b9cc421 (patch) | |
tree | 8ff43b5fd98ab68352dc4dd0823401a5736afab2 /arch | |
parent | 64f8c13561fbd2f1a8b4a8975b2aee73b561093e (diff) |
powerpc/perf: power_pmu_start restores incorrect values, breaking frequency events
perf on POWER stopped working after commit e050e3f0a71b (perf: Fix
broken interrupt rate throttling). That patch exposed a bug in
the POWER perf_events code.
Since the PMCs count upwards and take an exception when the top bit
is set, we want to write 0x80000000 - left in power_pmu_start. We were
instead programming in left which effectively disables the counter
until we eventually hit 0x80000000. This could take seconds or longer.
With the patch applied I get the expected number of samples:
SAMPLE events: 9948
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: <stable@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/perf_event.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c index 10a140f82cb8..64483fde95c6 100644 --- a/arch/powerpc/kernel/perf_event.c +++ b/arch/powerpc/kernel/perf_event.c | |||
@@ -865,6 +865,7 @@ static void power_pmu_start(struct perf_event *event, int ef_flags) | |||
865 | { | 865 | { |
866 | unsigned long flags; | 866 | unsigned long flags; |
867 | s64 left; | 867 | s64 left; |
868 | unsigned long val; | ||
868 | 869 | ||
869 | if (!event->hw.idx || !event->hw.sample_period) | 870 | if (!event->hw.idx || !event->hw.sample_period) |
870 | return; | 871 | return; |
@@ -880,7 +881,12 @@ static void power_pmu_start(struct perf_event *event, int ef_flags) | |||
880 | 881 | ||
881 | event->hw.state = 0; | 882 | event->hw.state = 0; |
882 | left = local64_read(&event->hw.period_left); | 883 | left = local64_read(&event->hw.period_left); |
883 | write_pmc(event->hw.idx, left); | 884 | |
885 | val = 0; | ||
886 | if (left < 0x80000000L) | ||
887 | val = 0x80000000L - left; | ||
888 | |||
889 | write_pmc(event->hw.idx, val); | ||
884 | 890 | ||
885 | perf_event_update_userpage(event); | 891 | perf_event_update_userpage(event); |
886 | perf_pmu_enable(event->pmu); | 892 | perf_pmu_enable(event->pmu); |