diff mbox series

KVM: selftests: Ignore CPUID.0DH.1H in get_cpuid_test

Message ID 20210519211345.3944063-1-dmatlack@google.com (mailing list archive)
State New, archived
Headers show
Series KVM: selftests: Ignore CPUID.0DH.1H in get_cpuid_test | expand

Commit Message

David Matlack May 19, 2021, 9:13 p.m. UTC
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.

Signed-off-by: David Matlack <dmatlack@google.com>
---
 tools/testing/selftests/kvm/x86_64/get_cpuid_test.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

David Matlack May 19, 2021, 9:14 p.m. UTC | #1
On Wed, May 19, 2021 at 2:13 PM David Matlack <dmatlack@google.com> wrote:
>
> 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.
>
> Signed-off-by: David Matlack <dmatlack@google.com>

Apologies, forgot to add:

Suggested-by: Jim Mattson <jmattson@google.com>

> ---
>  tools/testing/selftests/kvm/x86_64/get_cpuid_test.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> 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)
> --
> 2.31.1.751.gd2f1c929bd-goog
>
Paolo Bonzini May 24, 2021, 12:31 p.m. UTC | #2
On 19/05/21 23:13, David Matlack wrote:
> 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.
> 
> Signed-off-by: David Matlack <dmatlack@google.com>
> ---
>   tools/testing/selftests/kvm/x86_64/get_cpuid_test.c | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> 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)
> 

Queued, thanks.

Paolo
diff mbox series

Patch

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)