[11/42] KVM: selftests: Use kvm_cpu_has() in AMX test

Message ID	20220604012058.1972195-12-seanjc@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> Reply-To: Sean Christopherson <seanjc@google.com> Date: Sat, 4 Jun 2022 01:20:27 +0000 In-Reply-To: <20220604012058.1972195-1-seanjc@google.com> Message-Id: <20220604012058.1972195-12-seanjc@google.com> Mime-Version: 1.0 References: <20220604012058.1972195-1-seanjc@google.com> Subject: [PATCH 11/42] KVM: selftests: Use kvm_cpu_has() in AMX test From: Sean Christopherson <seanjc@google.com> To: Paolo Bonzini <pbonzini@redhat.com> Cc: kvm@vger.kernel.org, Vitaly Kuznetsov <vkuznets@redhat.com>, David Matlack <dmatlack@google.com>, Jim Mattson <jmattson@google.com>, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	KVM: selftests: Overhaul Part II - CPUID \| expand [00/42] KVM: selftests: Overhaul Part II - CPUID [01/42] KVM: selftests: Set KVM's supported CPUID as vCPU's CPUID during recreate [02/42] KVM: sefltests: Use CPUID_XSAVE and CPUID_OSXAVE instead of X86_FEATURE_* [03/42] KVM: selftests: Add framework to query KVM CPUID bits [04/42] KVM: selftests: Use kvm_cpu_has() in the SEV migration test [05/42] KVM: selftests: Use kvm_cpu_has() for nested SVM checks [06/42] KVM: selftests: Use kvm_cpu_has() for nested VMX checks [07/42] KVM: selftests: Use kvm_cpu_has() to query PDCM in PMU selftest [08/42] KVM: selftests: Drop redundant vcpu_set_cpuid() from PMU selftest [09/42] KVM: selftests: Use kvm_cpu_has() for XSAVES in XSS MSR test [10/42] KVM: selftests: Check for _both_ XTILE data and cfg in AMX test [11/42] KVM: selftests: Use kvm_cpu_has() in AMX test [12/42] KVM: selftests: Use kvm_cpu_has() for XSAVE in cr4_cpuid_sync_test [13/42] KVM: selftests: Remove the obsolete/dead MMU role test [14/42] KVM: selftests: Use kvm_cpu_has() for KVM's PV steal time [15/42] KVM: selftests: Use kvm_cpu_has() for nSVM soft INT injection test [16/42] KVM: selftests: Verify that kvm_cpuid2.entries layout is unchanged by KVM [17/42] KVM: selftests: Split out kvm_cpuid2_size() from allocate_kvm_cpuid2() [18/42] KVM: selftests: Cache CPUID in struct kvm_vcpu [19/42] KVM: selftests: Don't use a static local in vcpu_get_supported_hv_cpuid() [20/42] KVM: selftests: Rename and tweak get_cpuid() to get_cpuid_entry() [21/42] KVM: selftests: Use get_cpuid_entry() in kvm_get_supported_cpuid_index() [22/42] KVM: selftests: Add helpers to get and modify a vCPU's CPUID entries [23/42] KVM: selftests: Use vm->pa_bits to generate reserved PA bits [24/42] KVM: selftests: Add and use helper to set vCPU's CPUID maxphyaddr [25/42] KVM: selftests: Use vcpu_get_cpuid_entry() in PV features test (sort of) [26/42] KVM: selftests: Use vCPU's CPUID directly in Hyper-V test [27/42] KVM: selftests: Use vcpu_get_cpuid_entry() in CPUID test [28/42] KVM: selftests: Use vcpu_{set,clear}_cpuid_feature() in nVMX state test [29/42] KVM: selftests: Use vcpu_clear_cpuid_feature() to clear x2APIC [30/42] KVM: selftests: Make get_supported_cpuid() returns "const" [31/42] KVM: selftests: Set input function/index in raw CPUID helper(s) [32/42] KVM: selftests: Add this_cpu_has() to query X86_FEATURE_* via cpuid() [33/42] KVM: selftests: Use this_cpu_has() in CR4/CPUID sync test [34/42] KVM: selftests: Use this_cpu_has() to detect SVM support in L1 [35/42] KVM: selftests: Drop unnecessary use of kvm_get_supported_cpuid_index() [36/42] KVM: selftests: Rename kvm_get_supported_cpuid_index() to __..._entry() [37/42] KVM: selftests: Inline "get max CPUID leaf" helpers [38/42] KVM: selftests: Check KVM's supported CPUID, not host CPUID, for XFD [39/42] KVM: selftests: Skip AMX test if ARCH_REQ_XCOMP_GUEST_PERM isn't supported [40/42] KVM: selftests: Clean up requirements for XFD-aware XSAVE features [41/42] KVM: selftests: Use the common cpuid() helper in cpu_vendor_string_is() [42/42] KVM: selftests: Drop unused SVM_CPUID_FUNC macro

Message ID

20220604012058.1972195-12-seanjc@google.com (mailing list archive)

State

New, archived

Headers

Reply-To: Sean Christopherson <seanjc@google.com>
Date: Sat,  4 Jun 2022 01:20:27 +0000
In-Reply-To: <20220604012058.1972195-1-seanjc@google.com>
Message-Id: <20220604012058.1972195-12-seanjc@google.com>
Mime-Version: 1.0
References: <20220604012058.1972195-1-seanjc@google.com>
Subject: [PATCH 11/42] KVM: selftests: Use kvm_cpu_has() in AMX test
From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, Vitaly Kuznetsov <vkuznets@redhat.com>,
        David Matlack <dmatlack@google.com>,
        Jim Mattson <jmattson@google.com>, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Series

KVM: selftests: Overhaul Part II - CPUID | expand

Commit Message

Sean Christopherson June 4, 2022, 1:20 a.m. UTC

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>
---
 .../selftests/kvm/include/x86_64/processor.h    |  3 +++
 tools/testing/selftests/kvm/x86_64/amx_test.c   | 17 ++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
index 7992c665be1f..9a7ce6b047f1 100644
--- a/tools/testing/selftests/kvm/include/x86_64/processor.h
+++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
@@ -107,9 +107,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 dcad838953d0..bcf535646321 100644
--- 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);

[11/42] KVM: selftests: Use kvm_cpu_has() in AMX test

Commit Message

Patch