From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bandan Das Subject: [PATCH 3/3] KVM: nVMX: check for null vmcs12 when L1 does invept Date: Wed, 19 Mar 2014 23:28:09 -0400 Message-ID: <1395286089-5406-4-git-send-email-bsd@redhat.com> References: <1395286089-5406-1-git-send-email-bsd@redhat.com> Cc: Paolo Bonzini , Gleb Natapov , Jan Kiszka To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:30711 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752923AbaCTD3P (ORCPT ); Wed, 19 Mar 2014 23:29:15 -0400 In-Reply-To: <1395286089-5406-1-git-send-email-bsd@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Some L1 hypervisors such as Xen seem to be calling invept after vmclear or before vmptrld on L2. In this case, proceed with falling through and syncing roots as a case where context wide invalidation can't be supported Signed-off-by: Bandan Das --- arch/x86/kvm/vmx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index c707389..b407b3a 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6435,8 +6435,9 @@ static int handle_invept(struct kvm_vcpu *vcpu) switch (type) { case VMX_EPT_EXTENT_CONTEXT: - if ((operand.eptp & eptp_mask) != - (nested_ept_get_cr3(vcpu) & eptp_mask)) + if (get_vmcs12(vcpu) && + ((operand.eptp & eptp_mask) != (nested_ept_get_cr3(vcpu) & + eptp_mask))) break; case VMX_EPT_EXTENT_GLOBAL: kvm_mmu_sync_roots(vcpu); -- 1.8.3.1