|
 |
357786 |
From 65165d3130b3f1d85cfb3078f96f9b0b29e8f42e Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
Date: Tue, 3 Jul 2018 17:23:56 +0200
|
|
|
357786 |
Subject: [PATCH 11/89] i386: Remove generic SMT thread check
|
|
|
357786 |
|
|
|
357786 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
Message-id: <20180703172356.21038-11-ehabkost@redhat.com>
|
|
|
357786 |
Patchwork-id: 81220
|
|
|
357786 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH v3 10/10] i386: Remove generic SMT thread check
|
|
|
357786 |
Bugzilla: 1481253
|
|
|
357786 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
357786 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
357786 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
From: Babu Moger <babu.moger@amd.com>
|
|
|
357786 |
|
|
|
357786 |
Remove generic non-intel check while validating hyperthreading support.
|
|
|
357786 |
Certain AMD CPUs can support hyperthreading now.
|
|
|
357786 |
|
|
|
357786 |
CPU family with TOPOEXT feature can support hyperthreading now.
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: Babu Moger <babu.moger@amd.com>
|
|
|
357786 |
Tested-by: Geoffrey McRae <geoff@hostfission.com>
|
|
|
357786 |
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
Message-Id: <1529443919-67509-4-git-send-email-babu.moger@amd.com>
|
|
|
357786 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
(cherry picked from commit 6b2942f966d5e54c37d305c80f5f98d504c2bc55)
|
|
|
357786 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
target/i386/cpu.c | 17 +++++++++++------
|
|
|
357786 |
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
|
357786 |
index 5d5d7e6..eabe4ea 100644
|
|
|
357786 |
--- a/target/i386/cpu.c
|
|
|
357786 |
+++ b/target/i386/cpu.c
|
|
|
357786 |
@@ -4952,17 +4952,22 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
357786 |
|
|
|
357786 |
qemu_init_vcpu(cs);
|
|
|
357786 |
|
|
|
357786 |
- /* Only Intel CPUs support hyperthreading. Even though QEMU fixes this
|
|
|
357786 |
- * issue by adjusting CPUID_0000_0001_EBX and CPUID_8000_0008_ECX
|
|
|
357786 |
- * based on inputs (sockets,cores,threads), it is still better to gives
|
|
|
357786 |
+ /*
|
|
|
357786 |
+ * Most Intel and certain AMD CPUs support hyperthreading. Even though QEMU
|
|
|
357786 |
+ * fixes this issue by adjusting CPUID_0000_0001_EBX and CPUID_8000_0008_ECX
|
|
|
357786 |
+ * based on inputs (sockets,cores,threads), it is still better to give
|
|
|
357786 |
* users a warning.
|
|
|
357786 |
*
|
|
|
357786 |
* NOTE: the following code has to follow qemu_init_vcpu(). Otherwise
|
|
|
357786 |
* cs->nr_threads hasn't be populated yet and the checking is incorrect.
|
|
|
357786 |
*/
|
|
|
357786 |
- if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) {
|
|
|
357786 |
- error_report("AMD CPU doesn't support hyperthreading. Please configure"
|
|
|
357786 |
- " -smp options properly.");
|
|
|
357786 |
+ if (IS_AMD_CPU(env) &&
|
|
|
357786 |
+ !(env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_TOPOEXT) &&
|
|
|
357786 |
+ cs->nr_threads > 1 && !ht_warned) {
|
|
|
357786 |
+ error_report("This family of AMD CPU doesn't support "
|
|
|
357786 |
+ "hyperthreading(%d). Please configure -smp "
|
|
|
357786 |
+ "options properly or try enabling topoext feature.",
|
|
|
357786 |
+ cs->nr_threads);
|
|
|
357786 |
ht_warned = true;
|
|
|
357786 |
}
|
|
|
357786 |
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|