KVM: selftests: Use kvm_cpu_has() in AMX test

Use kvm_cpu_has() in the AMX test instead of open coding equivalent
functionality using kvm_get_supported_cpuid_entry() and
kvm_get_supported_cpuid_index().

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20220614200707.3315957-12-seanjc@google.com

diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
index 227473ab8ec6a8c30e23e2c338c5d76f0db3d5e7..3b819bf673ac794d7c5bd3fe85bb46ba9e73d006 100644 (file)
--- a/tools/testing/selftests/kvm/include/x86_64/processor.h
+++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
@@ -109,9 +109,12 @@ struct kvm_x86_cpu_feature {
 #define        X86_FEATURE_RDPID               KVM_X86_CPU_FEATURE(0x7, 0, ECX, 22)
 #define        X86_FEATURE_SHSTK               KVM_X86_CPU_FEATURE(0x7, 0, ECX, 7)
 #define        X86_FEATURE_IBT                 KVM_X86_CPU_FEATURE(0x7, 0, EDX, 20)
+#define        X86_FEATURE_AMX_TILE            KVM_X86_CPU_FEATURE(0x7, 0, EDX, 24)
 #define        X86_FEATURE_SPEC_CTRL           KVM_X86_CPU_FEATURE(0x7, 0, EDX, 26)
 #define        X86_FEATURE_ARCH_CAPABILITIES   KVM_X86_CPU_FEATURE(0x7, 0, EDX, 29)
 #define        X86_FEATURE_PKS                 KVM_X86_CPU_FEATURE(0x7, 0, ECX, 31)
+#define        X86_FEATURE_XTILECFG            KVM_X86_CPU_FEATURE(0xD, 0, EAX, 17)
+#define        X86_FEATURE_XTILEDATA           KVM_X86_CPU_FEATURE(0xD, 0, EAX, 18)
 #define        X86_FEATURE_XSAVES              KVM_X86_CPU_FEATURE(0xD, 1, EAX, 3)
 
 /*

diff --git a/tools/testing/selftests/kvm/x86_64/amx_test.c b/tools/testing/selftests/kvm/x86_64/amx_test.c
index 6fc4e652b38f1bcfb5bd90a542f9db6acaeb40c7..c8f98331a807bcd78ef949991890f583821782c6 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/amx_test.c
+++ b/tools/testing/selftests/kvm/x86_64/amx_test.c
@@ -312,13 +312,12 @@ void guest_nm_handler(struct ex_regs *regs)
 
 int main(int argc, char *argv[])
 {
-       struct kvm_cpuid_entry2 *entry;
        struct kvm_regs regs1, regs2;
        struct kvm_vcpu *vcpu;
        struct kvm_vm *vm;
        struct kvm_run *run;
        struct kvm_x86_state *state;
-       int xsave_restore_size = 0;
+       int xsave_restore_size;
        vm_vaddr_t amx_cfg, tiledata, xsavedata;
        struct ucall uc;
        u32 amx_offset;
@@ -329,17 +328,13 @@ int main(int argc, char *argv[])
        /* Create VM */
        vm = vm_create_with_one_vcpu(&vcpu, guest_code);
 
-       entry = kvm_get_supported_cpuid_entry(1);
-       TEST_REQUIRE(entry->ecx & CPUID_XSAVE);
-
-       TEST_REQUIRE(kvm_get_cpuid_max_basic() >= 0xd);
-
-       entry = kvm_get_supported_cpuid_index(0xd, 0);
-       TEST_REQUIRE(entry->eax & XFEATURE_MASK_XTILECFG);
-       TEST_REQUIRE(entry->eax & XFEATURE_MASK_XTILEDATA);
+       TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XSAVE));
+       TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_AMX_TILE));
+       TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XTILECFG));
+       TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XTILEDATA));
 
        /* Get xsave/restore max size */
-       xsave_restore_size = entry->ecx;
+       xsave_restore_size = kvm_get_supported_cpuid_index(0xd, 0)->ecx;
 
        run = vcpu->run;
        vcpu_regs_get(vcpu, &regs1);