summary refs log tree commit diff
path: root/tools
diff options
context:
space:
mode:
authorDavid Matlack <dmatlack@google.com>2021-05-19 21:13:45 +0000
committerPaolo Bonzini <pbonzini@redhat.com>2021-05-27 07:45:54 -0400
commit50bc913d526beb9937f1eb0159ec63c43234f961 (patch)
tree11fdbcc7590c55e7018bed7fb075d3f071650c42 /tools
parentef4c9f4f654622fa15b7a94a9bd1f19e76bb7feb (diff)
downloadlinux-50bc913d526beb9937f1eb0159ec63c43234f961.tar.gz
KVM: selftests: Ignore CPUID.0DH.1H in get_cpuid_test
Similar to CPUID.0DH.0H this entry depends on the vCPU's XCR0 register
and IA32_XSS MSR. Since this test does not control for either before
assigning the vCPU's CPUID, these entries will not necessarily match
the supported CPUID exposed by KVM.

This fixes get_cpuid_test on Cascade Lake CPUs.

Suggested-by: Jim Mattson <jmattson@google.com>
Signed-off-by: David Matlack <dmatlack@google.com>
Message-Id: <20210519211345.3944063-1-dmatlack@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/kvm/x86_64/get_cpuid_test.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/testing/selftests/kvm/x86_64/get_cpuid_test.c b/tools/testing/selftests/kvm/x86_64/get_cpuid_test.c
index 9b78e8889638..8c77537af5a1 100644
--- a/tools/testing/selftests/kvm/x86_64/get_cpuid_test.c
+++ b/tools/testing/selftests/kvm/x86_64/get_cpuid_test.c
@@ -19,7 +19,12 @@ struct {
 	u32 function;
 	u32 index;
 } mangled_cpuids[] = {
+	/*
+	 * These entries depend on the vCPU's XCR0 register and IA32_XSS MSR,
+	 * which are not controlled for by this test.
+	 */
 	{.function = 0xd, .index = 0},
+	{.function = 0xd, .index = 1},
 };
 
 static void test_guest_cpuids(struct kvm_cpuid2 *guest_cpuid)