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

KVM: selftests: Purge vm+vcpu_id == vcpu silliness 



Take a vCPU directly instead of a VM+vcpu pair in all vCPU-scoped helpers
and ioctls.

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

tools/testing/selftests/kvm/aarch64/arch_timer.c

+5 −5
Original line number Diff line number Diff line
@@ -218,14 +218,14 @@ static void *test_vcpu_run(void *arg) 
	struct kvm_vm *vm = vcpu->vm;

	struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[vcpu_idx];



	vcpu_run(vm, vcpu->id);

	vcpu_run(vcpu);



	/* Currently, any exit from guest is an indication of completion */

	pthread_mutex_lock(&vcpu_done_map_lock);

	set_bit(vcpu_idx, vcpu_done_map);

	pthread_mutex_unlock(&vcpu_done_map_lock);



	switch (get_ucall(vm, vcpu->id, &uc)) {

	switch (get_ucall(vcpu, &uc)) {

	case UCALL_SYNC:

	case UCALL_DONE:

		break;
@@ -345,9 +345,9 @@ static void test_run(struct kvm_vm *vm) 
static void test_init_timer_irq(struct kvm_vm *vm)

{

	/* Timer initid should be same for all the vCPUs, so query only vCPU-0 */

	vcpu_device_attr_get(vm, vcpus[0]->id, KVM_ARM_VCPU_TIMER_CTRL,

	vcpu_device_attr_get(vcpus[0], KVM_ARM_VCPU_TIMER_CTRL,

			     KVM_ARM_VCPU_TIMER_IRQ_PTIMER, &ptimer_irq);

	vcpu_device_attr_get(vm, vcpus[0]->id, KVM_ARM_VCPU_TIMER_CTRL,

	vcpu_device_attr_get(vcpus[0], KVM_ARM_VCPU_TIMER_CTRL,

			     KVM_ARM_VCPU_TIMER_IRQ_VTIMER, &vtimer_irq);



	sync_global_to_guest(vm, ptimer_irq);
@@ -370,7 +370,7 @@ static struct kvm_vm *test_vm_create(void) 
	vm_install_exception_handler(vm, VECTOR_IRQ_CURRENT, guest_irq_handler);



	for (i = 0; i < nr_vcpus; i++)

		vcpu_init_descriptor_tables(vm, vcpus[i]->id);

		vcpu_init_descriptor_tables(vcpus[i]);



	ucall_init(vm, NULL);

	test_init_timer_irq(vm);

tools/testing/selftests/kvm/aarch64/debug-exceptions.c

+4 −4
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int debug_version(struct kvm_vcpu *vcpu) 
{

	uint64_t id_aa64dfr0;



	vcpu_get_reg(vcpu->vm, vcpu->id, KVM_ARM64_SYS_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0);

	vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0);

	return id_aa64dfr0 & 0xf;

}
@@ -257,7 +257,7 @@ int main(int argc, char *argv[]) 
	ucall_init(vm, NULL);



	vm_init_descriptor_tables(vm);

	vcpu_init_descriptor_tables(vm, vcpu->id);

	vcpu_init_descriptor_tables(vcpu);



	if (debug_version(vcpu) < 6) {

		print_skip("Armv8 debug architecture not supported.");
@@ -277,9 +277,9 @@ int main(int argc, char *argv[]) 
				ESR_EC_SVC64, guest_svc_handler);



	for (stage = 0; stage < 11; stage++) {

		vcpu_run(vm, vcpu->id);

		vcpu_run(vcpu);



		switch (get_ucall(vm, vcpu->id, &uc)) {

		switch (get_ucall(vcpu, &uc)) {

		case UCALL_SYNC:

			TEST_ASSERT(uc.args[1] == stage,

				"Stage %d: Unexpected sync ucall, got %lx",

tools/testing/selftests/kvm/aarch64/get-reg-list.c

+8 −8
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static void prepare_vcpu_init(struct vcpu_config *c, struct kvm_vcpu_init *init) 
			init->features[s->feature / 32] |= 1 << (s->feature % 32);

}



static void finalize_vcpu(struct kvm_vm *vm, uint32_t vcpuid, struct vcpu_config *c)

static void finalize_vcpu(struct kvm_vcpu *vcpu, struct vcpu_config *c)

{

	struct reg_sublist *s;

	int feature;
@@ -385,7 +385,7 @@ static void finalize_vcpu(struct kvm_vm *vm, uint32_t vcpuid, struct vcpu_config 
	for_each_sublist(c, s) {

		if (s->finalize) {

			feature = s->feature;

			vcpu_ioctl(vm, vcpuid, KVM_ARM_VCPU_FINALIZE, &feature);

			vcpu_ioctl(vcpu, KVM_ARM_VCPU_FINALIZE, &feature);

		}

	}

}
@@ -420,10 +420,10 @@ static void run_test(struct vcpu_config *c) 
	vm = vm_create_barebones();

	prepare_vcpu_init(c, &init);

	vcpu = __vm_vcpu_add(vm, 0);

	aarch64_vcpu_setup(vm, vcpu->id, &init);

	finalize_vcpu(vm, vcpu->id, c);

	aarch64_vcpu_setup(vcpu, &init);

	finalize_vcpu(vcpu, c);



	reg_list = vcpu_get_reg_list(vm, vcpu->id);

	reg_list = vcpu_get_reg_list(vcpu);



	if (fixup_core_regs)

		core_reg_fixup();
@@ -459,7 +459,7 @@ static void run_test(struct vcpu_config *c) 
		bool reject_reg = false;

		int ret;



		ret = __vcpu_get_reg(vm, vcpu->id, reg_list->reg[i], &addr);

		ret = __vcpu_get_reg(vcpu, reg_list->reg[i], &addr);

		if (ret) {

			printf("%s: Failed to get ", config_name(c));

			print_reg(c, reg.id);
@@ -471,7 +471,7 @@ static void run_test(struct vcpu_config *c) 
		for_each_sublist(c, s) {

			if (s->rejects_set && find_reg(s->rejects_set, s->rejects_set_n, reg.id)) {

				reject_reg = true;

				ret = __vcpu_ioctl(vm, vcpu->id, KVM_SET_ONE_REG, &reg);

				ret = __vcpu_ioctl(vcpu, KVM_SET_ONE_REG, &reg);

				if (ret != -1 || errno != EPERM) {

					printf("%s: Failed to reject (ret=%d, errno=%d) ", config_name(c), ret, errno);

					print_reg(c, reg.id);
@@ -483,7 +483,7 @@ static void run_test(struct vcpu_config *c) 
		}



		if (!reject_reg) {

			ret = __vcpu_ioctl(vm, vcpu->id, KVM_SET_ONE_REG, &reg);

			ret = __vcpu_ioctl(vcpu, KVM_SET_ONE_REG, &reg);

			if (ret) {

				printf("%s: Failed to set ", config_name(c));

				print_reg(c, reg.id);

tools/testing/selftests/kvm/aarch64/hypercalls.c

+9 −9
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static void steal_time_init(struct kvm_vcpu *vcpu) 
	gpages = vm_calc_num_guest_pages(VM_MODE_DEFAULT, STEAL_TIME_SIZE);

	vm_userspace_mem_region_add(vcpu->vm, VM_MEM_SRC_ANONYMOUS, ST_GPA_BASE, 1, gpages, 0);



	vcpu_device_attr_set(vcpu->vm, vcpu->id, KVM_ARM_VCPU_PVTIME_CTRL,

	vcpu_device_attr_set(vcpu, KVM_ARM_VCPU_PVTIME_CTRL,

			     KVM_ARM_VCPU_PVTIME_IPA, &st_ipa);

}
@@ -172,18 +172,18 @@ static void test_fw_regs_before_vm_start(struct kvm_vcpu *vcpu) 
		const struct kvm_fw_reg_info *reg_info = &fw_reg_info[i];



		/* First 'read' should be an upper limit of the features supported */

		vcpu_get_reg(vcpu->vm, vcpu->id, reg_info->reg, &val);

		vcpu_get_reg(vcpu, reg_info->reg, &val);

		TEST_ASSERT(val == FW_REG_ULIMIT_VAL(reg_info->max_feat_bit),

			"Expected all the features to be set for reg: 0x%lx; expected: 0x%lx; read: 0x%lx\n",

			reg_info->reg, FW_REG_ULIMIT_VAL(reg_info->max_feat_bit), val);



		/* Test a 'write' by disabling all the features of the register map */

		ret = __vcpu_set_reg(vcpu->vm, vcpu->id, reg_info->reg, 0);

		ret = __vcpu_set_reg(vcpu, reg_info->reg, 0);

		TEST_ASSERT(ret == 0,

			"Failed to clear all the features of reg: 0x%lx; ret: %d\n",

			reg_info->reg, errno);



		vcpu_get_reg(vcpu->vm, vcpu->id, reg_info->reg, &val);

		vcpu_get_reg(vcpu, reg_info->reg, &val);

		TEST_ASSERT(val == 0,

			"Expected all the features to be cleared for reg: 0x%lx\n", reg_info->reg);
@@ -192,7 +192,7 @@ static void test_fw_regs_before_vm_start(struct kvm_vcpu *vcpu) 
		 * Avoid this check if all the bits are occupied.

		 */

		if (reg_info->max_feat_bit < 63) {

			ret = __vcpu_set_reg(vcpu->vm, vcpu->id, reg_info->reg, BIT(reg_info->max_feat_bit + 1));

			ret = __vcpu_set_reg(vcpu, reg_info->reg, BIT(reg_info->max_feat_bit + 1));

			TEST_ASSERT(ret != 0 && errno == EINVAL,

			"Unexpected behavior or return value (%d) while setting an unsupported feature for reg: 0x%lx\n",

			errno, reg_info->reg);
@@ -213,7 +213,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vcpu *vcpu) 
		 * Before starting the VM, the test clears all the bits.

		 * Check if that's still the case.

		 */

		vcpu_get_reg(vcpu->vm, vcpu->id, reg_info->reg, &val);

		vcpu_get_reg(vcpu, reg_info->reg, &val);

		TEST_ASSERT(val == 0,

			"Expected all the features to be cleared for reg: 0x%lx\n",

			reg_info->reg);
@@ -223,7 +223,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vcpu *vcpu) 
		 * the registers and should return EBUSY. Set the registers and check for

		 * the expected errno.

		 */

		ret = __vcpu_set_reg(vcpu->vm, vcpu->id, reg_info->reg, FW_REG_ULIMIT_VAL(reg_info->max_feat_bit));

		ret = __vcpu_set_reg(vcpu, reg_info->reg, FW_REG_ULIMIT_VAL(reg_info->max_feat_bit));

		TEST_ASSERT(ret != 0 && errno == EBUSY,

		"Unexpected behavior or return value (%d) while setting a feature while VM is running for reg: 0x%lx\n",

		errno, reg_info->reg);
@@ -281,9 +281,9 @@ static void test_run(void) 
	test_fw_regs_before_vm_start(vcpu);



	while (!guest_done) {

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

		vcpu_run(vcpu);



		switch (get_ucall(vcpu->vm, vcpu->id, &uc)) {

		switch (get_ucall(vcpu, &uc)) {

		case UCALL_SYNC:

			test_guest_stage(&vm, &vcpu);

			break;

tools/testing/selftests/kvm/aarch64/psci_test.c

+8 −8
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void vcpu_power_off(struct kvm_vcpu *vcpu) 
		.mp_state = KVM_MP_STATE_STOPPED,

	};



	vcpu_mp_state_set(vcpu->vm, vcpu->id, &mp_state);

	vcpu_mp_state_set(vcpu, &mp_state);

}



static struct kvm_vm *setup_vm(void *guest_code, struct kvm_vcpu **source,
@@ -92,8 +92,8 @@ static void enter_guest(struct kvm_vcpu *vcpu) 
{

	struct ucall uc;



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

	if (get_ucall(vcpu->vm, vcpu->id, &uc) == UCALL_ABORT)

	vcpu_run(vcpu);

	if (get_ucall(vcpu, &uc) == UCALL_ABORT)

		TEST_FAIL("%s at %s:%ld", (const char *)uc.args[0], __FILE__,

			  uc.args[1]);

}
@@ -102,8 +102,8 @@ static void assert_vcpu_reset(struct kvm_vcpu *vcpu) 
{

	uint64_t obs_pc, obs_x0;



	vcpu_get_reg(vcpu->vm, vcpu->id, ARM64_CORE_REG(regs.pc), &obs_pc);

	vcpu_get_reg(vcpu->vm, vcpu->id, ARM64_CORE_REG(regs.regs[0]), &obs_x0);

	vcpu_get_reg(vcpu, ARM64_CORE_REG(regs.pc), &obs_pc);

	vcpu_get_reg(vcpu, ARM64_CORE_REG(regs.regs[0]), &obs_x0);



	TEST_ASSERT(obs_pc == CPU_ON_ENTRY_ADDR,

		    "unexpected target cpu pc: %lx (expected: %lx)",
@@ -143,11 +143,11 @@ static void host_test_cpu_on(void) 
	 */

	vcpu_power_off(target);



	vcpu_get_reg(vm, target->id, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), &target_mpidr);

	vcpu_args_set(vm, source->id, 1, target_mpidr & MPIDR_HWID_BITMASK);

	vcpu_get_reg(target, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), &target_mpidr);

	vcpu_args_set(source, 1, target_mpidr & MPIDR_HWID_BITMASK);

	enter_guest(source);



	if (get_ucall(vm, source->id, &uc) != UCALL_DONE)

	if (get_ucall(source, &uc) != UCALL_DONE)

		TEST_FAIL("Unhandled ucall: %lu", uc.cmd);



	assert_vcpu_reset(target);