Skip to content

Commit 189ecdb

Browse files
committed
KVM: x86: Snapshot the host's DEBUGCTL after disabling IRQs
Snapshot the host's DEBUGCTL after disabling IRQs, as perf can toggle debugctl bits from IRQ context, e.g. when enabling/disabling events via smp_call_function_single(). Taking the snapshot (long) before IRQs are disabled could result in KVM effectively clobbering DEBUGCTL due to using a stale snapshot. Cc: stable@vger.kernel.org Reviewed-and-tested-by: Ravi Bangoria <ravi.bangoria@amd.com> Link: https://lore.kernel.org/r/20250227222411.3490595-6-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 4332658 commit 189ecdb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/kvm/x86.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4968,7 +4968,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
49684968

49694969
/* Save host pkru register if supported */
49704970
vcpu->arch.host_pkru = read_pkru();
4971-
vcpu->arch.host_debugctl = get_debugctlmsr();
49724971

49734972
/* Apply any externally detected TSC adjustments (due to suspend) */
49744973
if (unlikely(vcpu->arch.tsc_offset_adjustment)) {
@@ -10969,6 +10968,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
1096910968
set_debugreg(0, 7);
1097010969
}
1097110970

10971+
vcpu->arch.host_debugctl = get_debugctlmsr();
10972+
1097210973
guest_timing_enter_irqoff();
1097310974

1097410975
for (;;) {

0 commit comments

Comments
 (0)