Commit ee36656f authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: VMX: Define Hyper-V paravirt TLB flush fields iff Hyper-V is enabled 



Ifdef away the Hyper-V specific fields in structs kvm_vmx and vcpu_vmx
as each field has only a single reference outside of the struct itself
that isn't already wrapped in ifdeffery (and both are initialization).

vcpu_vmx.ept_pointer in particular should be wrapped as it is valid if
and only if Hyper-v is active, i.e. non-Hyper-V code cannot rely on it
to actually track the current EPTP (without additional code changes).

Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210305183123.3978098-10-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c82f1b67

arch/x86/kvm/vmx/vmx.c

+4 −1
Original line number Diff line number Diff line
@@ -6920,8 +6920,9 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu) 
	vmx->pi_desc.nv = POSTED_INTR_VECTOR;

	vmx->pi_desc.sn = 1;



#if IS_ENABLED(CONFIG_HYPERV)

	vmx->ept_pointer = INVALID_PAGE;



#endif

	return 0;



free_vmcs:
@@ -6938,7 +6939,9 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu) 


static int vmx_vm_init(struct kvm *kvm)

{

#if IS_ENABLED(CONFIG_HYPERV)

	spin_lock_init(&to_kvm_vmx(kvm)->ept_pointer_lock);

#endif



	if (!ple_gap)

		kvm->arch.pause_in_guest = true;

arch/x86/kvm/vmx/vmx.h

+4 −0
Original line number Diff line number Diff line
@@ -325,7 +325,9 @@ struct vcpu_vmx { 
	 */

	u64 msr_ia32_feature_control;

	u64 msr_ia32_feature_control_valid_bits;

#if IS_ENABLED(CONFIG_HYPERV)

	u64 ept_pointer;

#endif



	struct pt_desc pt_desc;

	struct lbr_desc lbr_desc;
@@ -345,8 +347,10 @@ struct kvm_vmx { 
	bool ept_identity_pagetable_done;

	gpa_t ept_identity_map_addr;



#if IS_ENABLED(CONFIG_HYPERV)

	hpa_t hv_tlb_eptp;

	spinlock_t ept_pointer_lock;

#endif

};



bool nested_vmx_allowed(struct kvm_vcpu *vcpu);