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

KVM: selftests: Convert cr4_cpuid_sync_test away from VCPU_ID 



Convert cr4_cpuid_sync_test to use vm_create_with_one_vcpu() and pass
around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.  Note,
this is a "functional" change in the sense that the test now creates a vCPU
with vcpu_id==0 instead of vcpu_id==1.  The non-zero VCPU_ID was 100%
arbitrary and added little to no validation coverage.  If testing non-zero
vCPU IDs is desirable for generic tests, that can be done in the future by
tweaking the VM creation helpers.

Opportunistically use vcpu_run() instead of _vcpu_run() with an open
coded assert that KVM_RUN succeeded.

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

tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c

+7 −10
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#define X86_FEATURE_XSAVE	(1<<26)

#define X86_FEATURE_OSXSAVE	(1<<27)

#define VCPU_ID			1



static inline bool cr4_cpuid_is_sync(void)

{
@@ -63,12 +62,12 @@ static void guest_code(void) 


int main(int argc, char *argv[])

{

	struct kvm_vcpu *vcpu;

	struct kvm_run *run;

	struct kvm_vm *vm;

	struct kvm_sregs sregs;

	struct kvm_cpuid_entry2 *entry;

	struct ucall uc;

	int rc;



	entry = kvm_get_supported_cpuid_entry(1);

	if (!(entry->ecx & X86_FEATURE_XSAVE)) {
@@ -79,25 +78,23 @@ int main(int argc, char *argv[]) 
	/* Tell stdout not to buffer its content */

	setbuf(stdout, NULL);



	/* Create VM */

	vm = vm_create_default(VCPU_ID, 0, guest_code);

	run = vcpu_state(vm, VCPU_ID);

	vm = vm_create_with_one_vcpu(&vcpu, guest_code);

	run = vcpu->run;



	while (1) {

		rc = _vcpu_run(vm, VCPU_ID);

		vcpu_run(vm, vcpu->id);



		TEST_ASSERT(rc == 0, "vcpu_run failed: %d\n", rc);

		TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,

			    "Unexpected exit reason: %u (%s),\n",

			    run->exit_reason,

			    exit_reason_str(run->exit_reason));



		switch (get_ucall(vm, VCPU_ID, &uc)) {

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

		case UCALL_SYNC:

			/* emulate hypervisor clearing CR4.OSXSAVE */

			vcpu_sregs_get(vm, VCPU_ID, &sregs);

			vcpu_sregs_get(vm, vcpu->id, &sregs);

			sregs.cr4 &= ~X86_CR4_OSXSAVE;

			vcpu_sregs_set(vm, VCPU_ID, &sregs);

			vcpu_sregs_set(vm, vcpu->id, &sregs);

			break;

		case UCALL_ABORT:

			TEST_FAIL("Guest CR4 bit (OSXSAVE) unsynchronized with CPUID bit.");