Commit 551447cf authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

selftest: kvm: Reorder vcpu_load_state steps for AMX 



For AMX support it is recommended to load XCR0 after XFD, so
that KVM does not see XFD=0, XCR=1 for a save state that will
eventually be disabled (which would lead to premature allocation
of the space required for that save state).

It is also required to load XSAVE data after XCR0 and XFD, so
that KVM can trigger allocation of the extra space required to
store AMX state.

Adjust vcpu_load_state to obey these new requirements.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarYang Zhong <yang.zhong@intel.com>
Message-Id: <20211223145322.2914028-2-yang.zhong@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b5274b1b

tools/testing/selftests/kvm/lib/x86_64/processor.c

+9 −8
Original line number Diff line number Diff line
@@ -1212,24 +1212,25 @@ void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_x86_state *s 
	struct vcpu *vcpu = vcpu_find(vm, vcpuid);

	int r;



	r = ioctl(vcpu->fd, KVM_SET_XSAVE, state->xsave);

        TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_XSAVE, r: %i",

	r = ioctl(vcpu->fd, KVM_SET_SREGS, &state->sregs);

	TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_SREGS, r: %i",

                r);



	r = ioctl(vcpu->fd, KVM_SET_MSRS, &state->msrs);

	TEST_ASSERT(r == state->msrs.nmsrs,

		"Unexpected result from KVM_SET_MSRS, r: %i (failed at %x)",

		r, r == state->msrs.nmsrs ? -1 : state->msrs.entries[r].index);



	if (kvm_check_cap(KVM_CAP_XCRS)) {

		r = ioctl(vcpu->fd, KVM_SET_XCRS, &state->xcrs);

		TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_XCRS, r: %i",

			    r);

	}



	r = ioctl(vcpu->fd, KVM_SET_SREGS, &state->sregs);

        TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_SREGS, r: %i",

	r = ioctl(vcpu->fd, KVM_SET_XSAVE, state->xsave);

	TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_XSAVE, r: %i",

                r);



	r = ioctl(vcpu->fd, KVM_SET_MSRS, &state->msrs);

        TEST_ASSERT(r == state->msrs.nmsrs, "Unexpected result from KVM_SET_MSRS, r: %i (failed at %x)",

                r, r == state->msrs.nmsrs ? -1 : state->msrs.entries[r].index);



	r = ioctl(vcpu->fd, KVM_SET_VCPU_EVENTS, &state->events);

        TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_VCPU_EVENTS, r: %i",

                r);