KVM: SEV: Fix a CR8 intercept goof with SEV-ES guests
Sean Christopherson
maintainercover KVM: SEV: Fix a CR8 intercept goof with SEV-ES guests
Fix a recently introduced bug where KVM incorrectly enables CR8 write interception when inhibiting AVIC for SEV-ES guests, and extend the SEV+ smoke selftest to guard against similar goofs in the future.
Sean Christopherson (2):
KVM: SEV: Don't set CR8 write intercept when disabling AVIC for SEV-ES
guests
KVM: selftests: Verify SEV+ guests can read and write EFER, CR0, CR4,
and CR8
arch/x86/kvm/svm/avic.c | 3 +- .../selftests/kvm/include/x86/processor.h | 23 ++++++++++++++ .../selftests/kvm/x86/sev_smoke_test.c | 30 +++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-)
base-commit: 3271085a7f1030ba9897cab60452acd370423ff1
Signature · 1 line
2.53.0.473.g4a7958ca14-goog
Sean Christopherson
maintainerPATCH 1/2 KVM: SEV: Don't set CR8 write intercept when disabling AVIC for SEV-ES guests
Don't set the CR8 write intercept when disabling AVIC for SEV-ES vCPUs, as attempting to intercept CR8 will generate a #VC and in all likelihood kill the VM.
Note! At first glance, one might think KVM's handling of CR8 write traps for SEV-ES is flawed, as KVM traps CR8 writes even when AVIC is enabled, despite the fact that hardware updates the AVIC backing page as well. But KVM unconditionally inhibits AVIC for SEV-ES guests as current hardware apparently can't support it (see c538dc792ff7 ("KVM: SVM: Do not activate AVIC for SEV-enabled guest")).
However, KVM's overall handling of CR8 _is_ broken, as sync_cr8_to_lapic() will clobber with stale information from the unencrypted VMCB. That issue will be fixed separately.
--- arch/x86/kvm/svm/avic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/avic.c +2 -1
@@ -226,7 +226,8 @@ static void avic_deactivate_vmcb(struct vcpu_svm *svm) vmcb->control.int_ctl &= ~(AVIC_ENABLE_MASK |X2APIC_MODE_MASK ); vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK ; -svm_set_intercept (svm,INTERCEPT_CR8_WRITE ); +if (!sev_es_guest (svm->vcpu.kvm)) +svm_set_intercept (svm,INTERCEPT_CR8_WRITE );/* * If running nested and the guest uses its own MSR bitmap, there
Signature · 1 line
2.53.0.473.g4a7958ca14-goog
Re: [PATCH 1/2] KVM: SEV: Don't set CR8 write intercept when disabling AVIC for SEV-ES guests
Quoted 30 lines · Sean Christopherson
Don't set the CR8 write intercept when disabling AVIC for SEV-ES vCPUs, as attempting to intercept CR8 will generate a #VC and in all likelihood kill the VM.
Note! At first glance, one might think KVM's handling of CR8 write traps for SEV-ES is flawed, as KVM traps CR8 writes even when AVIC is enabled, despite the fact that hardware updates the AVIC backing page as well. But KVM unconditionally inhibits AVIC for SEV-ES guests as current hardware apparently can't support it (see
c538dc792ff7("KVM: SVM: Do not activate AVIC for SEV-enabled guest")).However, KVM's overall handling of CR8 _is_ broken, as
sync_cr8_to_lapic()will clobber with stale information from the unencrypted VMCB. That issue will be fixed separately.Reported-by Srikanth Aithal <[email protected]>Fixes e992bf67bcba ("KVM: SVM: Set/clear CR8 write interception when AVIC is (de)activated")Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/svm/avic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/x86/kvm/svm/avic.c +0
-0
arch/x86/kvm/svm/avic.c static void avic_deactivate_vmcb(struct vcpu_svm *svm) · line 233
Quoted 9 lines
arch/x86/kvm/svm/avic.c +2
-1@@ -226,7 +226,8 @@ static void avic_deactivate_vmcb(struct vcpu_svm *svm) vmcb->control.int_ctl &= ~(AVIC_ENABLE_MASK |X2APIC_MODE_MASK ); vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK ; -svm_set_intercept (svm,INTERCEPT_CR8_WRITE ); +if (!sev_es_guest (svm->vcpu.kvm)) +svm_set_intercept (svm,INTERCEPT_CR8_WRITE );/* * If running nested and the guest uses its own MSR bitmap, there
This fixes the SEV-ES boot issue. Thank you.
Sean Christopherson
maintainerPATCH 2/2 KVM: selftests: Verify SEV+ guests can read and write EFER, CR0, CR4, and CR8
In reply to Sean ChristophersonAdd "do no harm" testing of EFER, CR0, CR4, and CR8 for SEV+ guests to verify that the guest can read and write the registers, without hitting e.g. a #VC on SEV-ES guests due to KVM incorrectly trying to intercept a register.
--- .../selftests/kvm/include/x86/processor.h | 23 ++++++++++++++ .../selftests/kvm/x86/sev_smoke_test.c | 30 +++++++++++++++++++ 2 files changed, 53 insertions(+)
tools/testing/selftests/kvm/include/x86/processor.h +23 -0
@@ -557,6 +557,11 @@ static inline uint64_t get_cr0(void)return cr0; } +static inline void set_cr0 (uint64_t val) +{ + __asm__ __volatile__("mov %0, %%cr0" : :"r" (val) :"memory" ); +} +static inline uint64_t get_cr3 (void ) {uint64_t cr3;
@@ -566,6 +571,11 @@ static inline uint64_t get_cr3(void)return cr3; } +static inline void set_cr3 (uint64_t val) +{ + __asm__ __volatile__("mov %0, %%cr3" : :"r" (val) :"memory" ); +} +static inline uint64_t get_cr4 (void ) {uint64_t cr4;
@@ -580,6 +590,19 @@ static inline void set_cr4(uint64_t val) __asm__ __volatile__("mov %0, %%cr4" : :"r" (val) :"memory" ); } +static inline uint64_t get_cr8 (void ) +{ +uint64_t cr8; + + __asm__ __volatile__("mov %%cr8, %[cr8]" : [cr8]"=r" (cr8)); +return cr8; +} + +static inline void set_cr8 (uint64_t val) +{ + __asm__ __volatile__("mov %0, %%cr8" : :"r" (val) :"memory" ); +} +static inline void set_idt (const struct desc_ptr *idt_desc) { __asm__ __volatile__("lidt %0" ::"m" (*idt_desc));
tools/testing/selftests/kvm/x86/sev_smoke_test.c +30 -0
@@ -13,6 +13,30 @@#include "linux/psp-sev.h" #include "sev.h" +static void guest_sev_test_msr (uint32_t msr) +{ +uint64_t val =rdmsr (msr); + +wrmsr (msr, val); +GUEST_ASSERT (val ==rdmsr (msr)); +} + +#define guest_sev_test_reg (reg) \ +do { \ + uint64_t val = get_##reg(); \ + \ + set_##reg(val); \ + GUEST_ASSERT(val == get_##reg()); \ +} while (0) + +static void guest_sev_test_regs (void ) +{ +guest_sev_test_msr (MSR_EFER ); +guest_sev_test_reg (cr0); +guest_sev_test_reg (cr3); +guest_sev_test_reg (cr4); +guest_sev_test_reg (cr8); +}#define XFEATURE_MASK_X87_AVX (XFEATURE_MASK_FP | XFEATURE_MASK_SSE | XFEATURE_MASK_YMM)
@@ -24,6 +48,8 @@ static void guest_snp_code(void)GUEST_ASSERT (sev_msr &MSR_AMD64_SEV_ES_ENABLED );GUEST_ASSERT (sev_msr &MSR_AMD64_SEV_SNP_ENABLED ); +guest_sev_test_regs (); +wrmsr (MSR_AMD64_SEV_ES_GHCB ,GHCB_MSR_TERM_REQ );vmgexit (); }
@@ -34,6 +60,8 @@ static void guest_sev_es_code(void)GUEST_ASSERT (rdmsr (MSR_AMD64_SEV ) &MSR_AMD64_SEV_ENABLED );GUEST_ASSERT (rdmsr (MSR_AMD64_SEV ) &MSR_AMD64_SEV_ES_ENABLED ); +guest_sev_test_regs (); +/* * TODO: Add GHCB and ucall support for SEV-ES guests. For now, simply * force "termination" to signal "done" via the GHCB MSR protocol.
@@ -47,6 +75,8 @@ static void guest_sev_code(void)GUEST_ASSERT (this_cpu_has (X86_FEATURE_SEV ));GUEST_ASSERT (rdmsr (MSR_AMD64_SEV ) &MSR_AMD64_SEV_ENABLED ); +guest_sev_test_regs (); +GUEST_DONE (); }
Signature · 1 line
2.53.0.473.g4a7958ca14-goog
Re: [PATCH 2/2] KVM: selftests: Verify SEV+ guests can read and write EFER, CR0, CR4, and CR8
Quoted 113 lines · Sean Christopherson
Add "do no harm" testing of EFER, CR0, CR4, and CR8 for SEV+ guests to verify that the guest can read and write the registers, without hitting e.g. a #VC on SEV-ES guests due to KVM incorrectly trying to intercept a register.
Signed-off-by Sean Christopherson <[email protected]>--- .../selftests/kvm/include/x86/processor.h | 23 ++++++++++++++ .../selftests/kvm/x86/sev_smoke_test.c | 30 +++++++++++++++++++ 2 files changed, 53 insertions(+)tools/testing/selftests/kvm/include/x86/processor.h +23
-0@@ -557,6 +557,11 @@ static inline uint64_t get_cr0(void)return cr0; } +static inline void set_cr0 (uint64_t val) +{ + __asm__ __volatile__("mov %0, %%cr0" : :"r" (val) :"memory" ); +} +static inline uint64_t get_cr3 (void ) {uint64_t cr3;@@ -566,6 +571,11 @@ static inline uint64_t get_cr3(void)return cr3; } +static inline void set_cr3 (uint64_t val) +{ + __asm__ __volatile__("mov %0, %%cr3" : :"r" (val) :"memory" ); +} +static inline uint64_t get_cr4 (void ) {uint64_t cr4;@@ -580,6 +590,19 @@ static inline void set_cr4(uint64_t val) __asm__ __volatile__("mov %0, %%cr4" : :"r" (val) :"memory" ); } +static inline uint64_t get_cr8 (void ) +{ +uint64_t cr8; + + __asm__ __volatile__("mov %%cr8, %[cr8]" : [cr8]"=r" (cr8)); +return cr8; +} + +static inline void set_cr8 (uint64_t val) +{ + __asm__ __volatile__("mov %0, %%cr8" : :"r" (val) :"memory" ); +} +static inline void set_idt (const struct desc_ptr *idt_desc) { __asm__ __volatile__("lidt %0" ::"m" (*idt_desc));tools/testing/selftests/kvm/x86/sev_smoke_test.c +28
-0@@ -13,6 +13,30 @@#include "linux/psp-sev.h" #include "sev.h" +static void guest_sev_test_msr (uint32_t msr) +{ +uint64_t val =rdmsr (msr); + +wrmsr (msr, val); +GUEST_ASSERT (val ==rdmsr (msr)); +} + +#define guest_sev_test_reg (reg) \ +do { \ + uint64_t val = get_##reg(); \ + \ + set_##reg(val); \ + GUEST_ASSERT(val == get_##reg()); \ +} while (0) + +static void guest_sev_test_regs (void ) +{ +guest_sev_test_msr (MSR_EFER ); +guest_sev_test_reg (cr0); +guest_sev_test_reg (cr3); +guest_sev_test_reg (cr4); +guest_sev_test_reg (cr8); +}#define XFEATURE_MASK_X87_AVX (XFEATURE_MASK_FP | XFEATURE_MASK_SSE | XFEATURE_MASK_YMM)@@ -24,6 +48,8 @@ static void guest_snp_code(void)GUEST_ASSERT (sev_msr &MSR_AMD64_SEV_ES_ENABLED );GUEST_ASSERT (sev_msr &MSR_AMD64_SEV_SNP_ENABLED ); +guest_sev_test_regs (); +wrmsr (MSR_AMD64_SEV_ES_GHCB ,GHCB_MSR_TERM_REQ );vmgexit (); }@@ -34,6 +60,8 @@ static void guest_sev_es_code(void)GUEST_ASSERT (rdmsr (MSR_AMD64_SEV ) &MSR_AMD64_SEV_ENABLED );GUEST_ASSERT (rdmsr (MSR_AMD64_SEV ) &MSR_AMD64_SEV_ES_ENABLED ); +guest_sev_test_regs (); +/* * TODO: Add GHCB and ucall support for SEV-ES guests. For now, simply * force "termination" to signal "done" via the GHCB MSR protocol.
tools/testing/selftests/kvm/x86/sev_smoke_test.c static void guest_sev_code(void) · line 82
Quoted 8 lines
tools/testing/selftests/kvm/x86/sev_smoke_test.c +2
-0@@ -47,6 +75,8 @@ static void guest_sev_code(void)GUEST_ASSERT (this_cpu_has (X86_FEATURE_SEV ));GUEST_ASSERT (rdmsr (MSR_AMD64_SEV ) &MSR_AMD64_SEV_ENABLED ); +guest_sev_test_regs (); +GUEST_DONE (); }
Tested this on my machine:
# selftests: kvm: sev_smoke_test
# Random seed: 0x6b8b4567
ok 81 selftests: kvm: sev_smoke_test