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

KVM: selftests: Make vm_create_default common 



The code is almost 100% the same anyway. Just move it to common
and add a few arch-specific macros.

Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarBen Gardon <bgardon@google.com>
Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Message-Id: <20201111122636.73346-5-drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f63f0b68

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

+19 −4
Original line number Diff line number Diff line
@@ -45,13 +45,28 @@ enum vm_guest_mode { 
};



#if defined(__aarch64__)



#define VM_MODE_DEFAULT			VM_MODE_P40V48_4K

#define MIN_PAGE_SHIFT			12U

#define ptes_per_page(page_size)	((page_size) / 8)



#elif defined(__x86_64__)



#define VM_MODE_DEFAULT			VM_MODE_PXXV48_4K

#else

#define MIN_PAGE_SHIFT			12U

#define ptes_per_page(page_size)	((page_size) / 8)



#elif defined(__s390x__)



#define VM_MODE_DEFAULT			VM_MODE_P52V48_4K

#define MIN_PAGE_SHIFT			12U

#define ptes_per_page(page_size)	((page_size) / 16)



#endif



#define MIN_PAGE_SIZE		(1U << MIN_PAGE_SHIFT)

#define PTES_PER_MIN_PAGE	ptes_per_page(MIN_PAGE_SIZE)



#define vm_guest_mode_string(m) vm_guest_mode_string[m]

extern const char * const vm_guest_mode_string[];

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

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

 */



#define _GNU_SOURCE /* for program_invocation_name */



#include <linux/compiler.h>



#include "kvm_util.h"
@@ -219,21 +217,6 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) 
	}

}



struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,

				 void *guest_code)

{

	uint64_t ptrs_per_4k_pte = 512;

	uint64_t extra_pg_pages = (extra_mem_pages / ptrs_per_4k_pte) * 2;

	struct kvm_vm *vm;



	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages, O_RDWR);



	kvm_vm_elf_load(vm, program_invocation_name, 0, 0);

	vm_vcpu_add_default(vm, vcpuid, guest_code);



	return vm;

}



void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *init)

{

	struct kvm_vcpu_init default_init = { .target = -1, };

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

+26 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright (C) 2018, Google LLC.

 */



#define _GNU_SOURCE /* for program_invocation_name */

#include "test_util.h"

#include "kvm_util.h"

#include "kvm_util_internal.h"
@@ -281,6 +282,31 @@ struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) 
	return vm;

}



struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,

				 void *guest_code)

{

	/* The maximum page table size for a memory region will be when the

	 * smallest pages are used. Considering each page contains x page

	 * table descriptors, the total extra size for page tables (for extra

	 * N pages) will be: N/x+N/x^2+N/x^3+... which is definitely smaller

	 * than N/x*2.

	 */

	uint64_t extra_pg_pages = (extra_mem_pages / PTES_PER_MIN_PAGE) * 2;

	struct kvm_vm *vm;



	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages, O_RDWR);



	kvm_vm_elf_load(vm, program_invocation_name, 0, 0);



#ifdef __x86_64__

	vm_create_irqchip(vm);

#endif



	vm_vcpu_add_default(vm, vcpuid, guest_code);



	return vm;

}



/*

 * VM Restart

 *

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

+0 −22
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
 * Copyright (C) 2019, Red Hat, Inc.

 */



#define _GNU_SOURCE /* for program_invocation_name */



#include "processor.h"

#include "kvm_util.h"

#include "../kvm_util_internal.h"
@@ -160,26 +158,6 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) 
	virt_dump_region(stream, vm, indent, vm->pgd);

}



struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,

				 void *guest_code)

{

	/*

	 * The additional amount of pages required for the page tables is:

	 * 1 * n / 256 + 4 * (n / 256) / 2048 + 4 * (n / 256) / 2048^2 + ...

	 * which is definitely smaller than (n / 256) * 2.

	 */

	uint64_t extra_pg_pages = extra_mem_pages / 256 * 2;

	struct kvm_vm *vm;



	vm = vm_create(VM_MODE_DEFAULT,

		       DEFAULT_GUEST_PHY_PAGES + extra_pg_pages, O_RDWR);



	kvm_vm_elf_load(vm, program_invocation_name, 0, 0);

	vm_vcpu_add_default(vm, vcpuid, guest_code);



	return vm;

}



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

{

	size_t stack_size =  DEFAULT_STACK_PGS * getpagesize();

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

+0 −32
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
 * Copyright (C) 2018, Google LLC.

 */



#define _GNU_SOURCE /* for program_invocation_name */



#include "test_util.h"

#include "kvm_util.h"

#include "../kvm_util_internal.h"
@@ -731,36 +729,6 @@ void vcpu_set_cpuid(struct kvm_vm *vm, 


}



struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,

				 void *guest_code)

{

	struct kvm_vm *vm;

	/*

	 * For x86 the maximum page table size for a memory region

	 * will be when only 4K pages are used.  In that case the

	 * total extra size for page tables (for extra N pages) will

	 * be: N/512+N/512^2+N/512^3+... which is definitely smaller

	 * than N/512*2.

	 */

	uint64_t extra_pg_pages = extra_mem_pages / 512 * 2;



	/* Create VM */

	vm = vm_create(VM_MODE_DEFAULT,

		       DEFAULT_GUEST_PHY_PAGES + extra_pg_pages,

		       O_RDWR);



	/* Setup guest code */

	kvm_vm_elf_load(vm, program_invocation_name, 0, 0);



	/* Setup IRQ Chip */

	vm_create_irqchip(vm);



	/* Add the first vCPU. */

	vm_vcpu_add_default(vm, vcpuid, guest_code);



	return vm;

}



/*

 * VCPU Get MSR

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE