perf/x86/amd: Fix for LBR Freeze
Subsystems (3)
v4 cover perf/x86/amd: Fix for LBR Freeze
Contains a fix for usage of LBR Freeze.
Previous versions can be found at:
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
Changes in v4:
- Move scattered feature bits from CPUID 0x80000022[EAX] to a dedicated word as suggested by Ingo.
- Remove patches that have been merged (patch 2 and 3 from v3).
Changes in v3:
- As suggested by Boris, update the commit message of the first patch with the reason behind making the LBR and PMC Freeze feature bit visible in /proc/cpuinfo.
Changes in v2:
- Make the LBR and PMC Freeze feature bit visible in /proc/cpuinfo. As suggested by Stephane, this will be useful to determine if it is feasible to perform kernel FDO on a system.
Sandipan Das (2):
x86/cpufeatures: Add dedicated feature word for CPUID leaf
0x80000022[EAX]
perf/x86/amd/lbr: Use freeze based on availability
arch/x86/events/amd/core.c | 4 ++-- arch/x86/events/amd/lbr.c | 16 ++++++++++------ arch/x86/include/asm/cpufeature.h | 7 +++++-- arch/x86/include/asm/cpufeatures.h | 11 ++++++++--- arch/x86/include/asm/disabled-features.h | 3 ++- arch/x86/include/asm/required-features.h | 3 ++- arch/x86/kernel/cpu/common.c | 3 +++ arch/x86/kernel/cpu/scattered.c | 2 -- arch/x86/kvm/cpuid.c | 5 +---- arch/x86/kvm/reverse_cpuid.h | 1 - 10 files changed, 33 insertions(+), 22 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/2 x86/cpufeatures: Add dedicated feature word for CPUID leaf 0x80000022[EAX]
Move the existing scattered performance monitoring related feature bits from CPUID leaf 0x80000022[EAX] into a dedicated word since additional bits will be defined from the same leaf in the future. This includes X86_FEATURE_PERFMON_V2 and X86_FEATURE_AMD_LBR_V2.
--- arch/x86/include/asm/cpufeature.h | 7 +++++-- arch/x86/include/asm/cpufeatures.h | 10 +++++++--- arch/x86/include/asm/disabled-features.h | 3 ++- arch/x86/include/asm/required-features.h | 3 ++- arch/x86/kernel/cpu/common.c | 3 +++ arch/x86/kernel/cpu/scattered.c | 2 -- arch/x86/kvm/cpuid.c | 5 +---- arch/x86/kvm/reverse_cpuid.h | 1 - 8 files changed, 20 insertions(+), 14 deletions(-)
arch/x86/include/asm/cpufeature.h +5 -2
@@ -33,6 +33,7 @@ enum cpuid_leafsCPUID_7_EDX ,CPUID_8000_001F_EAX ,CPUID_8000_0021_EAX , + CPUID_8000_0022_EAX, };#define X86_CAP_FMT_NUM "%d:%d"
@@ -91,8 +92,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 18, feature_bit) || \ CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 19, feature_bit) || \ CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 20, feature_bit) || \ + CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 21, feature_bit) || \ REQUIRED_MASK_CHECK || \ - BUILD_BUG_ON_ZERO(NCAPINTS != 21)) + BUILD_BUG_ON_ZERO(NCAPINTS != 22))#define DISABLED_MASK_BIT_SET (feature_bit) \ ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 0, feature_bit) || \
@@ -116,8 +118,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 18, feature_bit) || \ CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 19, feature_bit) || \ CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 20, feature_bit) || \ + CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 21, feature_bit) || \ DISABLED_MASK_CHECK || \ - BUILD_BUG_ON_ZERO(NCAPINTS != 21)) + BUILD_BUG_ON_ZERO(NCAPINTS != 22))#define cpu_has (c, bit) \ (__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
arch/x86/include/asm/cpufeatures.h +7 -3
@@ -13,7 +13,7 @@/* * Defines x86 CPU feature bits */ -#define NCAPINTS 21/* N 32-bit words worth of info */ +#define NCAPINTS 22/* N 32-bit words worth of info */ #define NBUGINTS 2/* N 32-bit bug flags */ /*
@@ -94,7 +94,7 @@#define X86_FEATURE_SYSCALL32 ( 3*32+14)/* "" syscall in IA32 userspace */ #define X86_FEATURE_SYSENTER32 ( 3*32+15)/* "" sysenter in IA32 userspace */ #define X86_FEATURE_REP_GOOD ( 3*32+16)/* REP microcode works well */ -#define X86_FEATURE_AMD_LBR_V2 ( 3*32+17)/* AMD Last Branch Record Extension Version 2 */ +/* FREE! ( 3*32+17) */ #define X86_FEATURE_CLEAR_CPU_BUF ( 3*32+18)/* "" Clear CPU buffers using VERW */ #define X86_FEATURE_ACC_POWER ( 3*32+19)/* AMD Accumulated Power Mechanism */ #define X86_FEATURE_NOPL ( 3*32+20)/* The NOPL (0F 1F) instructions */
@@ -209,7 +209,7 @@#define X86_FEATURE_SSBD ( 7*32+17)/* Speculative Store Bypass Disable */ #define X86_FEATURE_MBA ( 7*32+18)/* Memory Bandwidth Allocation */ #define X86_FEATURE_RSB_CTXSW ( 7*32+19)/* "" Fill RSB on context switches */ -#define X86_FEATURE_PERFMON_V2 ( 7*32+20)/* AMD Performance Monitoring Version 2 */ +/* FREE! ( 7*32+20) */ #define X86_FEATURE_USE_IBPB ( 7*32+21)/* "" Indirect Branch Prediction Barrier enabled */ #define X86_FEATURE_USE_IBRS_FW ( 7*32+22)/* "" Use IBRS during runtime firmware calls */ #define X86_FEATURE_SPEC_STORE_BYPASS_DISABLE ( 7*32+23)/* "" Disable Speculative Store Bypass. */
@@ -459,6 +459,10 @@#define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */ #define X86_FEATURE_SRSO_NO (20*32+29)/* "" CPU is not affected by SRSO */ +/* AMD-defined performance monitoring features, CPUID level 0x80000022 (EAX), word 21 */ +#define X86_FEATURE_PERFMON_V2 (21*32+ 0)/* AMD Performance Monitoring Version 2 */ +#define X86_FEATURE_AMD_LBR_V2 (21*32+ 1)/* AMD Last Branch Record Extension Version 2 */ +/* * BUG word(s) */
arch/x86/include/asm/disabled-features.h +2 -1
@@ -155,6 +155,7 @@#define DISABLED_MASK18 (DISABLE_IBT)#define DISABLED_MASK19 (DISABLE_SEV_SNP)#define DISABLED_MASK20 0 -#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 21) +#define DISABLED_MASK21 0 +#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 22)#endif /* _ASM_X86_DISABLED_FEATURES_H */
arch/x86/include/asm/required-features.h +2 -1
@@ -99,6 +99,7 @@#define REQUIRED_MASK18 0#define REQUIRED_MASK19 0#define REQUIRED_MASK20 0 -#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 21) +#define REQUIRED_MASK21 0 +#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 22)#endif /* _ASM_X86_REQUIRED_FEATURES_H */
arch/x86/kernel/cpu/common.c +3 -0
@@ -1039,6 +1039,9 @@ void get_cpu_cap(struct cpuinfo_x86 *c)if (c->extended_cpuid_level >=0x80000021 ) c->x86_capability[CPUID_8000_0021_EAX ] =cpuid_eax (0x80000021 ); +if (c->extended_cpuid_level >=0x80000022 ) + c->x86_capability[CPUID_8000_0022_EAX ] =cpuid_eax (0x80000022 ); +init_scattered_cpuid_features (c);init_speculation_control (c);
arch/x86/kernel/cpu/scattered.c +0 -2
@@ -47,8 +47,6 @@ static const struct cpuid_bit cpuid_bits[] = { { X86_FEATURE_MBA, CPUID_EBX, 6, 0x80000008, 0 }, { X86_FEATURE_SMBA, CPUID_EBX, 2, 0x80000020, 0 }, { X86_FEATURE_BMEC, CPUID_EBX, 3, 0x80000020, 0 }, - { X86_FEATURE_PERFMON_V2, CPUID_EAX, 0, 0x80000022, 0 }, - { X86_FEATURE_AMD_LBR_V2, CPUID_EAX, 1, 0x80000022, 0 }, { 0, 0, 0, 0, 0 } };
arch/x86/kvm/cpuid.c +1 -4
@@ -773,10 +773,7 @@ void kvm_set_cpu_caps(void)kvm_cpu_cap_check_and_set (X86_FEATURE_SBPB );kvm_cpu_cap_check_and_set (X86_FEATURE_IBPB_BRTYPE );kvm_cpu_cap_check_and_set (X86_FEATURE_SRSO_NO ); - -kvm_cpu_cap_init_kvm_defined (CPUID_8000_0022_EAX , -F (PERFMON_V2 ) - ); +kvm_cpu_cap_check_and_set (X86_FEATURE_PERFMON_V2 );/* * Synthesize "LFENCE is serializing" into the AMD-defined entry in
arch/x86/kvm/reverse_cpuid.h +0 -1
@@ -15,7 +15,6 @@ enum kvm_only_cpuid_leafs {CPUID_12_EAX =NCAPINTS ,CPUID_7_1_EDX ,CPUID_8000_0007_EDX , -CPUID_8000_0022_EAX ,CPUID_7_2_EDX , NR_KVM_CPU_CAPS,
Signature · 1 line
2.34.1
Re: [PATCH v4 1/2] x86/cpufeatures: Add dedicated feature word for CPUID leaf 0x80000022[EAX]
Quoted 45 lines · Sandipan Das
Move the existing scattered performance monitoring related feature bits from CPUID leaf 0x80000022[EAX] into a dedicated word since additional bits will be defined from the same leaf in the future. This includes
X86_FEATURE_PERFMON_V2andX86_FEATURE_AMD_LBR_V2.Signed-off-by Sandipan Das <[email protected]>--- arch/x86/include/asm/cpufeature.h | 7 +++++-- arch/x86/include/asm/cpufeatures.h | 10 +++++++--- arch/x86/include/asm/disabled-features.h | 3 ++- arch/x86/include/asm/required-features.h | 3 ++- arch/x86/kernel/cpu/common.c | 3 +++ arch/x86/kernel/cpu/scattered.c | 2 -- arch/x86/kvm/cpuid.c | 5 +---- arch/x86/kvm/reverse_cpuid.h | 1 - 8 files changed, 20 insertions(+), 14 deletions(-)arch/x86/include/asm/cpufeature.h +1
-0@@ -33,6 +33,7 @@ enum cpuid_leafsCPUID_7_EDX ,CPUID_8000_001F_EAX ,CPUID_8000_0021_EAX , +CPUID_8000_0022_EAX , #define X86_FEATURE_SYSCALL32 ( 3*32+14) /* "" syscall in IA32 userspace */ #define X86_FEATURE_SYSENTER32 ( 3*32+15) /* "" sysenter in IA32 userspace */#define
X86_FEATURE_REP_GOOD( 3*32+16) /* REP microcode works well */arch/x86/include/asm/cpufeature.h +2
-2-#define X86_FEATURE_AMD_LBR_V2 ( 3*32+17)/* AMD Last Branch Record Extension Version 2 */ +/* FREE! ( 3*32+17) */ #define X86_FEATURE_CLEAR_CPU_BUF ( 3*32+18)/* "" Clear CPU buffers using VERW */ #define X86_FEATURE_ACC_POWER ( 3*32+19)/* AMD Accumulated Power Mechanism */ #define X86_FEATURE_NOPL ( 3*32+20)/* The NOPL (0F 1F) instructions */ @@ -209,7 +209,7 @@#define X86_FEATURE_SSBD ( 7*32+17)/* Speculative Store Bypass Disable */ #define X86_FEATURE_MBA ( 7*32+18)/* Memory Bandwidth Allocation */ #define X86_FEATURE_RSB_CTXSW ( 7*32+19)/* "" Fill RSB on context switches */ -#define X86_FEATURE_PERFMON_V2 ( 7*32+20)/* AMD Performance Monitoring Version 2 */ +/* FREE! ( 7*32+20) */ #define X86_FEATURE_USE_IBPB ( 7*32+21)/* "" Indirect Branch Prediction Barrier enabled */ #define X86_FEATURE_USE_IBRS_FW ( 7*32+22)/* "" Use IBRS during runtime firmware calls */ #define X86_FEATURE_SPEC_STORE_BYPASS_DISABLE ( 7*32+23)/* "" Disable Speculative Store Bypass. */
arch/x86/include/asm/cpufeature.h line 464
Quoted 6 lines
arch/x86/include/asm/cpufeature.h +3
-0@@ -459,6 +459,10 @@#define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */ #define X86_FEATURE_SRSO_NO (20*32+29)/* "" CPU is not affected by SRSO */ +/* AMD-defined performance monitoring features, CPUID level 0x80000022 (EAX), word 21 */ +#define X86_FEATURE_PERFMON_V2 (21*32+ 0)/* AMD Performance Monitoring Version 2 */ +#define X86_FEATURE_AMD_LBR_V2 (21*32+ 1)/* AMD Last Branch Record Extension Version 2 */
Thank you! I presume you tested both patches on the relevant system with the X86_FEATURE_AMD_LBR_PMC_FREEZE bug?
Thanks,
Ingo
Re: [PATCH v4 1/2] x86/cpufeatures: Add dedicated feature word for CPUID leaf 0x80000022[EAX]
Quoted 51 lines · Ingo Molnar
Quoted 48 lines · Sandipan Das
Move the existing scattered performance monitoring related feature bits from CPUID leaf 0x80000022[EAX] into a dedicated word since additional bits will be defined from the same leaf in the future. This includes
X86_FEATURE_PERFMON_V2andX86_FEATURE_AMD_LBR_V2.Signed-off-by Sandipan Das <[email protected]>--- arch/x86/include/asm/cpufeature.h | 7 +++++-- arch/x86/include/asm/cpufeatures.h | 10 +++++++--- arch/x86/include/asm/disabled-features.h | 3 ++- arch/x86/include/asm/required-features.h | 3 ++- arch/x86/kernel/cpu/common.c | 3 +++ arch/x86/kernel/cpu/scattered.c | 2 -- arch/x86/kvm/cpuid.c | 5 +---- arch/x86/kvm/reverse_cpuid.h | 1 - 8 files changed, 20 insertions(+), 14 deletions(-)arch/x86/include/asm/cpufeature.h +1
-0@@ -33,6 +33,7 @@ enum cpuid_leafsCPUID_7_EDX ,CPUID_8000_001F_EAX ,CPUID_8000_0021_EAX , +CPUID_8000_0022_EAX , #define X86_FEATURE_SYSCALL32 ( 3*32+14) /* "" syscall in IA32 userspace */ #define X86_FEATURE_SYSENTER32 ( 3*32+15) /* "" sysenter in IA32 userspace */#define
X86_FEATURE_REP_GOOD( 3*32+16) /* REP microcode works well */arch/x86/include/asm/cpufeature.h +2
-2-#define X86_FEATURE_AMD_LBR_V2 ( 3*32+17)/* AMD Last Branch Record Extension Version 2 */ +/* FREE! ( 3*32+17) */ #define X86_FEATURE_CLEAR_CPU_BUF ( 3*32+18)/* "" Clear CPU buffers using VERW */ #define X86_FEATURE_ACC_POWER ( 3*32+19)/* AMD Accumulated Power Mechanism */ #define X86_FEATURE_NOPL ( 3*32+20)/* The NOPL (0F 1F) instructions */ @@ -209,7 +209,7 @@#define X86_FEATURE_SSBD ( 7*32+17)/* Speculative Store Bypass Disable */ #define X86_FEATURE_MBA ( 7*32+18)/* Memory Bandwidth Allocation */ #define X86_FEATURE_RSB_CTXSW ( 7*32+19)/* "" Fill RSB on context switches */ -#define X86_FEATURE_PERFMON_V2 ( 7*32+20)/* AMD Performance Monitoring Version 2 */ +/* FREE! ( 7*32+20) */ #define X86_FEATURE_USE_IBPB ( 7*32+21)/* "" Indirect Branch Prediction Barrier enabled */ #define X86_FEATURE_USE_IBRS_FW ( 7*32+22)/* "" Use IBRS during runtime firmware calls */ #define X86_FEATURE_SPEC_STORE_BYPASS_DISABLE ( 7*32+23)/* "" Disable Speculative Store Bypass. */ @@ -459,6 +459,10 @@#define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */ #define X86_FEATURE_SRSO_NO (20*32+29)/* "" CPU is not affected by SRSO */
Quoted 7 lines
arch/x86/include/asm/cpufeature.h line 464
Quoted 3 lines
arch/x86/include/asm/cpufeature.h +3
-0+/* AMD-defined performance monitoring features, CPUID level 0x80000022 (EAX), word 21 */ +#define X86_FEATURE_PERFMON_V2 (21*32+ 0)/* AMD Performance Monitoring Version 2 */ +#define X86_FEATURE_AMD_LBR_V2 (21*32+ 1)/* AMD Last Branch Record Extension Version 2 */ Thank you! I presume you tested both patches on the relevant system with the
X86_FEATURE_AMD_LBR_PMC_FREEZEbug?
Yes, I tested them on systems which don't support freeze.
When kernel branches are captured on such systems, the records mostly point to amd_pmu_lbr_read() and native_read_msr() which are called to read the branch record MSRs. This is the expected result since LBR does not stop recording branches after a PMC overflow.
E.g.
# To display the perf.data header info, please use --header/--header-only options. #
#
# Total Lost Samples: 0
#
# Samples: 190K of event 'ex_ret_brn_tkn'
# Event count (approx.): 190144
#
# Overhead Command Source Shared Object Source Symbol Target Symbol Basic Block Cycles
# ........ ....... .................... ........................... ........................... ..................
#
24.98% branchy [kernel.kallsyms] [k] amd_pmu_lbr_read [k] amd_pmu_lbr_read -
12.49% branchy [kernel.kallsyms] [k] amd_pmu_lbr_read [k] native_read_msr -
12.49% branchy [kernel.kallsyms] [k] native_read_msr [k] native_read_msr -
12.49% branchy [kernel.kallsyms] [k] srso_alias_safe_ret [k] amd_pmu_lbr_read -
12.49% branchy [kernel.kallsyms] [k] srso_alias_safe_ret [k] srso_alias_safe_ret -
12.49% branchy [kernel.kallsyms] [k] srso_alias_return_thunk [k] srso_alias_return_thunk -
6.25% branchy [kernel.kallsyms] [k] native_read_msr [k] srso_alias_return_thunk -
6.25% branchy [kernel.kallsyms] [k] srso_alias_return_thunk [k] srso_alias_safe_ret -
0.02% perf-ex [kernel.kallsyms] [k] amd_pmu_lbr_read [k] amd_pmu_lbr_read -
0.01% perf-ex [kernel.kallsyms] [k] amd_pmu_lbr_read [k] native_read_msr -
0.01% perf-ex [kernel.kallsyms] [k] native_read_msr [k] native_read_msr -
0.01% perf-ex [kernel.kallsyms] [k] srso_alias_safe_ret [k] amd_pmu_lbr_read -
0.01% perf-ex [kernel.kallsyms] [k] srso_alias_safe_ret [k] srso_alias_safe_ret -
0.01% perf-ex [kernel.kallsyms] [k] srso_alias_return_thunk [k] srso_alias_return_thunk -
0.00% perf-ex [kernel.kallsyms] [k] native_read_msr [k] srso_alias_return_thunk -
0.00% perf-ex [kernel.kallsyms] [k] srso_alias_return_thunk [k] srso_alias_safe_ret -Re: [PATCH v4 1/2] x86/cpufeatures: Add dedicated feature word for CPUID leaf 0x80000022[EAX]
In reply to Ingo MolnarQuoted 6 lines · Ingo Molnar
arch/x86/include/asm/cpufeatures.h line 464
Quoted 3 lines
arch/x86/include/asm/cpufeatures.h +3
-0+/* AMD-defined performance monitoring features, CPUID level 0x80000022 (EAX), word 21 */ +#define X86_FEATURE_PERFMON_V2 (21*32+ 0)/* AMD Performance Monitoring Version 2 */ +#define X86_FEATURE_AMD_LBR_V2 (21*32+ 1)/* AMD Last Branch Record Extension Version 2 */ Thank you! I presume you tested both patches on the relevant system with the
X86_FEATURE_AMD_LBR_PMC_FREEZEbug?
Also, Boris reminds me that we really want to do what I suggested originally and use a new synthethic word here, not a new vendor word, to keep all the bits better compressed in cpuinfo.x86_capability[] - so one more iteration will be needed.
Thanks,
Ingo
PATCH v4 2/2 perf/x86/amd/lbr: Use freeze based on availability
In reply to Sandipan DasCurrently, it is assumed that LBR Freeze is supported on all processors when X86_FEATURE_AMD_LBR_V2 is available i.e. CPUID leaf 0x80000022[EAX] bit 1 is set. This is incorrect as the availability of the feature is additionally dependent on CPUID leaf 0x80000022[EAX] bit 2 being set. This may not be the case for all Zen 4 processors. Define a new feature bit for LBR and PMC freeze and set the freeze enable bit (FLBRI) in DebugCtl (MSR 0x1d9) conditionally.
It should still be possible to use LBR without freeze for profile-guided optimization of user programs by using an user-only branch filter during profiling. When the user-only filter is enabled, branches are no longer recorded after the transition to CPL 0 upon PMI arrival. When branch entries are read in the PMI handler, the branch stack does not change.
E.g.
$ perf record -j any,u -e ex_ret_brn_tkn ./workload
Since the feature bit is visible under flags in /proc/cpuinfo, it can be used to determine the feasibility of use-cases which require LBR Freeze to be supported by the hardware such as profile-guided optimization of kernels.
--- arch/x86/events/amd/core.c | 4 ++-- arch/x86/events/amd/lbr.c | 16 ++++++++++------ arch/x86/include/asm/cpufeatures.h | 1 + 3 files changed, 13 insertions(+), 8 deletions(-)
arch/x86/events/amd/core.c +2 -2
@@ -904,8 +904,8 @@ static int amd_pmu_v2_handle_irq(struct pt_regs *regs)if (!status) goto done; -/* Read branch records before unfreezing */ -if (status &GLOBAL_STATUS_LBRS_FROZEN ) { +/* Read branch records */ +if (x86_pmu.lbr_nr) {amd_pmu_lbr_read (); status &= ~GLOBAL_STATUS_LBRS_FROZEN ; }
arch/x86/events/amd/lbr.c +10 -6
@@ -402,10 +402,12 @@ void amd_pmu_lbr_enable_all(void)wrmsrl (MSR_AMD64_LBR_SELECT , lbr_select); } -rdmsrl (MSR_IA32_DEBUGCTLMSR , dbg_ctl); -rdmsrl (MSR_AMD_DBG_EXTN_CFG , dbg_extn_cfg); +if (cpu_feature_enabled (X86_FEATURE_AMD_LBR_PMC_FREEZE )) { +rdmsrl (MSR_IA32_DEBUGCTLMSR , dbg_ctl); +wrmsrl (MSR_IA32_DEBUGCTLMSR , dbg_ctl |DEBUGCTLMSR_FREEZE_LBRS_ON_PMI ); + } -wrmsrl (MSR_IA32_DEBUGCTLMSR , dbg_ctl |DEBUGCTLMSR_FREEZE_LBRS_ON_PMI ); +rdmsrl (MSR_AMD_DBG_EXTN_CFG , dbg_extn_cfg);wrmsrl (MSR_AMD_DBG_EXTN_CFG , dbg_extn_cfg |DBG_EXTN_CFG_LBRV2EN ); }
@@ -418,10 +420,12 @@ void amd_pmu_lbr_disable_all(void)return ;rdmsrl (MSR_AMD_DBG_EXTN_CFG , dbg_extn_cfg); -rdmsrl (MSR_IA32_DEBUGCTLMSR , dbg_ctl); -wrmsrl (MSR_AMD_DBG_EXTN_CFG , dbg_extn_cfg & ~DBG_EXTN_CFG_LBRV2EN ); -wrmsrl (MSR_IA32_DEBUGCTLMSR , dbg_ctl & ~DEBUGCTLMSR_FREEZE_LBRS_ON_PMI ); + +if (cpu_feature_enabled (X86_FEATURE_AMD_LBR_PMC_FREEZE )) { +rdmsrl (MSR_IA32_DEBUGCTLMSR , dbg_ctl); +wrmsrl (MSR_IA32_DEBUGCTLMSR , dbg_ctl & ~DEBUGCTLMSR_FREEZE_LBRS_ON_PMI ); + } }__init int amd_pmu_lbr_init (void )
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -462,6 +462,7 @@/* AMD-defined performance monitoring features, CPUID level 0x80000022 (EAX), word 21 */ #define X86_FEATURE_PERFMON_V2 (21*32+ 0)/* AMD Performance Monitoring Version 2 */ #define X86_FEATURE_AMD_LBR_V2 (21*32+ 1)/* AMD Last Branch Record Extension Version 2 */ +#define X86_FEATURE_AMD_LBR_PMC_FREEZE (21*32+ 2)/* AMD LBR and PMC Freeze */ /* * BUG word(s)
Signature · 1 line
2.34.1