Commit 2f8ebe43 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-selftests-6.8-rcN' of https://github.com/kvm-x86/linux into HEAD 

KVM selftests fixes/cleanups (and one KVM x86 cleanup) for 6.8:

 - Remove redundant newlines from error messages.

 - Delete an unused variable in the AMX test (which causes build failures when
   compiling with -Werror).

 - Fail instead of skipping tests if open(), e.g. of /dev/kvm, fails with an
   error code other than ENOENT (a Hyper-V selftest bug resulted in an EMFILE,
   and the test eventually got skipped).

 - Fix TSC related bugs in several Hyper-V selftests.

 - Fix a bug in the dirty ring logging test where a sem_post() could be left
   pending across multiple runs, resulting in incorrect synchronization between
   the main thread and the vCPU worker thread.

 - Relax the dirty log split test's assertions on 4KiB mappings to fix false
   positives due to the number of mappings for memslot 0 (used for code and
   data that is NOT being dirty logged) changing, e.g. due to NUMA balancing.

 - Have KVM's gtod_is_based_on_tsc() return "bool" instead of an "int" (the
   function generates boolean values, and all callers treat the return value as
   a bool).
parents 22d0bc07 6fd78bee

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -2506,7 +2506,7 @@ static u64 compute_guest_tsc(struct kvm_vcpu *vcpu, s64 kernel_ns) 
}



#ifdef CONFIG_X86_64

static inline int gtod_is_based_on_tsc(int mode)

static inline bool gtod_is_based_on_tsc(int mode)

{

	return mode == VDSO_CLOCKMODE_TSC || mode == VDSO_CLOCKMODE_HVCLOCK;

}

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

+6 −6
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static void *test_vcpu_run(void *arg) 
		REPORT_GUEST_ASSERT(uc);

		break;

	default:

		TEST_FAIL("Unexpected guest exit\n");

		TEST_FAIL("Unexpected guest exit");

	}



	return NULL;
@@ -287,7 +287,7 @@ static int test_migrate_vcpu(unsigned int vcpu_idx) 


	/* Allow the error where the vCPU thread is already finished */

	TEST_ASSERT(ret == 0 || ret == ESRCH,

		    "Failed to migrate the vCPU:%u to pCPU: %u; ret: %d\n",

		    "Failed to migrate the vCPU:%u to pCPU: %u; ret: %d",

		    vcpu_idx, new_pcpu, ret);



	return ret;
@@ -326,12 +326,12 @@ static void test_run(struct kvm_vm *vm) 


	pthread_mutex_init(&vcpu_done_map_lock, NULL);

	vcpu_done_map = bitmap_zalloc(test_args.nr_vcpus);

	TEST_ASSERT(vcpu_done_map, "Failed to allocate vcpu done bitmap\n");

	TEST_ASSERT(vcpu_done_map, "Failed to allocate vcpu done bitmap");



	for (i = 0; i < (unsigned long)test_args.nr_vcpus; i++) {

		ret = pthread_create(&pt_vcpu_run[i], NULL, test_vcpu_run,

				     (void *)(unsigned long)i);

		TEST_ASSERT(!ret, "Failed to create vCPU-%d pthread\n", i);

		TEST_ASSERT(!ret, "Failed to create vCPU-%d pthread", i);

	}



	/* Spawn a thread to control the vCPU migrations */
@@ -340,7 +340,7 @@ static void test_run(struct kvm_vm *vm) 


		ret = pthread_create(&pt_vcpu_migration, NULL,

					test_vcpu_migration, NULL);

		TEST_ASSERT(!ret, "Failed to create the migration pthread\n");

		TEST_ASSERT(!ret, "Failed to create the migration pthread");

	}
@@ -384,7 +384,7 @@ static struct kvm_vm *test_vm_create(void) 
		if (kvm_has_cap(KVM_CAP_COUNTER_OFFSET))

			vm_ioctl(vm, KVM_ARM_SET_COUNTER_OFFSET, &test_args.offset);

		else

			TEST_FAIL("no support for global offset\n");

			TEST_FAIL("no support for global offset");

	}



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

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

+8 −8
Original line number Diff line number Diff line
@@ -175,18 +175,18 @@ static void test_fw_regs_before_vm_start(struct kvm_vcpu *vcpu) 
		/* First 'read' should be an upper limit of the features supported */

		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",

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

			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, reg_info->reg, 0);

		TEST_ASSERT(ret == 0,

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

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

			reg_info->reg, errno);



		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);

			"Expected all the features to be cleared for reg: 0x%lx", reg_info->reg);



		/*

		 * Test enabling a feature that's not supported.
@@ -195,7 +195,7 @@ static void test_fw_regs_before_vm_start(struct kvm_vcpu *vcpu) 
		if (reg_info->max_feat_bit < 63) {

			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",

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

			errno, reg_info->reg);

		}

	}
@@ -216,7 +216,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vcpu *vcpu) 
		 */

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

		TEST_ASSERT(val == 0,

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

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

			reg_info->reg);



		/*
@@ -226,7 +226,7 @@ static void test_fw_regs_after_vm_start(struct kvm_vcpu *vcpu) 
		 */

		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",

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

		errno, reg_info->reg);

	}

}
@@ -265,7 +265,7 @@ static void test_guest_stage(struct kvm_vm **vm, struct kvm_vcpu **vcpu) 
	case TEST_STAGE_HVC_IFACE_FALSE_INFO:

		break;

	default:

		TEST_FAIL("Unknown test stage: %d\n", prev_stage);

		TEST_FAIL("Unknown test stage: %d", prev_stage);

	}

}
@@ -294,7 +294,7 @@ static void test_run(void) 
			REPORT_GUEST_ASSERT(uc);

			break;

		default:

			TEST_FAIL("Unexpected guest exit\n");

			TEST_FAIL("Unexpected guest exit");

		}

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -414,10 +414,10 @@ static bool punch_hole_in_backing_store(struct kvm_vm *vm, 
	if (fd != -1) {

		ret = fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,

				0, paging_size);

		TEST_ASSERT(ret == 0, "fallocate failed\n");

		TEST_ASSERT(ret == 0, "fallocate failed");

	} else {

		ret = madvise(hva, paging_size, MADV_DONTNEED);

		TEST_ASSERT(ret == 0, "madvise failed\n");

		TEST_ASSERT(ret == 0, "madvise failed");

	}



	return true;
@@ -501,7 +501,7 @@ static bool handle_cmd(struct kvm_vm *vm, int cmd) 


void fail_vcpu_run_no_handler(int ret)

{

	TEST_FAIL("Unexpected vcpu run failure\n");

	TEST_FAIL("Unexpected vcpu run failure");

}



void fail_vcpu_run_mmio_no_syndrome_handler(int ret)

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

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static void expect_call_denied(struct kvm_vcpu *vcpu) 
	struct ucall uc;



	if (get_ucall(vcpu, &uc) != UCALL_SYNC)

		TEST_FAIL("Unexpected ucall: %lu\n", uc.cmd);

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



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

		    "Unexpected SMCCC return code: %lu", uc.args[1]);