The pci host config register is used to save PCI address for
read/write config data. If guest write a value to config register,
and then pause the vcpu to migrate, After the migration, the guest
continue to write pci config data, and the write data will be ignored
because of new qemu process lost the config register state.
Reproduction steps are:
1. guest booting in seabios.
2. guest enable the SMRAM in seabios:piix4_apmc_smm_setup, and then
expect to disable the SMRAM by pci_config_writeb.
3. after guest write the pci host config register, and then pasued vcpu
to finish migration.
4. guest write config data(0x0A) fail to disable the SMRAM becasue of
config register state lost.
5. guest continue to boot and crash in ipxe option ROM due to SMRAM in
enabled state.
Signed-off-by: Hogan Wang <hogan.w...@huawei.com>
---
hw/i386/pc.c | 5 ++++-
hw/pci-host/i440fx.c | 20 ++++++++++++++++++++
hw/pci-host/q35.c | 19 +++++++++++++++++++
hw/pci/pci_host.c | 11 +++++++++++
hw/pci/pcie_host.c | 11 +++++++++++
include/hw/pci-host/q35.h | 1 +
include/hw/pci/pci_host.h | 10 ++++++++++
include/hw/pci/pcie_host.h | 10 ++++++++++
8 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 3d419d5991..517f185992 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -97,7 +97,10 @@
#include "fw_cfg.h"
#include "trace.h"
-GlobalProperty pc_compat_5_0[] = {};
+GlobalProperty pc_compat_5_0[] = {
+ { "i440FX-pcihost", "migration-enabled", "off" },
+ { "q35-pcihost", "migration-enabled", "off" },
+};
const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0);
GlobalProperty pc_compat_4_2[] = {
diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 8ed2417f0c..c662903dbb 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -49,6 +49,7 @@ typedef struct I440FXState {
Range pci_hole;
uint64_t pci_hole64_size;
bool pci_hole64_fix;
+ bool migration_enabled;
uint32_t short_root_bus;
} I440FXState;
@@ -118,6 +119,23 @@ static const VMStateDescription vmstate_i440fx = {
}
};
+static bool i440fx_pcihost_needed(void *opaque)
+{
+ I440FXState *s = opaque;
+ return s->migration_enabled;
+}
+
+static const VMStateDescription vmstate_i440fx_pcihost = {
+ .name = "I440FX_PCIHost",
+ .needed = i440fx_pcihost_needed,
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_PCI_HOST(parent_obj, I440FXState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static void i440fx_pcihost_get_pci_hole_start(Object *obj, Visitor *v,
const char *name, void *opaque,
Error **errp)
@@ -387,6 +405,7 @@ static Property i440fx_props[] = {
pci_hole64_size, I440FX_PCI_HOST_HOLE64_SIZE_DEFAULT),
DEFINE_PROP_UINT32("short_root_bus", I440FXState, short_root_bus, 0),
DEFINE_PROP_BOOL("x-pci-hole64-fix", I440FXState, pci_hole64_fix, true),
+ DEFINE_PROP_BOOL("migration-enabled", I440FXState, migration_enabled,
true),
DEFINE_PROP_END_OF_LIST(),
};
@@ -398,6 +417,7 @@ static void i440fx_pcihost_class_init(ObjectClass *klass,
void *data)
hc->root_bus_path = i440fx_pcihost_root_bus_path;
dc->realize = i440fx_pcihost_realize;
dc->fw_name = "pci";
+ dc->vmsd = &vmstate_i440fx_pcihost;
device_class_set_props(dc, i440fx_props);
/* Reason: needs to be wired up by pc_init1 */
dc->user_creatable = false;
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index b67cb9c29f..bb41665da4 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -165,6 +165,23 @@ static void q35_host_get_pci_hole64_end(Object *obj,
Visitor *v,
visit_type_uint64(v, name, &value, errp);
}
+static bool q35_host_needed(void *opaque)
+{
+ Q35PCIHost *s = opaque;
+ return s->migration_enabled;
+}
+
+static const VMStateDescription vmstate_q35_host = {
+ .name = "Q35_PCIHost",
+ .needed = q35_host_needed,
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_PCIE_HOST(parent_obj, Q35PCIHost),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
/*
* NOTE: setting defaults for the mch.* fields in this table
* doesn't work, because mch is a separate QOM object that is
@@ -184,6 +201,7 @@ static Property q35_host_props[] = {
DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, Q35PCIHost,
mch.above_4g_mem_size, 0),
DEFINE_PROP_BOOL("x-pci-hole64-fix", Q35PCIHost, pci_hole64_fix, true),
+ DEFINE_PROP_BOOL("migration-enabled", Q35PCIHost, migration_enabled, true),
DEFINE_PROP_END_OF_LIST(),
};
@@ -194,6 +212,7 @@ static void q35_host_class_init(ObjectClass *klass, void
*data)
hc->root_bus_path = q35_host_root_bus_path;
dc->realize = q35_host_realize;
+ dc->vmsd = &vmstate_q35_host;
device_class_set_props(dc, q35_host_props);
/* Reason: needs to be wired up by pc_q35_init */
dc->user_creatable = false;
diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
index ce7bcdb1d5..7cdd5a3ea3 100644
--- a/hw/pci/pci_host.c
+++ b/hw/pci/pci_host.c
@@ -24,6 +24,7 @@
#include "hw/pci/pci_host.h"
#include "qemu/module.h"
#include "hw/pci/pci_bus.h"
+#include "migration/vmstate.h"
#include "trace.h"
/* debug PCI */
@@ -200,6 +201,16 @@ const MemoryRegionOps pci_host_data_be_ops = {
.endianness = DEVICE_BIG_ENDIAN,
};
+const VMStateDescription vmstate_pcihost = {
+ .name = "PCIHost",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(config_reg, PCIHostState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static const TypeInfo pci_host_type_info = {
.name = TYPE_PCI_HOST_BRIDGE,
.parent = TYPE_SYS_BUS_DEVICE,
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index 3534006f99..a653c39bb7 100644
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -24,6 +24,7 @@
#include "hw/pci/pcie_host.h"
#include "qemu/module.h"
#include "exec/address-spaces.h"
+#include "migration/vmstate.h"
/* a helper function to get a PCIDevice for a given mmconfig address */
static inline PCIDevice *pcie_dev_find_by_mmcfg_addr(PCIBus *s,
@@ -121,6 +122,16 @@ void pcie_host_mmcfg_update(PCIExpressHost *e,
memory_region_transaction_commit();
}
+const VMStateDescription vmstate_pciehost = {
+ .name = "PCIEHost",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_PCI_HOST(pci, PCIExpressHost),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static const TypeInfo pcie_host_type_info = {
.name = TYPE_PCIE_HOST_BRIDGE,
.parent = TYPE_PCI_HOST_BRIDGE,
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h
index 070305f83d..02906e8159 100644
--- a/include/hw/pci-host/q35.h
+++ b/include/hw/pci-host/q35.h
@@ -65,6 +65,7 @@ typedef struct Q35PCIHost {
/*< public >*/
bool pci_hole64_fix;
+ bool migration_enabled;
MCHPCIState mch;
} Q35PCIHost;
diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h
index 9ce088bd13..fc88305e04 100644
--- a/include/hw/pci/pci_host.h
+++ b/include/hw/pci/pci_host.h
@@ -70,4 +70,14 @@ extern const MemoryRegionOps pci_host_conf_be_ops;
extern const MemoryRegionOps pci_host_data_le_ops;
extern const MemoryRegionOps pci_host_data_be_ops;
+extern const VMStateDescription vmstate_pcihost;
+
+#define VMSTATE_PCI_HOST(_field, _state) { \
+ .name = (stringify(_field)), \
+ .size = sizeof(PCIHostState), \
+ .vmsd = &vmstate_pcihost, \
+ .flags = VMS_STRUCT, \
+ .offset = vmstate_offset_value(_state, _field, PCIHostState),\
+}
+
#endif /* PCI_HOST_H */
diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h
index 3f7b9886d1..e8856f03e9 100644
--- a/include/hw/pci/pcie_host.h
+++ b/include/hw/pci/pcie_host.h
@@ -78,4 +78,14 @@ void pcie_host_mmcfg_update(PCIExpressHost *e,
PCIE_MMCFG_DEVFN_MASK)
#define PCIE_MMCFG_CONFOFFSET(addr) ((addr) & PCIE_MMCFG_CONFOFFSET_MASK)
+extern const VMStateDescription vmstate_pciehost;
+
+#define VMSTATE_PCIE_HOST(_field, _state) { \
+ .name = (stringify(_field)), \
+ .size = sizeof(PCIExpressHost), \
+ .vmsd = &vmstate_pciehost, \
+ .flags = VMS_STRUCT, \
+ .offset = vmstate_offset_value(_state, _field, PCIExpressHost),\
+}
+
#endif /* PCIE_HOST_H */
--
2.27.0
