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

x86/hyperv: Move VMCB enlightenment definitions to hyperv-tlfs.h 

Move Hyper-V's VMCB enlightenment definitions to the TLFS header; the
definitions come directly from the TLFS[*], not from KVM.

No functional change intended.

[*] https://learn.microsoft.com/en-us/virtualization/hyper-v-on-windows/tlfs/datatypes/hv_svm_enlightened_vmcb_fields



[vitaly: rename VMCB_HV_ -> HV_VMCB_ to match the rest of
hyperv-tlfs.h, keep svm/hyperv.h]

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-2-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6c7b2202

arch/x86/include/asm/hyperv-tlfs.h

+22 −0
Original line number Diff line number Diff line
@@ -598,6 +598,28 @@ struct hv_enlightened_vmcs { 


#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL			0xFFFF



/*

 * Hyper-V uses the software reserved 32 bytes in VMCB control area to expose

 * SVM enlightenments to guests.

 */

struct hv_enlightenments {

	struct __packed hv_enlightenments_control {

		u32 nested_flush_hypercall:1;

		u32 msr_bitmap:1;

		u32 enlightened_npt_tlb: 1;

		u32 reserved:29;

	} __packed hv_enlightenments_control;

	u32 hv_vp_id;

	u64 hv_vm_id;

	u64 partition_assist_page;

	u64 reserved;

} __packed;



/*

 * Hyper-V uses the software reserved clean bit in VMCB.

 */

#define HV_VMCB_NESTED_ENLIGHTENMENTS		31



struct hv_partition_assist_pg {

	u32 tlb_lock_count;

};

arch/x86/kvm/svm/hyperv.h

+0 −22
Original line number Diff line number Diff line
@@ -10,26 +10,4 @@ 


#include "../hyperv.h"



/*

 * Hyper-V uses the software reserved 32 bytes in VMCB

 * control area to expose SVM enlightenments to guests.

 */

struct hv_enlightenments {

	struct __packed hv_enlightenments_control {

		u32 nested_flush_hypercall:1;

		u32 msr_bitmap:1;

		u32 enlightened_npt_tlb: 1;

		u32 reserved:29;

	} __packed hv_enlightenments_control;

	u32 hv_vp_id;

	u64 hv_vm_id;

	u64 partition_assist_page;

	u64 reserved;

} __packed;



/*

 * Hyper-V uses the software reserved clean bit in VMCB

 */

#define VMCB_HV_NESTED_ENLIGHTENMENTS VMCB_SW



#endif /* __ARCH_X86_KVM_SVM_HYPERV_H__ */

arch/x86/kvm/svm/nested.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) 
	if (!svm->nested.force_msr_bitmap_recalc &&

	    kvm_hv_hypercall_enabled(&svm->vcpu) &&

	    hve->hv_enlightenments_control.msr_bitmap &&

	    (svm->nested.ctl.clean & BIT(VMCB_HV_NESTED_ENLIGHTENMENTS)))

	    (svm->nested.ctl.clean & BIT(HV_VMCB_NESTED_ENLIGHTENMENTS)))

		goto set_msrpm_base_pa;



	if (!(vmcb12_is_intercept(&svm->nested.ctl, INTERCEPT_MSR_PROT)))

arch/x86/kvm/svm/svm_onhyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu) 
	hve->hv_vm_id = (unsigned long)vcpu->kvm;

	if (!hve->hv_enlightenments_control.nested_flush_hypercall) {

		hve->hv_enlightenments_control.nested_flush_hypercall = 1;

		vmcb_mark_dirty(to_svm(vcpu)->vmcb, VMCB_HV_NESTED_ENLIGHTENMENTS);

		vmcb_mark_dirty(to_svm(vcpu)->vmcb, HV_VMCB_NESTED_ENLIGHTENMENTS);

	}



	return 0;

arch/x86/kvm/svm/svm_onhyperv.h

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static inline void svm_hv_vmcb_dirty_nested_enlightenments( 
		(struct hv_enlightenments *)vmcb->control.reserved_sw;



	if (hve->hv_enlightenments_control.msr_bitmap)

		vmcb_mark_dirty(vmcb, VMCB_HV_NESTED_ENLIGHTENMENTS);

		vmcb_mark_dirty(vmcb, HV_VMCB_NESTED_ENLIGHTENMENTS);

}



static inline void svm_hv_update_vp_id(struct vmcb *vmcb,
@@ -76,7 +76,7 @@ static inline void svm_hv_update_vp_id(struct vmcb *vmcb, 


	if (hve->hv_vp_id != vp_index) {

		hve->hv_vp_id = vp_index;

		vmcb_mark_dirty(vmcb, VMCB_HV_NESTED_ENLIGHTENMENTS);

		vmcb_mark_dirty(vmcb, HV_VMCB_NESTED_ENLIGHTENMENTS);

	}

}

#else