Commit 12c386b2 authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

KVM: selftests: Move vm type into _vm_create() internally 



Rather than passing the vm type from the top level to the end of vm
creation, let's simply keep that as an internal of kvm_vm struct and
decide the type in _vm_create().  Several reasons for doing this:

- The vm type is only decided by physical address width and currently
  only used in aarch64, so we've got enough information as long as
  we're passing vm_guest_mode into _vm_create(),

- This removes a loop dependency between the vm->type and creation of
  vms.  That's why now we need to parse vm_guest_mode twice sometimes,
  once in run_test() and then again in _vm_create().  The follow up
  patches will move on to clean up that as well so we can have a
  single place to decide guest machine types and so.

Note that this patch will slightly change the behavior of aarch64
tests in that previously most vm_create() callers will directly pass
in type==0 into _vm_create() but now the type will depend on
vm_guest_mode, however it shouldn't affect any user because all
vm_create() users of aarch64 will be using VM_MODE_DEFAULT guest
mode (which is VM_MODE_P40V48_4K) so at last type will still be zero.

Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5a0165f6

tools/testing/selftests/kvm/dirty_log_test.c

+3 −10
Original line number Diff line number Diff line
@@ -249,14 +249,12 @@ static void vm_dirty_log_verify(unsigned long *bmap) 
}



static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid,

				uint64_t extra_mem_pages, void *guest_code,

				unsigned long type)

				uint64_t extra_mem_pages, void *guest_code)

{

	struct kvm_vm *vm;

	uint64_t extra_pg_pages = extra_mem_pages / 512 * 2;



	vm = _vm_create(mode, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages,

			O_RDWR, type);

	vm = _vm_create(mode, 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);
@@ -273,7 +271,6 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, 
	struct kvm_vm *vm;

	uint64_t max_gfn;

	unsigned long *bmap;

	unsigned long type = 0;



	switch (mode) {

	case VM_MODE_P52V48_4K:
@@ -314,10 +311,6 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, 
	 * bits we can change to 39.

	 */

	guest_pa_bits = 39;

#endif

#ifdef __aarch64__

	if (guest_pa_bits != 40)

		type = KVM_VM_TYPE_ARM_IPA_SIZE(guest_pa_bits);

#endif

	max_gfn = (1ul << (guest_pa_bits - guest_page_shift)) - 1;

	guest_page_size = (1ul << guest_page_shift);
@@ -351,7 +344,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, 
	bmap = bitmap_alloc(host_num_pages);

	host_bmap_track = bitmap_alloc(host_num_pages);



	vm = create_vm(mode, VCPU_ID, guest_num_pages, guest_code, type);

	vm = create_vm(mode, VCPU_ID, guest_num_pages, guest_code);



#ifdef USE_CLEAR_DIRTY_LOG

	struct kvm_enable_cap cap = {};

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

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ int kvm_check_cap(long cap); 
int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap);



struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);

struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages,

			  int perm, unsigned long type);

struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);

void kvm_vm_free(struct kvm_vm *vmp);

void kvm_vm_restart(struct kvm_vm *vmp, int perm);

void kvm_vm_release(struct kvm_vm *vmp);

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

+13 −8
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap) 
	return ret;

}



static void vm_open(struct kvm_vm *vm, int perm, unsigned long type)

static void vm_open(struct kvm_vm *vm, int perm)

{

	vm->kvm_fd = open(KVM_DEV_PATH, perm);

	if (vm->kvm_fd < 0)
@@ -95,7 +95,7 @@ static void vm_open(struct kvm_vm *vm, int perm, unsigned long type) 
		exit(KSFT_SKIP);

	}



	vm->fd = ioctl(vm->kvm_fd, KVM_CREATE_VM, type);

	vm->fd = ioctl(vm->kvm_fd, KVM_CREATE_VM, vm->type);

	TEST_ASSERT(vm->fd >= 0, "KVM_CREATE_VM ioctl failed, "

		"rc: %i errno: %i", vm->fd, errno);

}
@@ -130,8 +130,7 @@ _Static_assert(sizeof(vm_guest_mode_string)/sizeof(char *) == NUM_VM_MODES, 
 * descriptor to control the created VM is created with the permissions

 * given by perm (e.g. O_RDWR).

 */

struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages,

			  int perm, unsigned long type)

struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)

{

	struct kvm_vm *vm;
@@ -139,8 +138,7 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, 
	TEST_ASSERT(vm != NULL, "Insufficient Memory");



	vm->mode = mode;

	vm->type = type;

	vm_open(vm, perm, type);

	vm->type = 0;



	/* Setup mode specific traits. */

	switch (vm->mode) {
@@ -190,6 +188,13 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, 
		TEST_ASSERT(false, "Unknown guest mode, mode: 0x%x", mode);

	}



#ifdef __aarch64__

	if (vm->pa_bits != 40)

		vm->type = KVM_VM_TYPE_ARM_IPA_SIZE(vm->pa_bits);

#endif



	vm_open(vm, perm);



	/* Limit to VA-bit canonical virtual addresses. */

	vm->vpages_valid = sparsebit_alloc();

	sparsebit_set_num(vm->vpages_valid,
@@ -212,7 +217,7 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, 


struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)

{

	return _vm_create(mode, phy_pages, perm, 0);

	return _vm_create(mode, phy_pages, perm);

}



/*
@@ -232,7 +237,7 @@ void kvm_vm_restart(struct kvm_vm *vmp, int perm) 
{

	struct userspace_mem_region *region;



	vm_open(vmp, perm, vmp->type);

	vm_open(vmp, perm);

	if (vmp->has_irqchip)

		vm_create_irqchip(vmp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE