On 20/05/19 22:10, Sean Christopherson wrote:
> @@ -3777,18 +3777,8 @@ static void nested_vmx_restore_host_state(struct kvm_vcpu *vcpu)
> vmx_set_cr4(vcpu, vmcs_readl(CR4_READ_SHADOW));
>
> nested_ept_uninit_mmu_context(vcpu);
> -
> - /*
> - * This is only valid if EPT is in use, otherwise the vmcs01 GUEST_CR3
> - * points to shadow pages! Fortunately we only get here after a WARN_ON
> - * if EPT is disabled, so a VMabort is perfectly fine.
> - */
> - if (enable_ept) {
> - vcpu->arch.cr3 = vmcs_readl(GUEST_CR3);
> - __set_bit(VCPU_EXREG_CR3, (ulong *)&vcpu->arch.regs_avail);
> - } else {
> - nested_vmx_abort(vcpu, VMX_ABORT_VMCS_CORRUPTED);
> - }
> + vcpu->arch.cr3 = vmcs_readl(GUEST_CR3);
> + __set_bit(VCPU_EXREG_CR3, (ulong *)&vcpu->arch.regs_avail);
>
> /*
> * Use ept_save_pdptrs(vcpu) to load the MMU's cached PDPTRs
This hunk needs to be moved to patch 1, which then becomes much easier
to understand... I'm still missing however the place where
kvm_mmu_new_cr3 is called in the nested_vmx_restore_host_state path.
Paolo
