Commit eabe7881 authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

kvm: selftests: tidy up kvm_util 



Tidy up kvm-util code: code/comment formatting, remove unused code,
and move x86 specific code out. We also move vcpu_dump() out of
common code, because not all arches (AArch64) have KVM_GET_REGS.

Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent eea192bf

tools/testing/selftests/kvm/include/kvm_util.h

+26 −54
Original line number Diff line number Diff line
@@ -17,12 +17,6 @@ 


#include "sparsebit.h"



/*

 * Memslots can't cover the gfn starting at this gpa otherwise vCPUs can't be

 * created. Only applies to VMs using EPT.

 */

#define KVM_DEFAULT_IDENTITY_MAP_ADDRESS 0xfffbc000ul





/* Callers of kvm_util only have an incomplete/opaque description of the

 * structure kvm_util is using to maintain the state of a VM.
@@ -58,15 +52,15 @@ void kvm_vm_restart(struct kvm_vm *vmp, int perm); 
void kvm_vm_release(struct kvm_vm *vmp);

void kvm_vm_get_dirty_log(struct kvm_vm *vm, int slot, void *log);



int kvm_memcmp_hva_gva(void *hva,

	struct kvm_vm *vm, const vm_vaddr_t gva, size_t len);

int kvm_memcmp_hva_gva(void *hva, struct kvm_vm *vm, const vm_vaddr_t gva,

		       size_t len);



void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename,

		     uint32_t data_memslot, uint32_t pgd_memslot);



void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent);

void vcpu_dump(FILE *stream, struct kvm_vm *vm,

	uint32_t vcpuid, uint8_t indent);

void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid,

	       uint8_t indent);



void vm_create_irqchip(struct kvm_vm *vm);
@@ -75,11 +69,12 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
	uint64_t guest_paddr, uint32_t slot, uint64_t npages,

	uint32_t flags);



void vcpu_ioctl(struct kvm_vm *vm,

	uint32_t vcpuid, unsigned long ioctl, void *arg);

void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,

		void *arg);

void vm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);

void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags);

void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, int pgd_memslot, int gdt_memslot);

void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, int pgd_memslot,

		 int gdt_memslot);

vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,

			  uint32_t data_memslot, uint32_t pgd_memslot);

void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
@@ -94,55 +89,32 @@ void vcpu_run(struct kvm_vm *vm, uint32_t vcpuid); 
int _vcpu_run(struct kvm_vm *vm, uint32_t vcpuid);

void vcpu_set_mp_state(struct kvm_vm *vm, uint32_t vcpuid,

		       struct kvm_mp_state *mp_state);

void vcpu_regs_get(struct kvm_vm *vm,

	uint32_t vcpuid, struct kvm_regs *regs);

void vcpu_regs_set(struct kvm_vm *vm,

	uint32_t vcpuid, struct kvm_regs *regs);

void vcpu_regs_get(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_regs *regs);

void vcpu_regs_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_regs *regs);

void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...);

void vcpu_sregs_get(struct kvm_vm *vm,

	uint32_t vcpuid, struct kvm_sregs *sregs);

void vcpu_sregs_set(struct kvm_vm *vm,

	uint32_t vcpuid, struct kvm_sregs *sregs);

int _vcpu_sregs_set(struct kvm_vm *vm,

	uint32_t vcpuid, struct kvm_sregs *sregs);

void vcpu_sregs_get(struct kvm_vm *vm, uint32_t vcpuid,

		    struct kvm_sregs *sregs);

void vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid,

		    struct kvm_sregs *sregs);

int _vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid,

		    struct kvm_sregs *sregs);

void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,

		     struct kvm_vcpu_events *events);

void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,

		     struct kvm_vcpu_events *events);

uint64_t vcpu_get_msr(struct kvm_vm *vm, uint32_t vcpuid, uint64_t msr_index);

void vcpu_set_msr(struct kvm_vm *vm, uint32_t vcpuid, uint64_t msr_index,

	uint64_t msr_value);



const char *exit_reason_str(unsigned int exit_reason);



void virt_pgd_alloc(struct kvm_vm *vm, uint32_t pgd_memslot);

void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,

		 uint32_t pgd_memslot);

vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm,

	vm_paddr_t paddr_min, uint32_t memslot);



struct kvm_cpuid2 *kvm_get_supported_cpuid(void);

void vcpu_set_cpuid(

	struct kvm_vm *vm, uint32_t vcpuid, struct kvm_cpuid2 *cpuid);



struct kvm_cpuid_entry2 *

kvm_get_supported_cpuid_index(uint32_t function, uint32_t index);



static inline struct kvm_cpuid_entry2 *

kvm_get_supported_cpuid_entry(uint32_t function)

{

	return kvm_get_supported_cpuid_index(function, 0);

}

vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min,

			     uint32_t memslot);



struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_size,

				 void *guest_code);

void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code);



typedef void (*vmx_guest_code_t)(vm_vaddr_t vmxon_vaddr,

				 vm_paddr_t vmxon_paddr,

				 vm_vaddr_t vmcs_vaddr,

				 vm_paddr_t vmcs_paddr);



struct kvm_userspace_memory_region *

kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,

				 uint64_t end);

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

+19 −1
Original line number Diff line number Diff line
@@ -305,7 +305,25 @@ static inline unsigned long get_xmm(int n) 


struct kvm_x86_state;

struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid);

void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_x86_state *state);

void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid,

		     struct kvm_x86_state *state);



struct kvm_cpuid2 *kvm_get_supported_cpuid(void);

void vcpu_set_cpuid(struct kvm_vm *vm, uint32_t vcpuid,

		    struct kvm_cpuid2 *cpuid);



struct kvm_cpuid_entry2 *

kvm_get_supported_cpuid_index(uint32_t function, uint32_t index);



static inline struct kvm_cpuid_entry2 *

kvm_get_supported_cpuid_entry(uint32_t function)

{

	return kvm_get_supported_cpuid_index(function, 0);

}



uint64_t vcpu_get_msr(struct kvm_vm *vm, uint32_t vcpuid, uint64_t msr_index);

void vcpu_set_msr(struct kvm_vm *vm, uint32_t vcpuid, uint64_t msr_index,

	  	  uint64_t msr_value);



/*

 * Basic CPU control in CR0

tools/testing/selftests/kvm/lib/kvm_util.c

+106 −332

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/kvm/lib/kvm_util_internal.h

+10 −12

File changed.

Preview size limit exceeded, changes collapsed.

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

+245 −0

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE