KVM: SVM: Fix DEBUGCTL bugs
Sean Christopherson
maintainerv2 cover KVM: SVM: Fix DEBUGCTL bugs
Fix a long-lurking bug in SVM where KVM runs the guest with the host's DEBUGCTL if LBR virtualization is disabled. AMD CPUs rather stupidly context switch DEBUGCTL if and only if LBR virtualization is enabled (not just supported, but fully enabled).
The bug has gone unnoticed because until recently, the only bits that KVM would leave set were things like BTF, which are guest visible but won't cause functional problems unless guest software is being especially particular about #DBs.
The bug was exposed by the addition of BusLockTrap ("Detect" in the kernel), as the resulting #DBs due to split-lock accesses in guest userspace (lol Steam) get reflected into the guest by KVM.
v2:
- Load the guest's DEBUGCTL instead of simply zeroing it on VMRUN.
- Drop bits 5:3 from guest DEBUGCTL so that KVM doesn't let the guest unintentionally enable BusLockTrap (AMD repurposed bits). [Ravi]
- Collect a review. [Xiaoyao]
- Make bits 5:3 fully reserved, in a separate not-for-stable patch.
v1: https://lore.kernel.org/all/[email protected]
Sean Christopherson (5):
KVM: SVM: Drop DEBUGCTL[5:2] from guest's effective value
KVM: x86: Snapshot the host's DEBUGCTL in common x86
KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is
disabled
KVM: x86: Snapshot the host's DEBUGCTL after disabling IRQs
KVM: SVM: Treat DEBUGCTL[5:2] as reserved
arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm/svm.c | 15 +++++++++++++++ arch/x86/kvm/svm/svm.h | 2 +- arch/x86/kvm/vmx/vmx.c | 8 ++------ arch/x86/kvm/vmx/vmx.h | 2 -- arch/x86/kvm/x86.c | 2 ++ 6 files changed, 21 insertions(+), 9 deletions(-)
base-commit: fed48e2967f402f561d80075a20c5c9e16866e53
Signature · 1 line
2.48.1.711.g2feabab25a-goog
Sean Christopherson
maintainerPATCH v2 1/5 KVM: SVM: Drop DEBUGCTL[5:2] from guest's effective value
Drop bits 5:2 from the guest's effective DEBUGCTL value, as AMD changed the architectural behavior of the bits and broke backwards compatibility. On CPUs without BusLockTrap (or at least, in APMs from before ~2023), bits 5:2 controlled the behavior of external pins:
Performance-Monitoring/Breakpoint Pin-Control (PBi)—Bits 5:2, read/write. Software uses thesebits to control the type of information reported by the four external performance-monitoring/breakpoint pins on the processor. When a PBi bit is cleared to 0, the corresponding external pin (BPi) reports performance-monitor information. When a PBi bit is set to 1, the corresponding external pin (BPi) reports breakpoint information.
With the introduction of BusLockTrap, presumably to be compatible with Intel CPUs, AMD redefined bit 2 to be BLCKDB:
Bus Lock #DB Trap (BLCKDB)—Bit 2, read/write. Software sets this bit to enable generation of a #DB trap following successful execution of a bus lock when CPL is > 0.
and redefined bits 5:3 (and bit 6) as "6:3 Reserved MBZ".
Ideally, KVM would treat bits 5:2 as reserved. Defer that change to a feature cleanup to avoid breaking existing guest in LTS kernels. For now, drop the bits to retain backwards compatibility (of a sort).
Note, dropping bits 5:2 is still a guest-visible change, e.g. if the guest is enabling LBRs *and* the legacy PBi bits, then the state of the PBi bits is visible to the guest, whereas now the guest will always see '0'.
--- arch/x86/kvm/svm/svm.c | 12 ++++++++++++ arch/x86/kvm/svm/svm.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/svm.c +12 -0
@@ -3165,6 +3165,18 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)kvm_pr_unimpl_wrmsr (vcpu, ecx, data);break ; } + +/* +* AMD changed the architectural behavior of bits 5:2. On CPUs +* without BusLockTrap, bits 5:2 control "external pins", but +* on CPUs that support BusLockDetect, bit 2 enables BusLockTrap +* and bits 5:3 are reserved-to-zero. Sadly, old KVM allowed +* the guest to set bits 5:2 despite not actually virtualizing +* Performance-Monitoring/Breakpoint external pins. Drop bits +* 5:2 for backwards compatibility. +*/ + data &= ~GENMASK (5 ,2 ); +if (data &DEBUGCTL_RESERVED_BITS )return 1 ;
arch/x86/kvm/svm/svm.h +1 -1
@@ -582,7 +582,7 @@ static inline bool is_vnmi_enabled(struct vcpu_svm *svm)/* svm.c */ #define MSR_INVALID 0xffffffffU -#define DEBUGCTL_RESERVED_BITS (~(0x3fULL)) +#define DEBUGCTL_RESERVED_BITS (~(DEBUGCTLMSR_BTF | DEBUGCTLMSR_LBR))extern bool dump_invalid_vmcb;
Signature · 1 line
2.48.1.711.g2feabab25a-goog
Sean Christopherson
maintainerPATCH v2 2/5 KVM: x86: Snapshot the host's DEBUGCTL in common x86
In reply to Sean ChristophersonMove KVM's snapshot of DEBUGCTL to kvm_vcpu_arch and take the snapshot in common x86, so that SVM can also use the snapshot.
Opportunistically change the field to a u64. While bits 63:32 are reserved on AMD, not mentioned at all in Intel's SDM, and managed as an "unsigned long" by the kernel, DEBUGCTL is an MSR and therefore a 64-bit value.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/vmx/vmx.c | 8 ++------ arch/x86/kvm/vmx/vmx.h | 2 -- arch/x86/kvm/x86.c | 1 + 4 files changed, 4 insertions(+), 8 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -781,6 +781,7 @@ struct kvm_vcpu_arch {u32 pkru;u32 hflags;u64 efer; +u64 host_debugctl;u64 apic_base;struct kvm_lapic *apic;/* kernel irqchip context */ bool load_eoi_exitmap_pending;
arch/x86/kvm/vmx/vmx.c +2 -6
@@ -1514,16 +1514,12 @@ void vmx_vcpu_load_vmcs(struct kvm_vcpu *vcpu, int cpu,*/ void vmx_vcpu_load (struct kvm_vcpu *vcpu,int cpu) { -struct vcpu_vmx *vmx =to_vmx (vcpu); -if (vcpu->scheduled_out && !kvm_pause_in_guest (vcpu->kvm))shrink_ple_window (vcpu);vmx_vcpu_load_vmcs (vcpu, cpu,NULL );vmx_vcpu_pi_load (vcpu, cpu); - - vmx->host_debugctlmsr =get_debugctlmsr (); }void vmx_vcpu_put (struct kvm_vcpu *vcpu)
@@ -7458,8 +7454,8 @@ fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu, bool force_immediate_exit) }/* MSR_IA32_DEBUGCTLMSR is zeroed on vmexit. Restore it if needed */ -if (vmx->host_debugctlmsr) -update_debugctlmsr (vmx->host_debugctlmsr); +if (vcpu->arch.host_debugctl) +update_debugctlmsr (vcpu->arch.host_debugctl);#ifndef CONFIG_X86_64 /*
arch/x86/kvm/vmx/vmx.h +0 -2
@@ -340,8 +340,6 @@ struct vcpu_vmx {/* apic deadline value in host tsc */ u64 hv_deadline_tsc; -unsigned long host_debugctlmsr; -/* * Only bits masked by msr_ia32_feature_control_valid_bits can be set in * msr_ia32_feature_control. FEAT_CTL_LOCKED is always included
arch/x86/kvm/x86.c +1 -0
@@ -4991,6 +4991,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)/* Save host pkru register if supported */ vcpu->arch.host_pkru =read_pkru (); + vcpu->arch.host_debugctl =get_debugctlmsr ();/* Apply any externally detected TSC adjustments (due to suspend) */ if (unlikely (vcpu->arch.tsc_offset_adjustment)) {
Signature · 1 line
2.48.1.711.g2feabab25a-goog
Sean Christopherson
maintainerPATCH v2 3/5 KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is disabled
In reply to Sean ChristophersonManually load the guest's DEBUGCTL prior to VMRUN (and restore the host's value on #VMEXIT) if it diverges from the host's value and LBR virtualization is disabled, as hardware only context switches DEBUGCTL if LBR virtualization is fully enabled. Running the guest with the host's value has likely been mildly problematic for quite some time, e.g. it will result in undesirable behavior if BTF diverges.
But the bug became fatal with the introduction of Bus Lock Trap ("Detect" in kernel paralance) support for AMD (commit 408eb7417a92 ("x86/bus_lock: Add support for AMD")), as a bus lock in the guest will trigger an unexpected #DB.
Note, suppressing the bus lock #DB, i.e. simply resuming the guest without injecting a #DB, is not an option. It wouldn't address the general issue with DEBUGCTL, e.g. for things like BTF, and there are other guest-visible side effects if BusLockTrap is left enabled.
If BusLockTrap is disabled, then DR6.BLD is reserved-to-1; any attempts to clear it by software are ignored. But if BusLockTrap is enabled, software can clear DR6.BLD:
Software enables bus lock trap by setting DebugCtl MSR[BLCKDB] (bit 2) to 1. When bus lock trap is enabled, ... The processor indicates that this #DB was caused by a bus lock by clearing DR6[BLD] (bit 11). DR6[11] previously had been defined to be always 1.
and clearing DR6.BLD is "sticky" in that it's not set (i.e. lowered) by other #DBs:
All other #DB exceptions leave DR6[BLD] unmodified
E.g. leaving BusLockTrap enable can confuse a legacy guest that writes '0' to reset DR6.
--- arch/x86/kvm/svm/svm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/x86/kvm/svm/svm.c +14 -0
@@ -4265,6 +4265,16 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu,clgi ();kvm_load_guest_xsave_state (vcpu); +/* +* Hardware only context switches DEBUGCTL if LBR virtualization is +* enabled. Manually load DEBUGCTL if necessary (and restore it after +* VM-Exit), as running with the host's DEBUGCTL can negatively affect +* guest state and can even be fatal, e.g. due to Bus Lock Detect. +*/ +if (!(svm->vmcb->control.virt_ext &LBR_CTL_ENABLE_MASK ) && + vcpu->arch.host_debugctl != svm->vmcb->save.dbgctl) +update_debugctlmsr (0 ); +kvm_wait_lapic_expire (vcpu);/*
@@ -4292,6 +4302,10 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu,if (unlikely (svm->vmcb->control.exit_code ==SVM_EXIT_NMI ))kvm_before_interrupt (vcpu,KVM_HANDLING_NMI ); +if (!(svm->vmcb->control.virt_ext &LBR_CTL_ENABLE_MASK ) && + vcpu->arch.host_debugctl != svm->vmcb->save.dbgctl) +update_debugctlmsr (vcpu->arch.host_debugctl); +kvm_load_host_xsave_state (vcpu);stgi ();
Signature · 1 line
2.48.1.711.g2feabab25a-goog
Re: [PATCH v2 3/5] KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is disabled
Hi Sean,
arch/x86/kvm/svm/svm.c static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, · line 4276
Quoted 13 lines
arch/x86/kvm/svm/svm.c +9
-0@@ -4265,6 +4265,16 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu,clgi ();kvm_load_guest_xsave_state (vcpu); +/* +* Hardware only context switches DEBUGCTL if LBR virtualization is +* enabled. Manually load DEBUGCTL if necessary (and restore it after +* VM-Exit), as running with the host's DEBUGCTL can negatively affect +* guest state and can even be fatal, e.g. due to Bus Lock Detect. +*/ +if (!(svm->vmcb->control.virt_ext &LBR_CTL_ENABLE_MASK ) && + vcpu->arch.host_debugctl != svm->vmcb->save.dbgctl) +update_debugctlmsr (0 );
^^^^^^^^^^^^^^^^^^^^^
You mean:
update_debugctlmsr(svm->vmcb->save.dbgctl);?
Somewhat related but independent: CPU automatically clears DEBUGCTL[BTF] on #DB exception. So, when DEBUGCTL is save/restored by KVM (i.e. when LBR virtualization is disabled), it's KVM's responsibility to clear DEBUGCTL[BTF].
---
@@ -2090,6 +2090,14 @@ static int db_interception(struct kvm_vcpu *vcpu)
(KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP)) &&
!svm->nmi_singlestep) {
u32 payload = svm->vmcb->save.dr6 ^ DR6_ACTIVE_LOW;
+
+ /*
+ * CPU automatically clears DEBUGCTL[BTF] on #DB exception.
+ * Simulate it when DEBUGCTL isn't auto save/restored.
+ */
+ if (!(svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK))
+ svm->vmcb->save.dbgctl &= ~0x2;
+
kvm_queue_exception_p(vcpu, DB_VECTOR, payload); return 1;
}
---
Thanks,
Ravi
Re: [PATCH v2 3/5] KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is disabled
Quoted 4 lines
Somewhat related but independent: CPU automatically clears DEBUGCTL[BTF] on #DB exception. So, when DEBUGCTL is save/restored by KVM (i.e. when LBR virtualization is disabled), it's KVM's responsibility to clear DEBUGCTL[BTF].
Found this with below KUT test.
(I wasn't sure whether I should send a separate series for kernel fix + KUT patch, or you can squash kernel fix in your patch and I shall send only KUT patch. So for now, sending it as a reply here.)
---
x86/debug.c +45 -0
@@ -409,6 +409,45 @@ static noinline unsigned long singlestep_with_sti_hlt(void)return start_rip; } +static noinline unsigned long __run_basic_block_ss_test (void ) +{ +unsigned long start_rip; + +wrmsr (MSR_IA32_DEBUGCTLMSR ,DEBUGCTLMSR_BTF ); + + asmvolatile ( +"pushf\n\t" +"pop %%rax\n\t" +"or $(1<<8),%%rax\n\t" +"push %%rax\n\t" +"popf\n\t" +"1: nop\n\t" +"jmp 2f\n\t" +"nop\n\t" +"2: lea 1b(%%rip), %0\n\t" + :"=r" (start_rip) : :"rax" + ); + +return start_rip; +} + +static void run_basic_block_ss_test (void ) +{ +unsigned long jmp_target; +unsigned long debugctl; + +write_dr6 (0 ); + jmp_target =__run_basic_block_ss_test () +4 ; + +report (is_single_step_db (dr6[0 ]) && db_addr[0 ] == jmp_target, +"Basic Block Single-step #DB: 0x%lx == 0x%lx" , db_addr[0 ], + jmp_target); + + debugctl =rdmsr (MSR_IA32_DEBUGCTLMSR ); +/* CPU should automatically clear DEBUGCTL[BTF] on #DB exception */ +report (debugctl ==0 ,"DebugCtl[BTF] reset post #DB. 0x%lx" , debugctl); +} +int main (int ac,char **av) {unsigned long cr4;
@@ -475,6 +514,12 @@ int main(int ac, char **av)run_ss_db_test (singlestep_with_movss_blocking_and_dr7_gd);run_ss_db_test (singlestep_with_sti_hlt); +/* Seems DEBUGCTL[BTF] is not supported on Intel. Run it only on AMD */ +if (this_cpu_has (X86_FEATURE_SVM )) { + n =0 ; +run_basic_block_ss_test (); + } + n =0 ;write_dr1 ((void *)&value);write_dr6 (DR6_BS );
---
Thanks,
Ravi
Sean Christopherson
maintainerRe: [PATCH v2 3/5] KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is disabled
Quoted 10 lines · Ravi Bangoria
Quoted 4 lines
Somewhat related but independent: CPU automatically clears DEBUGCTL[BTF] on #DB exception. So, when DEBUGCTL is save/restored by KVM (i.e. when LBR virtualization is disabled), it's KVM's responsibility to clear DEBUGCTL[BTF].
Found this with below KUT test.
(I wasn't sure whether I should send a separate series for kernel fix + KUT patch, or you can squash kernel fix in your patch and I shall send only KUT patch. So for now, sending it as a reply here.)
Go ahead and send the KUT test. They two repositories evolve independently no matter the order, just put a Link to lore of the kernel fix/discussion.
Thanks a ton for writing a test!
Sean Christopherson
maintainerRe: [PATCH v2 3/5] KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is disabled
In reply to Ravi BangoriaQuoted 10 lines · Ravi Bangoria
Quoted 4 lines
Somewhat related but independent: CPU automatically clears DEBUGCTL[BTF] on #DB exception. So, when DEBUGCTL is save/restored by KVM (i.e. when LBR virtualization is disabled), it's KVM's responsibility to clear DEBUGCTL[BTF].
Found this with below KUT test.
(I wasn't sure whether I should send a separate series for kernel fix + KUT patch, or you can squash kernel fix in your patch and I shall send only KUT patch. So for now, sending it as a reply here.)
Actualy, I'll post this along with some other cleanups to the test, and a fix for Intel if needed (it _should_ pass on Intel). All the open-coded EFLAGS.TF literals can be replaced, and clobbering arithmetic flags with SS is really, really, gross.
Quoted 68 lines
---
x86/debug.c +45
-1@@ -409,6 +409,45 @@ static noinline unsigned long singlestep_with_sti_hlt(void)return start_rip; } +static noinline unsigned long __run_basic_block_ss_test (void ) +{ +unsigned long start_rip; + +wrmsr (MSR_IA32_DEBUGCTLMSR ,DEBUGCTLMSR_BTF ); + + asmvolatile ( +"pushf\n\t" +"pop %%rax\n\t" +"or $(1<<8),%%rax\n\t" +"push %%rax\n\t" +"popf\n\t" +"1: nop\n\t" +"jmp 2f\n\t" +"nop\n\t" +"2: lea 1b(%%rip), %0\n\t" + :"=r" (start_rip) : :"rax" + ); + +return start_rip; +} + +static void run_basic_block_ss_test (void ) +{ +unsigned long jmp_target; +unsigned long debugctl; + +write_dr6 (0 ); + jmp_target =__run_basic_block_ss_test () +4 ; + +report (is_single_step_db (dr6[0 ]) && db_addr[0 ] == jmp_target, +"Basic Block Single-step #DB: 0x%lx == 0x%lx" , db_addr[0 ], + jmp_target); + + debugctl =rdmsr (MSR_IA32_DEBUGCTLMSR ); +/* CPU should automatically clear DEBUGCTL[BTF] on #DB exception */ +report (debugctl ==0 ,"DebugCtl[BTF] reset post #DB. 0x%lx" , debugctl); +} +int main (int ac,char **av) {unsigned long cr4;@@ -475,6 +514,12 @@ int main(int ac, char **av)run_ss_db_test (singlestep_with_movss_blocking_and_dr7_gd);run_ss_db_test (singlestep_with_sti_hlt); +/* Seems DEBUGCTL[BTF] is not supported on Intel. Run it only on AMD */ +if (this_cpu_has (X86_FEATURE_SVM )) { + n =0 ; +run_basic_block_ss_test (); + } + n =0 ;write_dr1 ((void *)&value);write_dr6 (DR6_BS ); ---Thanks,
Ravi
Sean Christopherson
maintainerRe: [PATCH v2 3/5] KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is disabled
Quoted 6 lines · Sean Christopherson
Quoted 5 lines · Ravi Bangoria
Quoted 4 lines
Somewhat related but independent: CPU automatically clears DEBUGCTL[BTF] on #DB exception. So, when DEBUGCTL is save/restored by KVM (i.e. when LBR virtualization is disabled), it's KVM's responsibility to clear DEBUGCTL[BTF].
Quoted 8 lines
Quoted 5 lines
Found this with below KUT test.
(I wasn't sure whether I should send a separate series for kernel fix + KUT patch, or you can squash kernel fix in your patch and I shall send only KUT patch. So for now, sending it as a reply here.)
Actualy, I'll post this along with some other cleanups to the test, and a fix for Intel if needed (it _should_ pass on Intel).
*sigh*
I forgot that KVM doesn't actually support DEBUGCTL_BTF. VMX drops the flag entirely, SVM doesn't clear BTF on #DB, the emulator doesn't honor it, it doesn't play nice KVM_GUESTDBG_SINGLESTEP, and who knows what else.
I could hack in enough support to get it limping, but I most definitely don't want to do that for an LTS backport. The only way it has worked in any capacity on AMD is if the guest happened to enable LBRs at the same time. So rather than trying to go straight to a half-baked implementation, I think the least awful option is to give SVM the same treatment and explicitly squash BTF. And then bribe someone to put in the effort to get it fully functional (or at least, as close to fully functional as we can get it).
Sean Christopherson
maintainerRe: [PATCH v2 3/5] KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is disabled
In reply to Ravi BangoriaQuoted 19 lines · Ravi Bangoria
Hi Sean,
arch/x86/kvm/svm/svm.c static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, · line 4276
Quoted 13 lines
arch/x86/kvm/svm/svm.c +9
-0@@ -4265,6 +4265,16 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu,clgi ();kvm_load_guest_xsave_state (vcpu); +/* +* Hardware only context switches DEBUGCTL if LBR virtualization is +* enabled. Manually load DEBUGCTL if necessary (and restore it after +* VM-Exit), as running with the host's DEBUGCTL can negatively affect +* guest state and can even be fatal, e.g. due to Bus Lock Detect. +*/ +if (!(svm->vmcb->control.virt_ext &LBR_CTL_ENABLE_MASK ) && + vcpu->arch.host_debugctl != svm->vmcb->save.dbgctl) +update_debugctlmsr (0 );^^^^^^^^^^^^^^^^^^^^^ You mean: update_debugctlmsr(svm->vmcb->save.dbgctl);
Quoted 1 line
?
Argh, yes.
Quoted 6 lines
Somewhat related but independent: CPU automatically clears DEBUGCTL[BTF] on #DB exception. So, when DEBUGCTL is save/restored by KVM (i.e. when LBR virtualization is disabled), it's KVM's responsibility to clear DEBUGCTL[BTF].
---
Review static int db_interception(struct kvm_vcpu *vcpu) · line 2099
Quoted 10 lines
(quoted diff) +7
-0@@ -2090,6 +2090,14 @@ static int db_interception(struct kvm_vcpu *vcpu) (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP)) && !svm->nmi_singlestep) { u32 payload = svm->vmcb->save.dr6 ^ DR6_ACTIVE_LOW; + + /* + * CPU automatically clears DEBUGCTL[BTF] on #DB exception. + * Simulate it when DEBUGCTL isn't auto save/restored. + */ + if (!(svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK)) + svm->vmcb->save.dbgctl &= ~0x2;
Any reason not to clear is unconditionally?
svm->vmcb->save.dbgctl &= ~DEBUGCTLMSR_BTF;
Quoted 7 lines
(quoted diff) +0
-1kvm_queue_exception_p(vcpu, DB_VECTOR, payload); return 1; } ---Thanks,
Ravi
Re: [PATCH v2 3/5] KVM: SVM: Manually context switch DEBUGCTL if LBR virtualization is disabled
Quoted 19 lines
Quoted 6 lines
Somewhat related but independent: CPU automatically clears DEBUGCTL[BTF] on #DB exception. So, when DEBUGCTL is save/restored by KVM (i.e. when LBR virtualization is disabled), it's KVM's responsibility to clear DEBUGCTL[BTF].
---Review static int db_interception(struct kvm_vcpu *vcpu) · line 2099
Quoted 10 lines
(quoted diff) +7
-0@@ -2090,6 +2090,14 @@ static int db_interception(struct kvm_vcpu *vcpu) (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP)) && !svm->nmi_singlestep) { u32 payload = svm->vmcb->save.dr6 ^ DR6_ACTIVE_LOW; + + /* + * CPU automatically clears DEBUGCTL[BTF] on #DB exception. + * Simulate it when DEBUGCTL isn't auto save/restored. + */ + if (!(svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK)) + svm->vmcb->save.dbgctl &= ~0x2;Any reason not to clear is unconditionally?
Quoted 1 line
svm->vmcb->save.dbgctl &= ~DEBUGCTLMSR_BTF;
No particular reason, just that HW would have already done it when LBRV is enabled.
Thanks,
Ravi
Sean Christopherson
maintainerPATCH v2 4/5 KVM: x86: Snapshot the host's DEBUGCTL after disabling IRQs
In reply to Sean ChristophersonSnapshot 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.
--- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +2 -1
@@ -4991,7 +4991,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)/* Save host pkru register if supported */ vcpu->arch.host_pkru =read_pkru (); - vcpu->arch.host_debugctl =get_debugctlmsr ();/* Apply any externally detected TSC adjustments (due to suspend) */ if (unlikely (vcpu->arch.tsc_offset_adjustment)) {
@@ -10984,6 +10983,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)set_debugreg (0 ,7 ); } + vcpu->arch.host_debugctl =get_debugctlmsr (); +guest_timing_enter_irqoff ();for (;;) {
Signature · 1 line
2.48.1.711.g2feabab25a-goog
Sean Christopherson
maintainerPATCH v2 5/5 KVM: SVM: Treat DEBUGCTL[5:2] as reserved
In reply to Sean ChristophersonStop ignoring DEBUGCTL[5:2] on AMD CPUs and instead treat them as reserved. KVM has never properly virtualized AMD's legacy PBi bits, but did allow the guest (and host userspace) to set the bits. To avoid breaking guests when running on CPUs with BusLockTrap, which redefined bit 2 to BLCKDB and made bits 5:3 reserved, a previous KVM change ignored bits 5:3, e.g. so that legacy guest software wouldn't inadvertently enable BusLockTrap or hit a VMRUN failure due to setting reserved.
To allow for virtualizing BusLockTrap and whatever future features may use bits 5:3, treat bits 5:2 as reserved (and hope that doing so doesn't break any existing guests).
--- arch/x86/kvm/svm/svm.c | 11 ----------- 1 file changed, 11 deletions(-)
arch/x86/kvm/svm/svm.c +0 -11
@@ -3166,17 +3166,6 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)break ; } -/* -* AMD changed the architectural behavior of bits 5:2. On CPUs -* without BusLockTrap, bits 5:2 control "external pins", but -* on CPUs that support BusLockDetect, bit 2 enables BusLockTrap -* and bits 5:3 are reserved-to-zero. Sadly, old KVM allowed -* the guest to set bits 5:2 despite not actually virtualizing -* Performance-Monitoring/Breakpoint external pins. Drop bits -* 5:2 for backwards compatibility. -*/ - data &= ~GENMASK (5 ,2 ); -if (data &DEBUGCTL_RESERVED_BITS )return 1 ;
Signature · 1 line
2.48.1.711.g2feabab25a-goog