]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
perf/x86: Avoid touching LBR_TOS MSR for Arch LBR
authorLike Xu <like.xu@linux.intel.com>
Fri, 30 Apr 2021 05:22:46 +0000 (13:22 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 30 Jun 2021 06:26:55 +0000 (08:26 +0200)
commit54779bebe15c481966f6d818ddc1fc59d9128ab1
tree24de5a2b394110a5719c4bf6e4635c21e8fd6ef2
parent0722c734d97c6adad8185478ebdbaea599d8f281
perf/x86: Avoid touching LBR_TOS MSR for Arch LBR

BugLink: https://bugs.launchpad.net/bugs/1931896
[ Upstream commit 3317c26a4b413b41364f2c4b83c778c6aba1576d ]

The Architecture LBR does not have MSR_LBR_TOS (0x000001c9).
In a guest that should support Architecture LBR, check_msr()
will be a non-related check for the architecture MSR 0x0
(IA32_P5_MC_ADDR) that is also not supported by KVM.

The failure will cause x86_pmu.lbr_nr = 0, thereby preventing
the initialization of the guest Arch LBR. Fix it by avoiding
this extraneous check in intel_pmu_init() for Arch LBR.

Fixes: 47125db27e47 ("perf/x86/intel/lbr: Support Architectural LBR")
Signed-off-by: Like Xu <like.xu@linux.intel.com>
[peterz: simpler still]
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210430052247.3079672-1-like.xu@linux.intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
arch/x86/events/intel/core.c