perf, x86: Streamline LBR MSR handling in PMI
Subsystems (2)
PATCH 1/2 perf, x86: Streamline LBR MSR handling in PMI
From: Andi Kleen <[email protected]>
The perf PMI currently does unnecessary MSR accesses when LBRs are enabled. We use LBR freezing, or when in callstack mode force the LBRs to only filter on ring 3.
So there is no need to disable the LBRs explicitely in the PMI handler.
Also we always unnecessarily rewrite LBR_SELECT in the LBR handler, even though it can never change.
5) | /* write_msr: MSR_LBR_SELECT(1c8), value 0 */ 5) | /* read_msr: MSR_IA32_DEBUGCTLMSR(1d9), value 1801 */ 5) | /* write_msr: MSR_IA32_DEBUGCTLMSR(1d9), value 1801 */ 5) | /* write_msr: MSR_CORE_PERF_GLOBAL_CTRL(38f), value 70000000f */ 5) | /* write_msr: MSR_CORE_PERF_GLOBAL_CTRL(38f), value 0 */ 5) | /* write_msr: MSR_LBR_SELECT(1c8), value 0 */ 5) | /* read_msr: MSR_IA32_DEBUGCTLMSR(1d9), value 1801 */ 5) | /* write_msr: MSR_IA32_DEBUGCTLMSR(1d9), value 1801 */
This patch:
- Avoids disabling already frozen LBRs unnecessarily in the PMI
- Avoids changing LBR_SELECT in the PMI
--- arch/x86/kernel/cpu/perf_event.h | 2 +- arch/x86/kernel/cpu/perf_event_intel.c | 23 ++++++++++++++++++----- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 12 ++++++++---- 3 files changed, 27 insertions(+), 10 deletions(-)
arch/x86/kernel/cpu/perf_event.h +1 -1
@@ -739,7 +739,7 @@ void intel_pmu_lbr_enable(struct perf_event *event);void intel_pmu_lbr_disable (struct perf_event *event); -void intel_pmu_lbr_enable_all (void ); +void intel_pmu_lbr_enable_all (bool pmi);void intel_pmu_lbr_disable_all (void );
arch/x86/kernel/cpu/perf_event_intel.c +18 -5
@@ -1029,7 +1029,10 @@ static __initconst const u64 slm_hw_cache_event_ids }, }; -static void intel_pmu_disable_all (void ) +/* +* Use from PMIs where the LBRs are already disabled. +*/ +static void __intel_pmu_disable_all (void ) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);
@@ -1039,15 +1042,20 @@ static void intel_pmu_disable_all(void)intel_pmu_disable_bts ();intel_pmu_pebs_disable_all (); +} + +static void intel_pmu_disable_all (void ) +{ +__intel_pmu_disable_all ();intel_pmu_lbr_disable_all (); } -static void intel_pmu_enable_all (int added) +static void __intel_pmu_enable_all (int added,bool pmi) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);intel_pmu_pebs_enable_all (); -intel_pmu_lbr_enable_all (); +intel_pmu_lbr_enable_all (pmi);wrmsrl (MSR_CORE_PERF_GLOBAL_CTRL , x86_pmu.intel_ctrl & ~cpuc->intel_ctrl_guest_mask);
@@ -1062,6 +1070,11 @@ static void intel_pmu_enable_all(int added) } } +static void intel_pmu_enable_all (int added) +{ +__intel_pmu_enable_all (added, false); +} +/* * Workaround for: * Intel Errata AAK100 (model 26)
@@ -1343,7 +1356,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)*/ if (!x86_pmu.late_ack)apic_write (APIC_LVTPC ,APIC_DM_NMI ); -intel_pmu_disable_all (); +__intel_pmu_disable_all (); handled =intel_pmu_drain_bts_buffer (); status =intel_pmu_get_status ();if (!status)
@@ -1419,7 +1432,7 @@ again: goto again; done: -intel_pmu_enable_all (0 ); +__intel_pmu_enable_all (0 , true);/* * Only unmask the NMI after the overflow counters * have been reset. This avoids spurious NMIs on
arch/x86/kernel/cpu/perf_event_intel_lbr.c +8 -4
@@ -132,12 +132,16 @@ static void intel_pmu_lbr_filter(struct cpu_hw_events *cpuc);* otherwise it becomes near impossible to get a reliable stack. */ -static void __intel_pmu_lbr_enable (void ) +static void __intel_pmu_lbr_enable (bool pmi) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);u64 debugctl, lbr_select =0 ; -if (cpuc->lbr_sel) { +/* +* No need to reprogram LBR_SELECT in a PMI, as it +* did not change. +*/ +if (cpuc->lbr_sel && !pmi) { lbr_select = cpuc->lbr_sel->config;wrmsrl (MSR_LBR_SELECT , lbr_select); }
@@ -351,12 +355,12 @@ void intel_pmu_lbr_disable(struct perf_event *event) } } -void intel_pmu_lbr_enable_all (void ) +void intel_pmu_lbr_enable_all (bool pmi) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);if (cpuc->lbr_users) -__intel_pmu_lbr_enable (); +__intel_pmu_lbr_enable (pmi); }void intel_pmu_lbr_disable_all (void )
Signature · 1 line
1.9.3
PATCH 2/2 perf, x86: Avoid rewriting DEBUGCTL with the same value for LBRs
From: Andi Kleen <[email protected]>
perf with LBRs on has a tendency to rewrite the DEBUGCTL MSR with the same value. Add a little optimization to skip the unnecessary write.
--- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_lbr.c +4 -2
@@ -135,7 +135,7 @@ static void intel_pmu_lbr_filter(struct cpu_hw_events *cpuc);static void __intel_pmu_lbr_enable (bool pmi) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); -u64 debugctl, lbr_select =0 ; +u64 debugctl, lbr_select =0 , orig_debugctl;/* * No need to reprogram LBR_SELECT in a PMI, as it
@@ -147,6 +147,7 @@ static void __intel_pmu_lbr_enable(bool pmi) }rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); + orig_debugctl = debugctl; debugctl |=DEBUGCTLMSR_LBR ;/* * LBR callstack does not work well with FREEZE_LBRS_ON_PMI.
@@ -155,7 +156,8 @@ static void __intel_pmu_lbr_enable(bool pmi)*/ if (!(lbr_select &LBR_CALL_STACK )) debugctl |=DEBUGCTLMSR_FREEZE_LBRS_ON_PMI ; -wrmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); +if (orig_debugctl != debugctl) +wrmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); }static void __intel_pmu_lbr_disable (void )
Signature · 1 line
1.9.3
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf/x86/intel: Avoid rewriting DEBUGCTL with the same value for LBRs
perf/x86/intel: Avoid rewriting DEBUGCTL with the same value for LBRs
Commit-ID: cd1f11de69226cc7ce7e7f22bdab9010103ddaa6 Gitweb: http://git.kernel.org/tip/cd1f11de69226cc7ce7e7f22bdab9010103ddaa6 Author: Andi Kleen <[email protected]> AuthorDate: Fri, 20 Mar 2015 10:11:24 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 2 Apr 2015 17:33:20 +0200
perf/x86/intel: Avoid rewriting DEBUGCTL with the same value for LBRs
perf with LBRs on has a tendency to rewrite the DEBUGCTL MSR with the same value. Add a little optimization to skip the unnecessary write.
--- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_lbr.c +4 -2
@@ -135,7 +135,7 @@ static void intel_pmu_lbr_filter(struct cpu_hw_events *cpuc);static void __intel_pmu_lbr_enable (bool pmi) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); -u64 debugctl, lbr_select =0 ; +u64 debugctl, lbr_select =0 , orig_debugctl;/* * No need to reprogram LBR_SELECT in a PMI, as it
@@ -147,6 +147,7 @@ static void __intel_pmu_lbr_enable(bool pmi) }rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); + orig_debugctl = debugctl; debugctl |=DEBUGCTLMSR_LBR ;/* * LBR callstack does not work well with FREEZE_LBRS_ON_PMI.
@@ -155,7 +156,8 @@ static void __intel_pmu_lbr_enable(bool pmi)*/ if (!(lbr_select &LBR_CALL_STACK )) debugctl |=DEBUGCTLMSR_FREEZE_LBRS_ON_PMI ; -wrmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); +if (orig_debugctl != debugctl) +wrmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); }static void __intel_pmu_lbr_disable (void )
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf/x86/intel: Streamline LBR MSR handling in PMI
In reply to Andi Kleenperf/x86/intel: Streamline LBR MSR handling in PMI
Commit-ID: 1a78d93750bb5f61abdc59a91fc3bd06a214542a Gitweb: http://git.kernel.org/tip/1a78d93750bb5f61abdc59a91fc3bd06a214542a Author: Andi Kleen <[email protected]> AuthorDate: Fri, 20 Mar 2015 10:11:23 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 2 Apr 2015 17:33:19 +0200
perf/x86/intel: Streamline LBR MSR handling in PMI
The perf PMI currently does unnecessary MSR accesses when LBRs are enabled. We use LBR freezing, or when in callstack mode force the LBRs to only filter on ring 3.
So there is no need to disable the LBRs explicitely in the PMI handler.
Also we always unnecessarily rewrite LBR_SELECT in the LBR handler, even though it can never change.
5) | /* write_msr: MSR_LBR_SELECT(1c8), value 0 */ 5) | /* read_msr: MSR_IA32_DEBUGCTLMSR(1d9), value 1801 */ 5) | /* write_msr: MSR_IA32_DEBUGCTLMSR(1d9), value 1801 */ 5) | /* write_msr: MSR_CORE_PERF_GLOBAL_CTRL(38f), value 70000000f */ 5) | /* write_msr: MSR_CORE_PERF_GLOBAL_CTRL(38f), value 0 */ 5) | /* write_msr: MSR_LBR_SELECT(1c8), value 0 */ 5) | /* read_msr: MSR_IA32_DEBUGCTLMSR(1d9), value 1801 */ 5) | /* write_msr: MSR_IA32_DEBUGCTLMSR(1d9), value 1801 */
This patch:
- Avoids disabling already frozen LBRs unnecessarily in the PMI
- Avoids changing LBR_SELECT in the PMI
--- arch/x86/kernel/cpu/perf_event.h | 2 +- arch/x86/kernel/cpu/perf_event_intel.c | 23 ++++++++++++++++++----- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 12 ++++++++---- 3 files changed, 27 insertions(+), 10 deletions(-)
arch/x86/kernel/cpu/perf_event.h +1 -1
@@ -870,7 +870,7 @@ void intel_pmu_lbr_enable(struct perf_event *event);void intel_pmu_lbr_disable (struct perf_event *event); -void intel_pmu_lbr_enable_all (void ); +void intel_pmu_lbr_enable_all (bool pmi);void intel_pmu_lbr_disable_all (void );
arch/x86/kernel/cpu/perf_event_intel.c +18 -5
@@ -1244,7 +1244,10 @@ static __initconst const u64 slm_hw_cache_event_ids }, }; -static void intel_pmu_disable_all (void ) +/* +* Use from PMIs where the LBRs are already disabled. +*/ +static void __intel_pmu_disable_all (void ) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);
@@ -1256,15 +1259,20 @@ static void intel_pmu_disable_all(void)intel_bts_disable_local ();intel_pmu_pebs_disable_all (); +} + +static void intel_pmu_disable_all (void ) +{ +__intel_pmu_disable_all ();intel_pmu_lbr_disable_all (); } -static void intel_pmu_enable_all (int added) +static void __intel_pmu_enable_all (int added,bool pmi) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);intel_pmu_pebs_enable_all (); -intel_pmu_lbr_enable_all (); +intel_pmu_lbr_enable_all (pmi);wrmsrl (MSR_CORE_PERF_GLOBAL_CTRL , x86_pmu.intel_ctrl & ~cpuc->intel_ctrl_guest_mask);
@@ -1280,6 +1288,11 @@ static void intel_pmu_enable_all(int added)intel_bts_enable_local (); } +static void intel_pmu_enable_all (int added) +{ +__intel_pmu_enable_all (added, false); +} +/* * Workaround for: * Intel Errata AAK100 (model 26)
@@ -1573,7 +1586,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)*/ if (!x86_pmu.late_ack)apic_write (APIC_LVTPC ,APIC_DM_NMI ); -intel_pmu_disable_all (); +__intel_pmu_disable_all (); handled =intel_pmu_drain_bts_buffer (); handled +=intel_bts_interrupt (); status =intel_pmu_get_status ();
@@ -1658,7 +1671,7 @@ again: goto again; done: -intel_pmu_enable_all (0 ); +__intel_pmu_enable_all (0 , true);/* * Only unmask the NMI after the overflow counters * have been reset. This avoids spurious NMIs on
arch/x86/kernel/cpu/perf_event_intel_lbr.c +8 -4
@@ -132,12 +132,16 @@ static void intel_pmu_lbr_filter(struct cpu_hw_events *cpuc);* otherwise it becomes near impossible to get a reliable stack. */ -static void __intel_pmu_lbr_enable (void ) +static void __intel_pmu_lbr_enable (bool pmi) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);u64 debugctl, lbr_select =0 ; -if (cpuc->lbr_sel) { +/* +* No need to reprogram LBR_SELECT in a PMI, as it +* did not change. +*/ +if (cpuc->lbr_sel && !pmi) { lbr_select = cpuc->lbr_sel->config;wrmsrl (MSR_LBR_SELECT , lbr_select); }
@@ -351,12 +355,12 @@ void intel_pmu_lbr_disable(struct perf_event *event) } } -void intel_pmu_lbr_enable_all (void ) +void intel_pmu_lbr_enable_all (bool pmi) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);if (cpuc->lbr_users) -__intel_pmu_lbr_enable (); +__intel_pmu_lbr_enable (pmi); }void intel_pmu_lbr_disable_all (void )