perf/x86: fix SLM MSR_OFFCORE_RSP1 valid_mask
Subsystems (2)
PATCH 1/1 perf/x86: fix SLM MSR_OFFCORE_RSP1 valid_mask
From: Kan Liang <[email protected]>
AVG_LATENCY(bit 38) is only available on MSR_OFFCORE_RSP0. So the bit should be removed from RSP1 valid_mask.
Since RSP0 and RSP1 may have different valid_mask, intel_alt_er should validate the config on the alternate offcore reg before replacing it.
Signed-off-by Kan Liang <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +10 -6
@@ -1114,7 +1114,7 @@ static struct extra_reg intel_slm_extra_regs[] __read_mostly = {/* must define OFFCORE_RSP_X first, see intel_fixup_er() */ INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0x768005ffffull ,RSP_0 ), -INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0x768005ffffull ,RSP_1 ), +INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0x368005ffffull ,RSP_1 ), EVENT_EXTRA_END };
@@ -1699,18 +1699,22 @@ intel_bts_constraints(struct perf_event *event)return NULL ; } -static int intel_alt_er (int idx) +static int intel_alt_er (int idx,u64 config) { +int alt_idx;if (!(x86_pmu.flags &PMU_FL_HAS_RSP_1 ))return idx;if (idx ==EXTRA_REG_RSP_0 ) -return EXTRA_REG_RSP_1 ; + alt_idx =EXTRA_REG_RSP_1 ;if (idx ==EXTRA_REG_RSP_1 ) -return EXTRA_REG_RSP_0 ; + alt_idx =EXTRA_REG_RSP_0 ; -return idx; +if (config & ~x86_pmu.extra_regs[alt_idx].valid_mask) +return idx; + +return alt_idx; }static void intel_fixup_er (struct perf_event *event,int idx)
@@ -1799,7 +1803,7 @@ again:*/ c =NULL ; }else { - idx =intel_alt_er (idx); + idx =intel_alt_er (idx, reg->config);if (idx != reg->idx) {raw_spin_unlock_irqrestore (&era->lock, flags); goto again;
Signature · 1 line
1.8.3.1
tip-bot for Kan Liang
merge bot[tip:perf/core] perf/x86/intel: Fix SLM MSR_OFFCORE_RSP1 valid_mask
perf/x86/intel: Fix SLM MSR_OFFCORE_RSP1 valid_mask
Commit-ID: ae3f011fc25104a218caf4448b1d47ef1c9b3a42 Gitweb: http://git.kernel.org/tip/ae3f011fc25104a218caf4448b1d47ef1c9b3a42 Author: Kan Liang <[email protected]> AuthorDate: Wed, 24 Jun 2015 11:23:35 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Aug 2015 10:16:54 +0200
perf/x86/intel: Fix SLM MSR_OFFCORE_RSP1 valid_mask
AVG_LATENCY(bit 38) is only available on MSR_OFFCORE_RSP0. So the bit should be removed from RSP1 valid_mask.
Since RSP0 and RSP1 may have different valid_mask, intel_alt_er should validate the config on the alternate offcore reg before replacing it.
Signed-off-by Kan Liang <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +10 -6
@@ -1114,7 +1114,7 @@ static struct extra_reg intel_slm_extra_regs[] __read_mostly = {/* must define OFFCORE_RSP_X first, see intel_fixup_er() */ INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0x768005ffffull ,RSP_0 ), -INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0x768005ffffull ,RSP_1 ), +INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0x368005ffffull ,RSP_1 ), EVENT_EXTRA_END };
@@ -1699,18 +1699,22 @@ intel_bts_constraints(struct perf_event *event)return NULL ; } -static int intel_alt_er (int idx) +static int intel_alt_er (int idx,u64 config) { +int alt_idx;if (!(x86_pmu.flags &PMU_FL_HAS_RSP_1 ))return idx;if (idx ==EXTRA_REG_RSP_0 ) -return EXTRA_REG_RSP_1 ; + alt_idx =EXTRA_REG_RSP_1 ;if (idx ==EXTRA_REG_RSP_1 ) -return EXTRA_REG_RSP_0 ; + alt_idx =EXTRA_REG_RSP_0 ; -return idx; +if (config & ~x86_pmu.extra_regs[alt_idx].valid_mask) +return idx; + +return alt_idx; }static void intel_fixup_er (struct perf_event *event,int idx)
@@ -1799,7 +1803,7 @@ again:*/ c =NULL ; }else { - idx =intel_alt_er (idx); + idx =intel_alt_er (idx, reg->config);if (idx != reg->idx) {raw_spin_unlock_irqrestore (&era->lock, flags); goto again;