Commit 2dc458b8 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: selftests: Create a vendor independent helper to allocate Hyper-V specific test pages 



There's no need to pollute VMX and SVM code with Hyper-V specific
stuff and allocate Hyper-V specific test pages for all test as only
few really need them. Create a dedicated struct and an allocation
helper.

Reviewed-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-43-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cd8f11bd

tools/testing/selftests/kvm/include/x86_64/evmcs.h

+2 −2
Original line number Diff line number Diff line
@@ -256,9 +256,9 @@ static inline int evmcs_vmptrld(uint64_t vmcs_pa, void *vmcs) 
	return 0;

}



static inline bool load_evmcs(uint64_t enlightened_vmcs_gpa, void *enlightened_vmcs)

static inline bool load_evmcs(struct hyperv_test_pages *hv)

{

	if (evmcs_vmptrld(enlightened_vmcs_gpa, enlightened_vmcs))

	if (evmcs_vmptrld(hv->enlightened_vmcs_gpa, hv->enlightened_vmcs))

		return false;



	current_evmcs->revision_id = EVMCS_VERSION;

tools/testing/selftests/kvm/include/x86_64/hyperv.h

+15 −0
Original line number Diff line number Diff line
@@ -268,4 +268,19 @@ extern struct hv_vp_assist_page *current_vp_assist; 


int enable_vp_assist(uint64_t vp_assist_pa, void *vp_assist);



struct hyperv_test_pages {

	/* VP assist page */

	void *vp_assist_hva;

	uint64_t vp_assist_gpa;

	void *vp_assist;



	/* Enlightened VMCS */

	void *enlightened_vmcs_hva;

	uint64_t enlightened_vmcs_gpa;

	void *enlightened_vmcs;

};



struct hyperv_test_pages *vcpu_alloc_hyperv_test_pages(struct kvm_vm *vm,

						       vm_vaddr_t *p_hv_pages_gva);



#endif /* !SELFTEST_KVM_HYPERV_H */

tools/testing/selftests/kvm/include/x86_64/vmx.h

+0 −8
Original line number Diff line number Diff line
@@ -517,14 +517,6 @@ struct vmx_pages { 
	uint64_t vmwrite_gpa;

	void *vmwrite;



	void *vp_assist_hva;

	uint64_t vp_assist_gpa;

	void *vp_assist;



	void *enlightened_vmcs_hva;

	uint64_t enlightened_vmcs_gpa;

	void *enlightened_vmcs;



	void *eptp_hva;

	uint64_t eptp_gpa;

	void *eptp;

tools/testing/selftests/kvm/lib/x86_64/hyperv.c

+20 −0
Original line number Diff line number Diff line
@@ -8,6 +8,26 @@ 
#include "processor.h"

#include "hyperv.h"



struct hyperv_test_pages *vcpu_alloc_hyperv_test_pages(struct kvm_vm *vm,

						       vm_vaddr_t *p_hv_pages_gva)

{

	vm_vaddr_t hv_pages_gva = vm_vaddr_alloc_page(vm);

	struct hyperv_test_pages *hv = addr_gva2hva(vm, hv_pages_gva);



	/* Setup of a region of guest memory for the VP Assist page. */

	hv->vp_assist = (void *)vm_vaddr_alloc_page(vm);

	hv->vp_assist_hva = addr_gva2hva(vm, (uintptr_t)hv->vp_assist);

	hv->vp_assist_gpa = addr_gva2gpa(vm, (uintptr_t)hv->vp_assist);



	/* Setup of a region of guest memory for the enlightened VMCS. */

	hv->enlightened_vmcs = (void *)vm_vaddr_alloc_page(vm);

	hv->enlightened_vmcs_hva = addr_gva2hva(vm, (uintptr_t)hv->enlightened_vmcs);

	hv->enlightened_vmcs_gpa = addr_gva2gpa(vm, (uintptr_t)hv->enlightened_vmcs);



	*p_hv_pages_gva = hv_pages_gva;

	return hv;

}



int enable_vp_assist(uint64_t vp_assist_pa, void *vp_assist)

{

	uint64_t val = (vp_assist_pa & HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_MASK) |

tools/testing/selftests/kvm/lib/x86_64/vmx.c

+0 −12
Original line number Diff line number Diff line
@@ -109,18 +109,6 @@ vcpu_alloc_vmx(struct kvm_vm *vm, vm_vaddr_t *p_vmx_gva) 
	vmx->vmwrite_gpa = addr_gva2gpa(vm, (uintptr_t)vmx->vmwrite);

	memset(vmx->vmwrite_hva, 0, getpagesize());



	/* Setup of a region of guest memory for the VP Assist page. */

	vmx->vp_assist = (void *)vm_vaddr_alloc_page(vm);

	vmx->vp_assist_hva = addr_gva2hva(vm, (uintptr_t)vmx->vp_assist);

	vmx->vp_assist_gpa = addr_gva2gpa(vm, (uintptr_t)vmx->vp_assist);



	/* Setup of a region of guest memory for the enlightened VMCS. */

	vmx->enlightened_vmcs = (void *)vm_vaddr_alloc_page(vm);

	vmx->enlightened_vmcs_hva =

		addr_gva2hva(vm, (uintptr_t)vmx->enlightened_vmcs);

	vmx->enlightened_vmcs_gpa =

		addr_gva2gpa(vm, (uintptr_t)vmx->enlightened_vmcs);



	*p_vmx_gva = vmx_gva;

	return vmx;

}