Nested SVM fixes, cleanups, and hardening
Subsystems (5)
v5 cover Nested SVM fixes, cleanups, and hardening
A group of semi-related fixes, cleanups, and hardening patches for nSVM. This series doubled in size between v2 and v3, but it's Sean's fault for finding more bugs that needed fixing.
The series is essentially a group of related mini-series stitched together for syntactic and semantic dependencies. The first 19 patches (except patch 3) are all optimistically CC'd to stable as they are fixes or refactoring leading up to bug fixes. Although I am not sure how much of that will actually apply to stable trees.
Patches 1-3 here are v2 of the last 3 patches in the LBRV fixes series [1]. The first 3 patches of [1] are already upstream.
Patches 4-14 are fixes for failure handling in the nested VMRUN and #VMEXIT code paths, ending with a nice unified code path for handling VMRUN failures as suggested by Sean. Within this block, patches 7-12 are refactoring needed for patches 13-14.
Patches 15-19 are fixes for missing or made-up consistency checks.
Patches 20-22 are renames and cleanups.
Patches 23-26 add hardening to reading the VMCB12, caching all used fields in the save area to prevent theoritical TOC-TOU bugs, sanitizing used fields in the control area, and restricting accesses to the VMCB12 through guest memory.
v3 -> v4:
- Dropped "KVM: SVM: Use BIT() and GENMASK() for definitions in svm.h" [Sean].
- Split the vmcb12 clean bit fix from using a macro for svm_copy_lbrs() [Sean].
- Dropped test comments and GUEST_PRINTF(), renamed RECORD_BRANCH(), and used do/while for macros [Sean].
- Renamed nested_svm_failed_vmrun() to nested_svm_vmrun_error_vmexit(), used WARN_ON_ONCE() instead of WARN(), and fixed build at intermediate patches [Sean].
- Fixed nCR3 consistency check to check NP enablement from the passed control area [Yosry].
- Updated the names of MISC flags [Sean].
v4: https://lore.kernel.org/kvm/[email protected]/
[1]https://lore.kernel.org/kvm/[email protected]/
Yosry Ahmed (26):
KVM: nSVM: Avoid clearing VMCB_LBR in vmcb12
KVM: SVM: Switch svm_copy_lbrs() to a macro
KVM: SVM: Add missing save/restore handling of LBR MSRs
KVM: selftests: Add a test for LBR save/restore (ft. nested)
KVM: nSVM: Always inject a #GP if mapping VMCB12 fails on nested VMRUN
KVM: nSVM: Triple fault if mapping VMCB12 fails on nested #VMEXIT
KVM: nSVM: Triple fault if restore host CR3 fails on nested #VMEXIT
KVM: nSVM: Drop nested_vmcb_check_{save/control}() wrappers
KVM: nSVM: Call enter_guest_mode() before switching to VMCB02
KVM: nSVM: Make nested_svm_merge_msrpm() return an errno
KVM: nSVM: Call nested_svm_merge_msrpm() from enter_svm_guest_mode()
KVM: nSVM: Call nested_svm_init_mmu_context() before switching to
VMCB02
KVM: nSVM: Refactor minimal #VMEXIT handling out of
nested_svm_vmexit()
KVM: nSVM: Unify handling of VMRUN failures with proper cleanup
KVM: nSVM: Clear EVENTINJ field in VMCB12 on nested #VMEXIT
KVM: nSVM: Drop the non-architectural consistency check for NP_ENABLE
KVM: nSVM: Add missing consistency check for nCR3 validity
KVM: nSVM: Add missing consistency check for hCR0.PG and NP_ENABLE
KVM: nSVM: Add missing consistency check for EFER, CR0, CR4, and CS
KVM: nSVM: Add missing consistency check for event_inj
KVM: SVM: Rename vmcb->nested_ctl to vmcb->misc_ctl
KVM: SVM: Rename vmcb->virt_ext to vmcb->misc_ctl2
KVM: nSVM: Cache all used fields from VMCB12
KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN
KVM: nSVM: Sanitize control fields copied from VMCB12
KVM: nSVM: Only copy SVM_MISC_ENABLE_NP from VMCB01's misc_ctl
arch/x86/include/asm/svm.h | 18 +- arch/x86/kvm/svm/nested.c | 541 +++++++++++------- arch/x86/kvm/svm/sev.c | 4 +- arch/x86/kvm/svm/svm.c | 68 +-- arch/x86/kvm/svm/svm.h | 51 +- arch/x86/kvm/x86.c | 3 + tools/testing/selftests/kvm/Makefile.kvm | 1 + .../selftests/kvm/include/x86/processor.h | 5 + tools/testing/selftests/kvm/include/x86/svm.h | 14 +- tools/testing/selftests/kvm/lib/x86/svm.c | 2 +- .../kvm/x86/nested_vmsave_vmload_test.c | 16 +- .../selftests/kvm/x86/svm_lbr_nested_state.c | 146 +++++ 12 files changed, 599 insertions(+), 270 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c
base-commit: e944fe2c09f405a2e2d147145c9b470084bc4c9a
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 1/26 KVM: nSVM: Avoid clearing VMCB_LBR in vmcb12
svm_copy_lbrs() always marks VMCB_LBR dirty in the destination VMCB. However, nested_svm_vmexit() uses it to copy LBRs to vmcb12, and clearing clean bits in vmcb12 is not architecturally defined.
Move vmcb_mark_dirty() to callers and drop it for vmcb12.
This also facilitates incoming refactoring that does not pass the entire VMCB to svm_copy_lbrs().
--- arch/x86/kvm/svm/nested.c | 7 +++++-- arch/x86/kvm/svm/svm.c | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-)
arch/x86/kvm/svm/nested.c +5 -2
@@ -714,6 +714,7 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12 }else {svm_copy_lbrs (vmcb02, vmcb01); } +vmcb_mark_dirty (vmcb02,VMCB_LBR );svm_update_lbrv (&svm->vcpu); }
@@ -1232,10 +1233,12 @@ int nested_svm_vmexit(struct vcpu_svm *svm)kvm_make_request (KVM_REQ_EVENT , &svm->vcpu);if (unlikely (guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && - (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK ))) + (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK ))) {svm_copy_lbrs (vmcb12, vmcb02); -else + }else {svm_copy_lbrs (vmcb01, vmcb02); +vmcb_mark_dirty (vmcb01,VMCB_LBR ); + }svm_update_lbrv (vcpu);
arch/x86/kvm/svm/svm.c +0 -2
@@ -848,8 +848,6 @@ void svm_copy_lbrs(struct vmcb *to_vmcb, struct vmcb *from_vmcb) to_vmcb->save.br_to = from_vmcb->save.br_to; to_vmcb->save.last_excp_from = from_vmcb->save.last_excp_from; to_vmcb->save.last_excp_to = from_vmcb->save.last_excp_to; - -vmcb_mark_dirty (to_vmcb,VMCB_LBR ); }static void __svm_enable_lbrv (struct kvm_vcpu *vcpu)
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 2/26 KVM: SVM: Switch svm_copy_lbrs() to a macro
In reply to Yosry AhmedIn preparation for using svm_copy_lbrs() with 'struct vmcb_save_area' without a containing 'struct vmcb', and later even 'struct vmcb_save_area_cached', make it a macro.
Macros are generally not preferred compared to functions, mainly due to type-safety. However, in this case it seems like having a simple macro copying a few fields is better than copy-pasting the same 5 lines of code in different places.
--- arch/x86/kvm/svm/nested.c | 8 ++++---- arch/x86/kvm/svm/svm.c | 9 --------- arch/x86/kvm/svm/svm.h | 10 +++++++++- 3 files changed, 13 insertions(+), 14 deletions(-)
arch/x86/kvm/svm/nested.c +4 -4
@@ -709,10 +709,10 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12* Reserved bits of DEBUGCTL are ignored. Be consistent with * svm_set_msr's definition of reserved bits. */ -svm_copy_lbrs (vmcb02, vmcb12); +svm_copy_lbrs (&vmcb02->save, &vmcb12->save); vmcb02->save.dbgctl &= ~DEBUGCTL_RESERVED_BITS ; }else { -svm_copy_lbrs (vmcb02, vmcb01); +svm_copy_lbrs (&vmcb02->save, &vmcb01->save); }vmcb_mark_dirty (vmcb02,VMCB_LBR );svm_update_lbrv (&svm->vcpu);
@@ -1234,9 +1234,9 @@ int nested_svm_vmexit(struct vcpu_svm *svm)if (unlikely (guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK ))) { -svm_copy_lbrs (vmcb12, vmcb02); +svm_copy_lbrs (&vmcb12->save, &vmcb02->save); }else { -svm_copy_lbrs (vmcb01, vmcb02); +svm_copy_lbrs (&vmcb01->save, &vmcb02->save);vmcb_mark_dirty (vmcb01,VMCB_LBR ); }
arch/x86/kvm/svm/svm.c +0 -9
@@ -841,15 +841,6 @@ static void svm_recalc_msr_intercepts(struct kvm_vcpu *vcpu)*/ } -void svm_copy_lbrs (struct vmcb *to_vmcb,struct vmcb *from_vmcb) -{ - to_vmcb->save.dbgctl = from_vmcb->save.dbgctl; - to_vmcb->save.br_from = from_vmcb->save.br_from; - to_vmcb->save.br_to = from_vmcb->save.br_to; - to_vmcb->save.last_excp_from = from_vmcb->save.last_excp_from; - to_vmcb->save.last_excp_to = from_vmcb->save.last_excp_to; -} -static void __svm_enable_lbrv (struct kvm_vcpu *vcpu) {to_svm (vcpu)->vmcb->control.virt_ext |=LBR_CTL_ENABLE_MASK ;
arch/x86/kvm/svm/svm.h +9 -1
@@ -713,8 +713,16 @@ static inline void *svm_vcpu_alloc_msrpm(void)return svm_alloc_permissions_map (MSRPM_SIZE ,GFP_KERNEL_ACCOUNT ); } +#define svm_copy_lbrs (to, from) \ +do { \ + (to)->dbgctl = (from)->dbgctl; \ + (to)->br_from = (from)->br_from; \ + (to)->br_to = (from)->br_to; \ + (to)->last_excp_from = (from)->last_excp_from; \ + (to)->last_excp_to = (from)->last_excp_to; \ +} while (0) +void svm_vcpu_free_msrpm (void *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);
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 3/26 KVM: SVM: Add missing save/restore handling of LBR MSRs
In reply to Yosry AhmedMSR_IA32_DEBUGCTLMSR and LBR MSRs are currently not enumerated by KVM_GET_MSR_INDEX_LIST, and LBR MSRs cannot be set with KVM_SET_MSRS. So save/restore is completely broken.
Fix it by adding the MSRs to msrs_to_save_base, and allowing writes to LBR MSRs from userspace only (as they are read-only MSRs). Additionally, to correctly restore L1's LBRs while L2 is running, make sure the LBRs are copied from the captured VMCB01 save area in svm_copy_vmrun_state().
--- arch/x86/kvm/svm/nested.c | 3 +++ arch/x86/kvm/svm/svm.c | 20 ++++++++++++++++++++ arch/x86/kvm/x86.c | 3 +++ 3 files changed, 26 insertions(+)
arch/x86/kvm/svm/nested.c +3 -0
@@ -1100,6 +1100,9 @@ void svm_copy_vmrun_state(struct vmcb_save_area *to_save, to_save->isst_addr = from_save->isst_addr; to_save->ssp = from_save->ssp; } + +if (lbrv) +svm_copy_lbrs (to_save, from_save); }void svm_copy_vmloadsave_state (struct vmcb *to_vmcb,struct vmcb *from_vmcb)
arch/x86/kvm/svm/svm.c +20 -0
@@ -3071,6 +3071,26 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)vmcb_mark_dirty (svm->vmcb,VMCB_LBR );svm_update_lbrv (vcpu);break ; +case MSR_IA32_LASTBRANCHFROMIP : +if (!msr->host_initiated) +return 1 ; + svm->vmcb->save.br_from = data; +break ; +case MSR_IA32_LASTBRANCHTOIP : +if (!msr->host_initiated) +return 1 ; + svm->vmcb->save.br_to = data; +break ; +case MSR_IA32_LASTINTFROMIP : +if (!msr->host_initiated) +return 1 ; + svm->vmcb->save.last_excp_from = data; +break ; +case MSR_IA32_LASTINTTOIP : +if (!msr->host_initiated) +return 1 ; + svm->vmcb->save.last_excp_to = data; +break ;case MSR_VM_HSAVE_PA :/* * Old kernels did not validate the value written to
arch/x86/kvm/x86.c +3 -0
@@ -351,6 +351,9 @@ static const u32 msrs_to_save_base[] = {MSR_IA32_U_CET ,MSR_IA32_S_CET ,MSR_IA32_PL0_SSP ,MSR_IA32_PL1_SSP ,MSR_IA32_PL2_SSP ,MSR_IA32_PL3_SSP ,MSR_IA32_INT_SSP_TAB , +MSR_IA32_DEBUGCTLMSR , +MSR_IA32_LASTBRANCHFROMIP ,MSR_IA32_LASTBRANCHTOIP , + MSR_IA32_LASTINTFROMIP, MSR_IA32_LASTINTTOIP, }; static const u32 msrs_to_save_pmu[] = {
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 4/26 KVM: selftests: Add a test for LBR save/restore (ft. nested)
In reply to Yosry AhmedAdd a selftest exercising save/restore with usage of LBRs in both L1 and L2, and making sure all LBRs remain intact.
--- tools/testing/selftests/kvm/Makefile.kvm | 1 + .../selftests/kvm/include/x86/processor.h | 5 + .../selftests/kvm/x86/svm_lbr_nested_state.c | 146 ++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c
tools/testing/selftests/kvm/Makefile.kvm +1 -0
@@ -112,6 +112,7 @@ TEST_GEN_PROGS_x86 += x86/svm_vmcall_test TEST_GEN_PROGS_x86 += x86/svm_int_ctl_test TEST_GEN_PROGS_x86 += x86/svm_nested_shutdown_test TEST_GEN_PROGS_x86 += x86/svm_nested_soft_inject_test +TEST_GEN_PROGS_x86 += x86/svm_lbr_nested_state TEST_GEN_PROGS_x86 += x86/tsc_scaling_sync TEST_GEN_PROGS_x86 += x86/sync_regs_test TEST_GEN_PROGS_x86 += x86/ucna_injection_test
tools/testing/selftests/kvm/include/x86/processor.h +5 -0
@@ -1360,6 +1360,11 @@ static inline bool kvm_is_ignore_msrs(void)return get_kvm_param_bool ("ignore_msrs" ); } +static inline bool kvm_is_lbrv_enabled (void ) +{ +return !!get_kvm_amd_param_integer ("lbrv" ); +} +uint64_t *vm_get_pte (struct kvm_vm *vm,uint64_t vaddr); uint64_t kvm_hypercall(uint64_t nr, uint64_t a0, uint64_t a1, uint64_t a2,
tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c new file +146 -0
146 lines not on this page · raw message
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 5/26 KVM: nSVM: Always inject a #GP if mapping VMCB12 fails on nested VMRUN
In reply to Yosry Ahmednested_svm_vmrun() currently only injects a #GP if kvm_vcpu_map() fails with -EINVAL. But it could also fail with -EFAULT if creating a host mapping failed. Inject a #GP in all cases, no reason to treat failure modes differently.
--- arch/x86/kvm/svm/nested.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/kvm/svm/nested.c +1 -4
@@ -1011,12 +1011,9 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) } vmcb12_gpa = svm->vmcb->save.rax; - ret =kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map); -if (ret == -EINVAL ) { +if (kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map)) {kvm_inject_gp (vcpu,0 );return 1 ; - }else if (ret) { -return kvm_skip_emulated_instruction (vcpu); } ret =kvm_skip_emulated_instruction (vcpu);
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 6/26 KVM: nSVM: Triple fault if mapping VMCB12 fails on nested #VMEXIT
In reply to Yosry AhmedKVM currently injects a #GP and hopes for the best if mapping VMCB12 fails on nested #VMEXIT, and only if the failure mode is -EINVAL. Mapping the VMCB12 could also fail if creating host mappings fails.
After the #GP is injected, nested_svm_vmexit() bails early, without cleaning up (e.g. KVM_REQ_GET_NESTED_STATE_PAGES is set, is_guest_mode() is true, etc). Move mapping VMCB12 a bit later, after leaving guest mode and clearing KVM_REQ_GET_NESTED_STATE_PAGES, right before the VMCB12 is actually used.
Instead of optionally injecting a #GP, triple fault the guest if mapping VMCB12 fails since KVM cannot make a sane recovery. The APM states that a #VMEXIT will triple fault if host state is illegal or an exception occurs while loading host state, so the behavior is not entirely made up.
Also update the WARN_ON() in svm_get_nested_state_pages() to WARN_ON_ONCE() to avoid future user-triggeable bugs spamming kernel logs and potentially causing issues.
--- arch/x86/kvm/svm/nested.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)
arch/x86/kvm/svm/nested.c +11 -14
@@ -1121,24 +1121,14 @@ void svm_copy_vmloadsave_state(struct vmcb *to_vmcb, struct vmcb *from_vmcb)int nested_svm_vmexit (struct vcpu_svm *svm) {struct kvm_vcpu *vcpu = &svm->vcpu; +gpa_t vmcb12_gpa = svm->nested.vmcb12_gpa;struct vmcb *vmcb01 = svm->vmcb01.ptr;struct vmcb *vmcb02 = svm->nested.vmcb02.ptr;struct vmcb *vmcb12;struct kvm_host_map map; -int rc; - - rc =kvm_vcpu_map (vcpu,gpa_to_gfn (svm->nested.vmcb12_gpa), &map); -if (rc) { -if (rc == -EINVAL ) -kvm_inject_gp (vcpu,0 ); -return 1 ; - } - - vmcb12 = map.hva;/* Exit Guest-Mode */ leave_guest_mode (vcpu); - svm->nested.vmcb12_gpa =0 ;WARN_ON_ONCE (svm->nested.nested_run_pending);kvm_clear_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu);
@@ -1146,8 +1136,16 @@ int nested_svm_vmexit(struct vcpu_svm *svm)/* in case we halted in L2 */ kvm_set_mp_state (vcpu,KVM_MP_STATE_RUNNABLE ); + svm->nested.vmcb12_gpa =0 ; + +if (kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map)) { +kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); +return 1 ; + } +/* Give the current vmcb to the guest */ + vmcb12 = map.hva; vmcb12->save.es = vmcb02->save.es; vmcb12->save.cs = vmcb02->save.cs; vmcb12->save.ss = vmcb02->save.ss;
@@ -1304,8 +1302,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm)nested_svm_uninit_mmu_context (vcpu); - rc =nested_svm_load_cr3 (vcpu, vmcb01->save.cr3, false, true); -if (rc) +if (nested_svm_load_cr3 (vcpu, vmcb01->save.cr3, false, true))return 1 ;/*
@@ -1936,7 +1933,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,static bool svm_get_nested_state_pages (struct kvm_vcpu *vcpu) { -if (WARN_ON (!is_guest_mode (vcpu))) +if (WARN_ON_ONCE (!is_guest_mode (vcpu)))return true; if (!vcpu->arch.pdptrs_from_userspace &&
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
Sean Christopherson
maintainerRe: [PATCH v5 06/26] KVM: nSVM: Triple fault if mapping VMCB12 fails on nested #VMEXIT
Quoted 60 lines · Yosry Ahmed
KVM currently injects a #GP and hopes for the best if mapping VMCB12 fails on nested #VMEXIT, and only if the failure mode is
-EINVAL. Mapping the VMCB12 could also fail if creating host mappings fails.After the #GP is injected,
nested_svm_vmexit()bails early, without cleaning up (e.g.KVM_REQ_GET_NESTED_STATE_PAGESis set,is_guest_mode()is true, etc). Move mapping VMCB12 a bit later, after leaving guest mode and clearingKVM_REQ_GET_NESTED_STATE_PAGES, right before the VMCB12 is actually used.Instead of optionally injecting a #GP, triple fault the guest if mapping VMCB12 fails since KVM cannot make a sane recovery. The APM states that a #VMEXIT will triple fault if host state is illegal or an exception occurs while loading host state, so the behavior is not entirely made up.
Also update the
WARN_ON()insvm_get_nested_state_pages()toWARN_ON_ONCE()to avoid future user-triggeable bugs spamming kernel logs and potentially causing issues.Fixes cf74a78b229d ("KVM: SVM: Add VMEXIT handler and intercepts")Co-developed-by Sean Christopherson <[email protected]>Signed-off-by Sean Christopherson <[email protected]>Signed-off-by Yosry Ahmed <[email protected]>--- arch/x86/kvm/svm/nested.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)arch/x86/kvm/svm/nested.c +1
-11@@ -1121,24 +1121,14 @@ void svm_copy_vmloadsave_state(struct vmcb *to_vmcb, struct vmcb *from_vmcb)int nested_svm_vmexit (struct vcpu_svm *svm) {struct kvm_vcpu *vcpu = &svm->vcpu; +gpa_t vmcb12_gpa = svm->nested.vmcb12_gpa;struct vmcb *vmcb01 = svm->vmcb01.ptr;struct vmcb *vmcb02 = svm->nested.vmcb02.ptr;struct vmcb *vmcb12;struct kvm_host_map map; -int rc; - - rc =kvm_vcpu_map (vcpu,gpa_to_gfn (svm->nested.vmcb12_gpa), &map); -if (rc) { -if (rc == -EINVAL ) -kvm_inject_gp (vcpu,0 ); -return 1 ; - } - - vmcb12 = map.hva;/* Exit Guest-Mode */ leave_guest_mode (vcpu); - svm->nested.vmcb12_gpa =0 ;WARN_ON_ONCE (svm->nested.nested_run_pending);kvm_clear_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu);
arch/x86/kvm/svm/nested.c int nested_svm_vmexit(struct vcpu_svm *svm) · line 1143
Quoted 8 lines
arch/x86/kvm/svm/nested.c +5
-0@@ -1146,8 +1136,16 @@ int nested_svm_vmexit(struct vcpu_svm *svm)/* in case we halted in L2 */ kvm_set_mp_state (vcpu,KVM_MP_STATE_RUNNABLE ); + svm->nested.vmcb12_gpa =0 ; + +if (kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map)) { +kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); +return 1 ;
Returning early isn't entirely correct. In fact, I think it's worse than the current behavior in many aspects.
By doing leave_guest_mode() and not switching back to vmcb01 and not putting vcpu->arch.mmu back to root_mmu, the vCPU will be in L1 but with vmcb02 and L2's MMU active.
The idea I can come up with is to isolate the vmcb12 writes (which is suprisingly straightforward), and then simply skip the vmcb12 updates. E.g.
--- arch/x86/kvm/svm/nested.c | 95 ++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 41 deletions(-)
arch/x86/kvm/svm/nested.c +54 -41
@@ -639,6 +639,12 @@ void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm) svm->nested.vmcb02.ptr->save.g_pat = svm->vmcb01.ptr->save.g_pat; } +static bool nested_vmcb12_has_lbrv (struct kvm_vcpu *vcpu) +{ +return guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && +to_svm (vcpu)->nested.ctl.virt_ext; +} +static void nested_vmcb02_prepare_save (struct vcpu_svm *svm,struct vmcb *vmcb12) {bool new_vmcb12 = false;
@@ -703,8 +709,7 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12vmcb_mark_dirty (vmcb02,VMCB_DR ); } -if (unlikely (guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && - (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK ))) { +if (nested_vmcb12_has_lbrv (vcpu)) {/* * Reserved bits of DEBUGCTL are ignored. Be consistent with * svm_set_msr's definition of reserved bits.
@@ -1118,35 +1123,14 @@ void svm_copy_vmloadsave_state(struct vmcb *to_vmcb, struct vmcb *from_vmcb) to_vmcb->save.sysenter_eip = from_vmcb->save.sysenter_eip; } -int nested_svm_vmexit (struct vcpu_svm *svm) +static void nested_svm_vmexit_update_vmcb12 (struct kvm_vcpu *vcpu, +struct vmcb *vmcb12, +struct vmcb *vmcb02) { -struct kvm_vcpu *vcpu = &svm->vcpu; -struct vmcb *vmcb01 = svm->vmcb01.ptr; -struct vmcb *vmcb02 = svm->nested.vmcb02.ptr; -struct vmcb *vmcb12; -struct kvm_host_map map; -int rc; +struct vcpu_svm *svm =to_svm (vcpu); - rc =kvm_vcpu_map (vcpu,gpa_to_gfn (svm->nested.vmcb12_gpa), &map); -if (rc) { -if (rc == -EINVAL ) -kvm_inject_gp (vcpu,0 ); -return 1 ; - } - - vmcb12 = map.hva; - -/* Exit Guest-Mode */ -leave_guest_mode (vcpu); - svm->nested.vmcb12_gpa =0 ; -WARN_ON_ONCE (svm->nested.nested_run_pending); - -kvm_clear_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu); - -/* in case we halted in L2 */ -kvm_set_mp_state (vcpu,KVM_MP_STATE_RUNNABLE ); - -/* Give the current vmcb to the guest */ +if (!vmcb12) +return ; vmcb12->save.es = vmcb02->save.es; vmcb12->save.cs = vmcb02->save.cs;
@@ -1184,14 +1168,53 @@ int nested_svm_vmexit(struct vcpu_svm *svm)if (guest_cpu_cap_has (vcpu,X86_FEATURE_NRIPS )) vmcb12->control.next_rip = vmcb02->control.next_rip; +if (nested_vmcb12_has_lbrv (vcpu)) +svm_copy_lbrs (&vmcb12->save, &vmcb02->save); + vmcb12->control.int_ctl = svm->nested.ctl.int_ctl; vmcb12->control.event_inj = svm->nested.ctl.event_inj; vmcb12->control.event_inj_err = svm->nested.ctl.event_inj_err; +trace_kvm_nested_vmexit_inject (vmcb12->control.exit_code, + vmcb12->control.exit_info_1, + vmcb12->control.exit_info_2, + vmcb12->control.exit_int_info, + vmcb12->control.exit_int_info_err, +KVM_ISA_SVM ); +} + +int nested_svm_vmexit (struct vcpu_svm *svm) +{ +struct kvm_vcpu *vcpu = &svm->vcpu; +struct vmcb *vmcb01 = svm->vmcb01.ptr; +struct vmcb *vmcb02 = svm->nested.vmcb02.ptr; +struct vmcb *vmcb12; +struct kvm_host_map map; +int rc; + +if (!kvm_vcpu_map (vcpu,gpa_to_gfn (svm->nested.vmcb12_gpa), &map)) { + vmcb12 = map.hva; + }else { +kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); + vmcb12 =NULL ; + } + +/* Exit Guest-Mode */ +leave_guest_mode (vcpu); + svm->nested.vmcb12_gpa =0 ; +WARN_ON_ONCE (svm->nested.nested_run_pending); + +kvm_clear_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu); + +/* in case we halted in L2 */ +kvm_set_mp_state (vcpu,KVM_MP_STATE_RUNNABLE ); + +/* Give the current vmcb to the guest */ +nested_svm_vmexit_update_vmcb12 (vcpu, vmcb12, vmcb02); +if (!kvm_pause_in_guest (vcpu->kvm)) { vmcb01->control.pause_filter_count = vmcb02->control.pause_filter_count;vmcb_mark_dirty (vmcb01,VMCB_INTERCEPTS ); - }/*
@@ -1232,10 +1255,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm)if (!nested_exit_on_intr (svm))kvm_make_request (KVM_REQ_EVENT , &svm->vcpu); -if (unlikely (guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && - (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK ))) { -svm_copy_lbrs (&vmcb12->save, &vmcb02->save); - }else { +if (!nested_vmcb12_has_lbrv (vcpu)) {svm_copy_lbrs (&vmcb01->save, &vmcb02->save);vmcb_mark_dirty (vmcb01,VMCB_LBR ); }
@@ -1291,13 +1311,6 @@ int nested_svm_vmexit(struct vcpu_svm *svm) svm->vcpu.arch.dr7 =DR7_FIXED_1 ;kvm_update_dr7 (&svm->vcpu); -trace_kvm_nested_vmexit_inject (vmcb12->control.exit_code, - vmcb12->control.exit_info_1, - vmcb12->control.exit_info_2, - vmcb12->control.exit_int_info, - vmcb12->control.exit_int_info_err, -KVM_ISA_SVM ); -kvm_vcpu_unmap (vcpu, &map);nested_svm_transition_tlb_flush (vcpu);
base-commit: 2125912d022f4740238a950469da505783945be6 --
Re: [PATCH v5 06/26] KVM: nSVM: Triple fault if mapping VMCB12 fails on nested #VMEXIT
Quoted 13 lines
Review int nested_svm_vmexit(struct vcpu_svm *svm) · line 1143
Quoted 9 lines
(quoted diff) +5
-0@@ -1146,8 +1136,16 @@ int nested_svm_vmexit(struct vcpu_svm *svm) /* in case we halted in L2 */ kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); + svm->nested.vmcb12_gpa = 0; + + if (kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map)) { + kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu); + return 1;Returning early isn't entirely correct. In fact, I think it's worse than the current behavior in many aspects.
Quoted 3 lines
By doing
leave_guest_mode()and not switching back to vmcb01 and not puttingvcpu->arch.mmuback toroot_mmu, the vCPU will be in L1 but with vmcb02 and L2's MMU active.
Hmm yeah, the same problem also exists in nested_svm_vmrun_error_vmexit() after "KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN". In that path, we only need to map vmcb12 to zero event_inj in __nested_svm_vmexit(). We can probably move them to the callers (nested_svm_vmrun_error_vmexit() and nested_svm_vmexit()) to make it easier to skip if mapping fails.
Quoted 5 lines
The idea I can come up with is to isolate the vmcb12 writes (which is suprisingly straightforward), and then simply skip the vmcb12 updates. E.g.
---
[..]
Quoted 20 lines
arch/x86/kvm/svm/nested.c +12
-0@@ -1184,14 +1168,53 @@ int nested_svm_vmexit(struct vcpu_svm *svm)if (guest_cpu_cap_has (vcpu,X86_FEATURE_NRIPS )) vmcb12->control.next_rip = vmcb02->control.next_rip; +if (nested_vmcb12_has_lbrv (vcpu)) +svm_copy_lbrs (&vmcb12->save, &vmcb02->save); + vmcb12->control.int_ctl = svm->nested.ctl.int_ctl; vmcb12->control.event_inj = svm->nested.ctl.event_inj; vmcb12->control.event_inj_err = svm->nested.ctl.event_inj_err; +trace_kvm_nested_vmexit_inject (vmcb12->control.exit_code, + vmcb12->control.exit_info_1, + vmcb12->control.exit_info_2, + vmcb12->control.exit_int_info, + vmcb12->control.exit_int_info_err, +KVM_ISA_SVM ); +} + +int nested_svm_vmexit (struct vcpu_svm *svm)
arch/x86/kvm/svm/nested.c int nested_svm_vmexit(struct vcpu_svm *svm) · line 1196
Quoted 10 lines
arch/x86/kvm/svm/nested.c +10
-0+{ +struct kvm_vcpu *vcpu = &svm->vcpu; +struct vmcb *vmcb01 = svm->vmcb01.ptr; +struct vmcb *vmcb02 = svm->nested.vmcb02.ptr; +struct vmcb *vmcb12; +struct kvm_host_map map; +int rc; + +if (!kvm_vcpu_map (vcpu,gpa_to_gfn (svm->nested.vmcb12_gpa), &map)) { + vmcb12 = map.hva;
Maybe also kvm_vcpu_map() mapping call to nested_svm_vmexit_update_vmcb12() and inject a tripe fault if it fails? Probably plays nicer with "KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN".
Otherwise it looks good to me.
Should I send a new version to add all the changes?
Sean Christopherson
maintainerRe: [PATCH v5 06/26] KVM: nSVM: Triple fault if mapping VMCB12 fails on nested #VMEXIT
Quoted 17 lines · Yosry Ahmed
Quoted 13 lines
Review int nested_svm_vmexit(struct vcpu_svm *svm) · line 1143
Quoted 9 lines
(quoted diff) +5
-0@@ -1146,8 +1136,16 @@ int nested_svm_vmexit(struct vcpu_svm *svm) /* in case we halted in L2 */ kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); + svm->nested.vmcb12_gpa = 0; + + if (kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map)) { + kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu); + return 1;Returning early isn't entirely correct. In fact, I think it's worse than the current behavior in many aspects.
Quoted 3 lines
By doing
leave_guest_mode()and not switching back to vmcb01 and not puttingvcpu->arch.mmuback toroot_mmu, the vCPU will be in L1 but with vmcb02 and L2's MMU active.
Quoted 6 lines
Hmm yeah, the same problem also exists in
nested_svm_vmrun_error_vmexit()after "KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN". In that path, we only need to map vmcb12 to zeroevent_injin__nested_svm_vmexit(). We can probably move them to the callers (nested_svm_vmrun_error_vmexit()andnested_svm_vmexit()) to make it easier to skip if mapping fails.
Agreed, I don't see a better option.
Quoted 32 lines
Quoted 4 lines
The idea I can come up with is to isolate the vmcb12 writes (which is suprisingly straightforward), and then simply skip the vmcb12 updates. E.g.
---
[..]
Quoted 27 lines
arch/x86/kvm/svm/nested.c +19
-0@@ -1184,14 +1168,53 @@ int nested_svm_vmexit(struct vcpu_svm *svm)if (guest_cpu_cap_has (vcpu,X86_FEATURE_NRIPS )) vmcb12->control.next_rip = vmcb02->control.next_rip; +if (nested_vmcb12_has_lbrv (vcpu)) +svm_copy_lbrs (&vmcb12->save, &vmcb02->save); + vmcb12->control.int_ctl = svm->nested.ctl.int_ctl; vmcb12->control.event_inj = svm->nested.ctl.event_inj; vmcb12->control.event_inj_err = svm->nested.ctl.event_inj_err; +trace_kvm_nested_vmexit_inject (vmcb12->control.exit_code, + vmcb12->control.exit_info_1, + vmcb12->control.exit_info_2, + vmcb12->control.exit_int_info, + vmcb12->control.exit_int_info_err, +KVM_ISA_SVM ); +} + +int nested_svm_vmexit (struct vcpu_svm *svm) +{ +struct kvm_vcpu *vcpu = &svm->vcpu; +struct vmcb *vmcb01 = svm->vmcb01.ptr; +struct vmcb *vmcb02 = svm->nested.vmcb02.ptr; +struct vmcb *vmcb12; +struct kvm_host_map map; +int rc;
Quoted 8 lines
arch/x86/kvm/svm/nested.c int nested_svm_vmexit(struct vcpu_svm *svm) · line 1196
Quoted 3 lines
arch/x86/kvm/svm/nested.c +3
-0+ +if (!kvm_vcpu_map (vcpu,gpa_to_gfn (svm->nested.vmcb12_gpa), &map)) { + vmcb12 = map.hva;Maybe also
kvm_vcpu_map()mapping call tonested_svm_vmexit_update_vmcb12()and inject a tripe fault if it fails? Probably plays nicer with "KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN".
Oh, yeah, good call! That would be way cleaner (I initially didn't move all vmcb12 reference, but that's a *really* good argument for doing so).
Quoted 3 lines
Otherwise it looks good to me.
Should I send a new version to add all the changes?
Yes please. Thanks!
PATCH v5 7/26 KVM: nSVM: Triple fault if restore host CR3 fails on nested #VMEXIT
In reply to Yosry AhmedIf loading L1's CR3 fails on a nested #VMEXIT, nested_svm_vmexit() returns an error code that is ignored by most callers, and continues to run L1 with corrupted state. A sane recovery is not possible in this case, and HW behavior is to cause a shutdown. Inject a triple fault instead.
From the APM:
Upon #VMEXIT, the processor performs the following actions in order to return to the host execution context:
...
if (illegal host state loaded, or exception while loading
host state)
shutdown
else
execute first host instruction following the VMRUN
Remove the return value of nested_svm_vmexit(), which is mostly unchecked anyway.
--- arch/x86/kvm/svm/nested.c | 12 ++++++------ arch/x86/kvm/svm/svm.c | 11 ++--------- arch/x86/kvm/svm/svm.h | 6 +++--- 3 files changed, 11 insertions(+), 18 deletions(-)
arch/x86/kvm/svm/nested.c +6 -6
@@ -1118,7 +1118,7 @@ void svm_copy_vmloadsave_state(struct vmcb *to_vmcb, struct vmcb *from_vmcb) to_vmcb->save.sysenter_eip = from_vmcb->save.sysenter_eip; } -int nested_svm_vmexit (struct vcpu_svm *svm) +void nested_svm_vmexit (struct vcpu_svm *svm) {struct kvm_vcpu *vcpu = &svm->vcpu;gpa_t vmcb12_gpa = svm->nested.vmcb12_gpa;
@@ -1140,7 +1140,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm)if (kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map)) {kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); -return 1 ; +return ; }/* Give the current vmcb to the guest */
@@ -1302,8 +1302,10 @@ int nested_svm_vmexit(struct vcpu_svm *svm)nested_svm_uninit_mmu_context (vcpu); -if (nested_svm_load_cr3 (vcpu, vmcb01->save.cr3, false, true)) -return 1 ; +if (nested_svm_load_cr3 (vcpu, vmcb01->save.cr3, false, true)) { +kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); +return ; + }/* * Drop what we picked up for L2 via svm_complete_interrupts() so it
@@ -1328,8 +1330,6 @@ int nested_svm_vmexit(struct vcpu_svm *svm)*/ if (kvm_apicv_activated (vcpu->kvm))__kvm_vcpu_update_apicv (vcpu); - -return 0 ; }static void nested_svm_triple_fault (struct kvm_vcpu *vcpu)
arch/x86/kvm/svm/svm.c +2 -9
@@ -2234,13 +2234,9 @@ static int emulate_svm_instr(struct kvm_vcpu *vcpu, int opcode) [SVM_INSTR_VMSAVE] = vmsave_interception, };struct vcpu_svm *svm =to_svm (vcpu); -int ret;if (is_guest_mode (vcpu)) { -/* Returns '1' or -errno on failure, '0' on success. */ - ret =nested_svm_simple_vmexit (svm, guest_mode_exit_codes[opcode]); -if (ret) -return ret; +nested_svm_simple_vmexit (svm, guest_mode_exit_codes[opcode]);return 1 ; }return svm_instr_handlers[opcode](vcpu);
@@ -4792,7 +4788,6 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) {struct vcpu_svm *svm =to_svm (vcpu);struct kvm_host_map map_save; -int ret;if (!is_guest_mode (vcpu))return 0 ;
@@ -4812,9 +4807,7 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP ]; svm->vmcb->save.rip = vcpu->arch.regs[VCPU_REGS_RIP ]; - ret =nested_svm_simple_vmexit (svm,SVM_EXIT_SW ); -if (ret) -return ret; +nested_svm_simple_vmexit (svm,SVM_EXIT_SW );/* * KVM uses VMCB01 to store L1 host state while L2 runs but
arch/x86/kvm/svm/svm.h +3 -3
@@ -793,14 +793,14 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu);void svm_copy_vmrun_state (struct vmcb_save_area *to_save,struct vmcb_save_area *from_save);void svm_copy_vmloadsave_state (struct vmcb *to_vmcb,struct vmcb *from_vmcb); -int nested_svm_vmexit (struct vcpu_svm *svm); +void nested_svm_vmexit (struct vcpu_svm *svm); -static inline int nested_svm_simple_vmexit (struct vcpu_svm *svm,u32 exit_code) +static inline void nested_svm_simple_vmexit (struct vcpu_svm *svm,u32 exit_code) { svm->vmcb->control.exit_code = exit_code; svm->vmcb->control.exit_info_1 =0 ; svm->vmcb->control.exit_info_2 =0 ; -return nested_svm_vmexit (svm); +nested_svm_vmexit (svm); }int nested_svm_exit_handled (struct vcpu_svm *svm);
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
Sean Christopherson
maintainerRe: [PATCH v5 07/26] KVM: nSVM: Triple fault if restore host CR3 fails on nested #VMEXIT
arch/x86/kvm/svm/nested.c int nested_svm_vmexit(struct vcpu_svm *svm) · line 1144
Quoted 7 lines · Yosry Ahmed
arch/x86/kvm/svm/nested.c +1
-1@@ -1140,7 +1140,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm)if (kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map)) {kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); -return 1 ; +return ; }
And then here I think we can do the same thing, e.g.
if (nested_svm_load_cr3(vcpu, vmcb01->save.cr3, false, true)) kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
PATCH v5 8/26 KVM: nSVM: Drop nested_vmcb_check_{save/control}() wrappers
In reply to Yosry AhmedThe wrappers provide little value and make it harder to see what KVM is checking in the normal flow. Drop them.
Opportunistically fixup comments referring to the functions, adding '()' to make it clear it's a reference to a function.
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-)
arch/x86/kvm/svm/nested.c +10 -26
@@ -339,8 +339,8 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size)kvm_vcpu_is_legal_gpa (vcpu, addr + size -1 ); } -static bool __nested_vmcb_check_controls (struct kvm_vcpu *vcpu, -struct vmcb_ctrl_area_cached *control) +static bool nested_vmcb_check_controls (struct kvm_vcpu *vcpu, +struct vmcb_ctrl_area_cached *control) {if (CC (!vmcb12_is_intercept (control,INTERCEPT_VMRUN )))return false;
@@ -367,8 +367,8 @@ static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu, }/* Common checks that apply to both L1 and L2 state. */ -static bool __nested_vmcb_check_save (struct kvm_vcpu *vcpu, -struct vmcb_save_area_cached *save) +static bool nested_vmcb_check_save (struct kvm_vcpu *vcpu, +struct vmcb_save_area_cached *save) {if (CC (!(save->efer &EFER_SVME )))return false;
@@ -402,22 +402,6 @@ static bool __nested_vmcb_check_save(struct kvm_vcpu *vcpu,return true; } -static bool nested_vmcb_check_save (struct kvm_vcpu *vcpu) -{ -struct vcpu_svm *svm =to_svm (vcpu); -struct vmcb_save_area_cached *save = &svm->nested.save; - -return __nested_vmcb_check_save (vcpu, save); -} - -static bool nested_vmcb_check_controls (struct kvm_vcpu *vcpu) -{ -struct vcpu_svm *svm =to_svm (vcpu); -struct vmcb_ctrl_area_cached *ctl = &svm->nested.ctl; - -return __nested_vmcb_check_controls (vcpu, ctl); -} -/* * If a feature is not advertised to L1, clear the corresponding vmcb12 * intercept.
@@ -469,7 +453,7 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, to->pause_filter_count = from->pause_filter_count; to->pause_filter_thresh = from->pause_filter_thresh; -/* Copy asid here because nested_vmcb_check_controls will check it. */ +/* Copy asid here because nested_vmcb_check_controls() will check it */ to->asid = from->asid; to->msrpm_base_pa &= ~0x0fffULL ; to->iopm_base_pa &= ~0x0fffULL ;
@@ -1026,8 +1010,8 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu)nested_copy_vmcb_control_to_cache (svm, &vmcb12->control);nested_copy_vmcb_save_to_cache (svm, &vmcb12->save); -if (!nested_vmcb_check_save (vcpu) || - !nested_vmcb_check_controls (vcpu)) { +if (!nested_vmcb_check_save (vcpu, &svm->nested.save) || + !nested_vmcb_check_controls (vcpu, &svm->nested.ctl)) { vmcb12->control.exit_code =SVM_EXIT_ERR ; vmcb12->control.exit_info_1 =0 ; vmcb12->control.exit_info_2 =0 ;
@@ -1861,12 +1845,12 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, ret = -EINVAL ;__nested_copy_vmcb_control_to_cache (vcpu, &ctl_cached, ctl); -if (!__nested_vmcb_check_controls (vcpu, &ctl_cached)) +if (!nested_vmcb_check_controls (vcpu, &ctl_cached)) goto out_free;/* * Processor state contains L2 state. Check that it is -* valid for guest mode (see nested_vmcb_check_save). +* valid for guest mode (see nested_vmcb_check_save()). */ cr0 =kvm_read_cr0 (vcpu);if (((cr0 &X86_CR0_CD ) ==0 ) && (cr0 &X86_CR0_NW ))
@@ -1880,7 +1864,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,if (!(save->cr0 &X86_CR0_PG ) || !(save->cr0 &X86_CR0_PE ) || (save->rflags &X86_EFLAGS_VM ) || - !__nested_vmcb_check_save (vcpu, &save_cached)) + !nested_vmcb_check_save (vcpu, &save_cached)) goto out_free;
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 9/26 KVM: nSVM: Call enter_guest_mode() before switching to VMCB02
In reply to Yosry AhmedIn preparation for moving more changes that rely on is_guest_mode() before switching to VMCB02, move entering guest mode a bit earlier.
Nothing between the new callsite(s) and the old ones rely on is_guest_mode(), so this should be safe.
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/svm/nested.c +3 -3
@@ -741,9 +741,6 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm,nested_svm_transition_tlb_flush (vcpu); -/* Enter Guest-Mode */ -enter_guest_mode (vcpu); -/* * Filled at exit: exit_code, exit_info_1, exit_info_2, exit_int_info, * exit_int_info_err, next_rip, insn_len, insn_bytes.
@@ -944,6 +941,8 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,WARN_ON (svm->vmcb == svm->nested.vmcb02.ptr); +enter_guest_mode (vcpu); +nested_svm_copy_common_state (svm->vmcb01.ptr, svm->nested.vmcb02.ptr);svm_switch_vmcb (svm, &svm->nested.vmcb02);
@@ -1890,6 +1889,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,svm_copy_vmrun_state (&svm->vmcb01.ptr->save, save);nested_copy_vmcb_control_to_cache (svm, ctl); +enter_guest_mode (vcpu);svm_switch_vmcb (svm, &svm->nested.vmcb02);nested_vmcb02_prepare_control (svm, svm->vmcb->save.rip, svm->vmcb->save.cs.base);
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
Sean Christopherson
maintainerRe: [PATCH v5 09/26] KVM: nSVM: Call enter_guest_mode() before switching to VMCB02
Quoted 38 lines · Yosry Ahmed
In preparation for moving more changes that rely on
is_guest_mode()before switching to VMCB02, move entering guest mode a bit earlier.Nothing between the new callsite(s) and the old ones rely on
is_guest_mode(), so this should be safe.No functional change intended.
Signed-off-by Yosry Ahmed <[email protected]>--- arch/x86/kvm/svm/nested.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/x86/kvm/svm/nested.c +2
-3@@ -741,9 +741,6 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm,nested_svm_transition_tlb_flush (vcpu); -/* Enter Guest-Mode */ -enter_guest_mode (vcpu); -/* * Filled at exit: exit_code, exit_info_1, exit_info_2, exit_int_info, * exit_int_info_err, next_rip, insn_len, insn_bytes. @@ -944,6 +941,8 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,WARN_ON (svm->vmcb == svm->nested.vmcb02.ptr); +enter_guest_mode (vcpu); +nested_svm_copy_common_state (svm->vmcb01.ptr, svm->nested.vmcb02.ptr);svm_switch_vmcb (svm, &svm->nested.vmcb02);
arch/x86/kvm/svm/nested.c static int svm_set_nested_state(struct kvm_vcpu *vcpu, · line 1894
Quoted 6 lines
arch/x86/kvm/svm/nested.c +1
-0@@ -1890,6 +1889,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,svm_copy_vmrun_state (&svm->vmcb01.ptr->save, save);nested_copy_vmcb_control_to_cache (svm, ctl); +enter_guest_mode (vcpu);svm_switch_vmcb (svm, &svm->nested.vmcb02);nested_vmcb02_prepare_control (svm, svm->vmcb->save.rip, svm->vmcb->save.cs.base);
LOL, guess what! Today end's in 'y', which means there's a nSVM bug! It's a super minor one though, especially in the broader context, I just happened to see it when looking at this patch.
As per 3f6821aa147b ("KVM: x86: Forcibly leave nested if RSM to L2 hits shutdown"), shutdown on RSM is suppose to hit L1, not L2. But if enter_svm_guest_mode() fails, svm_leave_smm() bails without leaving guest code. Syzkaller probably hasn't found the bug because nested_run_pending doesn't get set, but it's still technically wrong.
Of course, as the comment in emulator_leave_smm() says, the *entire* RSM flow is wrong, because it's not a VM-Enter/VMRUN, it's somethign else entirely.
Anyways, I don't think there's anything to do in this series, but at some point we should probably do:
arch/x86/kvm/svm/svm.c +4 -2
@@ -4877,13 +4877,15 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) vmcb12 = map.hva;nested_copy_vmcb_control_to_cache (svm, &vmcb12->control);nested_copy_vmcb_save_to_cache (svm, &vmcb12->save); + ret =enter_svm_guest_mode (vcpu, smram64->svm_guest_vmcb_gpa, vmcb12, false); -if (ret) - goto unmap_save; + goto leave_nested; svm->nested.nested_run_pending =1 ; +leave_nested: +svm_leave_nested (vcpu); unmap_save:kvm_vcpu_unmap (vcpu, &map_save); unmap_map:
Re: [PATCH v5 09/26] KVM: nSVM: Call enter_guest_mode() before switching to VMCB02
Quoted 9 lines · Sean Christopherson
LOL, guess what! Today end's in 'y', which means there's a nSVM bug! It's a super minor one though, especially in the broader context, I just happened to see it when looking at this patch.
As per
3f6821aa147b("KVM: x86: Forcibly leave nested if RSM to L2 hits shutdown"), shutdown on RSM is suppose to hit L1, not L2. But ifenter_svm_guest_mode()fails,svm_leave_smm()bails without leaving guest code. Syzkaller probably hasn't found the bug becausenested_run_pendingdoesn't get set, but it's still technically wrong.
Whoever came up with CONFIG_KVM_SMM was an absolute genius!
Re: [PATCH v5 09/26] KVM: nSVM: Call enter_guest_mode() before switching to VMCB02
In reply to Sean Christopherson[..]
Quoted 3 lines
LOL, guess what! Today end's in 'y', which means there's a nSVM bug! It's a super minor one though, especially in the broader context, I just happened to see it when looking at this patch.
LOL.
Quoted 7 lines
As per
3f6821aa147b("KVM: x86: Forcibly leave nested if RSM to L2 hits shutdown"), shutdown on RSM is suppose to hit L1, not L2. But ifenter_svm_guest_mode()fails,svm_leave_smm()bails without leaving guest code. Syzkaller probably hasn't found the bug becausenested_run_pendingdoesn't get set, but it's still technically wrong.
Quoted 5 lines
Of course, as the comment in
emulator_leave_smm()says, the *entire* RSM flow is wrong, because it's not a VM-Enter/VMRUN, it's somethign else entirely.Anyways, I don't think there's anything to do in this series, but at some point we should probably do:
I would send a patch, but I have never tested (or did anything with) SMM before, and I am trying to keep it that way :P
PATCH v5 10/26 KVM: nSVM: Make nested_svm_merge_msrpm() return an errno
In reply to Yosry AhmedIn preparation for moving nested_svm_merge_msrpm() within enter_svm_guest_mode(), which returns an errno, return an errno from nested_svm_merge_msrpm().
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
arch/x86/kvm/svm/nested.c +9 -7
@@ -276,7 +276,7 @@ int __init nested_svm_init_msrpm_merge_offsets(void)* is optimized in that it only merges the parts where KVM MSR permission bitmap * may contain zero bits. */ -static bool nested_svm_merge_msrpm (struct kvm_vcpu *vcpu) +static int nested_svm_merge_msrpm (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);nsvm_msrpm_merge_t *msrpm02 = svm->nested.msrpm;
@@ -303,17 +303,19 @@ static bool nested_svm_merge_msrpm(struct kvm_vcpu *vcpu)#endif if (!(vmcb12_is_intercept (&svm->nested.ctl,INTERCEPT_MSR_PROT ))) -return true; +return 0 ;for (i =0 ; i < nested_svm_nr_msrpm_merge_offsets; i++) {const int p = nested_svm_msrpm_merge_offsets[i];nsvm_msrpm_merge_t l1_val;gpa_t gpa; +int r; gpa = svm->nested.ctl.msrpm_base_pa + (p *sizeof (l1_val)); -if (kvm_vcpu_read_guest (vcpu, gpa, &l1_val,sizeof (l1_val))) -return false; + r =kvm_vcpu_read_guest (vcpu, gpa, &l1_val,sizeof (l1_val)); +if (r) +return r; msrpm02[p] = msrpm01[p] | l1_val; }
@@ -325,7 +327,7 @@ static bool nested_svm_merge_msrpm(struct kvm_vcpu *vcpu)#endif svm->vmcb->control.msrpm_base_pa =__sme_set (__pa (svm->nested.msrpm)); -return true; +return 0 ; }/*
@@ -1035,7 +1037,7 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu)if (enter_svm_guest_mode (vcpu, vmcb12_gpa, vmcb12, true)) goto out_exit_err; -if (nested_svm_merge_msrpm (vcpu)) +if (!nested_svm_merge_msrpm (vcpu)) goto out; out_exit_err:
@@ -1930,7 +1932,7 @@ static bool svm_get_nested_state_pages(struct kvm_vcpu *vcpu)if (CC (!load_pdptrs (vcpu, vcpu->arch.cr3)))return false; -if (!nested_svm_merge_msrpm (vcpu)) { +if (nested_svm_merge_msrpm (vcpu)) { vcpu->run->exit_reason =KVM_EXIT_INTERNAL_ERROR ; vcpu->run->internal.suberror =KVM_INTERNAL_ERROR_EMULATION ;
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 11/26 KVM: nSVM: Call nested_svm_merge_msrpm() from enter_svm_guest_mode()
In reply to Yosry AhmedIn preparation for unifying the VMRUN failure code paths, move calling nested_svm_merge_msrpm() into enter_svm_guest_mode() next to the nested_svm_load_cr3() call (the other failure path in enter_svm_guest_mode()).
Adding more uses of the from_vmrun parameter is not pretty, but it is plumbed all the way to nested_svm_load_cr3() so it's not going away soon anyway.
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
arch/x86/kvm/svm/nested.c +15 -14
@@ -956,6 +956,12 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,if (ret)return ret; +if (from_vmrun) { + ret =nested_svm_merge_msrpm (vcpu); +if (ret) +return ret; + } +if (!from_vmrun)kvm_make_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu);
@@ -1034,22 +1040,17 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) svm->nested.nested_run_pending =1 ; -if (enter_svm_guest_mode (vcpu, vmcb12_gpa, vmcb12, true)) - goto out_exit_err; - -if (!nested_svm_merge_msrpm (vcpu)) - goto out; - -out_exit_err: - svm->nested.nested_run_pending =0 ; - svm->nmi_l1_to_l2 = false; - svm->soft_int_injected = false; +if (enter_svm_guest_mode (vcpu, vmcb12_gpa, vmcb12, true)) { + svm->nested.nested_run_pending =0 ; + svm->nmi_l1_to_l2 = false; + svm->soft_int_injected = false; - svm->vmcb->control.exit_code =SVM_EXIT_ERR ; - svm->vmcb->control.exit_info_1 =0 ; - svm->vmcb->control.exit_info_2 =0 ; + svm->vmcb->control.exit_code =SVM_EXIT_ERR ; + svm->vmcb->control.exit_info_1 =0 ; + svm->vmcb->control.exit_info_2 =0 ; -nested_svm_vmexit (svm); +nested_svm_vmexit (svm); + } out:kvm_vcpu_unmap (vcpu, &map);
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 12/26 KVM: nSVM: Call nested_svm_init_mmu_context() before switching to VMCB02
In reply to Yosry AhmedIn preparation for moving more code that depends on nested_svm_init_mmu_context() before switching to VMCB02, move the call outside of nested_vmcb02_prepare_control() into callers, a bit earlier. nested_svm_init_mmu_context() needs to be called after enter_guest_mode(), but not after switching to VMCB02.
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/kvm/svm/nested.c +7 -4
@@ -803,10 +803,6 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm,/* Also overwritten later if necessary. */ vmcb02->control.tlb_ctl =TLB_CONTROL_DO_NOTHING ; -/* nested_cr3. */ -if (nested_npt_enabled (svm)) -nested_svm_init_mmu_context (vcpu); - vcpu->arch.tsc_offset = kvm_calc_nested_tsc_offset( vcpu->arch.l1_tsc_offset, svm->nested.ctl.tsc_offset,
@@ -945,6 +941,9 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,enter_guest_mode (vcpu); +if (nested_npt_enabled (svm)) +nested_svm_init_mmu_context (vcpu); +nested_svm_copy_common_state (svm->vmcb01.ptr, svm->nested.vmcb02.ptr);svm_switch_vmcb (svm, &svm->nested.vmcb02);
@@ -1893,6 +1892,10 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,nested_copy_vmcb_control_to_cache (svm, ctl);enter_guest_mode (vcpu); + +if (nested_npt_enabled (svm)) +nested_svm_init_mmu_context (vcpu); +svm_switch_vmcb (svm, &svm->nested.vmcb02);nested_vmcb02_prepare_control (svm, svm->vmcb->save.rip, svm->vmcb->save.cs.base);
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 13/26 KVM: nSVM: Refactor minimal #VMEXIT handling out of nested_svm_vmexit()
In reply to Yosry AhmedIn preparation for having a separate minimal #VMEXIT path for handling failed VMRUNs, move the minimal logic out of nested_svm_vmexit() into a helper.
This includes clearing the GIF, handling single-stepping on VMRUN, and a few data structure cleanups. Basically, everything that is required by the architecture (or KVM) on a #VMEXIT where L2 never actually ran.
Additionally move uninitializing the nested MMU and reloading host CR3 to the new helper. It is not required at this point, but following changes will require it.
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 61 ++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 27 deletions(-)
arch/x86/kvm/svm/nested.c +34 -27
@@ -974,6 +974,34 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,return 0 ; } +static void __nested_svm_vmexit (struct vcpu_svm *svm) +{ +struct vmcb *vmcb01 = svm->vmcb01.ptr; +struct kvm_vcpu *vcpu = &svm->vcpu; + + svm->nested.vmcb12_gpa =0 ; + svm->nested.ctl.nested_cr3 =0 ; + +/* GIF is cleared on #VMEXIT, no event can be injected in L1 */ +svm_set_gif (svm, false); + vmcb01->control.exit_int_info =0 ; + +nested_svm_uninit_mmu_context (vcpu); +if (nested_svm_load_cr3 (vcpu, vmcb01->save.cr3, false, true)) { +kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); +return ; + } + +/* +* If we are here following the completion of a VMRUN that +* is being single-stepped, queue the pending #DB intercept +* right now so that it an be accounted for before we execute +* L1's next instruction. +*/ +if (unlikely (vmcb01->save.rflags &X86_EFLAGS_TF )) +kvm_queue_exception (vcpu,DB_VECTOR ); +} +int nested_svm_vmrun (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);
@@ -1121,8 +1149,6 @@ void nested_svm_vmexit(struct vcpu_svm *svm)/* in case we halted in L2 */ kvm_set_mp_state (vcpu,KVM_MP_STATE_RUNNABLE ); - svm->nested.vmcb12_gpa =0 ; -if (kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map)) {kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu);return ;
@@ -1239,13 +1265,6 @@ void nested_svm_vmexit(struct vcpu_svm *svm) } } -/* -* On vmexit the GIF is set to false and -* no event can be injected in L1. -*/ -svm_set_gif (svm, false); - vmcb01->control.exit_int_info =0 ; - svm->vcpu.arch.tsc_offset = svm->vcpu.arch.l1_tsc_offset;if (vmcb01->control.tsc_offset != svm->vcpu.arch.tsc_offset) { vmcb01->control.tsc_offset = svm->vcpu.arch.tsc_offset;
@@ -1258,8 +1277,6 @@ void nested_svm_vmexit(struct vcpu_svm *svm)svm_write_tsc_multiplier (vcpu); } - svm->nested.ctl.nested_cr3 =0 ; -/* * Restore processor state that had been saved in vmcb01 */
@@ -1285,13 +1302,6 @@ void nested_svm_vmexit(struct vcpu_svm *svm)nested_svm_transition_tlb_flush (vcpu); -nested_svm_uninit_mmu_context (vcpu); - -if (nested_svm_load_cr3 (vcpu, vmcb01->save.cr3, false, true)) { -kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); -return ; - } -/* * Drop what we picked up for L2 via svm_complete_interrupts() so it * doesn't end up in L1.
@@ -1300,21 +1310,18 @@ void nested_svm_vmexit(struct vcpu_svm *svm)kvm_clear_exception_queue (vcpu);kvm_clear_interrupt_queue (vcpu); -/* -* If we are here following the completion of a VMRUN that -* is being single-stepped, queue the pending #DB intercept -* right now so that it an be accounted for before we execute -* L1's next instruction. -*/ -if (unlikely (vmcb01->save.rflags &X86_EFLAGS_TF )) -kvm_queue_exception (&(svm->vcpu),DB_VECTOR ); -/* * Un-inhibit the AVIC right away, so that other vCPUs can start * to benefit from it right away. */ if (kvm_apicv_activated (vcpu->kvm))__kvm_vcpu_update_apicv (vcpu); + +/* +* Potentially queues an exception, so it needs to be after +* kvm_clear_exception_queue() is called above. +*/ +__nested_svm_vmexit (svm); }static void nested_svm_triple_fault (struct kvm_vcpu *vcpu)
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 14/26 KVM: nSVM: Unify handling of VMRUN failures with proper cleanup
In reply to Yosry AhmedThere are currently two possible causes of VMRUN failures emulated by KVM:
1) Consistency checks failures. In this case, KVM updates the exit code in the mapped VMCB12 and exits early in nested_svm_vmrun(). This causes a few problems:
A) KVM does not clear the GIF if the early consistency checks fail (because nested_svm_vmexit() is not called). Nothing requires GIF=0 before a VMRUN, from the APM:
It is assumed that VMM software cleared GIF some time before executing the VMRUN instruction, to ensure an atomic state switch.
So an early #VMEXIT from early consistency checks could leave the GIF set.
B) svm_leave_smm() is missing consistency checks on the newly loaded guest state, because the checks aren't performed by enter_svm_guest_mode().
2) Failure to load L2's CR3 or merge the MSR bitmaps. In this case, a fully-fledged #VMEXIT injection is performed as VMCB02 is already prepared.
Arguably all VMRUN failures should be handled before the VMCB02 is prepared, but with proper cleanup (e.g. clear the GIF). Move all the potential failure checks inside enter_svm_guest_mode() before switching to VMCB02. On failure of any of these checks, nested_svm_vmrun() synthesizes a minimal #VMEXIT through the new nested_svm_failed_vmrun() helper.
__nested_svm_vmexit() already performs the necessary cleanup for a failed VMRUN, including uninitializing the nested MMU and reloading L1's CR3. This ensures that consistency check failures do proper necessary cleanup, while other failures do not doo too much cleanup. It also leaves a unified path for handling VMRUN failures.
--- arch/x86/kvm/svm/nested.c | 66 +++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 24 deletions(-)
arch/x86/kvm/svm/nested.c +42 -24
@@ -934,22 +934,19 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa, vmcb12->control.intercepts[INTERCEPT_WORD4 ], vmcb12->control.intercepts[INTERCEPT_WORD5]); - svm->nested.vmcb12_gpa = vmcb12_gpa;WARN_ON (svm->vmcb == svm->nested.vmcb02.ptr);enter_guest_mode (vcpu); +if (!nested_vmcb_check_save (vcpu, &svm->nested.save) || + !nested_vmcb_check_controls (vcpu, &svm->nested.ctl)) +return -EINVAL ; +if (nested_npt_enabled (svm))nested_svm_init_mmu_context (vcpu); -nested_svm_copy_common_state (svm->vmcb01.ptr, svm->nested.vmcb02.ptr); - -svm_switch_vmcb (svm, &svm->nested.vmcb02); -nested_vmcb02_prepare_control (svm, vmcb12->save.rip, vmcb12->save.cs.base); -nested_vmcb02_prepare_save (svm, vmcb12); - ret =nested_svm_load_cr3 (&svm->vcpu, svm->nested.save.cr3,nested_npt_enabled (svm), from_vmrun);if (ret)
@@ -961,6 +958,17 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,return ret; } +/* +* Any VMRUN failure needs to happen before this point, such that the +* nested #VMEXIT is injected properly by nested_svm_vmrun_error_vmexit(). +*/ + +nested_svm_copy_common_state (svm->vmcb01.ptr, svm->nested.vmcb02.ptr); + +svm_switch_vmcb (svm, &svm->nested.vmcb02); +nested_vmcb02_prepare_control (svm, vmcb12->save.rip, vmcb12->save.cs.base); +nested_vmcb02_prepare_save (svm, vmcb12); +if (!from_vmrun)kvm_make_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu);
@@ -979,6 +987,8 @@ static void __nested_svm_vmexit(struct vcpu_svm *svm)struct vmcb *vmcb01 = svm->vmcb01.ptr;struct kvm_vcpu *vcpu = &svm->vcpu; +WARN_ON_ONCE (is_guest_mode (vcpu)); + svm->nested.vmcb12_gpa =0 ; svm->nested.ctl.nested_cr3 =0 ;
@@ -1002,6 +1012,20 @@ static void __nested_svm_vmexit(struct vcpu_svm *svm)kvm_queue_exception (vcpu,DB_VECTOR ); } +static void nested_svm_vmrun_error_vmexit (struct kvm_vcpu *vcpu,struct vmcb *vmcb12) +{ +struct vcpu_svm *svm =to_svm (vcpu); + +WARN_ON_ONCE (svm->vmcb == svm->nested.vmcb02.ptr); + +leave_guest_mode (vcpu); + + vmcb12->control.exit_code =SVM_EXIT_ERR ; + vmcb12->control.exit_info_1 =0 ; + vmcb12->control.exit_info_2 =0 ; +__nested_svm_vmexit (svm); +} +int nested_svm_vmrun (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);
@@ -1044,14 +1068,6 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu)nested_copy_vmcb_control_to_cache (svm, &vmcb12->control);nested_copy_vmcb_save_to_cache (svm, &vmcb12->save); -if (!nested_vmcb_check_save (vcpu, &svm->nested.save) || - !nested_vmcb_check_controls (vcpu, &svm->nested.ctl)) { - vmcb12->control.exit_code =SVM_EXIT_ERR ; - vmcb12->control.exit_info_1 =0 ; - vmcb12->control.exit_info_2 =0 ; - goto out; - } -/* * Since vmcb01 is not in use, we can use it to store some of the L1 * state.
@@ -1072,14 +1088,9 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) svm->nmi_l1_to_l2 = false; svm->soft_int_injected = false; - svm->vmcb->control.exit_code =SVM_EXIT_ERR ; - svm->vmcb->control.exit_info_1 =0 ; - svm->vmcb->control.exit_info_2 =0 ; - -nested_svm_vmexit (svm); +nested_svm_vmrun_error_vmexit (vcpu, vmcb12); } -out:kvm_vcpu_unmap (vcpu, &map);return ret;
@@ -1217,6 +1228,13 @@ void nested_svm_vmexit(struct vcpu_svm *svm)if (guest_cpu_cap_has (vcpu,X86_FEATURE_ERAPS )) vmcb01->control.erap_ctl |=ERAP_CONTROL_CLEAR_RAP ; +/* +* nested_svm_vmexit() is intended for use only when KVM is synthesizing +* a #VMEXIT after a successful nested VMRUN. All VMRUN consistency +* checks must be performed before loading guest state, and so should +* use __nested_svm_vmexit(). +*/ +WARN_ON_ONCE (svm->vmcb != svm->nested.vmcb02.ptr);svm_switch_vmcb (svm, &svm->vmcb01);/*
@@ -1903,9 +1921,6 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,if (nested_npt_enabled (svm))nested_svm_init_mmu_context (vcpu); -svm_switch_vmcb (svm, &svm->nested.vmcb02); -nested_vmcb02_prepare_control (svm, svm->vmcb->save.rip, svm->vmcb->save.cs.base); -/* * While the nested guest CR3 is already checked and set by * KVM_SET_SREGS, it was set when nested state was yet loaded,
@@ -1917,6 +1932,9 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,if (ret) goto out_free; +svm_switch_vmcb (svm, &svm->nested.vmcb02); +nested_vmcb02_prepare_control (svm, svm->vmcb->save.rip, svm->vmcb->save.cs.base); + svm->nested.force_msr_bitmap_recalc = true;kvm_make_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu);
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 15/26 KVM: nSVM: Clear EVENTINJ field in VMCB12 on nested #VMEXIT
In reply to Yosry AhmedAccording to the APM, from the reference of the VMRUN instruction:
Upon #VMEXIT, the processor performs the following actions in order to return to the host execution context:
...
clear EVENTINJ field in VMCB
KVM correctly cleared EVENTINJ (i.e. event_inj and event_inj_err) on nested #VMEXIT before commit 2d8a42be0e2b ("KVM: nSVM: synchronize VMCB controls updated by the processor on every vmexit"). That commit made sure the fields are synchronized between VMCB02 and KVM's cached VMCB12 on every L2->L0 #VMEXIT, such that they are serialized correctly on save/restore.
However, the commit also incorrectly copied the fields from KVM's cached VMCB12 to L1's VMCB12 on nested #VMEXIT. Go back to clearing the fields, and so in __nested_svm_vmexit() instead of nested_svm_vmexit(), such that it also applies to #VMEXITs caused by a failed VMRUN.
--- arch/x86/kvm/svm/nested.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
arch/x86/kvm/svm/nested.c +9 -7
@@ -982,7 +982,7 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,return 0 ; } -static void __nested_svm_vmexit (struct vcpu_svm *svm) +static void __nested_svm_vmexit (struct vcpu_svm *svm,struct vmcb *vmcb12) {struct vmcb *vmcb01 = svm->vmcb01.ptr;struct kvm_vcpu *vcpu = &svm->vcpu;
@@ -996,6 +996,10 @@ static void __nested_svm_vmexit(struct vcpu_svm *svm)svm_set_gif (svm, false); vmcb01->control.exit_int_info =0 ; +/* event_inj is cleared on #VMEXIT */ + vmcb12->control.event_inj =0 ; + vmcb12->control.event_inj_err =0 ; +nested_svm_uninit_mmu_context (vcpu);if (nested_svm_load_cr3 (vcpu, vmcb01->save.cr3, false, true)) {kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu);
@@ -1023,7 +1027,7 @@ static void nested_svm_vmrun_error_vmexit(struct kvm_vcpu *vcpu, struct vmcb *vm vmcb12->control.exit_code =SVM_EXIT_ERR ; vmcb12->control.exit_info_1 =0 ; vmcb12->control.exit_info_2 =0 ; -__nested_svm_vmexit (svm); +__nested_svm_vmexit (svm, vmcb12); }int nested_svm_vmrun (struct kvm_vcpu *vcpu)
@@ -1205,8 +1209,6 @@ void nested_svm_vmexit(struct vcpu_svm *svm) vmcb12->control.next_rip = vmcb02->control.next_rip; vmcb12->control.int_ctl = svm->nested.ctl.int_ctl; - vmcb12->control.event_inj = svm->nested.ctl.event_inj; - vmcb12->control.event_inj_err = svm->nested.ctl.event_inj_err;if (!kvm_pause_in_guest (vcpu->kvm)) { vmcb01->control.pause_filter_count = vmcb02->control.pause_filter_count;
@@ -1316,8 +1318,6 @@ void nested_svm_vmexit(struct vcpu_svm *svm) vmcb12->control.exit_int_info_err, KVM_ISA_SVM); -kvm_vcpu_unmap (vcpu, &map); -nested_svm_transition_tlb_flush (vcpu);/*
@@ -1339,7 +1339,9 @@ void nested_svm_vmexit(struct vcpu_svm *svm)* Potentially queues an exception, so it needs to be after * kvm_clear_exception_queue() is called above. */ -__nested_svm_vmexit (svm); +__nested_svm_vmexit (svm, vmcb12); + +kvm_vcpu_unmap (vcpu, &map); }static void nested_svm_triple_fault (struct kvm_vcpu *vcpu)
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 16/26 KVM: nSVM: Drop the non-architectural consistency check for NP_ENABLE
In reply to Yosry AhmedKVM currenty fails a nested VMRUN and injects VMEXIT_INVALID (aka SVM_EXIT_ERR) if L1 sets NP_ENABLE and the host does not support NPTs. On first glance, it seems like the check should actually be for guest_cpu_cap_has(X86_FEATURE_NPT) instead, as it is possible for the host to support NPTs but the guest CPUID to not advertise it.
However, the consistency check is not architectural to begin with. The APM does not mention VMEXIT_INVALID if NP_ENABLE is set on a processor that does not have X86_FEATURE_NPT. Hence, NP_ENABLE should be ignored if X86_FEATURE_NPT is not available for L1, so sanitize it when copying from the VMCB12 to KVM's cache.
Apart from the consistency check, NP_ENABLE in VMCB12 is currently ignored because the bit is actually copied from VMCB01 to VMCB02, not from VMCB12.
--- arch/x86/kvm/svm/nested.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/x86/kvm/svm/nested.c +5 -4
@@ -350,9 +350,6 @@ static bool nested_vmcb_check_controls(struct kvm_vcpu *vcpu,if (CC (control->asid ==0 ))return false; -if (CC ((control->nested_ctl &SVM_NESTED_CTL_NP_ENABLE ) && !npt_enabled)) -return false; -if (CC (!nested_svm_check_bitmap_pa (vcpu, control->msrpm_base_pa,MSRPM_SIZE )))return false;
@@ -433,6 +430,11 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu,nested_svm_sanitize_intercept (vcpu, to,SKINIT );nested_svm_sanitize_intercept (vcpu, to,RDPRU ); +/* Always clear SVM_NESTED_CTL_NP_ENABLE if the guest cannot use NPTs */ + to->nested_ctl = from->nested_ctl; +if (!guest_cpu_cap_has (vcpu,X86_FEATURE_NPT )) + to->nested_ctl &= ~SVM_NESTED_CTL_NP_ENABLE ; + to->iopm_base_pa = from->iopm_base_pa; to->msrpm_base_pa = from->msrpm_base_pa; to->tsc_offset = from->tsc_offset;
@@ -446,7 +448,6 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, to->exit_info_2 = from->exit_info_2; to->exit_int_info = from->exit_int_info; to->exit_int_info_err = from->exit_int_info_err; - to->nested_ctl = from->nested_ctl; to->event_inj = from->event_inj; to->event_inj_err = from->event_inj_err; to->next_rip = from->next_rip;
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 17/26 KVM: nSVM: Add missing consistency check for nCR3 validity
In reply to Yosry AhmedFrom the APM Volume #2, 15.25.4 (24593—Rev. 3.42—March 2024):
When VMRUN is executed with nested paging enabled (NP_ENABLE = 1), the following conditions are considered illegal state combinations, in addition to those mentioned in “Canonicalization and Consistency Checks”:
• Any MBZ bit of nCR3 is set.
• Any G_PAT.PA field has an unsupported type encoding or any reserved field in G_PAT has a nonzero value.
Add the consistency check for nCR3 being a legal GPA with no MBZ bits set. The G_PAT.PA check was proposed separately [*].
[*]https://lore.kernel.org/kvm/[email protected]/
--- arch/x86/kvm/svm/nested.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kvm/svm/nested.c +5 -0
@@ -350,6 +350,11 @@ static bool nested_vmcb_check_controls(struct kvm_vcpu *vcpu,if (CC (control->asid ==0 ))return false; +if (control->nested_ctl &SVM_NESTED_CTL_NP_ENABLE ) { +if (CC (!kvm_vcpu_is_legal_gpa (vcpu, control->nested_cr3))) +return false; + } +if (CC (!nested_svm_check_bitmap_pa (vcpu, control->msrpm_base_pa,MSRPM_SIZE )))return false;
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 18/26 KVM: nSVM: Add missing consistency check for hCR0.PG and NP_ENABLE
In reply to Yosry AhmedFrom the APM Volume #2, 15.25.3 (24593—Rev. 3.42—March 2024):
If VMRUN is executed with hCR0.PG cleared to zero and NP_ENABLE set to 1 , VMRUN terminates with #VMEXIT(VMEXIT_INVALID).
Add the consistency check by plumbing L1's CR0 tonested_vmcb_check_controls().
--- arch/x86/kvm/svm/nested.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arch/x86/kvm/svm/nested.c +8 -3
@@ -342,7 +342,8 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size) }static bool nested_vmcb_check_controls (struct kvm_vcpu *vcpu, -struct vmcb_ctrl_area_cached *control) +struct vmcb_ctrl_area_cached *control, +unsigned long l1_cr0) {if (CC (!vmcb12_is_intercept (control,INTERCEPT_VMRUN )))return false;
@@ -353,6 +354,8 @@ static bool nested_vmcb_check_controls(struct kvm_vcpu *vcpu,if (control->nested_ctl &SVM_NESTED_CTL_NP_ENABLE ) {if (CC (!kvm_vcpu_is_legal_gpa (vcpu, control->nested_cr3)))return false; +if (CC (!(l1_cr0 &X86_CR0_PG ))) +return false; } if (CC(!nested_svm_check_bitmap_pa(vcpu, control->msrpm_base_pa,
@@ -947,7 +950,8 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,enter_guest_mode (vcpu);if (!nested_vmcb_check_save (vcpu, &svm->nested.save) || - !nested_vmcb_check_controls (vcpu, &svm->nested.ctl)) + !nested_vmcb_check_controls (vcpu, &svm->nested.ctl, + svm->vmcb01.ptr->save.cr0))return -EINVAL ;if (nested_npt_enabled (svm))
@@ -1879,7 +1883,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, ret = -EINVAL ;__nested_copy_vmcb_control_to_cache (vcpu, &ctl_cached, ctl); -if (!nested_vmcb_check_controls (vcpu, &ctl_cached)) +/* 'save' contains L1 state saved from before VMRUN */ +if (!nested_vmcb_check_controls (vcpu, &ctl_cached, save->cr0)) goto out_free;/*
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 19/26 KVM: nSVM: Add missing consistency check for EFER, CR0, CR4, and CS
In reply to Yosry AhmedAccording to the APM Volume #2, 15.5, Canonicalization and Consistency Checks (24593—Rev. 3.42—March 2024), the following condition (among others) results in a #VMEXIT with VMEXIT_INVALID (aka SVM_EXIT_ERR):
EFER.LME, CR0.PG, CR4.PAE, CS.L, and CS.D are all non-zero.
Add the missing consistency check. This is functionally a nop because the nested VMRUN results in SVM_EXIT_ERR in HW, which is forwarded to L1, but KVM makes all consistency checks before a VMRUN is actually attempted.
--- arch/x86/kvm/svm/nested.c | 7 +++++++ arch/x86/kvm/svm/svm.h | 1 + 2 files changed, 8 insertions(+)
arch/x86/kvm/svm/nested.c +7 -0
@@ -397,6 +397,11 @@ static bool nested_vmcb_check_save(struct kvm_vcpu *vcpu, CC(!(save->cr0 & X86_CR0_PE)) || CC(!kvm_vcpu_is_legal_cr3(vcpu, save->cr3)))return false; + +if (CC ((save->cr4 &X86_CR4_PAE ) && + (save->cs.attrib &SVM_SELECTOR_L_MASK ) && + (save->cs.attrib &SVM_SELECTOR_DB_MASK ))) +return false; }/* Note, SVM doesn't have any additional restrictions on CR4. */
@@ -492,6 +497,8 @@ static void __nested_copy_vmcb_save_to_cache(struct vmcb_save_area_cached *to,* Copy only fields that are validated, as we need them * to avoid TOC/TOU races. */ + to->cs = from->cs; + to->efer = from->efer; to->cr0 = from->cr0; to->cr3 = from->cr3;
arch/x86/kvm/svm/svm.h +1 -0
@@ -140,6 +140,7 @@ struct kvm_vmcb_info { };struct vmcb_save_area_cached { +struct vmcb_seg cs;u64 efer;u64 cr4;u64 cr3;
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 20/26 KVM: nSVM: Add missing consistency check for event_inj
In reply to Yosry AhmedAccording to the APM Volume #2, 15.20 (24593—Rev. 3.42—March 2024):
VMRUN exits with VMEXIT_INVALID error code if either:
• Reserved values of TYPE have been specified, or
• TYPE = 3 (exception) has been specified with a vector that does not correspond to an exception (this includes vector 2, which is an NMI, not an exception).
Add the missing consistency checks to KVM. For the second point, inject VMEXIT_INVALID if the vector is anything but the vectors defined by the APM for exceptions. Reserved vectors are also considered invalid, which matches the HW behavior. Vector 9 (i.e. #CSO) is considered invalid because it is reserved on modern CPUs, and according to LLMs no CPUs exist supporting SVM and producing #CSOs.
Defined exceptions could be different between virtual CPUs as new CPUs define new vectors. In a best effort to dynamically define the valid vectors, make all currently defined vectors as valid except those obviously tied to a CPU feature: SHSTK -> #CP and SEV-ES -> #VC. As new vectors are defined, they can similarly be tied to corresponding CPU features.
Invalid vectors on specific (e.g. old) CPUs that are missed by KVM should be rejected by HW anyway.
--- arch/x86/kvm/svm/nested.c | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
arch/x86/kvm/svm/nested.c +51 -0
@@ -341,6 +341,54 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size)kvm_vcpu_is_legal_gpa (vcpu, addr + size -1 ); } +static bool nested_svm_event_inj_valid_exept (struct kvm_vcpu *vcpu,u8 vector) +{ +/* +* Vectors that do not correspond to a defined exception are invalid +* (including #NMI and reserved vectors). In a best effort to define +* valid exceptions based on the virtual CPU, make all exceptions always +* valid except those obviously tied to a CPU feature. +*/ +switch (vector) { +case DE_VECTOR :case DB_VECTOR :case BP_VECTOR :case OF_VECTOR : +case BR_VECTOR :case UD_VECTOR :case NM_VECTOR :case DF_VECTOR : +case TS_VECTOR :case NP_VECTOR :case SS_VECTOR :case GP_VECTOR : +case PF_VECTOR :case MF_VECTOR :case AC_VECTOR :case MC_VECTOR : +case XM_VECTOR :case HV_VECTOR :case SX_VECTOR : +return true; +case CP_VECTOR : +return guest_cpu_cap_has (vcpu,X86_FEATURE_SHSTK ); +case VC_VECTOR : +return guest_cpu_cap_has (vcpu,X86_FEATURE_SEV_ES ); + } +return false; +} + +/* +* According to the APM, VMRUN exits with SVM_EXIT_ERR if SVM_EVTINJ_VALID is +* set and: +* - The type of event_inj is not one of the defined values. +* - The type is SVM_EVTINJ_TYPE_EXEPT, but the vector is not a valid exception. +*/ +static bool nested_svm_check_event_inj (struct kvm_vcpu *vcpu,u32 event_inj) +{ +u32 type = event_inj &SVM_EVTINJ_TYPE_MASK ; +u8 vector = event_inj &SVM_EVTINJ_VEC_MASK ; + +if (!(event_inj &SVM_EVTINJ_VALID )) +return true; + +if (type !=SVM_EVTINJ_TYPE_INTR && type !=SVM_EVTINJ_TYPE_NMI && + type !=SVM_EVTINJ_TYPE_EXEPT && type !=SVM_EVTINJ_TYPE_SOFT ) +return false; + +if (type ==SVM_EVTINJ_TYPE_EXEPT && + !nested_svm_event_inj_valid_exept (vcpu, vector)) +return false; + +return true; +} +static bool nested_vmcb_check_controls (struct kvm_vcpu *vcpu,struct vmcb_ctrl_area_cached *control,unsigned long l1_cr0)
@@ -370,6 +418,9 @@ static bool nested_vmcb_check_controls(struct kvm_vcpu *vcpu,return false; } +if (CC (!nested_svm_check_event_inj (vcpu, control->event_inj))) +return false; +return true; }
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 21/26 KVM: SVM: Rename vmcb->nested_ctl to vmcb->misc_ctl
In reply to Yosry AhmedThe 'nested_ctl' field is misnamed. Although the first bit is for nested paging, the other defined bits are for SEV/SEV-ES. Other bits in the same field according to the APM (but not defined by KVM) include "Guest Mode Execution Trap", "Enable INVLPGB/TLBSYNC", and other control bits unrelated to 'nested'.
There is nothing common among these bits, so just name the field misc_ctl. Also rename the flags accordingly.
--- arch/x86/include/asm/svm.h | 8 ++++---- arch/x86/kvm/svm/nested.c | 14 +++++++------- arch/x86/kvm/svm/sev.c | 4 ++-- arch/x86/kvm/svm/svm.c | 4 ++-- arch/x86/kvm/svm/svm.h | 4 ++-- tools/testing/selftests/kvm/include/x86/svm.h | 6 +++--- tools/testing/selftests/kvm/lib/x86/svm.c | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-)
arch/x86/include/asm/svm.h +4 -4
@@ -142,7 +142,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area {u64 exit_info_2;u32 exit_int_info;u32 exit_int_info_err; -u64 nested_ctl; +u64 misc_ctl;u64 avic_vapic_bar;u64 ghcb_gpa;u32 event_inj;
@@ -239,9 +239,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define SVM_IOIO_SIZE_MASK (7 << SVM_IOIO_SIZE_SHIFT)#define SVM_IOIO_ASIZE_MASK (7 << SVM_IOIO_ASIZE_SHIFT) -#define SVM_NESTED_CTL_NP_ENABLE BIT(0) -#define SVM_NESTED_CTL_SEV_ENABLE BIT(1) -#define SVM_NESTED_CTL_SEV_ES_ENABLE BIT(2) +#define SVM_MISC_ENABLE_NP BIT(0) +#define SVM_MISC_ENABLE_SEV BIT(1) +#define SVM_MISC_ENABLE_SEV_ES BIT(2)#define SVM_TSC_RATIO_RSVD 0xffffff0000000000ULL
arch/x86/kvm/svm/nested.c +7 -7
@@ -399,7 +399,7 @@ static bool nested_vmcb_check_controls(struct kvm_vcpu *vcpu,if (CC (control->asid ==0 ))return false; -if (control->nested_ctl &SVM_NESTED_CTL_NP_ENABLE ) { +if (control->misc_ctl &SVM_MISC_ENABLE_NP ) {if (CC (!kvm_vcpu_is_legal_gpa (vcpu, control->nested_cr3)))return false;if (CC (!(l1_cr0 &X86_CR0_PG )))
@@ -494,10 +494,10 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu,nested_svm_sanitize_intercept (vcpu, to,SKINIT );nested_svm_sanitize_intercept (vcpu, to,RDPRU ); -/* Always clear SVM_NESTED_CTL_NP_ENABLE if the guest cannot use NPTs */ - to->nested_ctl = from->nested_ctl; +/* Always clear SVM_MISC_ENABLE_NP if the guest cannot use NPTs */ + to->misc_ctl = from->misc_ctl;if (!guest_cpu_cap_has (vcpu,X86_FEATURE_NPT )) - to->nested_ctl &= ~SVM_NESTED_CTL_NP_ENABLE ; + to->misc_ctl &= ~SVM_MISC_ENABLE_NP ; to->iopm_base_pa = from->iopm_base_pa; to->msrpm_base_pa = from->msrpm_base_pa;
@@ -833,7 +833,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, }/* Copied from vmcb01. msrpm_base can be overwritten later. */ - vmcb02->control.nested_ctl = vmcb01->control.nested_ctl; + vmcb02->control.misc_ctl = vmcb01->control.misc_ctl; vmcb02->control.iopm_base_pa = vmcb01->control.iopm_base_pa; vmcb02->control.msrpm_base_pa = vmcb01->control.msrpm_base_pa;vmcb_mark_dirty (vmcb02,VMCB_PERM_MAP );
@@ -989,7 +989,7 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa, vmcb12->save.rip, vmcb12->control.int_ctl, vmcb12->control.event_inj, - vmcb12->control.nested_ctl, + vmcb12->control.misc_ctl, vmcb12->control.nested_cr3, vmcb12->save.cr3, KVM_ISA_SVM);
@@ -1801,7 +1801,7 @@ static void nested_copy_vmcb_cache_to_control(struct vmcb_control_area *dst, dst->exit_info_2 = from->exit_info_2; dst->exit_int_info = from->exit_int_info; dst->exit_int_info_err = from->exit_int_info_err; - dst->nested_ctl = from->nested_ctl; + dst->misc_ctl = from->misc_ctl; dst->event_inj = from->event_inj; dst->event_inj_err = from->event_inj_err; dst->next_rip = from->next_rip;
arch/x86/kvm/svm/sev.c +2 -2
@@ -4599,7 +4599,7 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm, bool init_event)struct kvm_sev_info *sev =to_kvm_sev_info (svm->vcpu.kvm);struct vmcb *vmcb = svm->vmcb01.ptr; - svm->vmcb->control.nested_ctl |=SVM_NESTED_CTL_SEV_ES_ENABLE ; + svm->vmcb->control.misc_ctl |=SVM_MISC_ENABLE_SEV_ES ;/* * An SEV-ES guest requires a VMSA area that is a separate from the
@@ -4670,7 +4670,7 @@ void sev_init_vmcb(struct vcpu_svm *svm, bool init_event) {struct kvm_vcpu *vcpu = &svm->vcpu; - svm->vmcb->control.nested_ctl |=SVM_NESTED_CTL_SEV_ENABLE ; + svm->vmcb->control.misc_ctl |=SVM_MISC_ENABLE_SEV ;clr_exception_intercept (svm,UD_VECTOR );/*
arch/x86/kvm/svm/svm.c +2 -2
@@ -1152,7 +1152,7 @@ static void init_vmcb(struct kvm_vcpu *vcpu, bool init_event)if (npt_enabled) {/* Setup VMCB for Nested Paging */ - control->nested_ctl |=SVM_NESTED_CTL_NP_ENABLE ; + control->misc_ctl |=SVM_MISC_ENABLE_NP ;svm_clr_intercept (svm,INTERCEPT_INVLPG );clr_exception_intercept (svm,PF_VECTOR );svm_clr_intercept (svm,INTERCEPT_CR3_READ );
@@ -3358,7 +3358,7 @@ static void dump_vmcb(struct kvm_vcpu *vcpu)pr_err ("%-20s%016llx\n" ,"exit_info2:" , control->exit_info_2);pr_err ("%-20s%08x\n" ,"exit_int_info:" , control->exit_int_info);pr_err ("%-20s%08x\n" ,"exit_int_info_err:" , control->exit_int_info_err); -pr_err ("%-20s%lld\n" ,"nested_ctl:" , control->nested_ctl); +pr_err ("%-20s%lld\n" ,"misc_ctl:" , control->misc_ctl);pr_err ("%-20s%016llx\n" ,"nested_cr3:" , control->nested_cr3);pr_err ("%-20s%016llx\n" ,"avic_vapic_bar:" , control->avic_vapic_bar);pr_err ("%-20s%016llx\n" ,"ghcb:" , control->ghcb_gpa);
arch/x86/kvm/svm/svm.h +2 -2
@@ -167,7 +167,7 @@ struct vmcb_ctrl_area_cached {u64 exit_info_2;u32 exit_int_info;u32 exit_int_info_err; -u64 nested_ctl; +u64 misc_ctl;u32 event_inj;u32 event_inj_err;u64 next_rip;
@@ -579,7 +579,7 @@ static inline bool gif_set(struct vcpu_svm *svm)static inline bool nested_npt_enabled (struct vcpu_svm *svm) { -return svm->nested.ctl.nested_ctl &SVM_NESTED_CTL_NP_ENABLE ; +return svm->nested.ctl.misc_ctl &SVM_MISC_ENABLE_NP ; }static inline bool nested_vnmi_enabled (struct vcpu_svm *svm)
tools/testing/selftests/kvm/include/x86/svm.h +3 -3
@@ -97,7 +97,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area {u64 exit_info_2;u32 exit_int_info;u32 exit_int_info_err; -u64 nested_ctl; +u64 misc_ctl;u64 avic_vapic_bar;u8 reserved_4[8 ];u32 event_inj;
@@ -175,8 +175,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define SVM_VM_CR_SVM_LOCK_MASK 0x0008ULL#define SVM_VM_CR_SVM_DIS_MASK 0x0010ULL -#define SVM_NESTED_CTL_NP_ENABLE BIT(0) -#define SVM_NESTED_CTL_SEV_ENABLE BIT(1) +#define SVM_MISC_ENABLE_NP BIT(0) +#define SVM_MISC_ENABLE_SEV BIT(1)struct __attribute__ ((__packed__ ))vmcb_seg {u16 selector;
tools/testing/selftests/kvm/lib/x86/svm.c +1 -1
@@ -126,7 +126,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_r guest_regs.rdi = (u64 )svm;if (svm->ncr3_gpa) { - ctrl->nested_ctl |=SVM_NESTED_CTL_NP_ENABLE ; + ctrl->misc_ctl |=SVM_MISC_ENABLE_NP ; ctrl->nested_cr3 = svm->ncr3_gpa; } }
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 22/26 KVM: SVM: Rename vmcb->virt_ext to vmcb->misc_ctl2
In reply to Yosry Ahmed'virt' is confusing in the VMCB because it is relative and ambiguous. The 'virt_ext' field includes bits for LBR virtualization and VMSAVE/VMLOAD virtualization, so it's just another miscellaneous control field. Name it as such.
While at it, move the definitions of the bits below those for 'misc_ctl' and rename them for consistency.
--- arch/x86/include/asm/svm.h | 7 +++---- arch/x86/kvm/svm/nested.c | 18 ++++++++--------- arch/x86/kvm/svm/svm.c | 20 +++++++++---------- arch/x86/kvm/svm/svm.h | 2 +- tools/testing/selftests/kvm/include/x86/svm.h | 8 ++++---- .../kvm/x86/nested_vmsave_vmload_test.c | 16 +++++++-------- .../selftests/kvm/x86/svm_lbr_nested_state.c | 4 ++-- 7 files changed, 37 insertions(+), 38 deletions(-)
arch/x86/include/asm/svm.h +3 -4
@@ -148,7 +148,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area {u32 event_inj;u32 event_inj_err;u64 nested_cr3; -u64 virt_ext; +u64 misc_ctl2;u32 clean;u32 reserved_5;u64 next_rip;
@@ -222,9 +222,6 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define X2APIC_MODE_SHIFT 30#define X2APIC_MODE_MASK (1 << X2APIC_MODE_SHIFT) -#define LBR_CTL_ENABLE_MASK BIT_ULL(0) -#define VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK BIT_ULL(1) -#define SVM_INTERRUPT_SHADOW_MASK BIT_ULL(0)#define SVM_GUEST_INTERRUPT_MASK BIT_ULL(1)
@@ -243,6 +240,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define SVM_MISC_ENABLE_SEV BIT(1)#define SVM_MISC_ENABLE_SEV_ES BIT(2) +#define SVM_MISC2_ENABLE_V_LBR BIT_ULL(0) +#define SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE BIT_ULL(1)#define SVM_TSC_RATIO_RSVD 0xffffff0000000000ULL#define SVM_TSC_RATIO_MIN 0x0000000000000001ULL
arch/x86/kvm/svm/nested.c +9 -9
@@ -116,7 +116,7 @@ static bool nested_vmcb_needs_vls_intercept(struct vcpu_svm *svm)if (!nested_npt_enabled (svm))return true; -if (!(svm->nested.ctl.virt_ext &VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK )) +if (!(svm->nested.ctl.misc_ctl2 &SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE ))return true;return false;
@@ -179,7 +179,7 @@ void recalc_intercepts(struct vcpu_svm *svm)vmcb_set_intercept (c,INTERCEPT_VMLOAD );vmcb_set_intercept (c,INTERCEPT_VMSAVE ); }else { -WARN_ON (!(c->virt_ext &VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK )); +WARN_ON (!(c->misc_ctl2 &SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE )); } }
@@ -516,7 +516,7 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, to->event_inj_err = from->event_inj_err; to->next_rip = from->next_rip; to->nested_cr3 = from->nested_cr3; - to->virt_ext = from->virt_ext; + to->misc_ctl2 = from->misc_ctl2; to->pause_filter_count = from->pause_filter_count; to->pause_filter_thresh = from->pause_filter_thresh;
@@ -757,7 +757,7 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12 }if (unlikely (guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && - (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK ))) { + (svm->nested.ctl.misc_ctl2 &SVM_MISC2_ENABLE_V_LBR ))) {/* * Reserved bits of DEBUGCTL are ignored. Be consistent with * svm_set_msr's definition of reserved bits.
@@ -914,10 +914,10 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, svm->soft_int_next_rip = vmcb12_rip; } -/* LBR_CTL_ENABLE_MASK is controlled by svm_update_lbrv() */ +/* SVM_MISC2_ENABLE_V_LBR is controlled by svm_update_lbrv() */ if (!nested_vmcb_needs_vls_intercept (svm)) - vmcb02->control.virt_ext |=VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK ; + vmcb02->control.misc_ctl2 |=SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE ;if (guest_cpu_cap_has (vcpu,X86_FEATURE_PAUSEFILTER )) pause_count12 = svm->nested.ctl.pause_filter_count;
@@ -1330,7 +1330,7 @@ void nested_svm_vmexit(struct vcpu_svm *svm)kvm_make_request (KVM_REQ_EVENT , &svm->vcpu);if (unlikely (guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && - (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK ))) { + (svm->nested.ctl.misc_ctl2 &SVM_MISC2_ENABLE_V_LBR ))) {svm_copy_lbrs (&vmcb12->save, &vmcb02->save); }else {svm_copy_lbrs (&vmcb01->save, &vmcb02->save);
@@ -1805,8 +1805,8 @@ static void nested_copy_vmcb_cache_to_control(struct vmcb_control_area *dst, dst->event_inj = from->event_inj; dst->event_inj_err = from->event_inj_err; dst->next_rip = from->next_rip; - dst->nested_cr3 = from->nested_cr3; - dst->virt_ext = from->virt_ext; + dst->nested_cr3 = from->nested_cr3; + dst->misc_ctl2 = from->misc_ctl2; dst->pause_filter_count = from->pause_filter_count; dst->pause_filter_thresh = from->pause_filter_thresh;/* 'clean' and 'hv_enlightenments' are not changed by KVM */
arch/x86/kvm/svm/svm.c +10 -10
@@ -710,7 +710,7 @@ void *svm_alloc_permissions_map(unsigned long size, gfp_t gfp_mask)static void svm_recalc_lbr_msr_intercepts (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu); -bool intercept = !(svm->vmcb->control.virt_ext &LBR_CTL_ENABLE_MASK ); +bool intercept = !(svm->vmcb->control.misc_ctl2 &SVM_MISC2_ENABLE_V_LBR );if (intercept == svm->lbr_msrs_intercepted)return ;
@@ -843,7 +843,7 @@ static void svm_recalc_msr_intercepts(struct kvm_vcpu *vcpu)static void __svm_enable_lbrv (struct kvm_vcpu *vcpu) { -to_svm (vcpu)->vmcb->control.virt_ext |=LBR_CTL_ENABLE_MASK ; +to_svm (vcpu)->vmcb->control.misc_ctl2 |=SVM_MISC2_ENABLE_V_LBR ; }void svm_enable_lbrv (struct kvm_vcpu *vcpu)
@@ -855,16 +855,16 @@ void svm_enable_lbrv(struct kvm_vcpu *vcpu)static void __svm_disable_lbrv (struct kvm_vcpu *vcpu) {KVM_BUG_ON (sev_es_guest (vcpu->kvm), vcpu->kvm); -to_svm (vcpu)->vmcb->control.virt_ext &= ~LBR_CTL_ENABLE_MASK ; +to_svm (vcpu)->vmcb->control.misc_ctl2 &= ~SVM_MISC2_ENABLE_V_LBR ; }void svm_update_lbrv (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu); -bool current_enable_lbrv = svm->vmcb->control.virt_ext &LBR_CTL_ENABLE_MASK ; +bool current_enable_lbrv = svm->vmcb->control.misc_ctl2 &SVM_MISC2_ENABLE_V_LBR ;bool enable_lbrv = (svm->vmcb->save.dbgctl &DEBUGCTLMSR_LBR ) || (is_guest_mode (vcpu) &&guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && - (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK )); + (svm->nested.ctl.misc_ctl2 &SVM_MISC2_ENABLE_V_LBR ));if (enable_lbrv && !current_enable_lbrv)__svm_enable_lbrv (vcpu);
@@ -1023,7 +1023,7 @@ static void svm_recalc_instruction_intercepts(struct kvm_vcpu *vcpu) }/* -* No need to toggle VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK here, it is +* No need to toggle SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE here, it is * always set if vls is enabled. If the intercepts are set, the bit is * meaningless anyway. */
@@ -1191,7 +1191,7 @@ static void init_vmcb(struct kvm_vcpu *vcpu, bool init_event) }if (vls) - svm->vmcb->control.virt_ext |=VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK ; + svm->vmcb->control.misc_ctl2 |=SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE ;if (vcpu->kvm->arch.bus_lock_detection_enabled)svm_set_intercept (svm,INTERCEPT_BUSLOCK );
@@ -3364,7 +3364,7 @@ static void dump_vmcb(struct kvm_vcpu *vcpu)pr_err ("%-20s%016llx\n" ,"ghcb:" , control->ghcb_gpa);pr_err ("%-20s%08x\n" ,"event_inj:" , control->event_inj);pr_err ("%-20s%08x\n" ,"event_inj_err:" , control->event_inj_err); -pr_err ("%-20s%lld\n" ,"virt_ext:" , control->virt_ext); +pr_err ("%-20s%lld\n" ,"misc_ctl2:" , control->misc_ctl2);pr_err ("%-20s%016llx\n" ,"next_rip:" , control->next_rip);pr_err ("%-20s%016llx\n" ,"avic_backing_page:" , control->avic_backing_page);pr_err ("%-20s%016llx\n" ,"avic_logical_id:" , control->avic_logical_id);
@@ -4359,7 +4359,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags)* 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 ) && +if (!(svm->vmcb->control.misc_ctl2 &SVM_MISC2_ENABLE_V_LBR ) && vcpu->arch.host_debugctl != svm->vmcb->save.dbgctl)update_debugctlmsr (svm->vmcb->save.dbgctl);
@@ -4390,7 +4390,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags)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 ) && +if (!(svm->vmcb->control.misc_ctl2 &SVM_MISC2_ENABLE_V_LBR ) && vcpu->arch.host_debugctl != svm->vmcb->save.dbgctl)update_debugctlmsr (vcpu->arch.host_debugctl);
arch/x86/kvm/svm/svm.h +1 -1
@@ -172,7 +172,7 @@ struct vmcb_ctrl_area_cached {u32 event_inj_err;u64 next_rip;u64 nested_cr3; -u64 virt_ext; +u64 misc_ctl2;u32 clean;u64 bus_lock_rip;union {
tools/testing/selftests/kvm/include/x86/svm.h +4 -4
@@ -103,7 +103,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area {u32 event_inj;u32 event_inj_err;u64 nested_cr3; -u64 virt_ext; +u64 misc_ctl2;u32 clean;u32 reserved_5;u64 next_rip;
@@ -155,9 +155,6 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define AVIC_ENABLE_SHIFT 31#define AVIC_ENABLE_MASK (1 << AVIC_ENABLE_SHIFT) -#define LBR_CTL_ENABLE_MASK BIT_ULL(0) -#define VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK BIT_ULL(1) -#define SVM_INTERRUPT_SHADOW_MASK 1#define SVM_IOIO_STR_SHIFT 2
@@ -178,6 +175,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define SVM_MISC_ENABLE_NP BIT(0)#define SVM_MISC_ENABLE_SEV BIT(1) +#define SVM_MISC2_ENABLE_V_LBR BIT_ULL(0) +#define SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE BIT_ULL(1) +struct __attribute__ ((__packed__ ))vmcb_seg {u16 selector;u16 attrib;
tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c +8 -8
@@ -79,8 +79,8 @@ static void l1_guest_code(struct svm_test_data *svm) svm->vmcb->control.intercept |= (BIT_ULL (INTERCEPT_VMSAVE ) |BIT_ULL (INTERCEPT_VMLOAD )); -/* ..VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK cleared.. */ - svm->vmcb->control.virt_ext &= ~VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK ; +/* ..SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE cleared.. */ + svm->vmcb->control.misc_ctl2 &= ~SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE ; svm->vmcb->save.rip = (u64 )l2_guest_code_vmsave;run_guest (svm->vmcb, svm->vmcb_gpa);
@@ -90,8 +90,8 @@ static void l1_guest_code(struct svm_test_data *svm)run_guest (svm->vmcb, svm->vmcb_gpa);GUEST_ASSERT_EQ (svm->vmcb->control.exit_code,SVM_EXIT_VMLOAD ); -/* ..and VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK set */ - svm->vmcb->control.virt_ext |=VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK ; +/* ..and SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE set */ + svm->vmcb->control.misc_ctl2 |=SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE ; svm->vmcb->save.rip = (u64 )l2_guest_code_vmsave;run_guest (svm->vmcb, svm->vmcb_gpa);
@@ -106,20 +106,20 @@ static void l1_guest_code(struct svm_test_data *svm) BIT_ULL(INTERCEPT_VMLOAD));/* -* Without VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK, the GPA will be +* Without SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE, the GPA will be * interpreted as an L1 GPA, so VMCB0 should be used. */ svm->vmcb->save.rip = (u64 )l2_guest_code_vmcb0; - svm->vmcb->control.virt_ext &= ~VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK ; + svm->vmcb->control.misc_ctl2 &= ~SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE ;run_guest (svm->vmcb, svm->vmcb_gpa);GUEST_ASSERT_EQ (svm->vmcb->control.exit_code,SVM_EXIT_VMMCALL );/* -* With VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK, the GPA will be interpeted as +* With SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE, the GPA will be interpeted as * an L2 GPA, and translated through the NPT to VMCB1. */ svm->vmcb->save.rip = (u64 )l2_guest_code_vmcb1; - svm->vmcb->control.virt_ext |=VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK ; + svm->vmcb->control.misc_ctl2 |=SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE ;run_guest (svm->vmcb, svm->vmcb_gpa);GUEST_ASSERT_EQ (svm->vmcb->control.exit_code,SVM_EXIT_VMMCALL );
tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c +2 -2
@@ -69,9 +69,9 @@ static void l1_guest_code(struct svm_test_data *svm, bool nested_lbrv) &l2_guest_stack[L2_GUEST_STACK_SIZE]);if (nested_lbrv) - vmcb->control.virt_ext =LBR_CTL_ENABLE_MASK ; + vmcb->control.misc_ctl2 =SVM_MISC2_ENABLE_V_LBR ;else - vmcb->control.virt_ext &= ~LBR_CTL_ENABLE_MASK ; + vmcb->control.misc_ctl2 &= ~SVM_MISC2_ENABLE_V_LBR ;run_guest (vmcb, svm->vmcb_gpa);GUEST_ASSERT (svm->vmcb->control.exit_code ==SVM_EXIT_VMMCALL );
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 23/26 KVM: nSVM: Cache all used fields from VMCB12
In reply to Yosry AhmedCurrently, most fields used from VMCB12 are cached in svm->nested.{ctl/save}. This is mainly to avoid TOC-TOU bugs. However, for the save area, only the fields used in the consistency checks (i.e. nested_vmcb_check_save()) were being cached. Other fields are read directly from guest memory in nested_vmcb02_prepare_save().
While probably benign, this still makes it possible for TOC-TOU bugs to happen. For example, RAX, RSP, and RIP are read twice, once to store in VMCB02, and once to store in vcpu->arch.regs. It is possible for the guest to modify the value between both reads, potentially causing nasty bugs.
Harden against such bugs by caching everything in svm->nested.save. Cache all the needed fields, and keep all accesses to the VMCB12 strictly in nested_svm_vmrun() for caching and early error injection. Following changes will further limit the access to the VMCB12 in the nested VMRUN path.
Introduce vmcb12_is_dirty() to use with the cached control fields instead of vmcb_is_dirty(), similar to vmcb12_is_intercept().
Opportunistically order the copies in __nested_copy_vmcb_save_to_cache() by the order in which the fields are defined in struct vmcb_save_area.
--- arch/x86/kvm/svm/nested.c | 116 ++++++++++++++++++++++---------------- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/svm/svm.h | 27 ++++++++- 3 files changed, 93 insertions(+), 52 deletions(-)
arch/x86/kvm/svm/nested.c +67 -49
@@ -544,19 +544,34 @@ void nested_copy_vmcb_control_to_cache(struct vcpu_svm *svm,static void __nested_copy_vmcb_save_to_cache (struct vmcb_save_area_cached *to,struct vmcb_save_area *from) { -/* -* Copy only fields that are validated, as we need them -* to avoid TOC/TOU races. -*/ + to->es = from->es; to->cs = from->cs; + to->ss = from->ss; + to->ds = from->ds; + to->gdtr = from->gdtr; + to->idtr = from->idtr; + + to->cpl = from->cpl; to->efer = from->efer; - to->cr0 = from->cr0; - to->cr3 = from->cr3; to->cr4 = from->cr4; - - to->dr6 = from->dr6; + to->cr3 = from->cr3; + to->cr0 = from->cr0; to->dr7 = from->dr7; + to->dr6 = from->dr6; + + to->rflags = from->rflags; + to->rip = from->rip; + to->rsp = from->rsp; + + to->s_cet = from->s_cet; + to->ssp = from->ssp; + to->isst_addr = from->isst_addr; + + to->rax = from->rax; + to->cr2 = from->cr2; + +svm_copy_lbrs (to, from); } void nested_copy_vmcb_save_to_cache(struct vcpu_svm *svm,
@@ -692,8 +707,10 @@ void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm) svm->nested.vmcb02.ptr->save.g_pat = svm->vmcb01.ptr->save.g_pat; } -static void nested_vmcb02_prepare_save (struct vcpu_svm *svm,struct vmcb *vmcb12) +static void nested_vmcb02_prepare_save (struct vcpu_svm *svm) { +struct vmcb_ctrl_area_cached *control = &svm->nested.ctl; +struct vmcb_save_area_cached *save = &svm->nested.save;bool new_vmcb12 = false;struct vmcb *vmcb01 = svm->vmcb01.ptr;struct vmcb *vmcb02 = svm->nested.vmcb02.ptr;
@@ -709,48 +726,48 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12 svm->nested.force_msr_bitmap_recalc = true; } -if (unlikely (new_vmcb12 ||vmcb_is_dirty (vmcb12,VMCB_SEG ))) { - vmcb02->save.es = vmcb12->save.es; - vmcb02->save.cs = vmcb12->save.cs; - vmcb02->save.ss = vmcb12->save.ss; - vmcb02->save.ds = vmcb12->save.ds; - vmcb02->save.cpl = vmcb12->save.cpl; +if (unlikely (new_vmcb12 ||vmcb12_is_dirty (control,VMCB_SEG ))) { + vmcb02->save.es = save->es; + vmcb02->save.cs = save->cs; + vmcb02->save.ss = save->ss; + vmcb02->save.ds = save->ds; + vmcb02->save.cpl = save->cpl;vmcb_mark_dirty (vmcb02,VMCB_SEG ); } -if (unlikely (new_vmcb12 ||vmcb_is_dirty (vmcb12,VMCB_DT ))) { - vmcb02->save.gdtr = vmcb12->save.gdtr; - vmcb02->save.idtr = vmcb12->save.idtr; +if (unlikely (new_vmcb12 ||vmcb12_is_dirty (control,VMCB_DT ))) { + vmcb02->save.gdtr = save->gdtr; + vmcb02->save.idtr = save->idtr;vmcb_mark_dirty (vmcb02,VMCB_DT ); }if (guest_cpu_cap_has (vcpu,X86_FEATURE_SHSTK ) && - (unlikely (new_vmcb12 ||vmcb_is_dirty (vmcb12,VMCB_CET )))) { - vmcb02->save.s_cet = vmcb12->save.s_cet; - vmcb02->save.isst_addr = vmcb12->save.isst_addr; - vmcb02->save.ssp = vmcb12->save.ssp; + (unlikely (new_vmcb12 ||vmcb12_is_dirty (control,VMCB_CET )))) { + vmcb02->save.s_cet = save->s_cet; + vmcb02->save.isst_addr = save->isst_addr; + vmcb02->save.ssp = save->ssp;vmcb_mark_dirty (vmcb02,VMCB_CET ); } -kvm_set_rflags (vcpu, vmcb12->save.rflags |X86_EFLAGS_FIXED ); +kvm_set_rflags (vcpu, save->rflags |X86_EFLAGS_FIXED );svm_set_efer (vcpu, svm->nested.save.efer);svm_set_cr0 (vcpu, svm->nested.save.cr0);svm_set_cr4 (vcpu, svm->nested.save.cr4); - svm->vcpu.arch.cr2 = vmcb12->save.cr2; + svm->vcpu.arch.cr2 = save->cr2; -kvm_rax_write (vcpu, vmcb12->save.rax); -kvm_rsp_write (vcpu, vmcb12->save.rsp); -kvm_rip_write (vcpu, vmcb12->save.rip); +kvm_rax_write (vcpu, save->rax); +kvm_rsp_write (vcpu, save->rsp); +kvm_rip_write (vcpu, save->rip);/* In case we don't even reach vcpu_run, the fields are not updated */ - vmcb02->save.rax = vmcb12->save.rax; - vmcb02->save.rsp = vmcb12->save.rsp; - vmcb02->save.rip = vmcb12->save.rip; + vmcb02->save.rax = save->rax; + vmcb02->save.rsp = save->rsp; + vmcb02->save.rip = save->rip; -if (unlikely (new_vmcb12 ||vmcb_is_dirty (vmcb12,VMCB_DR ))) { +if (unlikely (new_vmcb12 ||vmcb12_is_dirty (control,VMCB_DR ))) { vmcb02->save.dr7 = svm->nested.save.dr7 |DR7_FIXED_1 ; svm->vcpu.arch.dr6 = svm->nested.save.dr6 |DR6_ACTIVE_LOW ;vmcb_mark_dirty (vmcb02,VMCB_DR );
@@ -762,7 +779,7 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12* Reserved bits of DEBUGCTL are ignored. Be consistent with * svm_set_msr's definition of reserved bits. */ -svm_copy_lbrs (&vmcb02->save, &vmcb12->save); +svm_copy_lbrs (&vmcb02->save, save); vmcb02->save.dbgctl &= ~DEBUGCTL_RESERVED_BITS ; }else {svm_copy_lbrs (&vmcb02->save, &vmcb01->save);
@@ -978,28 +995,29 @@ static void nested_svm_copy_common_state(struct vmcb *from_vmcb, struct vmcb *to to_vmcb->save.spec_ctrl = from_vmcb->save.spec_ctrl; } -int enter_svm_guest_mode (struct kvm_vcpu *vcpu,u64 vmcb12_gpa, -struct vmcb *vmcb12,bool from_vmrun) +int enter_svm_guest_mode (struct kvm_vcpu *vcpu,u64 vmcb12_gpa,bool from_vmrun) {struct vcpu_svm *svm =to_svm (vcpu); +struct vmcb_ctrl_area_cached *control = &svm->nested.ctl; +struct vmcb_save_area_cached *save = &svm->nested.save;int ret;trace_kvm_nested_vmenter (svm->vmcb->save.rip, vmcb12_gpa, - vmcb12->save.rip, - vmcb12->control.int_ctl, - vmcb12->control.event_inj, - vmcb12->control.misc_ctl, - vmcb12->control.nested_cr3, - vmcb12->save.cr3, + save->rip, + control->int_ctl, + control->event_inj, + control->misc_ctl, + control->nested_cr3, + save->cr3,KVM_ISA_SVM ); -trace_kvm_nested_intercepts (vmcb12->control.intercepts[INTERCEPT_CR ] &0xffff , - vmcb12->control.intercepts[INTERCEPT_CR ] >>16 , - vmcb12->control.intercepts[INTERCEPT_EXCEPTION ], - vmcb12->control.intercepts[INTERCEPT_WORD3 ], - vmcb12->control.intercepts[INTERCEPT_WORD4 ], - vmcb12->control.intercepts[INTERCEPT_WORD5 ]); +trace_kvm_nested_intercepts (control->intercepts[INTERCEPT_CR ] &0xffff , + control->intercepts[INTERCEPT_CR ] >>16 , + control->intercepts[INTERCEPT_EXCEPTION ], + control->intercepts[INTERCEPT_WORD3 ], + control->intercepts[INTERCEPT_WORD4 ], + control->intercepts[INTERCEPT_WORD5 ]); svm->nested.vmcb12_gpa = vmcb12_gpa;
@@ -1034,8 +1052,8 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa,nested_svm_copy_common_state (svm->vmcb01.ptr, svm->nested.vmcb02.ptr);svm_switch_vmcb (svm, &svm->nested.vmcb02); -nested_vmcb02_prepare_control (svm, vmcb12->save.rip, vmcb12->save.cs.base); -nested_vmcb02_prepare_save (svm, vmcb12); +nested_vmcb02_prepare_control (svm, save->rip, save->cs.base); +nested_vmcb02_prepare_save (svm);if (!from_vmrun)kvm_make_request (KVM_REQ_GET_NESTED_STATE_PAGES , vcpu);
@@ -1155,7 +1173,7 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) svm->nested.nested_run_pending =1 ; -if (enter_svm_guest_mode (vcpu, vmcb12_gpa, vmcb12, true)) { +if (enter_svm_guest_mode (vcpu, vmcb12_gpa, true)) { svm->nested.nested_run_pending =0 ; svm->nmi_l1_to_l2 = false; svm->soft_int_injected = false;
arch/x86/kvm/svm/svm.c +1 -1
@@ -4881,7 +4881,7 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) vmcb12 = map.hva;nested_copy_vmcb_control_to_cache (svm, &vmcb12->control);nested_copy_vmcb_save_to_cache (svm, &vmcb12->save); - ret =enter_svm_guest_mode (vcpu, smram64->svm_guest_vmcb_gpa, vmcb12, false); + ret =enter_svm_guest_mode (vcpu, smram64->svm_guest_vmcb_gpa, false);if (ret) goto unmap_save;
arch/x86/kvm/svm/svm.h +25 -2
@@ -140,13 +140,32 @@ struct kvm_vmcb_info { };struct vmcb_save_area_cached { +struct vmcb_seg es;struct vmcb_seg cs; +struct vmcb_seg ss; +struct vmcb_seg ds; +struct vmcb_seg gdtr; +struct vmcb_seg idtr; +u8 cpl;u64 efer;u64 cr4;u64 cr3;u64 cr0;u64 dr7;u64 dr6; +u64 rflags; +u64 rip; +u64 rsp; +u64 s_cet; +u64 ssp; +u64 isst_addr; +u64 rax; +u64 cr2; +u64 dbgctl; +u64 br_from; +u64 br_to; +u64 last_excp_from; +u64 last_excp_to; };struct vmcb_ctrl_area_cached {
@@ -421,6 +440,11 @@ static inline bool vmcb_is_dirty(struct vmcb *vmcb, int bit)return !test_bit (bit, (unsigned long *)&vmcb->control.clean); } +static inline bool vmcb12_is_dirty (struct vmcb_ctrl_area_cached *control,int bit) +{ +return !test_bit (bit, (unsigned long *)&control->clean); +} + static __always_inline struct vcpu_svm *to_svm(struct kvm_vcpu *vcpu) { return container_of(vcpu, struct vcpu_svm, vcpu);
@@ -785,8 +809,7 @@ static inline bool nested_exit_on_nmi(struct vcpu_svm *svm)int __init nested_svm_init_msrpm_merge_offsets (void ); -int enter_svm_guest_mode (struct kvm_vcpu *vcpu, -u64 vmcb_gpa,struct vmcb *vmcb12,bool from_vmrun); +int enter_svm_guest_mode (struct kvm_vcpu *vcpu,u64 vmcb_gpa,bool from_vmrun);void svm_leave_nested (struct kvm_vcpu *vcpu);void svm_free_nested (struct vcpu_svm *svm);int svm_allocate_nested (struct vcpu_svm *svm);
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
PATCH v5 24/26 KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN
In reply to Yosry AhmedAll accesses to the VMCB12 in the guest memory on nested VMRUN are limited to nested_svm_vmrun() and nested_svm_failed_vmrun(). However, the VMCB12 remains mapped throughout nested_svm_vmrun(). Mapping and unmapping around usages is possible, but it becomes easy-ish to introduce bugs where 'vmcb12' is used after being unmapped.
Move reading the VMCB12 and copying to cache from nested_svm_vmrun() into a new helper, nested_svm_copy_vmcb12_to_cache(), that maps the VMCB12, caches the needed fields, and unmaps it. Use kvm_vcpu_map_readonly() as only reading the VMCB12 is needed.
Similarly, move mapping the VMCB12 on VMRUN failure into nested_svm_failed_vmrun(). Inject a triple fault if the mapping fails, similar to nested_svm_vmexit().
--- arch/x86/kvm/svm/nested.c | 53 ++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 15 deletions(-)
arch/x86/kvm/svm/nested.c +38 -15
@@ -1102,26 +1102,56 @@ static void __nested_svm_vmexit(struct vcpu_svm *svm, struct vmcb *vmcb12)kvm_queue_exception (vcpu,DB_VECTOR ); } -static void nested_svm_vmrun_error_vmexit (struct kvm_vcpu *vcpu,struct vmcb *vmcb12) +static void nested_svm_vmrun_error_vmexit (struct kvm_vcpu *vcpu,u64 vmcb12_gpa) {struct vcpu_svm *svm =to_svm (vcpu); +struct kvm_host_map map; +struct vmcb *vmcb12; +int r;WARN_ON_ONCE (svm->vmcb == svm->nested.vmcb02.ptr);leave_guest_mode (vcpu); + r =kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map); +if (r) { +kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); +return ; + } + + vmcb12 = map.hva; vmcb12->control.exit_code =SVM_EXIT_ERR ; vmcb12->control.exit_info_1 =0 ; vmcb12->control.exit_info_2 =0 ;__nested_svm_vmexit (svm, vmcb12); + +kvm_vcpu_unmap (vcpu, &map); +} + +static int nested_svm_copy_vmcb12_to_cache (struct kvm_vcpu *vcpu,u64 vmcb12_gpa) +{ +struct vcpu_svm *svm =to_svm (vcpu); +struct kvm_host_map map; +struct vmcb *vmcb12; +int r; + + r =kvm_vcpu_map_readonly (vcpu,gpa_to_gfn (vmcb12_gpa), &map); +if (r) +return r; + + vmcb12 = map.hva; + +nested_copy_vmcb_control_to_cache (svm, &vmcb12->control); +nested_copy_vmcb_save_to_cache (svm, &vmcb12->save); + +kvm_vcpu_unmap (vcpu, &map); +return 0 ; }int nested_svm_vmrun (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);int ret; -struct vmcb *vmcb12; -struct kvm_host_map map;u64 vmcb12_gpa;struct vmcb *vmcb01 = svm->vmcb01.ptr;
@@ -1142,22 +1172,17 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu)return ret; } +if (WARN_ON_ONCE (!svm->nested.initialized)) +return -EINVAL ; + vmcb12_gpa = svm->vmcb->save.rax; -if (kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map)) { +if (nested_svm_copy_vmcb12_to_cache (vcpu, vmcb12_gpa)) {kvm_inject_gp (vcpu,0 );return 1 ; } ret =kvm_skip_emulated_instruction (vcpu); - vmcb12 = map.hva; - -if (WARN_ON_ONCE (!svm->nested.initialized)) -return -EINVAL ; - -nested_copy_vmcb_control_to_cache (svm, &vmcb12->control); -nested_copy_vmcb_save_to_cache (svm, &vmcb12->save); -/* * Since vmcb01 is not in use, we can use it to store some of the L1 * state.
@@ -1178,11 +1203,9 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) svm->nmi_l1_to_l2 = false; svm->soft_int_injected = false; -nested_svm_vmrun_error_vmexit (vcpu, vmcb12); +nested_svm_vmrun_error_vmexit (vcpu, vmcb12_gpa); } -kvm_vcpu_unmap (vcpu, &map); -return ret; }
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
Sean Christopherson
maintainerRe: [PATCH v5 24/26] KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN
Quoted 12 lines · Yosry Ahmed
arch/x86/kvm/svm/nested.c +1
-1@@ -1102,26 +1102,56 @@ static void __nested_svm_vmexit(struct vcpu_svm *svm, struct vmcb *vmcb12)kvm_queue_exception (vcpu,DB_VECTOR ); } -static void nested_svm_vmrun_error_vmexit (struct kvm_vcpu *vcpu,struct vmcb *vmcb12) +static void nested_svm_vmrun_error_vmexit (struct kvm_vcpu *vcpu,u64 vmcb12_gpa) {struct vcpu_svm *svm =to_svm (vcpu);
arch/x86/kvm/svm/nested.c static void __nested_svm_vmexit(struct vcpu_svm *svm, struct vmcb *vmcb12) · line 1117
Quoted 10 lines
arch/x86/kvm/svm/nested.c +5
-0+struct kvm_host_map map; +struct vmcb *vmcb12; +int r;WARN_ON_ONCE (svm->vmcb == svm->nested.vmcb02.ptr);leave_guest_mode (vcpu); + r =kvm_vcpu_map (vcpu,gpa_to_gfn (vmcb12_gpa), &map); +if (r) {
Drop the 'r' since KVM doesn't do anything with it, i.e.
if (kvm_vcpu_map(...)) {
kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
return;
}(I can do this when applying).
Quoted 3 lines
arch/x86/kvm/svm/nested.c +3
-0+kvm_make_request (KVM_REQ_TRIPLE_FAULT , vcpu); +return ; + }
PATCH v5 25/26 KVM: nSVM: Sanitize control fields copied from VMCB12
In reply to Yosry AhmedMake sure all fields used from VMCB12 in creating the VMCB02 are sanitized, such that no unhandled or reserved bits end up in the VMCB02.
The following control fields are read from VMCB12 and have bits that are either reserved or not handled/advertised by KVM: tlb_ctl, int_ctl, int_state, int_vector, event_inj, misc_ctl, and misc_ctl2.
The following fields do not require any extra sanitizing:
- int_ctl: bits from VMCB12 are copied bit-by-bit as needed.
- misc_ctl: only used in consistency checks (particularly NP_ENABLE).
- misc_ctl2: bits from VMCB12 are copied bit-by-bit as needed.
For the remaining fields, make sure only defined bits are copied from L1's VMCB12 into KVM'cache by defining appropriate masks where needed. The only exception is tlb_ctl, which is unused, so remove it.
Opportunistically cleanup ignoring the lower bits of {io/msr}pm_base_pa in __nested_copy_vmcb_control_to_cache() by using PAGE_MASK. Also, move the ASID copying ahead with other special cases, and expand the comment about the ASID being copied only for consistency checks.
--- arch/x86/include/asm/svm.h | 5 +++++ arch/x86/kvm/svm/nested.c | 28 +++++++++++++++------------- arch/x86/kvm/svm/svm.h | 1 - 3 files changed, 20 insertions(+), 14 deletions(-)
arch/x86/include/asm/svm.h +5 -0
@@ -222,6 +222,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define X2APIC_MODE_SHIFT 30#define X2APIC_MODE_MASK (1 << X2APIC_MODE_SHIFT) +#define SVM_INT_VECTOR_MASK GENMASK(7, 0) +#define SVM_INTERRUPT_SHADOW_MASK BIT_ULL(0)#define SVM_GUEST_INTERRUPT_MASK BIT_ULL(1)
@@ -635,6 +637,9 @@ static inline void __unused_size_checks(void)#define SVM_EVTINJ_VALID (1 << 31)#define SVM_EVTINJ_VALID_ERR (1 << 11) +#define SVM_EVTINJ_RESERVED_BITS ~(SVM_EVTINJ_VEC_MASK | SVM_EVTINJ_TYPE_MASK | \ + SVM_EVTINJ_VALID_ERR | SVM_EVTINJ_VALID) +#define SVM_EXITINTINFO_VEC_MASK SVM_EVTINJ_VEC_MASK#define SVM_EXITINTINFO_TYPE_MASK SVM_EVTINJ_TYPE_MASK
arch/x86/kvm/svm/nested.c +15 -13
@@ -499,32 +499,35 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu,if (!guest_cpu_cap_has (vcpu,X86_FEATURE_NPT )) to->misc_ctl &= ~SVM_MISC_ENABLE_NP ; - to->iopm_base_pa = from->iopm_base_pa; - to->msrpm_base_pa = from->msrpm_base_pa; +/* +* Copy the ASID here because nested_vmcb_check_controls() will check +* it. The ASID could be invalid, or conflict with another VM's ASID , +* so it should never be used directly to run L2. +*/ + to->asid = from->asid; + +/* Lower bits of IOPM_BASE_PA and MSRPM_BASE_PA are ignored */ + to->iopm_base_pa = from->iopm_base_pa &PAGE_MASK ; + to->msrpm_base_pa = from->msrpm_base_pa &PAGE_MASK ; + to->tsc_offset = from->tsc_offset; - to->tlb_ctl = from->tlb_ctl; to->erap_ctl = from->erap_ctl; to->int_ctl = from->int_ctl; - to->int_vector = from->int_vector; - to->int_state = from->int_state; + to->int_vector = from->int_vector &SVM_INT_VECTOR_MASK ; + to->int_state = from->int_state &SVM_INTERRUPT_SHADOW_MASK ; to->exit_code = from->exit_code; to->exit_info_1 = from->exit_info_1; to->exit_info_2 = from->exit_info_2; to->exit_int_info = from->exit_int_info; to->exit_int_info_err = from->exit_int_info_err; - to->event_inj = from->event_inj; + to->event_inj = from->event_inj & ~SVM_EVTINJ_RESERVED_BITS ; to->event_inj_err = from->event_inj_err; to->next_rip = from->next_rip; to->nested_cr3 = from->nested_cr3; - to->misc_ctl2 = from->misc_ctl2; + to->misc_ctl2 = from->misc_ctl2; to->pause_filter_count = from->pause_filter_count; to->pause_filter_thresh = from->pause_filter_thresh; -/* Copy asid here because nested_vmcb_check_controls() will check it */ - to->asid = from->asid; - to->msrpm_base_pa &= ~0x0fffULL ; - to->iopm_base_pa &= ~0x0fffULL ; -#ifdef CONFIG_KVM_HYPERV /* Hyper-V extensions (Enlightened VMCB) */ if (kvm_hv_hypercall_enabled (vcpu)) {
@@ -1832,7 +1835,6 @@ static void nested_copy_vmcb_cache_to_control(struct vmcb_control_area *dst, dst->msrpm_base_pa = from->msrpm_base_pa; dst->tsc_offset = from->tsc_offset; dst->asid = from->asid; - dst->tlb_ctl = from->tlb_ctl; dst->erap_ctl = from->erap_ctl; dst->int_ctl = from->int_ctl; dst->int_vector = from->int_vector;
arch/x86/kvm/svm/svm.h +0 -1
@@ -176,7 +176,6 @@ struct vmcb_ctrl_area_cached {u64 msrpm_base_pa;u64 tsc_offset;u32 asid; -u8 tlb_ctl;u8 erap_ctl;u32 int_ctl;u32 int_vector;
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog
Sean Christopherson
maintainerRe: [PATCH v5 25/26] KVM: nSVM: Sanitize control fields copied from VMCB12
Quoted 12 lines · Yosry Ahmed
Make sure all fields used from VMCB12 in creating the VMCB02 are sanitized, such that no unhandled or reserved bits end up in the VMCB02.
The following control fields are read from VMCB12 and have bits that are either reserved or not handled/advertised by KVM:
tlb_ctl,int_ctl,int_state,int_vector,event_inj,misc_ctl, andmisc_ctl2.The following fields do not require any extra sanitizing:
-int_ctl: bits from VMCB12 are copied bit-by-bit as needed.
-misc_ctl: only used in consistency checks (particularlyNP_ENABLE).
-misc_ctl2: bits from VMCB12 are copied bit-by-bit as needed.
Quoted 8 lines
For the remaining fields, make sure only defined bits are copied from L1's VMCB12 into KVM'cache by defining appropriate masks where needed. The only exception is
tlb_ctl, which is unused, so remove it.Opportunistically cleanup ignoring the lower bits of {io/msr}pm_base_pa in
__nested_copy_vmcb_control_to_cache()by usingPAGE_MASK. Also, move the ASID copying ahead with other special cases, and expand the comment about the ASID being copied only for consistency checks.
Stop. Bundling. Changes.
This is not a hypothetical situation, bundling small changes like this is quite literally making review take 3-4x longer than it should.
The interrupt changes are trivial to review.
The I/O and MSR bitmap changes are also easy enough, but I wanted to double that PAGE_MASK does indeed equal ~0x0fffULL (__PHYSICAL_MASK is the one that can be dynamic).
I disagree the the tlb_ctl change.
Moving the ASID handling is _completely_ superfluous.
Combining any two of those is annoying to deal with. Combining all of them wastes a non-trivial amount of time. What should have taken me ~5 minutes to review is dragging into 20+ minutes, because I keep having to cross-reference the changelog with the code to understand WTF is going on.
Just stop doing it, please.
Quoted 36 lines
Suggested-by Jim Mattson <[email protected]>Signed-off-by Yosry Ahmed <[email protected]>--- arch/x86/include/asm/svm.h | 5 +++++ arch/x86/kvm/svm/nested.c | 28 +++++++++++++++------------- arch/x86/kvm/svm/svm.h | 1 - 3 files changed, 20 insertions(+), 14 deletions(-)arch/x86/include/asm/svm.h +5
-0@@ -222,6 +222,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define X2APIC_MODE_SHIFT 30#define X2APIC_MODE_MASK (1 << X2APIC_MODE_SHIFT) +#define SVM_INT_VECTOR_MASK GENMASK(7, 0) +#define SVM_INTERRUPT_SHADOW_MASK BIT_ULL(0)#define SVM_GUEST_INTERRUPT_MASK BIT_ULL(1)@@ -635,6 +637,9 @@ static inline void __unused_size_checks(void)#define SVM_EVTINJ_VALID (1 << 31)#define SVM_EVTINJ_VALID_ERR (1 << 11) +#define SVM_EVTINJ_RESERVED_BITS ~(SVM_EVTINJ_VEC_MASK | SVM_EVTINJ_TYPE_MASK | \ + SVM_EVTINJ_VALID_ERR | SVM_EVTINJ_VALID) +#define SVM_EXITINTINFO_VEC_MASK SVM_EVTINJ_VEC_MASK#define SVM_EXITINTINFO_TYPE_MASK SVM_EVTINJ_TYPE_MASKarch/x86/kvm/svm/nested.c +0
-0
arch/x86/kvm/svm/nested.c void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, · line 504
Quoted 8 lines
arch/x86/kvm/svm/nested.c +3
-2@@ -499,32 +499,35 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu,if (!guest_cpu_cap_has (vcpu,X86_FEATURE_NPT )) to->misc_ctl &= ~SVM_MISC_ENABLE_NP ; - to->iopm_base_pa = from->iopm_base_pa; - to->msrpm_base_pa = from->msrpm_base_pa; +/* +* Copy the ASID here because nested_vmcb_check_controls() will check +* it. The ASID could be invalid, or conflict with another VM's ASID ,
Spurious space before the command.
arch/x86/kvm/svm/nested.c void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, · line 505
Quoted 9 lines
arch/x86/kvm/svm/nested.c +7
-1+* so it should never be used directly to run L2. +*/ + to->asid = from->asid; + +/* Lower bits of IOPM_BASE_PA and MSRPM_BASE_PA are ignored */ + to->iopm_base_pa = from->iopm_base_pa &PAGE_MASK ; + to->msrpm_base_pa = from->msrpm_base_pa &PAGE_MASK ; > to->tsc_offset = from->tsc_offset; - to->tlb_ctl = from->tlb_ctl;
I don't think we should completely drop tlb_ctl. KVM doesn't do anything with vmcb12's tlb_ctl only because we haven't addressed the TODO list in nested_svm_transition_tlb_flush(). I think I would rather update this code to sanitize the field now, as opposed to waiting until we address that TODO.
KVM advertises X86_FEATURE_FLUSHBYASID, so I think we can do the right thing without having to speculate on what the future will bring.
Alternatively, we could add a TODO here or update the one in nested_svm_transition_tlb_flush(), but that seems like more overall work than just hardening the code.
Re: [PATCH v5 25/26] KVM: nSVM: Sanitize control fields copied from VMCB12
[..]
Quoted 19 lines
Quoted 8 lines
For the remaining fields, make sure only defined bits are copied from L1's VMCB12 into KVM'cache by defining appropriate masks where needed. The only exception is
tlb_ctl, which is unused, so remove it.Opportunistically cleanup ignoring the lower bits of {io/msr}pm_base_pa in
__nested_copy_vmcb_control_to_cache()by usingPAGE_MASK. Also, move the ASID copying ahead with other special cases, and expand the comment about the ASID being copied only for consistency checks.Stop. Bundling. Changes.
This is not a hypothetical situation, bundling small changes like this is quite literally making review take 3-4x longer than it should.
The interrupt changes are trivial to review.
The I/O and MSR bitmap changes are also easy enough, but I wanted to double that
PAGE_MASKdoes indeed equal ~0x0fffULL (__PHYSICAL_MASKis the one that can be dynamic).
Quoted 8 lines
I disagree the the
tlb_ctlchange.Moving the ASID handling is _completely_ superfluous.
Combining any two of those is annoying to deal with. Combining all of them wastes a non-trivial amount of time. What should have taken me ~5 minutes to review is dragging into 20+ minutes, because I keep having to cross-reference the changelog with the code to understand WTF is going on.
Sigh, I kept it as-is because these changes have been together since the first or second version. You did mention cleaning up the definitions being split into a different patch (which I did, and then we dropped it entirely), but I thought keeping the asid and tlb_ctl changes here were fine.
[..]
Quoted 27 lines
arch/x86/kvm/svm/nested.c void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, · line 504
Quoted 9 lines
arch/x86/kvm/svm/nested.c +3
-2@@ -499,32 +499,35 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu,if (!guest_cpu_cap_has (vcpu,X86_FEATURE_NPT )) to->misc_ctl &= ~SVM_MISC_ENABLE_NP ; - to->iopm_base_pa = from->iopm_base_pa; - to->msrpm_base_pa = from->msrpm_base_pa; +/* +* Copy the ASID here because nested_vmcb_check_controls() will check +* it. The ASID could be invalid, or conflict with another VM's ASID , Spurious space before the command.
arch/x86/kvm/svm/nested.c void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, · line 505
Quoted 9 lines
arch/x86/kvm/svm/nested.c +7
-1+* so it should never be used directly to run L2. +*/ + to->asid = from->asid; + +/* Lower bits of IOPM_BASE_PA and MSRPM_BASE_PA are ignored */ + to->iopm_base_pa = from->iopm_base_pa &PAGE_MASK ; + to->msrpm_base_pa = from->msrpm_base_pa &PAGE_MASK ; > to->tsc_offset = from->tsc_offset; - to->tlb_ctl = from->tlb_ctl;I don't think we should completely drop
tlb_ctl. KVM doesn't do anything with vmcb12'stlb_ctlonly because we haven't addressed the TODO list innested_svm_transition_tlb_flush(). I think I would rather update this code to sanitize the field now, as opposed to waiting until we address that TODO.
Quoted 6 lines
KVM advertises
X86_FEATURE_FLUSHBYASID, so I think we can do the right thing without having to speculate on what the future will bring.Alternatively, we could add a TODO here or update the one in
nested_svm_transition_tlb_flush(), but that seems like more overall work than just hardening the code.
I will drop the ASID change.
I honestly don't know where to draw the line at this point. Should I split sanitizing all different fields into different patches? Or just split the tlb_ctl change? What about the I/O and MSR bitmap change?
Sean Christopherson
maintainerRe: [PATCH v5 25/26] KVM: nSVM: Sanitize control fields copied from VMCB12
Quoted 34 lines · Yosry Ahmed
Quoted 27 lines
arch/x86/kvm/svm/nested.c void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, · line 504
Quoted 9 lines
arch/x86/kvm/svm/nested.c +3
-2@@ -499,32 +499,35 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu,if (!guest_cpu_cap_has (vcpu,X86_FEATURE_NPT )) to->misc_ctl &= ~SVM_MISC_ENABLE_NP ; - to->iopm_base_pa = from->iopm_base_pa; - to->msrpm_base_pa = from->msrpm_base_pa; +/* +* Copy the ASID here because nested_vmcb_check_controls() will check +* it. The ASID could be invalid, or conflict with another VM's ASID , Spurious space before the command.
arch/x86/kvm/svm/nested.c void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu, · line 505
Quoted 9 lines
arch/x86/kvm/svm/nested.c +7
-1+* so it should never be used directly to run L2. +*/ + to->asid = from->asid; + +/* Lower bits of IOPM_BASE_PA and MSRPM_BASE_PA are ignored */ + to->iopm_base_pa = from->iopm_base_pa &PAGE_MASK ; + to->msrpm_base_pa = from->msrpm_base_pa &PAGE_MASK ; > to->tsc_offset = from->tsc_offset; - to->tlb_ctl = from->tlb_ctl;I don't think we should completely drop
tlb_ctl. KVM doesn't do anything with vmcb12'stlb_ctlonly because we haven't addressed the TODO list innested_svm_transition_tlb_flush(). I think I would rather update this code to sanitize the field now, as opposed to waiting until we address that TODO.Quoted 6 lines
KVM advertises
X86_FEATURE_FLUSHBYASID, so I think we can do the right thing without having to speculate on what the future will bring.Alternatively, we could add a TODO here or update the one in
nested_svm_transition_tlb_flush(), but that seems like more overall work than just hardening the code.
Quoted 5 lines
I will drop the ASID change.
I honestly don't know where to draw the line at this point. Should I split sanitizing all different fields into different patches? Or just split the
tlb_ctlchange? What about the I/O and MSR bitmap change?
FWIW, my rule of thumb is that, when writing the changelog, if I find myself either (a) having to explain mostly unrelated things or (b) generalizing away details, then I should split the patch.
In this case, I would do:
1. int_ctl and friends
2. tlb_cnt (with a changelog explaining why we're keeping it even though it's unused)
3. ~0xfffull => PAGE_MASK cleanup
4. ASID comment
Though honestly, I would drop the ASID change. The comment is misleading and arguably flat out wrong. This
The ASID could be invalid, or conflict with another VM's ASID, so it should never be used directly to run L2.
isn't why KVM musn't use the ASID from vmcb12 verbatim, the real reason is that the ASID space managed by KVM is logical different than the one managed by L1. I.e. KVM needs to shadow L1's ASID space, for all intents and purposes. And so KVM should never use vmcb12's ASID verbatim because it needs to be "translated".
PATCH v5 26/26 KVM: nSVM: Only copy SVM_MISC_ENABLE_NP from VMCB01's misc_ctl
In reply to Yosry AhmedThe 'misc_ctl' field in VMCB02 is taken as-is from VMCB01. However, the only bit that needs to copied is SVM_MISC_ENABLE_NP, as all other known bits in misc_ctl are related to SEV guests, and KVM doesn't support nested virtualization for SEV guests.
Only copy SVM_MISC_ENABLE_NP to harden against future bugs if/when other bits are set for L1 but should not be set for L2.
Opportunistically add a comment explaining why SVM_MISC_ENABLE_NP is taken from VMCB01 and not VMCB02.
--- arch/x86/kvm/svm/nested.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/nested.c +10 -2
@@ -852,8 +852,16 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, V_NMI_BLOCKING_MASK); } -/* Copied from vmcb01. msrpm_base can be overwritten later. */ - vmcb02->control.misc_ctl = vmcb01->control.misc_ctl; +/* +* Copied from vmcb01. msrpm_base can be overwritten later. +* +* SVM_MISC_ENABLE_NP in vmcb12 is only used for consistency checks. If +* L1 enables NPTs, KVM shadows L1's NPTs and uses those to run L2. If +* L1 disables NPT, KVM runs L2 with the same NPTs used to run L1. For +* the latter, L1 runs L2 with shadow page tables that translate L2 GVAs +* to L1 GPAs, so the same NPTs can be used for L1 and L2. +*/ + vmcb02->control.misc_ctl = vmcb01->control.misc_ctl &SVM_MISC_ENABLE_NP ; vmcb02->control.iopm_base_pa = vmcb01->control.iopm_base_pa; vmcb02->control.msrpm_base_pa = vmcb01->control.msrpm_base_pa;vmcb_mark_dirty (vmcb02,VMCB_PERM_MAP );
Signature · 1 line
2.53.0.rc2.204.g2597b5adb4-goog