104 lines
3.7 KiB
Diff
104 lines
3.7 KiB
Diff
|
From 7f7a15ba9ad3f1d906b472cad4972c80d11b77fc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Date: Fri, 28 Aug 2020 16:23:43 -0400
|
||
|
|
Subject: [PATCH 01/11] Revert "i386: Fix pkg_id offset for EPYC cpu models"
|
||
|
|
|
||
|
|
RH-Author: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Message-id: <20200828162349.1616028-2-imammedo@redhat.com>
|
||
|
|
Patchwork-id: 98247
|
||
|
|
O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH 1/7] Revert "i386: Fix pkg_id offset for EPYC cpu models"
|
||
|
|
Bugzilla: 1873417
|
||
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
||
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1873417
|
||
|
|
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=31005031
|
||
|
|
Branch: rhel-av-8.3.0
|
||
|
|
Upstream: RHEL only
|
||
|
|
Tested: locally
|
||
|
|
|
||
|
|
A regression was introduced since qemu-5.0, when EPYC specific
|
||
|
|
APIC ID encoding was introduced. Which leads to migration failing
|
||
|
|
with:
|
||
|
|
"
|
||
|
|
: Unknown savevm section or instance 'apic' 4. Make sure that your current VM setup matches your saved VM setup, including any hotplugged devices
|
||
|
|
: load of migration failed: Invalid argument
|
||
|
|
"
|
||
|
|
when EPYC cpu model and more than 1 numa node is used.
|
||
|
|
EPYC specific APIC ID encoding is considered as failed
|
||
|
|
experiment and upstream is preparing to revert it as well.
|
||
|
|
|
||
|
|
This reverts commit 7b225762c8c05fd31d4c2be116aedfbc00383f8b.
|
||
|
|
|
||
|
|
PS:
|
||
|
|
fixup an access to pkg_offset that were added by
|
||
|
|
cac9edfc4da (target/i386: Fix the CPUID leaf CPUID_Fn80000008)
|
||
|
|
|
||
|
|
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/i386/pc.c | 1 -
|
||
|
|
target/i386/cpu.c | 6 +++---
|
||
|
|
target/i386/cpu.h | 1 -
|
||
|
|
3 files changed, 3 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
|
||
|
|
index a75e0137ab..f469c060e5 100644
|
||
|
|
--- a/hw/i386/pc.c
|
||
|
|
+++ b/hw/i386/pc.c
|
||
|
|
@@ -1763,7 +1763,6 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
|
||
|
|
|
||
|
|
env->nr_dies = x86ms->smp_dies;
|
||
|
|
env->nr_nodes = topo_info.nodes_per_pkg;
|
||
|
|
- env->pkg_offset = x86ms->apicid_pkg_offset(&topo_info);
|
||
|
|
|
||
|
|
/*
|
||
|
|
* If APIC ID is not set,
|
||
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||
|
|
index cdaa1463f2..6517cc73a2 100644
|
||
|
|
--- a/target/i386/cpu.c
|
||
|
|
+++ b/target/i386/cpu.c
|
||
|
|
@@ -5680,7 +5680,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
||
|
|
*ecx |= CPUID_TOPOLOGY_LEVEL_SMT;
|
||
|
|
break;
|
||
|
|
case 1:
|
||
|
|
- *eax = env->pkg_offset;
|
||
|
|
+ *eax = apicid_pkg_offset(&topo_info);
|
||
|
|
*ebx = cs->nr_cores * cs->nr_threads;
|
||
|
|
*ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
|
||
|
|
break;
|
||
|
|
@@ -5714,7 +5714,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
||
|
|
*ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
|
||
|
|
break;
|
||
|
|
case 2:
|
||
|
|
- *eax = env->pkg_offset;
|
||
|
|
+ *eax = apicid_pkg_offset(&topo_info);
|
||
|
|
*ebx = env->nr_dies * cs->nr_cores * cs->nr_threads;
|
||
|
|
*ecx |= CPUID_TOPOLOGY_LEVEL_DIE;
|
||
|
|
break;
|
||
|
|
@@ -5895,7 +5895,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
||
|
|
* CPUX86State::pkg_offset.
|
||
|
|
* Bits 7:0 is "The number of threads in the package is NC+1"
|
||
|
|
*/
|
||
|
|
- *ecx = (env->pkg_offset << 12) |
|
||
|
|
+ *ecx = (apicid_pkg_offset(&topo_info) << 12) |
|
||
|
|
((cs->nr_cores * cs->nr_threads) - 1);
|
||
|
|
} else {
|
||
|
|
*ecx = 0;
|
||
|
|
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
||
|
|
index e1a5c174dc..d5ad42d694 100644
|
||
|
|
--- a/target/i386/cpu.h
|
||
|
|
+++ b/target/i386/cpu.h
|
||
|
|
@@ -1630,7 +1630,6 @@ typedef struct CPUX86State {
|
||
|
|
|
||
|
|
unsigned nr_dies;
|
||
|
|
unsigned nr_nodes;
|
||
|
|
- unsigned pkg_offset;
|
||
|
|
} CPUX86State;
|
||
|
|
|
||
|
|
struct kvm_msrs;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|