perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1
Subsystems (2)
PATCH 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.
Checking the PerfMon version. Only enable the feature for PerfMon V2 and later.
--- 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
Peter Zijlstra
maintainerQuoted 9 lines · On Tue, Apr 24, 2018 at 03:56:23PM -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.Checking the PerfMon version. Only enable the feature for PerfMon V2 and later.
That's fine..
Quoted 12 lines
Fixes 6089327f5424 ("perf/x86: Add sysfs entry to freeze counters on SMI")Signed-off-by Kan Liang <[email protected]>--- arch/x86/events/intel/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)arch/x86/events/intel/core.c +0
-0
arch/x86/events/intel/core.c static void intel_pmu_cpu_starting(int cpu) · line 3353
Quoted 9 lines
arch/x86/events/intel/core.c +2
-1@@ -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 ;
And the above chunk does as advertised.
Quoted 19 lines
arch/x86/events/intel/core.c +4
-0@@ -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,
arch/x86/events/intel/core.c __init int intel_pmu_init(void) · line 3928
Quoted 8 lines
arch/x86/events/intel/core.c +0
-2@@ -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:
But what is all this about? The Changelog doesn't mention anything about this. Looks like an unrelated cleanup that really should've been a separate patch or something.
Quoted 59 lines · Peter Zijlstra
Quoted 9 lines · On Tue, Apr 24, 2018 at 03:56:23PM -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.Checking the PerfMon version. Only enable the feature for PerfMon V2 and later.
That's fine..
Quoted 12 lines
Fixes 6089327f5424 ("perf/x86: Add sysfs entry to freeze counters on SMI")Signed-off-by Kan Liang <[email protected]>--- arch/x86/events/intel/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)arch/x86/events/intel/core.c +0
-0arch/x86/events/intel/core.c static void intel_pmu_cpu_starting(int cpu) · line 3353
Quoted 9 lines
arch/x86/events/intel/core.c +2
-1@@ -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 ;And the above chunk does as advertised.
Quoted 22 lines
arch/x86/events/intel/core.c +4
-0@@ -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);
Quoted 9 lines
arch/x86/events/intel/core.c __init int intel_pmu_init(void) · line 3928
Quoted 5 lines
arch/x86/events/intel/core.c +0
-2- - 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: But what is all this about? The Changelog doesn't mention anything about this. Looks like an unrelated cleanup that really should've been a separate patch or something.
Only if the PerfMon version >= V2, the intel_pmu can be applied.
Moving intel_pmu_attrs to intel_pmu, which guarantees the feature can only be enabled for V2 and later.
I will modify the change log to explicitly mention it.
Thanks,
Kan