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

KVM: selftests: Get rid of kvm_util_internal.h 



Fold kvm_util_internal.h into kvm_util_base.h, i.e. make all KVM utility
stuff "public".  Hiding struct implementations from tests has been a
massive failure, as it has led to pointless and poorly named wrappers,
unnecessarily opaque code, etc...

Not to mention that the approach was a complete failure as evidenced by
the non-zero number of tests that were including kvm_util_internal.h.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b938cafd

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

+90 −7
Original line number Diff line number Diff line
@@ -9,9 +9,13 @@ 


#include "test_util.h"



#include "asm/kvm.h"

#include <linux/compiler.h>

#include "linux/hashtable.h"

#include "linux/list.h"

#include "linux/kvm.h"

#include <linux/kernel.h>

#include <linux/kvm.h>

#include "linux/rbtree.h"



#include <sys/ioctl.h>



#include "sparsebit.h"
@@ -21,14 +25,93 @@ 


#define NSEC_PER_SEC 1000000000L



typedef uint64_t vm_paddr_t; /* Virtual Machine (Guest) physical address */

typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address */



struct userspace_mem_region {

	struct kvm_userspace_memory_region region;

	struct sparsebit *unused_phy_pages;

	int fd;

	off_t offset;

	void *host_mem;

	void *host_alias;

	void *mmap_start;

	void *mmap_alias;

	size_t mmap_size;

	struct rb_node gpa_node;

	struct rb_node hva_node;

	struct hlist_node slot_node;

};



struct vcpu {

	struct list_head list;

	uint32_t id;

	int fd;

	struct kvm_run *state;

	struct kvm_dirty_gfn *dirty_gfns;

	uint32_t fetch_index;

	uint32_t dirty_gfns_count;

};



struct userspace_mem_regions {

	struct rb_root gpa_tree;

	struct rb_root hva_tree;

	DECLARE_HASHTABLE(slot_hash, 9);

};



struct kvm_vm {

	int mode;

	unsigned long type;

	int kvm_fd;

	int fd;

	unsigned int pgtable_levels;

	unsigned int page_size;

	unsigned int page_shift;

	unsigned int pa_bits;

	unsigned int va_bits;

	uint64_t max_gfn;

	struct list_head vcpus;

	struct userspace_mem_regions regions;

	struct sparsebit *vpages_valid;

	struct sparsebit *vpages_mapped;

	bool has_irqchip;

	bool pgd_created;

	vm_paddr_t pgd;

	vm_vaddr_t gdt;

	vm_vaddr_t tss;

	vm_vaddr_t idt;

	vm_vaddr_t handlers;

	uint32_t dirty_ring_size;

};





#define kvm_for_each_vcpu(vm, i, vcpu)			\

	for ((i) = 0; (i) <= (vm)->last_vcpu_id; (i)++)	\

		if (!((vcpu) = vm->vcpus[i]))		\

			continue;			\

		else



struct vcpu *vcpu_get(struct kvm_vm *vm, uint32_t vcpuid);



/*

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

 * structure kvm_util is using to maintain the state of a VM.

 * Virtual Translation Tables Dump

 *

 * Input Args:

 *   stream - Output FILE stream

 *   vm     - Virtual Machine

 *   indent - Left margin indent amount

 *

 * Output Args: None

 *

 * Return: None

 *

 * Dumps to the FILE stream given by @stream, the contents of all the

 * virtual translation tables for the VM given by @vm.

 */

struct kvm_vm;

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



typedef uint64_t vm_paddr_t; /* Virtual Machine (Guest) physical address */

typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address */

struct userspace_mem_region *

memslot2region(struct kvm_vm *vm, uint32_t memslot);



/* Minimum allocated guest virtual and physical addresses */

#define KVM_UTIL_MIN_VADDR		0x2000

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

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include "guest_modes.h"

#include "kvm_util.h"

#include "../kvm_util_internal.h"

#include "processor.h"



#define DEFAULT_ARM64_GUEST_STACK_VADDR_MIN	0xac0000

tools/testing/selftests/kvm/lib/aarch64/ucall.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 * Copyright (C) 2018, Red Hat, Inc.

 */

#include "kvm_util.h"

#include "../kvm_util_internal.h"



static vm_vaddr_t *ucall_exit_mmio_addr;

tools/testing/selftests/kvm/lib/aarch64/vgic.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <asm/kvm.h>



#include "kvm_util.h"

#include "../kvm_util_internal.h"

#include "vgic.h"

#include "gic.h"

#include "gic_v3.h"

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

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/elf.h>



#include "kvm_util.h"

#include "kvm_util_internal.h"



static void elfhdr_get(const char *filename, Elf64_Ehdr *hdrp)

{