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

KVM: selftests: Convert set_memory_region_test away from VCPU_ID 



Convert set_memory_region_test to use vm_create_with_one_vcpu() and pass
around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.

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

tools/testing/selftests/kvm/set_memory_region_test.c

+18 −18
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
#include <kvm_util.h>

#include <processor.h>



#define VCPU_ID 0



/*

 * s390x needs at least 1MB alignment, and the x86_64 MOVE/DELETE tests need a

 * 2MB sized and aligned region so that the initial region corresponds to
@@ -54,8 +52,8 @@ static inline uint64_t guest_spin_on_val(uint64_t spin_val) 


static void *vcpu_worker(void *data)

{

	struct kvm_vm *vm = data;

	struct kvm_run *run;

	struct kvm_vcpu *vcpu = data;

	struct kvm_run *run = vcpu->run;

	struct ucall uc;

	uint64_t cmd;
@@ -64,13 +62,11 @@ static void *vcpu_worker(void *data) 
	 * which will occur if the guest attempts to access a memslot after it

	 * has been deleted or while it is being moved .

	 */

	run = vcpu_state(vm, VCPU_ID);



	while (1) {

		vcpu_run(vm, VCPU_ID);

		vcpu_run(vcpu->vm, vcpu->id);



		if (run->exit_reason == KVM_EXIT_IO) {

			cmd = get_ucall(vm, VCPU_ID, &uc);

			cmd = get_ucall(vcpu->vm, vcpu->id, &uc);

			if (cmd != UCALL_SYNC)

				break;
@@ -113,13 +109,14 @@ static void wait_for_vcpu(void) 
	usleep(100000);

}



static struct kvm_vm *spawn_vm(pthread_t *vcpu_thread, void *guest_code)

static struct kvm_vm *spawn_vm(struct kvm_vcpu **vcpu, pthread_t *vcpu_thread,

			       void *guest_code)

{

	struct kvm_vm *vm;

	uint64_t *hva;

	uint64_t gpa;



	vm = vm_create_default(VCPU_ID, 0, guest_code);

	vm = vm_create_with_one_vcpu(vcpu, guest_code);



	vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS_THP,

				    MEM_REGION_GPA, MEM_REGION_SLOT,
@@ -138,7 +135,7 @@ static struct kvm_vm *spawn_vm(pthread_t *vcpu_thread, void *guest_code) 
	hva = addr_gpa2hva(vm, MEM_REGION_GPA);

	memset(hva, 0, 2 * 4096);



	pthread_create(vcpu_thread, NULL, vcpu_worker, vm);

	pthread_create(vcpu_thread, NULL, vcpu_worker, *vcpu);



	/* Ensure the guest thread is spun up. */

	wait_for_vcpu();
@@ -180,10 +177,11 @@ static void guest_code_move_memory_region(void) 
static void test_move_memory_region(void)

{

	pthread_t vcpu_thread;

	struct kvm_vcpu *vcpu;

	struct kvm_vm *vm;

	uint64_t *hva;



	vm = spawn_vm(&vcpu_thread, guest_code_move_memory_region);

	vm = spawn_vm(&vcpu, &vcpu_thread, guest_code_move_memory_region);



	hva = addr_gpa2hva(vm, MEM_REGION_GPA);
@@ -258,11 +256,12 @@ static void guest_code_delete_memory_region(void) 
static void test_delete_memory_region(void)

{

	pthread_t vcpu_thread;

	struct kvm_vcpu *vcpu;

	struct kvm_regs regs;

	struct kvm_run *run;

	struct kvm_vm *vm;



	vm = spawn_vm(&vcpu_thread, guest_code_delete_memory_region);

	vm = spawn_vm(&vcpu, &vcpu_thread, guest_code_delete_memory_region);



	/* Delete the memory region, the guest should not die. */

	vm_mem_region_delete(vm, MEM_REGION_SLOT);
@@ -286,13 +285,13 @@ static void test_delete_memory_region(void) 


	pthread_join(vcpu_thread, NULL);



	run = vcpu_state(vm, VCPU_ID);

	run = vcpu->run;



	TEST_ASSERT(run->exit_reason == KVM_EXIT_SHUTDOWN ||

		    run->exit_reason == KVM_EXIT_INTERNAL_ERROR,

		    "Unexpected exit reason = %d", run->exit_reason);



	vcpu_regs_get(vm, VCPU_ID, &regs);

	vcpu_regs_get(vm, vcpu->id, &regs);



	/*

	 * On AMD, after KVM_EXIT_SHUTDOWN the VMCB has been reinitialized already,
@@ -309,18 +308,19 @@ static void test_delete_memory_region(void) 


static void test_zero_memory_regions(void)

{

	struct kvm_vcpu *vcpu;

	struct kvm_run *run;

	struct kvm_vm *vm;



	pr_info("Testing KVM_RUN with zero added memory regions\n");



	vm = vm_create_barebones();

	vm_vcpu_add(vm, VCPU_ID);

	vcpu = vm_vcpu_add(vm, 0);



	vm_ioctl(vm, KVM_SET_NR_MMU_PAGES, (void *)64ul);

	vcpu_run(vm, VCPU_ID);

	vcpu_run(vm, vcpu->id);



	run = vcpu_state(vm, VCPU_ID);

	run = vcpu->run;

	TEST_ASSERT(run->exit_reason == KVM_EXIT_INTERNAL_ERROR,

		    "Unexpected exit_reason = %u\n", run->exit_reason);