perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1
Subsystems (2)
PATCH v2 1/1 perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1
From: Kan Liang <[email protected]>
The SMM freeze feature was introduced since PerfMon V2. But the current code unconditionally enables the feature for all platforms. It can generate #GP exception, if the related FREEZE_WHILE_SMM bit is set for the machine with PerfMon V1.
To disable the feature for PerfMon V1, perf needs to
- Remove the freeze_on_smi sysfs entry by moving intel_pmu_attrs to intel_pmu, which is only applied to PerfMon V2 and later.
- Check the PerfMon version before flipping the SMM bit when starting CPU
---
Change since V1
- Modified the changelog.
arch/x86/events/intel/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/events/intel/core.c +6 -3
@@ -3346,7 +3346,8 @@ static void intel_pmu_cpu_starting(int cpu) cpuc->lbr_sel =NULL ; -flip_smm_bit (&x86_pmu.attr_freeze_on_smi); +if (x86_pmu.version >1 ) +flip_smm_bit (&x86_pmu.attr_freeze_on_smi);if (!cpuc->shared_regs)return ;
@@ -3509,6 +3510,8 @@ static __initconst const struct x86_pmu core_pmu = { .cpu_dying = intel_pmu_cpu_dying, }; +static struct attribute *intel_pmu_attrs[]; +static __initconst const struct x86_pmu intel_pmu = { .name ="Intel" , .handle_irq = intel_pmu_handle_irq,
@@ -3540,6 +3543,8 @@ static __initconst const struct x86_pmu intel_pmu = { .format_attrs = intel_arch3_formats_attr, .events_sysfs_show = intel_event_sysfs_show, + .attrs = intel_pmu_attrs, + .cpu_prepare = intel_pmu_cpu_prepare, .cpu_starting = intel_pmu_cpu_starting, .cpu_dying = intel_pmu_cpu_dying,
@@ -3918,8 +3923,6 @@ __init int intel_pmu_init(void) x86_pmu.max_pebs_events =min_t (unsigned,MAX_PEBS_EVENTS , x86_pmu.num_counters); - - x86_pmu.attrs = intel_pmu_attrs;/* * Quirk: v2 perfmon does not report fixed-purpose events, so * assume at least 3 events, when not running in a hypervisor:
Signature · 1 line
2.4.11
Quoted 7 lines · On Wed, Apr 25, 2018 at 02:57:17PM -0400, [email protected] wrote:
From: Kan Liang <[email protected]>
The SMM freeze feature was introduced since PerfMon V2. But the current code unconditionally enables the feature for all platforms. It can generate #GP exception, if the related
FREEZE_WHILE_SMMbit is set for the machine with PerfMon V1.
Quoted 7 lines
To disable the feature for PerfMon V1, perf needs to
- Remove thefreeze_on_smisysfs entry by movingintel_pmu_attrstointel_pmu, which is only applied to PerfMon V2 and later.
- Check the PerfMon version before flipping the SMM bit when starting CPUFixes 6089327f5424 ("perf/x86: Add sysfs entry to freeze counters on SMI")Signed-off-by Kan Liang <[email protected]>
Quoted 52 lines
---
Change since V1
- Modified the changelog.arch/x86/events/intel/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)arch/x86/events/intel/core.c +6
-3@@ -3346,7 +3346,8 @@ static void intel_pmu_cpu_starting(int cpu) cpuc->lbr_sel =NULL ; -flip_smm_bit (&x86_pmu.attr_freeze_on_smi); +if (x86_pmu.version >1 ) +flip_smm_bit (&x86_pmu.attr_freeze_on_smi);if (!cpuc->shared_regs)return ;@@ -3509,6 +3510,8 @@ static __initconst const struct x86_pmu core_pmu = { .cpu_dying = intel_pmu_cpu_dying, }; +static struct attribute *intel_pmu_attrs[]; +static __initconst const struct x86_pmu intel_pmu = { .name ="Intel" , .handle_irq = intel_pmu_handle_irq,@@ -3540,6 +3543,8 @@ static __initconst const struct x86_pmu intel_pmu = { .format_attrs = intel_arch3_formats_attr, .events_sysfs_show = intel_event_sysfs_show, + .attrs = intel_pmu_attrs, + .cpu_prepare = intel_pmu_cpu_prepare, .cpu_starting = intel_pmu_cpu_starting, .cpu_dying = intel_pmu_cpu_dying,@@ -3918,8 +3923,6 @@ __init int intel_pmu_init(void) x86_pmu.max_pebs_events =min_t (unsigned,MAX_PEBS_EVENTS , x86_pmu.num_counters); - - x86_pmu.attrs = intel_pmu_attrs;/* * Quirk: v2 perfmon does not report fixed-purpose events, so * assume at least 3 events, when not running in a hypervisor: Signature · 1 line
2.4.11
tip-bot for Kan Liang
merge botperf/x86/intel: Don't enable freeze-on-smi for PerfMon V1
Commit-ID: 4e949e9b9d1e3edcdab3b54656c5851bd9e49c67 Gitweb: https://git.kernel.org/tip/4e949e9b9d1e3edcdab3b54656c5851bd9e49c67 Author: Kan Liang <[email protected]> AuthorDate: Wed, 25 Apr 2018 14:57:17 -0400 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 25 Apr 2018 21:41:22 +0200
perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1
The SMM freeze feature was introduced since PerfMon V2. But the current code unconditionally enables the feature for all platforms. It can generate #GP exception, if the related FREEZE_WHILE_SMM bit is set for the machine with PerfMon V1.
To disable the feature for PerfMon V1, perf needs to
- Remove the freeze_on_smi sysfs entry by moving intel_pmu_attrs to intel_pmu, which is only applied to PerfMon V2 and later.
- Check the PerfMon version before flipping the SMM bit when starting CPU
--- arch/x86/events/intel/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/events/intel/core.c +6 -3
@@ -3339,7 +3339,8 @@ static void intel_pmu_cpu_starting(int cpu) cpuc->lbr_sel =NULL ; -flip_smm_bit (&x86_pmu.attr_freeze_on_smi); +if (x86_pmu.version >1 ) +flip_smm_bit (&x86_pmu.attr_freeze_on_smi);if (!cpuc->shared_regs)return ;
@@ -3502,6 +3503,8 @@ static __initconst const struct x86_pmu core_pmu = { .cpu_dying = intel_pmu_cpu_dying, }; +static struct attribute *intel_pmu_attrs[]; +static __initconst const struct x86_pmu intel_pmu = { .name ="Intel" , .handle_irq = intel_pmu_handle_irq,
@@ -3533,6 +3536,8 @@ static __initconst const struct x86_pmu intel_pmu = { .format_attrs = intel_arch3_formats_attr, .events_sysfs_show = intel_event_sysfs_show, + .attrs = intel_pmu_attrs, + .cpu_prepare = intel_pmu_cpu_prepare, .cpu_starting = intel_pmu_cpu_starting, .cpu_dying = intel_pmu_cpu_dying,
@@ -3911,8 +3916,6 @@ __init int intel_pmu_init(void) x86_pmu.max_pebs_events =min_t (unsigned,MAX_PEBS_EVENTS , x86_pmu.num_counters); - - x86_pmu.attrs = intel_pmu_attrs;/* * Quirk: v2 perfmon does not report fixed-purpose events, so * assume at least 3 events, when not running in a hypervisor: