Commit 24a7e944 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Sean Christopherson
Browse files

KVM: selftests: Move Hyper-V specific functions out of processor.c 



Since there is 'hyperv.c' for Hyper-V specific functions already, move
Hyper-V specific functions out of processor.c there.

No functional change intended.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Link: https://lore.kernel.org/r/20240816130139.286246-2-vkuznets@redhat.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 47ac09b9

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

+4 −0
Original line number Diff line number Diff line
@@ -343,4 +343,8 @@ struct hyperv_test_pages *vcpu_alloc_hyperv_test_pages(struct kvm_vm *vm, 
/* HV_X64_MSR_TSC_INVARIANT_CONTROL bits */

#define HV_INVARIANT_TSC_EXPOSED               BIT_ULL(0)



const struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);

const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu);

void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu);



#endif /* !SELFTEST_KVM_HYPERV_H */

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

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ extern bool host_cpu_is_intel; 
extern bool host_cpu_is_amd;

extern uint64_t guest_tsc_khz;



#ifndef MAX_NR_CPUID_ENTRIES

#define MAX_NR_CPUID_ENTRIES 100

#endif



/* Forced emulation prefix, used to invoke the emulator unconditionally. */

#define KVM_FEP "ud2; .byte 'k', 'v', 'm';"
@@ -908,8 +912,6 @@ static inline void vcpu_xcrs_set(struct kvm_vcpu *vcpu, struct kvm_xcrs *xcrs) 
const struct kvm_cpuid_entry2 *get_cpuid_entry(const struct kvm_cpuid2 *cpuid,

					       uint32_t function, uint32_t index);

const struct kvm_cpuid2 *kvm_get_supported_cpuid(void);

const struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);

const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu);



static inline uint32_t kvm_cpu_fms(void)

{
@@ -1009,7 +1011,6 @@ static inline struct kvm_cpuid2 *allocate_kvm_cpuid2(int nr_entries) 
}



void vcpu_init_cpuid(struct kvm_vcpu *vcpu, const struct kvm_cpuid2 *cpuid);

void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu);



static inline struct kvm_cpuid_entry2 *__vcpu_get_cpuid_entry(struct kvm_vcpu *vcpu,

							      uint32_t function,

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

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

#include "hyperv.h"



const struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void)

{

	static struct kvm_cpuid2 *cpuid;

	int kvm_fd;



	if (cpuid)

		return cpuid;



	cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES);

	kvm_fd = open_kvm_dev_path_or_exit();



	kvm_ioctl(kvm_fd, KVM_GET_SUPPORTED_HV_CPUID, cpuid);



	close(kvm_fd);

	return cpuid;

}



void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu)

{

	static struct kvm_cpuid2 *cpuid_full;

	const struct kvm_cpuid2 *cpuid_sys, *cpuid_hv;

	int i, nent = 0;



	if (!cpuid_full) {

		cpuid_sys = kvm_get_supported_cpuid();

		cpuid_hv = kvm_get_supported_hv_cpuid();



		cpuid_full = allocate_kvm_cpuid2(cpuid_sys->nent + cpuid_hv->nent);

		if (!cpuid_full) {

			perror("malloc");

			abort();

		}



		/* Need to skip KVM CPUID leaves 0x400000xx */

		for (i = 0; i < cpuid_sys->nent; i++) {

			if (cpuid_sys->entries[i].function >= 0x40000000 &&

			    cpuid_sys->entries[i].function < 0x40000100)

				continue;

			cpuid_full->entries[nent] = cpuid_sys->entries[i];

			nent++;

		}



		memcpy(&cpuid_full->entries[nent], cpuid_hv->entries,

		       cpuid_hv->nent * sizeof(struct kvm_cpuid_entry2));

		cpuid_full->nent = nent + cpuid_hv->nent;

	}



	vcpu_init_cpuid(vcpu, cpuid_full);

}



const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)

{

	struct kvm_cpuid2 *cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES);



	vcpu_ioctl(vcpu, KVM_GET_SUPPORTED_HV_CPUID, cpuid);



	return cpuid;

}



struct hyperv_test_pages *vcpu_alloc_hyperv_test_pages(struct kvm_vm *vm,

						       vm_vaddr_t *p_hv_pages_gva)

{

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

+0 −61
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#define KERNEL_DS	0x10

#define KERNEL_TSS	0x18



#define MAX_NR_CPUID_ENTRIES 100



vm_vaddr_t exception_handlers;

bool host_cpu_is_amd;

bool host_cpu_is_intel;
@@ -1195,65 +1193,6 @@ void xen_hypercall(uint64_t nr, uint64_t a0, void *a1) 
	GUEST_ASSERT(!__xen_hypercall(nr, a0, a1));

}



const struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void)

{

	static struct kvm_cpuid2 *cpuid;

	int kvm_fd;



	if (cpuid)

		return cpuid;



	cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES);

	kvm_fd = open_kvm_dev_path_or_exit();



	kvm_ioctl(kvm_fd, KVM_GET_SUPPORTED_HV_CPUID, cpuid);



	close(kvm_fd);

	return cpuid;

}



void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu)

{

	static struct kvm_cpuid2 *cpuid_full;

	const struct kvm_cpuid2 *cpuid_sys, *cpuid_hv;

	int i, nent = 0;



	if (!cpuid_full) {

		cpuid_sys = kvm_get_supported_cpuid();

		cpuid_hv = kvm_get_supported_hv_cpuid();



		cpuid_full = allocate_kvm_cpuid2(cpuid_sys->nent + cpuid_hv->nent);

		if (!cpuid_full) {

			perror("malloc");

			abort();

		}



		/* Need to skip KVM CPUID leaves 0x400000xx */

		for (i = 0; i < cpuid_sys->nent; i++) {

			if (cpuid_sys->entries[i].function >= 0x40000000 &&

			    cpuid_sys->entries[i].function < 0x40000100)

				continue;

			cpuid_full->entries[nent] = cpuid_sys->entries[i];

			nent++;

		}



		memcpy(&cpuid_full->entries[nent], cpuid_hv->entries,

		       cpuid_hv->nent * sizeof(struct kvm_cpuid_entry2));

		cpuid_full->nent = nent + cpuid_hv->nent;

	}



	vcpu_init_cpuid(vcpu, cpuid_full);

}



const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)

{

	struct kvm_cpuid2 *cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES);



	vcpu_ioctl(vcpu, KVM_GET_SUPPORTED_HV_CPUID, cpuid);



	return cpuid;

}



unsigned long vm_compute_max_gfn(struct kvm_vm *vm)

{

	const unsigned long num_ht_pages = 12 << (30 - vm->page_shift); /* 12 GiB */

tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "test_util.h"

#include "kvm_util.h"

#include "processor.h"

#include "hyperv.h"



#define HCALL_REGION_GPA	0xc0000000ULL

#define HCALL_REGION_SLOT	10