Skip to content

Commit b0380e1

Browse files
Kan LiangPeter Zijlstra
authored andcommitted
perf/x86/intel/lbr: Fix unchecked MSR access error on HSW
The fuzzer triggers the below trace. [ 7763.384369] unchecked MSR access error: WRMSR to 0x689 (tried to write 0x1fffffff8101349e) at rIP: 0xffffffff810704a4 (native_write_msr+0x4/0x20) [ 7763.397420] Call Trace: [ 7763.399881] <TASK> [ 7763.401994] intel_pmu_lbr_restore+0x9a/0x1f0 [ 7763.406363] intel_pmu_lbr_sched_task+0x91/0x1c0 [ 7763.410992] __perf_event_task_sched_in+0x1cd/0x240 On a machine with the LBR format LBR_FORMAT_EIP_FLAGS2, when the TSX is disabled, a TSX quirk is required to access LBR from registers. The lbr_from_signext_quirk_needed() is introduced to determine whether the TSX quirk should be applied. However, the lbr_from_signext_quirk_needed() is invoked before the intel_pmu_lbr_init(), which parses the LBR format information. Without the correct LBR format information, the TSX quirk never be applied. Move the lbr_from_signext_quirk_needed() into the intel_pmu_lbr_init(). Checking x86_pmu.lbr_has_tsx in the lbr_from_signext_quirk_needed() is not required anymore. Both LBR_FORMAT_EIP_FLAGS2 and LBR_FORMAT_INFO have LBR_TSX flag, but only the LBR_FORMAT_EIP_FLAGS2 requirs the quirk. Update the comments accordingly. Fixes: 1ac7fd8 ("perf/x86/intel/lbr: Support LBR format V7") Reported-by: Vince Weaver <[email protected]> Signed-off-by: Kan Liang <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: [email protected] Link: https://lkml.kernel.org/r/[email protected]
1 parent ff69927 commit b0380e1

File tree

1 file changed

+10
-9
lines changed
  • arch/x86/events/intel

1 file changed

+10
-9
lines changed

arch/x86/events/intel/lbr.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,17 +278,17 @@ enum {
278278
};
279279

280280
/*
281-
* For formats with LBR_TSX flags (e.g. LBR_FORMAT_EIP_FLAGS2), bits 61:62 in
282-
* MSR_LAST_BRANCH_FROM_x are the TSX flags when TSX is supported, but when
283-
* TSX is not supported they have no consistent behavior:
281+
* For format LBR_FORMAT_EIP_FLAGS2, bits 61:62 in MSR_LAST_BRANCH_FROM_x
282+
* are the TSX flags when TSX is supported, but when TSX is not supported
283+
* they have no consistent behavior:
284284
*
285285
* - For wrmsr(), bits 61:62 are considered part of the sign extension.
286286
* - For HW updates (branch captures) bits 61:62 are always OFF and are not
287287
* part of the sign extension.
288288
*
289289
* Therefore, if:
290290
*
291-
* 1) LBR has TSX format
291+
* 1) LBR format LBR_FORMAT_EIP_FLAGS2
292292
* 2) CPU has no TSX support enabled
293293
*
294294
* ... then any value passed to wrmsr() must be sign extended to 63 bits and any
@@ -300,7 +300,7 @@ static inline bool lbr_from_signext_quirk_needed(void)
300300
bool tsx_support = boot_cpu_has(X86_FEATURE_HLE) ||
301301
boot_cpu_has(X86_FEATURE_RTM);
302302

303-
return !tsx_support && x86_pmu.lbr_has_tsx;
303+
return !tsx_support;
304304
}
305305

306306
static DEFINE_STATIC_KEY_FALSE(lbr_from_quirk_key);
@@ -1609,9 +1609,6 @@ void intel_pmu_lbr_init_hsw(void)
16091609
x86_pmu.lbr_sel_map = hsw_lbr_sel_map;
16101610

16111611
x86_get_pmu(smp_processor_id())->task_ctx_cache = create_lbr_kmem_cache(size, 0);
1612-
1613-
if (lbr_from_signext_quirk_needed())
1614-
static_branch_enable(&lbr_from_quirk_key);
16151612
}
16161613

16171614
/* skylake */
@@ -1702,7 +1699,11 @@ void intel_pmu_lbr_init(void)
17021699
switch (x86_pmu.intel_cap.lbr_format) {
17031700
case LBR_FORMAT_EIP_FLAGS2:
17041701
x86_pmu.lbr_has_tsx = 1;
1705-
fallthrough;
1702+
x86_pmu.lbr_from_flags = 1;
1703+
if (lbr_from_signext_quirk_needed())
1704+
static_branch_enable(&lbr_from_quirk_key);
1705+
break;
1706+
17061707
case LBR_FORMAT_EIP_FLAGS:
17071708
x86_pmu.lbr_from_flags = 1;
17081709
break;

0 commit comments

Comments
 (0)