From fa6027e1ad6ead4c4b6a13f1f5359b63fec2e23c Mon Sep 17 00:00:00 2001

Message-Id: <fa6027e1ad6ead4c4b6a13f1f5359b63fec2e23c@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Fri, 27 Mar 2015 12:48:40 +0100

Subject: [PATCH] RHEL: Hack around changed Broadwell/Haswell CPUs

RHEL-only

Upstream tried to solve the change of Broadwell and Haswell CPUs by

removing rtm and hle features from the corresponding CPU models for new

machine types. Then they reverted this and introduced new *-noTSX models

instead. However, the original fix was backported to RHEL.

This patch makes sure Broadwell and Haswell will always contain rtm and

hle features regardless on RHEL version or machine type used.

https://bugzilla.redhat.com/show_bug.cgi?id=1199446

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 src/qemu/qemu_command.c                       | 21 +++++++++++++++++++

 tests/qemuxml2argvdata/cpu-Haswell.args       |  2 +-

 .../qemuxml2argvdata/cpu-host-model-cmt.args  |  2 +-

 .../cpu-translation.x86_64-4.0.0.args         |  2 +-

 .../cpu-translation.x86_64-latest.args        |  2 +-

 tests/qemuxml2argvdata/cpu-tsc-frequency.args |  2 +-

 tests/qemuxml2argvdata/q35-acpi-nouefi.args   |  2 +-

 tests/qemuxml2argvdata/q35-acpi-uefi.args     |  2 +-

 tests/qemuxml2argvdata/q35-noacpi-nouefi.args |  2 +-

 9 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c

index 48df8818a6..a1072f74cf 100644

--- a/src/qemu/qemu_command.c

+++ b/src/qemu/qemu_command.c

@@ -6242,6 +6242,8 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver,

 {

     size_t i;

     virCPUDef *cpu = def->cpu;

+    bool hle = false;

+    bool rtm = false;

     switch ((virCPUMode) cpu->mode) {

     case VIR_CPU_MODE_HOST_PASSTHROUGH:

@@ -6306,6 +6308,11 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver,

         virBufferAsprintf(buf, ",vendor=%s", cpu->vendor_id);

     for (i = 0; i < cpu->nfeatures; i++) {

+        if (STREQ("rtm", cpu->features[i].name))

+            rtm = true;

+        if (STREQ("hle", cpu->features[i].name))

+            hle = true;

+

         switch ((virCPUFeaturePolicy) cpu->features[i].policy) {

         case VIR_CPU_FEATURE_FORCE:

         case VIR_CPU_FEATURE_REQUIRE:

@@ -6323,6 +6330,20 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver,

         }

     }

+    /* Some versions of qemu-kvm in RHEL provide Broadwell and Haswell CPU

+     * models which lack rtm and hle features when used with some machine

+     * types. Let's make sure Broadwell and Haswell will always have these

+     * features. But only if the features were not explicitly mentioned in

+     * the guest CPU definition.

+     */

+    if (STREQ_NULLABLE(cpu->model, "Broadwell") ||

+        STREQ_NULLABLE(cpu->model, "Haswell")) {

+        if (!rtm)

+            qemuBuildCpuFeature(qemuCaps, buf, "rtm", true);

+        if (!hle)

+            qemuBuildCpuFeature(qemuCaps, buf, "hle", true);

+    }

+

     return 0;

 }

diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args

index 6441a4c1eb..110017cf0e 100644

--- a/tests/qemuxml2argvdata/cpu-Haswell.args

+++ b/tests/qemuxml2argvdata/cpu-Haswell.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \

 -S \

 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \

 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

--cpu Haswell \

+-cpu Haswell,+rtm,+hle \

 -m 214 \

 -realtime mlock=off \

 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args

index ffa9236a47..c859978e02 100644

--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args

+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \

 -S \

 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \

 -machine pc,accel=tcg,usb=off,dump-guest-core=off \

--cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm \

+-cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+rtm,+hle \

 -m 214 \

 -realtime mlock=off \

 -smp 6,sockets=6,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args

index 79bb77cc68..ac7694ada1 100644

--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args

+++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \

 -S \

 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \

 -machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \

--cpu Haswell,pclmuldq=on,ds_cpl=on,tsc_adjust=on,fxsr_opt=on,lahf_lm=on,cmp_legacy=on,nodeid_msr=on,perfctr_core=on,perfctr_nb=on,kvm_pv_eoi=on,kvm_pv_unhalt=on \

+-cpu Haswell,pclmuldq=on,ds_cpl=on,tsc_adjust=on,fxsr_opt=on,lahf_lm=on,cmp_legacy=on,nodeid_msr=on,perfctr_core=on,perfctr_nb=on,rtm=on,hle=on,kvm_pv_eoi=on,kvm_pv_unhalt=on \

 -m 214 \

 -overcommit mem-lock=off \

 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args

index bb6b5c9986..f4a9fde2bf 100644

--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args

+++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args

@@ -11,7 +11,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \

 -S \

 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \

 -machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \

--cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \

+-cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,rtm=on,hle=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \

 -m 214 \

 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \

 -overcommit mem-lock=off \

diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args

index 3a7d69d6b7..3b30aa92f8 100644

--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args

+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \

 -S \

 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \

 -machine pc,accel=kvm,usb=off,dump-guest-core=off \

--cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,tsc-frequency=4567890000 \

+-cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,+rtm,+hle,tsc-frequency=4567890000 \

 -m 214 \

 -realtime mlock=off \

 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args

index 956ee3b6b7..55222293d0 100644

--- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args

+++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \

 -S \

 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \

 -machine q35,accel=tcg,usb=off,dump-guest-core=off \

--cpu Haswell \

+-cpu Haswell,+rtm,+hle \

 -m 1024 \

 -realtime mlock=off \

 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args

index 272369de22..ea03a2ac33 100644

--- a/tests/qemuxml2argvdata/q35-acpi-uefi.args

+++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \

 -S \

 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \

 -machine q35,accel=tcg,usb=off,dump-guest-core=off \

--cpu Haswell \

+-cpu Haswell,+rtm,+hle \

 -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \

 -drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,unit=1 \

 -m 1024 \

diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args

index c6cffeea89..ce556db8e9 100644

--- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args

+++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \

 -S \

 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \

 -machine q35,accel=tcg,usb=off,dump-guest-core=off \

--cpu Haswell \

+-cpu Haswell,+rtm,+hle \

 -m 1024 \

 -realtime mlock=off \

 -smp 1,sockets=1,cores=1,threads=1 \

-- 

2.33.0