Skip to content

Commit 7e1075f

Browse files
suomilewissean-jc
authored andcommitted
KVM: selftests: Assert that XTILE is XSAVE-enabled
Assert that XTILE is XSAVE-enabled. check_xsave_supports_xtile() doesn't actually check anything since its return value is not used. Add the intended assert. Opportunistically, move the assert to a more appropriate location: immediately after XSETBV and remove check_xsave_supports_xtile(). Fixes: 5dc19f1 ("KVM: selftests: Convert AMX test to use X86_PROPRETY_XXX") Signed-off-by: Aaron Lewis <aaronlewis@google.com> Signed-off-by: Mingwei Zhang <mizhang@google.com> Link: https://lore.kernel.org/r/20230221163655.920289-10-mizhang@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent bfc5afc commit 7e1075f

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@ static inline void check_cpuid_xsave(void)
115115
GUEST_ASSERT(this_cpu_has(X86_FEATURE_OSXSAVE));
116116
}
117117

118-
static bool check_xsave_supports_xtile(void)
119-
{
120-
return __xgetbv(0) & XFEATURE_MASK_XTILE;
121-
}
122-
123118
static void check_xtile_info(void)
124119
{
125120
GUEST_ASSERT(this_cpu_has_p(X86_PROPERTY_XSTATE_MAX_SIZE_XCR0));
@@ -166,6 +161,7 @@ static void init_regs(void)
166161
xcr0 = __xgetbv(0);
167162
xcr0 |= XFEATURE_MASK_XTILE;
168163
__xsetbv(0x0, xcr0);
164+
GUEST_ASSERT(__xgetbv(0) & XFEATURE_MASK_XTILE);
169165
}
170166

171167
static void __attribute__((__flatten__)) guest_code(struct tile_config *amx_cfg,
@@ -174,7 +170,6 @@ static void __attribute__((__flatten__)) guest_code(struct tile_config *amx_cfg,
174170
{
175171
init_regs();
176172
check_cpuid_xsave();
177-
check_xsave_supports_xtile();
178173
check_xtile_info();
179174
GUEST_SYNC(1);
180175

0 commit comments

Comments
 (0)