| From 98b008dff8452653909d9263efda925873e8d8bb Mon Sep 17 00:00:00 2001 |
| From: Stephane Eranian <eranian@google.com> |
| Date: Thu, 22 Jan 2015 21:38:34 +0100 |
| Subject: perf/rapl: Fix crash in rapl_scale() |
| |
| From: Stephane Eranian <eranian@google.com> |
| |
| commit 98b008dff8452653909d9263efda925873e8d8bb upstream. |
| |
| This patch fixes a systematic crash in rapl_scale() |
| due to an invalid pointer. |
| |
| The bug was introduced by commit: |
| |
| 89cbc76768c2 ("x86: Replace __get_cpu_var uses") |
| |
| The fix is simple. Just put the parenthesis where it needs |
| to be, i.e., around rapl_pmu. To my surprise, the compiler |
| was not complaining about passing an integer instead of a |
| pointer. |
| |
| Reported-by: Vince Weaver <vincent.weaver@maine.edu> |
| Tested-by: Vince Weaver <vincent.weaver@maine.edu> |
| Fixes: 89cbc76768c2 ("x86: Replace __get_cpu_var uses") |
| Signed-off-by: Stephane Eranian <eranian@google.com> |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Cc: Arnaldo Carvalho de Melo <acme@kernel.org> |
| Cc: cl@linux.com |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Link: http://lkml.kernel.org/r/20150122203834.GA10228@thinkpad |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kernel/cpu/perf_event_intel_rapl.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c |
| +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c |
| @@ -135,7 +135,7 @@ static inline u64 rapl_scale(u64 v) |
| * or use ldexp(count, -32). |
| * Watts = Joules/Time delta |
| */ |
| - return v << (32 - __this_cpu_read(rapl_pmu->hw_unit)); |
| + return v << (32 - __this_cpu_read(rapl_pmu)->hw_unit); |
| } |
| |
| static u64 rapl_event_update(struct perf_event *event) |
