Skip to content

Commit 841b51e

Browse files
suryasaimadhuPeter Zijlstra
authored andcommitted
perf/x86/amd: Run AMD BRS code only on supported hw
This fires on a Fam16h machine here: unchecked MSR access error: WRMSR to 0xc000010f (tried to write 0x0000000000000018) \ at rIP: 0xffffffff81007db1 (amd_brs_reset+0x11/0x50) Call Trace: <TASK> amd_pmu_cpu_starting ? x86_pmu_dead_cpu x86_pmu_starting_cpu cpuhp_invoke_callback ? x86_pmu_starting_cpu ? x86_pmu_dead_cpu cpuhp_issue_call ? x86_pmu_starting_cpu __cpuhp_setup_state_cpuslocked ? x86_pmu_dead_cpu ? x86_pmu_starting_cpu __cpuhp_setup_state ? map_vsyscall init_hw_perf_events ? map_vsyscall do_one_initcall ? _raw_spin_unlock_irqrestore ? try_to_wake_up kernel_init_freeable ? rest_init kernel_init ret_from_fork because that CPU hotplug callback gets executed on any AMD CPU - not only on the BRS-enabled ones. Check the BRS feature bit properly. Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-By: Stephane Eranian <eranian@google.com> Link: https://lkml.kernel.org/r/20220516154838.7044-1-bp@alien8.de
1 parent 3c27b0c commit 841b51e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/x86/events/amd/brs.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static inline u64 get_debug_extn_cfg(void)
5757

5858
static bool __init amd_brs_detect(void)
5959
{
60-
if (!boot_cpu_has(X86_FEATURE_BRS))
60+
if (!cpu_feature_enabled(X86_FEATURE_BRS))
6161
return false;
6262

6363
switch (boot_cpu_data.x86) {
@@ -112,6 +112,9 @@ static inline int amd_brs_get_tos(union amd_debug_extn_cfg *cfg)
112112
*/
113113
void amd_brs_reset(void)
114114
{
115+
if (!cpu_feature_enabled(X86_FEATURE_BRS))
116+
return;
117+
115118
/*
116119
* Reset config
117120
*/

0 commit comments

Comments
 (0)