From 766a7ab6a7ebb9e819f6ec9a9b109ec4659388d4 Mon Sep 17 00:00:00 2001

From: Eduardo Habkost <ehabkost@redhat.com>

Date: Thu, 9 May 2019 23:21:08 +0100

Subject: [PATCH 2/2] i386: Disable OSPKE on CPU model definitions

RH-Author: Eduardo Habkost <ehabkost@redhat.com>

Message-id: <20190509232108.25675-3-ehabkost@redhat.com>

Patchwork-id: 87254

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 2/2] i386: Disable OSPKE on CPU model definitions

Bugzilla: 1561761

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Igor Mammedov <imammedo@redhat.com>

RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>

Currently, the Cascadelake-Server, Icelake-Client, and

Icelake-Server are always generating the following warning:

  qemu-system-x86_64: warning: \

    host doesn't support requested feature: CPUID.07H:ECX [bit 4]

This happens because OSPKE was never returned by

GET_SUPPORTED_CPUID or x86_cpu_get_supported_feature_word().

OSPKE is a runtime flag automatically set by the KVM module or by

TCG code, was always cleared by x86_cpu_filter_features(), and

was not supposed to appear on the CPU model table.

Remove the OSPKE flag from the CPU model table entries, to avoid

the bogus warning and avoid returning invalid feature data on

query-cpu-* QMP commands.  As OSPKE was always cleared by

x86_cpu_filter_features(), this won't have any guest-visible

impact.

Include a test case that should detect the problem if we introduce

a similar bug again.

Fixes: c7a88b52f62b ("i386: Add new model of Cascadelake-Server")

Fixes: 8a11c62da914 ("i386: Add new CPU model Icelake-{Server,Client}")

Cc: Tao Xu <tao3.xu@intel.com>

Cc: Robert Hoo <robert.hu@linux.intel.com>

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Message-Id: <20190319200515.14999-1-ehabkost@redhat.com>

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

(cherry picked from commit bb4928c7cafe50ab2137a0034e350ef1bfa044d9)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/cpu.c               |  4 ++--

 tests/acceptance/cpu_queries.py | 33 +++++++++++++++++++++++++++++++++

 2 files changed, 35 insertions(+), 2 deletions(-)

 create mode 100644 tests/acceptance/cpu_queries.py

diff --git a/target/i386/cpu.c b/target/i386/cpu.c

index c56d7e7..8ff6c38 100644

--- a/target/i386/cpu.c

+++ b/target/i386/cpu.c

@@ -2518,7 +2518,7 @@ static X86CPUDefinition builtin_x86_defs[] = {

             CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX,

         .features[FEAT_7_0_ECX] =

             CPUID_7_0_ECX_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU |

-            CPUID_7_0_ECX_OSPKE | CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI |

+            CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI |

             CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ |

             CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG |

             CPUID_7_0_ECX_AVX512_VPOPCNTDQ,

@@ -2576,7 +2576,7 @@ static X86CPUDefinition builtin_x86_defs[] = {

             CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT,

         .features[FEAT_7_0_ECX] =

             CPUID_7_0_ECX_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU |

-            CPUID_7_0_ECX_OSPKE | CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI |

+            CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI |

             CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ |

             CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG |

             CPUID_7_0_ECX_AVX512_VPOPCNTDQ | CPUID_7_0_ECX_LA57,

diff --git a/tests/acceptance/cpu_queries.py b/tests/acceptance/cpu_queries.py

new file mode 100644

index 0000000..e71edec

--- /dev/null

+++ b/tests/acceptance/cpu_queries.py

@@ -0,0 +1,33 @@

+# Sanity check of query-cpu-* results

+#

+# Copyright (c) 2019 Red Hat, Inc.

+#

+# Author:

+#  Eduardo Habkost <ehabkost@redhat.com>

+#

+# This work is licensed under the terms of the GNU GPL, version 2 or

+# later.  See the COPYING file in the top-level directory.

+

+import logging

+

+from avocado_qemu import Test

+

+class QueryCPUModelExpansion(Test):

+    """

+    Run query-cpu-model-expansion for each CPU model, and validate results

+    """

+

+    def test(self):

+        self.vm.set_machine('none')

+        self.vm.add_args('-S')

+        self.vm.launch()

+

+        cpus = self.vm.command('query-cpu-definitions')

+        for c in cpus:

+            print(repr(c))

+            self.assertNotIn('', c['unavailable-features'], c['name'])

+

+        for c in cpus:

+            model = {'name': c['name']}

+            e = self.vm.command('query-cpu-model-expansion', model=model, type='full')

+            self.assertEquals(e['model']['name'], c['name'])

-- 

1.8.3.1