KVM: SEV-ES: Fix KVM_{GET|SET}_MSRS and LBRV handling
v4 cover KVM: SEV-ES: Fix KVM_{GET|SET}_MSRS and LBRV handling
Fix couple of interrelated issues:
o KVM currently allows userspace to access MSRs even after the VMSA is encrypted. This can result into issues if MSR update has side effects on VM configuration. Patch 1 fixes that by preventing KVM_{GET|SET}_MSRS for SEV-ES guests once VMSA is encrypted.
o As documented in APM, LBR Virtualization must be enabled for SEV-ES guests. However, KVM currently enables LBRV unconditionally without checking feature bit, which is wrong. Patch 2 prevents SEV-ES guests when LBRV support is missing.
o Although LBRV is enabled for SEV-ES guests, MSR_IA32_DEBUGCTLMSR was still intercepted. This can crash SEV-ES guest if used inadvertently. Patch 3 fixes it.
Patches prepared on kvm/next (6f627b425378)
v3: https://lore.kernel.org/r/[email protected]v3->v4:
- Return -EINVAL instead of 0 while preventing MSR accesses post VMSA encryption.
- Make 'lbrv' a global variable instead of passing it as function argument, this follows the pattern used by other variables.
Nikunj A Dadhania (1):
KVM: SEV-ES: Prevent MSR access post VMSA encryption
Ravi Bangoria (2):
KVM: SEV-ES: Disallow SEV-ES guests when X86_FEATURE_LBRV is absent
KVM: SEV-ES: Fix LBRV code
arch/x86/kvm/svm/sev.c | 19 ++++++++++++++----- arch/x86/kvm/svm/svm.c | 42 ++++++++++++++++++++++++++++++++---------- arch/x86/kvm/svm/svm.h | 4 +++- 3 files changed, 49 insertions(+), 16 deletions(-)
Signature · 1 line
2.45.1
PATCH v4 1/3 KVM: SEV-ES: Prevent MSR access post VMSA encryption
From: Nikunj A Dadhania <[email protected]>
KVM currently allows userspace to read/write MSRs even after the VMSA is encrypted. This can cause unintentional issues if MSR access has side- effects. For ex, while migrating a guest, userspace could attempt to migrate MSR_IA32_DEBUGCTLMSR and end up unintentionally disabling LBRV on the target. Fix this by preventing access to those MSRs which are context switched via the VMSA, once the VMSA is encrypted.
--- arch/x86/kvm/svm/svm.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/x86/kvm/svm/svm.c +18 -0
@@ -2834,10 +2834,24 @@ static int svm_get_msr_feature(struct kvm_msr_entry *msr)return 0 ; } +static bool +sev_es_prevent_msr_access (struct kvm_vcpu *vcpu,struct msr_data *msr_info) +{ +return sev_es_guest (vcpu->kvm) && + vcpu->arch.guest_state_protected && +svm_msrpm_offset (msr_info->index) !=MSR_INVALID && + !msr_write_intercepted (vcpu, msr_info->index); +} +static int svm_get_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info) {struct vcpu_svm *svm =to_svm (vcpu); +if (sev_es_prevent_msr_access (vcpu, msr_info)) { + msr_info->data =0 ; +return -EINVAL ; + } +switch (msr_info->index) {case MSR_AMD64_TSC_RATIO : if (!msr_info->host_initiated &&
@@ -2988,6 +3002,10 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)u32 ecx = msr->index;u64 data = msr->data; + +if (sev_es_prevent_msr_access (vcpu, msr)) +return -EINVAL ; +switch (ecx) {case MSR_AMD64_TSC_RATIO :
Signature · 1 line
2.45.1
PATCH v4 2/3 KVM: SEV-ES: Disallow SEV-ES guests when X86_FEATURE_LBRV is absent
In reply to Ravi BangoriaAs documented in APM[1], LBR Virtualization must be enabled for SEV-ES guests. So, prevent SEV-ES guests when LBRV support is missing.
[1]: AMD64 Architecture Programmer's Manual Pub. 40332, Rev. 4.07 - June
2023, Vol 2, 15.35.2 Enabling SEV-ES.
https://bugzilla.kernel.org/attachment.cgi?id=304653--- arch/x86/kvm/svm/sev.c | 6 ++++++ arch/x86/kvm/svm/svm.c | 16 +++++++--------- arch/x86/kvm/svm/svm.h | 1 + 3 files changed, 14 insertions(+), 9 deletions(-)
arch/x86/kvm/svm/sev.c +6 -0
@@ -2933,6 +2933,12 @@ void __init sev_hardware_setup(void)if (!boot_cpu_has (X86_FEATURE_SEV_ES )) goto out; +if (!lbrv) { +WARN_ONCE (!boot_cpu_has (X86_FEATURE_LBRV ), +"LBRV must be present for SEV-ES support" ); + goto out; + } +/* Has the system been allocated ASIDs for SEV-ES? */ if (min_sev_asid ==1 ) goto out;
arch/x86/kvm/svm/svm.c +7 -9
@@ -215,7 +215,7 @@ int vgif = true;module_param (vgif, int,0444 );/* enable/disable LBR virtualization */ -static int lbrv = true; +int lbrv = true;module_param (lbrv, int,0444 );static int tsc_scaling = true;
@@ -5308,6 +5308,12 @@ static __init int svm_hardware_setup(void) nrips = nrips &&boot_cpu_has (X86_FEATURE_NRIPS ); +if (lbrv) { +if (!boot_cpu_has (X86_FEATURE_LBRV )) + lbrv = false; +else +pr_info ("LBR virtualization supported\n" ); + }/* * Note, SEV setup consumes npt_enabled and enable_mmio_caching (which * may be modified by svm_adjust_mmio_mask()), as well as nrips.
@@ -5361,14 +5367,6 @@ static __init int svm_hardware_setup(void) svm_x86_ops.set_vnmi_pending =NULL ; } - -if (lbrv) { -if (!boot_cpu_has (X86_FEATURE_LBRV )) - lbrv = false; -else -pr_info ("LBR virtualization supported\n" ); - } -if (!enable_pmu)pr_info ("PMU virtualization is disabled\n" );
arch/x86/kvm/svm/svm.h +1 -0
@@ -39,6 +39,7 @@ extern int vgif;extern bool intercept_smi;extern bool x2avic_enabled;extern bool vnmi; +extern int lbrv;/* * Clean bits in VMCB.
Signature · 1 line
2.45.1
PATCH v4 3/3 KVM: SEV-ES: Fix LBRV code
In reply to Ravi BangoriaAs documented in APM[1], LBR Virtualization must be enabled for SEV-ES guests. Although KVM currently enforces LBRV for SEV-ES guests, there are multiple issues with it:
o MSR_IA32_DEBUGCTLMSR is still intercepted. Since MSR_IA32_DEBUGCTLMSR interception is used to dynamically toggle LBRV for performance reasons, this can be fatal for SEV-ES guests. For ex SEV-ES guest on Zen3:
[guest ~]# wrmsr 0x1d9 0x4
KVM: entry failed, hardware error 0xffffffff EAX=00000004 EBX=00000000 ECX=000001d9 EDX=00000000
Fix this by never intercepting MSR_IA32_DEBUGCTLMSR for SEV-ES guests. No additional save/restore logic is required since MSR_IA32_DEBUGCTLMSR is of swap type A.
o KVM will disable LBRV if userspace sets MSR_IA32_DEBUGCTLMSR before the VMSA is encrypted. Fix this by moving LBRV enablement code post VMSA encryption.
[1]: AMD64 Architecture Programmer's Manual Pub. 40332, Rev. 4.07 - June
2023, Vol 2, 15.35.2 Enabling SEV-ES.
https://bugzilla.kernel.org/attachment.cgi?id=304653--- arch/x86/kvm/svm/sev.c | 13 ++++++++----- arch/x86/kvm/svm/svm.c | 8 +++++++- arch/x86/kvm/svm/svm.h | 3 ++- 3 files changed, 17 insertions(+), 7 deletions(-)
arch/x86/kvm/svm/sev.c +8 -5
@@ -851,6 +851,14 @@ static int __sev_launch_update_vmsa(struct kvm *kvm, struct kvm_vcpu *vcpu,*/ fpstate_set_confidential (&vcpu->arch.guest_fpu); vcpu->arch.guest_state_protected = true; + +/* +* SEV-ES guest mandates LBR Virtualization to be _always_ ON. Enable it +* only after setting guest_state_protected because KVM_SET_MSRS allows +* dynamic toggling of LBRV (for performance reason) on write access to +* MSR_IA32_DEBUGCTLMSR when guest_state_protected is not set. +*/ +svm_enable_lbrv (vcpu);return 0 ; }
@@ -4279,7 +4287,6 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)struct kvm_vcpu *vcpu = &svm->vcpu; svm->vmcb->control.nested_ctl |=SVM_NESTED_CTL_SEV_ES_ENABLE ; - svm->vmcb->control.virt_ext |=LBR_CTL_ENABLE_MASK ;/* * An SEV-ES guest requires a VMSA area that is a separate from the
@@ -4331,10 +4338,6 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)/* Clear intercepts on selected MSRs */ set_msr_interception (vcpu, svm->msrpm,MSR_EFER ,1 ,1 );set_msr_interception (vcpu, svm->msrpm,MSR_IA32_CR_PAT ,1 ,1 ); -set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTBRANCHFROMIP ,1 ,1 ); -set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTBRANCHTOIP ,1 ,1 ); -set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTINTFROMIP ,1 ,1 ); -set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTINTTOIP ,1 ,1 ); }void sev_init_vmcb (struct vcpu_svm *svm)
arch/x86/kvm/svm/svm.c +7 -1
@@ -99,6 +99,7 @@ static const struct svm_direct_access_msrs { { .index = MSR_IA32_SPEC_CTRL, .always = false }, { .index = MSR_IA32_PRED_CMD, .always = false }, { .index = MSR_IA32_FLUSH_CMD, .always = false }, + { .index = MSR_IA32_DEBUGCTLMSR, .always = false }, { .index = MSR_IA32_LASTBRANCHFROMIP, .always = false }, { .index = MSR_IA32_LASTBRANCHTOIP, .always = false }, { .index = MSR_IA32_LASTINTFROMIP, .always = false },
@@ -990,7 +991,7 @@ void svm_copy_lbrs(struct vmcb *to_vmcb, struct vmcb *from_vmcb)vmcb_mark_dirty (to_vmcb,VMCB_LBR ); } -static void svm_enable_lbrv (struct kvm_vcpu *vcpu) +void svm_enable_lbrv (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);
@@ -1000,6 +1001,9 @@ static void svm_enable_lbrv(struct kvm_vcpu *vcpu)set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTINTFROMIP ,1 ,1 );set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTINTTOIP ,1 ,1 ); +if (sev_es_guest (vcpu->kvm)) +set_msr_interception (vcpu, svm->msrpm,MSR_IA32_DEBUGCTLMSR ,1 ,1 ); +/* Move the LBR msrs to the vmcb02 so that the guest can see them. */ if (is_guest_mode (vcpu))svm_copy_lbrs (svm->vmcb, svm->vmcb01.ptr);
@@ -1009,6 +1013,8 @@ static void svm_disable_lbrv(struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu); +KVM_BUG_ON (sev_es_guest (vcpu->kvm), vcpu->kvm); + svm->vmcb->control.virt_ext &= ~LBR_CTL_ENABLE_MASK ;set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTBRANCHFROMIP ,0 ,0 );set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTBRANCHTOIP ,0 ,0 );
arch/x86/kvm/svm/svm.h +2 -1
@@ -30,7 +30,7 @@#define IOPM_SIZE PAGE_SIZE * 3#define MSRPM_SIZE PAGE_SIZE * 2 -#define MAX_DIRECT_ACCESS_MSRS 47 +#define MAX_DIRECT_ACCESS_MSRS 48#define MSRPM_OFFSETS 32extern u32 msrpm_offsets[MSRPM_OFFSETS ]__read_mostly ;extern bool npt_enabled;
@@ -583,6 +583,7 @@ u32 *svm_vcpu_alloc_msrpm(void);void svm_vcpu_init_msrpm (struct kvm_vcpu *vcpu,u32 *msrpm);void svm_vcpu_free_msrpm (u32 *msrpm);void svm_copy_lbrs (struct vmcb *to_vmcb,struct vmcb *from_vmcb); +void svm_enable_lbrv (struct kvm_vcpu *vcpu);void svm_update_lbrv (struct kvm_vcpu *vcpu);int svm_set_efer (struct kvm_vcpu *vcpu,u64 efer);
Signature · 1 line
2.45.1
PATCH 1/1 KVM: SNP: Fix LBR Virtualization for SNP guest
SEV-ES and thus SNP guest mandates LBR Virtualization to be _always_ ON. Although commit b7e4be0a224f ("KVM: SEV-ES: Delegate LBR virtualization to the processor") did the correct change for SEV-ES guests, it missed the SNP. Fix it.
---
- SNP support was not present while I prepared the original patches and that lead to this confusion. Sorry about that.
arch/x86/kvm/svm/sev.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/kvm/svm/sev.c +8 -0
@@ -2395,6 +2395,14 @@ static int snp_launch_update_vmsa(struct kvm *kvm, struct kvm_sev_cmd *argp) } svm->vcpu.arch.guest_state_protected = true; +/* +* SEV-ES (and thus SNP) guest mandates LBR Virtualization to +* be _always_ ON. Enable it only after setting +* guest_state_protected because KVM_SET_MSRS allows dynamic +* toggling of LBRV (for performance reason) on write access to +* MSR_IA32_DEBUGCTLMSR when guest_state_protected is not set. +*/ +svm_enable_lbrv (vcpu); }return 0 ;
Signature · 1 line
2.45.1
Paolo Bonzini
maintainerRe: [PATCH] KVM: SNP: Fix LBR Virtualization for SNP guest
Quoted 6 lines · Ravi Bangoria
SEV-ES and thus SNP guest mandates LBR Virtualization to be _always_ ON. Although commit
b7e4be0a224f("KVM: SEV-ES: Delegate LBR virtualization to the processor") did the correct change for SEV-ES guests, it missed the SNP. Fix it.
Quoted 6 lines
Reported-by Srikanth Aithal <[email protected]>Fixes b7e4be0a224f ("KVM: SEV-ES: Delegate LBR virtualization to the processor")Signed-off-by Ravi Bangoria <[email protected]>---
- SNP support was not present while I prepared the original patches and that lead to this confusion. Sorry about that.
No problem, this is a semantic conflict and your original patches will go in 6.10. Applied to kvm/next.
Paolo
Quoted 25 lines
arch/x86/kvm/svm/sev.c | 8 ++++++++ 1 file changed, 8 insertions(+)arch/x86/kvm/svm/sev.c +8
-1@@ -2395,6 +2395,14 @@ static int snp_launch_update_vmsa(struct kvm *kvm, struct kvm_sev_cmd *argp) } svm->vcpu.arch.guest_state_protected = true; +/* +* SEV-ES (and thus SNP) guest mandates LBR Virtualization to +* be _always_ ON. Enable it only after setting +* guest_state_protected because KVM_SET_MSRS allows dynamic +* toggling of LBRV (for performance reason) on write access to +* MSR_IA32_DEBUGCTLMSR when guest_state_protected is not set. +*/ +svm_enable_lbrv (vcpu); }return 0 ; --2.45.1
Re: [PATCH] KVM: SNP: Fix LBR Virtualization for SNP guest
In reply to Ravi BangoriaQuoted 24 lines · Ravi Bangoria
SEV-ES and thus SNP guest mandates LBR Virtualization to be _always_ ON. Although commit
b7e4be0a224f("KVM: SEV-ES: Delegate LBR virtualization to the processor") did the correct change for SEV-ES guests, it missed the SNP. Fix it.Reported-by Srikanth Aithal <[email protected]>Fixes b7e4be0a224f ("KVM: SEV-ES: Delegate LBR virtualization to the processor")Signed-off-by Ravi Bangoria <[email protected]>---
- SNP support was not present while I prepared the original patches and that lead to this confusion. Sorry about that.arch/x86/kvm/svm/sev.c | 8 ++++++++ 1 file changed, 8 insertions(+)arch/x86/kvm/svm/sev.c +1
-0@@ -2395,6 +2395,14 @@ static int snp_launch_update_vmsa(struct kvm *kvm, struct kvm_sev_cmd *argp) } svm->vcpu.arch.guest_state_protected = true; +/*
arch/x86/kvm/svm/sev.c static int snp_launch_update_vmsa(struct kvm *kvm, struct kvm_sev_cmd *argp) · line 2408
Quoted 10 lines
arch/x86/kvm/svm/sev.c +7
-0+* SEV-ES (and thus SNP) guest mandates LBR Virtualization to +* be _always_ ON. Enable it only after setting +* guest_state_protected because KVM_SET_MSRS allows dynamic +* toggling of LBRV (for performance reason) on write access to +* MSR_IA32_DEBUGCTLMSR when guest_state_protected is not set. +*/ +svm_enable_lbrv (vcpu); }return 0 ;
Queued, thanks.
Paolo