Skip to content

Commit 9c02fb5

Browse files
sean-jcgregkh
authored andcommitted
KVM: VMX: Allow guest to set DEBUGCTL.RTM_DEBUG if RTM is supported
commit 17ec2f9 upstream. Let the guest set DEBUGCTL.RTM_DEBUG if RTM is supported according to the guest CPUID model, as debug support is supposed to be available if RTM is supported, and there are no known downsides to letting the guest debug RTM aborts. Note, there are no known bug reports related to RTM_DEBUG, the primary motivation is to reduce the probability of breaking existing guests when a future change adds a missing consistency check on vmcs12.GUEST_DEBUGCTL (KVM currently lets L2 run with whatever hardware supports; whoops). Note #2, KVM already emulates DR6.RTM, and doesn't restrict access to DR7.RTM. Fixes: 83c5291 ("KVM: x86: expose Intel cpu new features (HLE, RTM) to guest") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250610232010.162191-5-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent acdc673 commit 9c02fb5

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

arch/x86/include/asm/msr-index.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@
419419
#define DEBUGCTLMSR_FREEZE_PERFMON_ON_PMI (1UL << 12)
420420
#define DEBUGCTLMSR_FREEZE_IN_SMM_BIT 14
421421
#define DEBUGCTLMSR_FREEZE_IN_SMM (1UL << DEBUGCTLMSR_FREEZE_IN_SMM_BIT)
422+
#define DEBUGCTLMSR_RTM_DEBUG BIT(15)
422423

423424
#define MSR_PEBS_FRONTEND 0x000003f7
424425

arch/x86/kvm/vmx/vmx.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,6 +2186,10 @@ static u64 vmx_get_supported_debugctl(struct kvm_vcpu *vcpu, bool host_initiated
21862186
(host_initiated || intel_pmu_lbr_is_enabled(vcpu)))
21872187
debugctl |= DEBUGCTLMSR_LBR | DEBUGCTLMSR_FREEZE_LBRS_ON_PMI;
21882188

2189+
if (boot_cpu_has(X86_FEATURE_RTM) &&
2190+
(host_initiated || guest_cpu_cap_has(vcpu, X86_FEATURE_RTM)))
2191+
debugctl |= DEBUGCTLMSR_RTM_DEBUG;
2192+
21892193
return debugctl;
21902194
}
21912195

0 commit comments

Comments
 (0)