[PULL 0/2] x86 queue, 2021-08-25

[PULL 0/2] x86 queue, 2021-08-25

[Eduardo Habkost]

The following changes since commit d42685765653ec155fdf60910662f8830bdb2cef:

  Open 6.2 development tree (2021-08-25 10:25:12 +0100)

are available in the Git repository at:

  https://gitlab.com/ehabkost/qemu.git tags/x86-next-pull-request

for you to fetch changes up to f429dbf8fc526a9cacf531176b28d0c65701475a:

  i386/cpu: Remove AVX_VNNI feature from Cooperlake cpu model (2021-08-25 12:36:49 -0400)

----------------------------------------------------------------
x86 queue, 2021-08-25

Bug fixes:
* Remove split lock detect in Snowridge CPU model (Chenyi Qiang)
* Remove AVX_VNNI feature from Cooperlake cpu model (Yang Zhong)

----------------------------------------------------------------

Chenyi Qiang (1):
  target/i386: Remove split lock detect in Snowridge CPU model

Yang Zhong (1):
  i386/cpu: Remove AVX_VNNI feature from Cooperlake cpu model

 target/i386/cpu.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

-- 
2.31.1

[PULL 1/2] target/i386: Remove split lock detect in Snowridge CPU model

[Eduardo Habkost]

From: Chenyi Qiang <chenyi.qiang@intel.com>

At present, there's no mechanism intelligent enough to virtualize split
lock detection correctly. Remove it in Snowridge CPU model to avoid the
feature exposure.

Signed-off-by: Chenyi Qiang <chenyi.qiang@intel.com>
Message-Id: <20210630012053.10098-1-chenyi.qiang@intel.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target/i386/cpu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 34a7ce865bb..aebf81d9c98 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3682,6 +3682,14 @@ static const X86CPUDefinition builtin_x86_defs[] = {
                     { /* end of list */ },
                 },
             },
+            {
+                .version = 4,
+                .note = "no split lock detect",
+                .props = (PropValue[]) {
+                    { "split-lock-detect", "off" },
+                    { /* end of list */ },
+                },
+            },
             { /* end of list */ },
         },
     },
-- 
2.31.1

[PULL 2/2] i386/cpu: Remove AVX_VNNI feature from Cooperlake cpu model

[Eduardo Habkost]

From: Yang Zhong <yang.zhong@intel.com>

The AVX_VNNI feature is not in Cooperlake platform, remove it
from cpu model.

Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Message-Id: <20210820054611.84303-1-yang.zhong@intel.com>
Fixes: c1826ea6a052 ("i386/cpu: Expose AVX_VNNI instruction to guest")
Cc: qemu-stable@nongnu.org
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target/i386/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index aebf81d9c98..97e250e8760 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3102,7 +3102,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
             MSR_ARCH_CAP_SKIP_L1DFL_VMENTRY | MSR_ARCH_CAP_MDS_NO |
             MSR_ARCH_CAP_PSCHANGE_MC_NO | MSR_ARCH_CAP_TAA_NO,
         .features[FEAT_7_1_EAX] =
-            CPUID_7_1_EAX_AVX_VNNI | CPUID_7_1_EAX_AVX512_BF16,
+            CPUID_7_1_EAX_AVX512_BF16,
         /* XSAVES is added in version 2 */
         .features[FEAT_XSAVE] =
             CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
-- 
2.31.1

Re: [PULL 0/2] x86 queue, 2021-08-25

[Peter Maydell]

On Wed, 25 Aug 2021 at 20:54, Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> The following changes since commit d42685765653ec155fdf60910662f8830bdb2cef:
>
>   Open 6.2 development tree (2021-08-25 10:25:12 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/ehabkost/qemu.git tags/x86-next-pull-request
>
> for you to fetch changes up to f429dbf8fc526a9cacf531176b28d0c65701475a:
>
>   i386/cpu: Remove AVX_VNNI feature from Cooperlake cpu model (2021-08-25 12:36:49 -0400)
>
> ----------------------------------------------------------------
> x86 queue, 2021-08-25
>
> Bug fixes:
> * Remove split lock detect in Snowridge CPU model (Chenyi Qiang)
> * Remove AVX_VNNI feature from Cooperlake cpu model (Yang Zhong)
>
> ----------------------------------------------------------------



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.2
for any user-visible changes.

-- PMM