81 lines
3.1 KiB
Diff
81 lines
3.1 KiB
Diff
|
From 88cfbf2cc3e93a276f9d036850265eb8c2f5310c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Date: Wed, 4 Sep 2019 10:31:38 +0100
|
||
|
|
Subject: [PATCH 7/8] pseries: Fix compat_pvr on reset
|
||
|
|
|
||
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Message-id: <20190904103139.29870-2-lvivier@redhat.com>
|
||
|
|
Patchwork-id: 90274
|
||
|
|
O-Subject: [RHEL-AV-8.1.0 qemu-kvm PATCH 1/2] pseries: Fix compat_pvr on reset
|
||
|
|
Bugzilla: 1744107
|
||
|
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
||
|
|
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
|
||
|
|
If we a migrate P8 machine to a P9 machine, the migration fails on
|
||
|
|
destination with:
|
||
|
|
|
||
|
|
error while loading state for instance 0x1 of device 'cpu'
|
||
|
|
load of migration failed: Operation not permitted
|
||
|
|
|
||
|
|
This is caused because the compat_pvr field is only present for the first
|
||
|
|
CPU.
|
||
|
|
Originally, spapr_machine_reset() calls ppc_set_compat() to set the value
|
||
|
|
max_compat_pvr for the first cpu and this was propagated to all CPUs by
|
||
|
|
spapr_cpu_reset(). Now, as spapr_cpu_reset() is called before that, the
|
||
|
|
value is not propagated to all CPUs and the migration fails.
|
||
|
|
|
||
|
|
To fix that, propagate the new value to all CPUs in spapr_machine_reset().
|
||
|
|
|
||
|
|
Fixes: 25c9780d38d4 ("spapr: Reset CAS & IRQ subsystem after devices")
|
||
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Message-Id: <20190826090812.19080-1-lvivier@redhat.com>
|
||
|
|
Reviewed-by: Greg Kurz <groug@kaod.org>
|
||
|
|
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
||
|
|
(cherry picked from commit ce03a193e1172ff7d4b3303ec7472dc29183db8c)
|
||
|
|
|
||
|
|
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1744107
|
||
|
|
BRANCH: rhel-av-8.1.0/master-4.1.0
|
||
|
|
UPSTREAM: Merged
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/ppc/spapr.c | 8 +++++++-
|
||
|
|
hw/ppc/spapr_cpu_core.c | 2 ++
|
||
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
||
|
|
index 9b500d2..30bf7bb 100644
|
||
|
|
--- a/hw/ppc/spapr.c
|
||
|
|
+++ b/hw/ppc/spapr.c
|
||
|
|
@@ -1746,7 +1746,13 @@ static void spapr_machine_reset(MachineState *machine)
|
||
|
|
spapr_ovec_cleanup(spapr->ov5_cas);
|
||
|
|
spapr->ov5_cas = spapr_ovec_new();
|
||
|
|
|
||
|
|
- ppc_set_compat(first_ppc_cpu, spapr->max_compat_pvr, &error_fatal);
|
||
|
|
+ /*
|
||
|
|
+ * reset compat_pvr for all CPUs
|
||
|
|
+ * as qemu_devices_reset() is called before this,
|
||
|
|
+ * it can't be propagated by spapr_cpu_reset()
|
||
|
|
+ * from the first CPU to all the others
|
||
|
|
+ */
|
||
|
|
+ ppc_set_compat_all(spapr->max_compat_pvr, &error_fatal);
|
||
|
|
}
|
||
|
|
|
||
|
|
if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {
|
||
|
|
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
|
||
|
|
index 29a3c7d..ae43c57 100644
|
||
|
|
--- a/hw/ppc/spapr_cpu_core.c
|
||
|
|
+++ b/hw/ppc/spapr_cpu_core.c
|
||
|
|
@@ -41,6 +41,8 @@ static void spapr_cpu_reset(void *opaque)
|
||
|
|
|
||
|
|
/* Set compatibility mode to match the boot CPU, which was either set
|
||
|
|
* by the machine reset code or by CAS. This should never fail.
|
||
|
|
+ * At startup the value is already set for all the CPUs
|
||
|
|
+ * but we need this when we hotplug a new CPU
|
||
|
|
*/
|
||
|
|
ppc_set_compat(cpu, POWERPC_CPU(first_cpu)->compat_pvr, &error_abort);
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|