Skip to content

Commit

Permalink
perf/x86/amd: Run AMD BRS code only on supported hw
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Acked-By: Stephane Eranian <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
  • Loading branch information
suryasaimadhu authored and Peter Zijlstra committed May 17, 2022
1 parent 3c27b0c commit 841b51e
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/x86/events/amd/brs.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ static inline u64 get_debug_extn_cfg(void)

static bool __init amd_brs_detect(void)
{
if (!boot_cpu_has(X86_FEATURE_BRS))
if (!cpu_feature_enabled(X86_FEATURE_BRS))
return false;

switch (boot_cpu_data.x86) {
Expand Down Expand Up @@ -112,6 +112,9 @@ static inline int amd_brs_get_tos(union amd_debug_extn_cfg *cfg)
*/
void amd_brs_reset(void)
{
if (!cpu_feature_enabled(X86_FEATURE_BRS))
return;

/*
* Reset config
*/
Expand Down

0 comments on commit 841b51e

Please sign in to comment.