Commit d01d4a4f authored by Aaron Lewis's avatar Aaron Lewis Committed by Sean Christopherson
Browse files

KVM: selftests: Move XSAVE and OSXSAVE CPUID checks into AMX's init_regs() 



Move the checks on XSAVE and OSXSAVE into init_regs() so that the XSAVE
check is done before setting CR4.OSXSAVE, i.e. before a potential #GP, and
so that the OSXSAVE check is performend immediately after enabling XSAVE
in CR4.

Signed-off-by: default avatarAaron Lewis <aaronlewis@google.com>
Signed-off-by: default avatarMingwei Zhang <mizhang@google.com>
Link: https://lore.kernel.org/r/20230221163655.920289-12-mizhang@google.com


[sean: keep XSAVE check, rewrite changelog accordingly]
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 2ab3991b

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

+3 −7
Original line number Diff line number Diff line
@@ -109,12 +109,6 @@ static inline void __xsavec(struct xstate *xstate, uint64_t rfbm) 
		     : "memory");

}



static inline void check_cpuid_xsave(void)

{

	GUEST_ASSERT(this_cpu_has(X86_FEATURE_XSAVE));

	GUEST_ASSERT(this_cpu_has(X86_FEATURE_OSXSAVE));

}



static void check_xtile_info(void)

{

	GUEST_ASSERT(this_cpu_has_p(X86_PROPERTY_XSTATE_MAX_SIZE_XCR0));
@@ -153,10 +147,13 @@ static void init_regs(void) 
{

	uint64_t cr4, xcr0;



	GUEST_ASSERT(this_cpu_has(X86_FEATURE_XSAVE));



	/* turn on CR4.OSXSAVE */

	cr4 = get_cr4();

	cr4 |= X86_CR4_OSXSAVE;

	set_cr4(cr4);

	GUEST_ASSERT(this_cpu_has(X86_FEATURE_OSXSAVE));



	xcr0 = __xgetbv(0);

	xcr0 |= XFEATURE_MASK_XTILE;
@@ -169,7 +166,6 @@ static void __attribute__((__flatten__)) guest_code(struct tile_config *amx_cfg, 
						    struct xstate *xstate)

{

	init_regs();

	check_cpuid_xsave();

	check_xtile_info();

	GUEST_SYNC(1);