hw/pci-host: save/restore pci host config register
PATCH v4 1/2 hw/pci-host: save/restore pci host config register
From: Hogan Wang <[email protected]>
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.
--- hw/i386/pc.c | 4 +++- hw/pci/pci_host.c | 33 +++++++++++++++++++++++++++++++++ include/hw/pci/pci_host.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-)
hw/i386/pc.c +3 -1
@@ -97,7 +97,9 @@#include "fw_cfg.h" #include "trace.h" -GlobalProperty pc_compat_5_0[] = {}; +GlobalProperty pc_compat_5_0[] = { + {"pci-host-bridge" ,"x-config-reg-migration-enabled" ,"off" }, +};const size_t pc_compat_5_0_len =G_N_ELEMENTS (pc_compat_5_0);GlobalProperty pc_compat_4_2[] = {
hw/pci/pci_host.c +33 -0
@@ -22,8 +22,10 @@#include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" +#include "hw/qdev-properties.h" #include "qemu/module.h" #include "hw/pci/pci_bus.h" +#include "migration/vmstate.h" #include "trace.h" /* debug PCI */
@@ -200,12 +202,43 @@ const MemoryRegionOps pci_host_data_be_ops = { .endianness = DEVICE_BIG_ENDIAN, }; +static bool pci_host_needed (void *opaque) +{ +PCIHostState *s = opaque; +return s->mig_enabled; +} + +const VMStateDescription vmstate_pcihost = { + .name ="PCIHost" , + .needed = pci_host_needed, + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (config_reg, PCIHostState), +VMSTATE_END_OF_LIST () + } +}; + +static Property pci_host_properties_common[] = { +DEFINE_PROP_BOOL ("x-config-reg-migration-enabled" , PCIHostState, + mig_enabled, true), +DEFINE_PROP_END_OF_LIST (), +}; + +static void pci_host_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +device_class_set_props (dc, pci_host_properties_common); + dc->vmsd = &vmstate_pcihost; +} +static const TypeInfo pci_host_type_info = { .name =TYPE_PCI_HOST_BRIDGE , .parent =TYPE_SYS_BUS_DEVICE , .abstract = true, .class_size =sizeof (PCIHostBridgeClass), .instance_size =sizeof (PCIHostState), + .class_init = pci_host_class_init, };static void pci_host_register_types (void )
include/hw/pci/pci_host.h +1 -0
@@ -45,6 +45,7 @@ struct PCIHostState {MemoryRegion data_mem;MemoryRegion mmcfg;uint32_t config_reg; +bool mig_enabled;PCIBus *bus;QLIST_ENTRY (PCIHostState) next;
Signature · 1 line
2.27.0
PATCH v4 2/2 hw/pci-host: save/restore pci host config register for old ones
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write 0xf0 to 0x402 port notify qemu to stop vcpu after 0x0cf8 port wrote i440 configure register. qemu stop vcpu when catch 0x402 port wrote 0xf0.
seabios:/src/hw/pci.c
@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val)
writeb(mmconfig_addr(bdf, addr), val);
} else {
outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD);
+ if (bdf == 0 && addr == 0x72 && val == 0xa) {
+ dprintf(1, "stop vcpu\n");
+ outb(0xf0, 0x402); // notify qemu to stop vcpu
+ dprintf(1, "resume vcpu\n");
+ }
outb(val, PORT_PCI_DATA + (addr & 3));
}}
qemu:hw/char/debugcon.c
@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val,
printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val);#endif
+ if (ch == 0xf0) {
+ vm_stop(RUN_STATE_PAUSED);
+ }
/* XXX this blocks entire thread. Rewrite to use
* qemu_chr_fe_write and background I/O callbacks */
qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio
step 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000
step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Before this patch, we can get KVM "emulation failure" error on vm2. This patch can fix it.
--- hw/pci-host/i440fx.c | 31 +++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)
hw/pci-host/i440fx.c +31 -0
@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;
@@ -98,8 +106,30 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) { + dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + }return 0 ; }
@@ -107,6 +137,7 @@ static const VMStateDescription vmstate_i440fx = { .name = "I440FX", .version_id = 3, .minimum_version_id = 3, + .pre_save = i440fx_pre_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),
hw/pci-host/q35.c +30 -0
@@ -43,6 +43,15 @@#define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) not support q35-pcihost state +* migration, use some reserved INTEL MCH configuration registers to +* save/restore q35-pcihost config register. Refer to [Intel 3 Series +* Chipset Family Datasheet Table 5-1. DRAM Controller Register Address +* Map (D0:F0)] +*/ +#define Q35_PCI_HOST_CONFIG_REG 0x70 + +static void q35_host_realize (DeviceState *dev,Error **errp) {PCIHostState *pci =PCI_HOST_BRIDGE (dev);
@@ -513,7 +522,27 @@ static void mch_update(MCHPCIState *mch)static int mch_post_load (void *opaque,int version_id) {MCHPCIState *mch = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE );mch_update (mch); +if (!s->mig_enabled) { + dev =PCI_DEVICE (mch); + s->config_reg =pci_get_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int mch_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ], s->config_reg); + }return 0 ; }
@@ -521,6 +550,7 @@ static const VMStateDescription vmstate_mch = { .name = "mch", .version_id = 1, .minimum_version_id = 1, + .pre_save = mch_pre_save, .post_load = mch_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, MCHPCIState),
Signature · 1 line
2.27.0
Re: [PATCH v4 2/2] hw/pci-host: save/restore pci host config register for old ones
Quoted 59 lines · Hogan Wang
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write0xf0to0x402port notify qemu to stop vcpu after0x0cf8port wrote i440 configure register. qemu stop vcpu when catch0x402port wrote0xf0.seabios:/src/hw/pci.c
(quoted diff) +5
-0@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val) writeb(mmconfig_addr(bdf, addr), val); } else { outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD); + if (bdf == 0 && addr == 0x72 && val == 0xa) { + dprintf(1, "stop vcpu\n"); + outb(0xf0, 0x402); // notify qemu to stop vcpu + dprintf(1, "resume vcpu\n"); + } outb(val, PORT_PCI_DATA + (addr & 3)); } }qemu:hw/char/debugcon.c
(quoted diff) +3
-0@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val, printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val); #endif + if (ch == 0xf0) { + vm_stop(RUN_STATE_PAUSED); + } /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdiostep 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
Quoted 7 lines
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Before this patch, we can get KVM "emulation failure" error on vm2. This patch can fix it.
Signed-off-by Hogan Wang <[email protected]>
Question - did you test that this migrates successfully to old QEMU too? Thanks!
And I guess this needs a CC stable?
Quoted 122 lines
--- hw/pci-host/i440fx.c | 31 +++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)hw/pci-host/i440fx.c +31
-0@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;@@ -98,8 +106,30 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) { + dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + }return 0 ; }@@ -107,6 +137,7 @@ static const VMStateDescription vmstate_i440fx = { .name = "I440FX", .version_id = 3, .minimum_version_id = 3, + .pre_save = i440fx_pre_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),hw/pci-host/q35.c +30
-0@@ -43,6 +43,15 @@#define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) not support q35-pcihost state +* migration, use some reserved INTEL MCH configuration registers to +* save/restore q35-pcihost config register. Refer to [Intel 3 Series +* Chipset Family Datasheet Table 5-1. DRAM Controller Register Address +* Map (D0:F0)] +*/ +#define Q35_PCI_HOST_CONFIG_REG 0x70 + +static void q35_host_realize (DeviceState *dev,Error **errp) {PCIHostState *pci =PCI_HOST_BRIDGE (dev);@@ -513,7 +522,27 @@ static void mch_update(MCHPCIState *mch)static int mch_post_load (void *opaque,int version_id) {MCHPCIState *mch = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE );mch_update (mch); +if (!s->mig_enabled) { + dev =PCI_DEVICE (mch); + s->config_reg =pci_get_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int mch_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ], s->config_reg); + }return 0 ; }@@ -521,6 +550,7 @@ static const VMStateDescription vmstate_mch = { .name = "mch", .version_id = 1, .minimum_version_id = 1, + .pre_save = mch_pre_save, .post_load = mch_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, MCHPCIState),Signature · 1 line
2.27.0
Re: [PATCH v4 2/2] hw/pci-host: save/restore pci host config register for old ones
Quoted 63 lines · * Michael S. Tsirkin ([email protected]) wrote:
Quoted 62 lines · Hogan Wang
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write0xf0to0x402port notify qemu to stop vcpu after0x0cf8port wrote i440 configure register. qemu stop vcpu when catch0x402port wrote0xf0.seabios:/src/hw/pci.c
(quoted diff) +5
-0@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val) writeb(mmconfig_addr(bdf, addr), val); } else { outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD); + if (bdf == 0 && addr == 0x72 && val == 0xa) { + dprintf(1, "stop vcpu\n"); + outb(0xf0, 0x402); // notify qemu to stop vcpu + dprintf(1, "resume vcpu\n"); + } outb(val, PORT_PCI_DATA + (addr & 3)); } }qemu:hw/char/debugcon.c
(quoted diff) +3
-0@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val, printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val); #endif + if (ch == 0xf0) { + vm_stop(RUN_STATE_PAUSED); + } /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdiostep 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Quoted 7 lines
Quoted 4 lines
Before this patch, we can get KVM "emulation failure" error on vm2. This patch can fix it.
Signed-off-by Hogan Wang <[email protected]>Question - did you test that this migrates successfully to old QEMU too? Thanks!
I'm not seeing how it will; and isn't pci_host used in lots of architectures?
Dave
Quoted 113 lines
And I guess this needs a CC stable?
Quoted 111 lines
--- hw/pci-host/i440fx.c | 31 +++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)hw/pci-host/i440fx.c +31
-0@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;@@ -98,8 +106,30 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) { + dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + }return 0 ; }@@ -107,6 +137,7 @@ static const VMStateDescription vmstate_i440fx = { .name = "I440FX", .version_id = 3, .minimum_version_id = 3, + .pre_save = i440fx_pre_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),hw/pci-host/q35.c +29
-0@@ -43,6 +43,15 @@#define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) not support q35-pcihost state +* migration, use some reserved INTEL MCH configuration registers to +* save/restore q35-pcihost config register. Refer to [Intel 3 Series +* Chipset Family Datasheet Table 5-1. DRAM Controller Register Address +* Map (D0:F0)] +*/ +#define Q35_PCI_HOST_CONFIG_REG 0x70 + +static void q35_host_realize (DeviceState *dev,Error **errp) {PCIHostState *pci =PCI_HOST_BRIDGE (dev);@@ -513,7 +522,27 @@ static void mch_update(MCHPCIState *mch)static int mch_post_load (void *opaque,int version_id) {MCHPCIState *mch = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE );mch_update (mch); +if (!s->mig_enabled) { + dev =PCI_DEVICE (mch); + s->config_reg =pci_get_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int mch_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ], s->config_reg); + }return 0 ; }
Quoted 12 lines
Quoted 11 lines
hw/pci-host/q35.c +1
-0@@ -521,6 +550,7 @@ static const VMStateDescription vmstate_mch = { .name = "mch", .version_id = 1, .minimum_version_id = 1, + .pre_save = mch_pre_save, .post_load = mch_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, MCHPCIState),Signature · 1 line
2.27.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH v4 2/2] hw/pci-host: save/restore pci host config register for old ones
Quoted 67 lines · Dr. David Alan Gilbert
Quoted 66 lines · * Michael S. Tsirkin ([email protected]) wrote:
Quoted 65 lines · Hogan Wang
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write0xf0to0x402port notify qemu to stop vcpu after0x0cf8port wrote i440 configure register. qemu stop vcpu when catch0x402port wrote0xf0.seabios:/src/hw/pci.c
(quoted diff) +5
-0@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val) writeb(mmconfig_addr(bdf, addr), val); } else { outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD); + if (bdf == 0 && addr == 0x72 && val == 0xa) { + dprintf(1, "stop vcpu\n"); + outb(0xf0, 0x402); // notify qemu to stop vcpu + dprintf(1, "resume vcpu\n"); + } outb(val, PORT_PCI_DATA + (addr & 3)); } }qemu:hw/char/debugcon.c
(quoted diff) +3
-0@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val, printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val); #endif + if (ch == 0xf0) { + vm_stop(RUN_STATE_PAUSED); + } /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdiostep 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Before this patch, we can get KVM "emulation failure" error on vm2. This patch can fix it.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Hogan Wang <[email protected]>Question - did you test that this migrates successfully to old QEMU too? Thanks!
I'm not seeing how it will;
Well the way this is supposed to work is, it's a reserved register. So if you migrate to an old qemu it will ignore it, the bug is not fixed but if you got lucky and did not run into the bug, the guest will keep going.
Migrating back has a small chance to mess up the guest in a way that is different from how it was messed up previously, because old qemu will send a stale config value if you run into the race.
The scariest thing is it can convert a buggy write into register 0 into a write into another register - potentially more dangerous. OTOH not writing at all which is what write to register 0 does it also unlikely to work as expected ...
I really think we need a way to add migrated data without breaking compat with old machine types, and have old types just ignore it. If we had such a way we could now use it and at least we would not be making the problem bigger for anyway.
Quoted 2 lines
and isn't
pci_hostused in lots of
architectures?
It doesn't affect these others. They can add a work around too if there's a migrated register.
Quoted 130 lines
Dave
Quoted 113 lines
And I guess this needs a CC stable?
Quoted 111 lines
--- hw/pci-host/i440fx.c | 31 +++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)hw/pci-host/i440fx.c +31
-0@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;@@ -98,8 +106,30 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) { + dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + }return 0 ; }@@ -107,6 +137,7 @@ static const VMStateDescription vmstate_i440fx = { .name = "I440FX", .version_id = 3, .minimum_version_id = 3, + .pre_save = i440fx_pre_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),hw/pci-host/q35.c +29
-0@@ -43,6 +43,15 @@#define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) not support q35-pcihost state +* migration, use some reserved INTEL MCH configuration registers to +* save/restore q35-pcihost config register. Refer to [Intel 3 Series +* Chipset Family Datasheet Table 5-1. DRAM Controller Register Address +* Map (D0:F0)] +*/ +#define Q35_PCI_HOST_CONFIG_REG 0x70 + +static void q35_host_realize (DeviceState *dev,Error **errp) {PCIHostState *pci =PCI_HOST_BRIDGE (dev);@@ -513,7 +522,27 @@ static void mch_update(MCHPCIState *mch)static int mch_post_load (void *opaque,int version_id) {MCHPCIState *mch = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE );mch_update (mch); +if (!s->mig_enabled) { + dev =PCI_DEVICE (mch); + s->config_reg =pci_get_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int mch_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ], s->config_reg); + }return 0 ; }Quoted 12 lines
Quoted 11 lines
hw/pci-host/q35.c +1
-0@@ -521,6 +550,7 @@ static const VMStateDescription vmstate_mch = { .name = "mch", .version_id = 1, .minimum_version_id = 1, + .pre_save = mch_pre_save, .post_load = mch_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, MCHPCIState),Signature · 1 line
2.27.0--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH v4 2/2] hw/pci-host: save/restore pci host config register for old ones
In reply to Hogan WangQuoted 59 lines · Hogan Wang
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write0xf0to0x402port notify qemu to stop vcpu after0x0cf8port wrote i440 configure register. qemu stop vcpu when catch0x402port wrote0xf0.seabios:/src/hw/pci.c
(quoted diff) +5
-0@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val) writeb(mmconfig_addr(bdf, addr), val); } else { outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD); + if (bdf == 0 && addr == 0x72 && val == 0xa) { + dprintf(1, "stop vcpu\n"); + outb(0xf0, 0x402); // notify qemu to stop vcpu + dprintf(1, "resume vcpu\n"); + } outb(val, PORT_PCI_DATA + (addr & 3)); } }qemu:hw/char/debugcon.c
(quoted diff) +3
-0@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val, printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val); #endif + if (ch == 0xf0) { + vm_stop(RUN_STATE_PAUSED); + } /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdiostep 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
Quoted 7 lines
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Before this patch, we can get KVM "emulation failure" error on vm2. This patch can fix it.
Signed-off-by Hogan Wang <[email protected]>
OK I dropped this one for now, pls address comments I posted if at all possible.
Patch 1 is in my tree though, I fixed up some minor issues and tweaked the commit log.
Thanks a lot and great job noticing and fixing this!
Quoted 122 lines
--- hw/pci-host/i440fx.c | 31 +++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)hw/pci-host/i440fx.c +31
-0@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;@@ -98,8 +106,30 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) { + dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + }return 0 ; }@@ -107,6 +137,7 @@ static const VMStateDescription vmstate_i440fx = { .name = "I440FX", .version_id = 3, .minimum_version_id = 3, + .pre_save = i440fx_pre_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),hw/pci-host/q35.c +30
-0@@ -43,6 +43,15 @@#define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) not support q35-pcihost state +* migration, use some reserved INTEL MCH configuration registers to +* save/restore q35-pcihost config register. Refer to [Intel 3 Series +* Chipset Family Datasheet Table 5-1. DRAM Controller Register Address +* Map (D0:F0)] +*/ +#define Q35_PCI_HOST_CONFIG_REG 0x70 + +static void q35_host_realize (DeviceState *dev,Error **errp) {PCIHostState *pci =PCI_HOST_BRIDGE (dev);@@ -513,7 +522,27 @@ static void mch_update(MCHPCIState *mch)static int mch_post_load (void *opaque,int version_id) {MCHPCIState *mch = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE );mch_update (mch); +if (!s->mig_enabled) { + dev =PCI_DEVICE (mch); + s->config_reg =pci_get_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int mch_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ], s->config_reg); + }return 0 ; }@@ -521,6 +550,7 @@ static const VMStateDescription vmstate_mch = { .name = "mch", .version_id = 1, .minimum_version_id = 1, + .pre_save = mch_pre_save, .post_load = mch_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, MCHPCIState),Signature · 1 line
2.27.0
Re: [PATCH v4 2/2] hw/pci-host: save/restore pci host config register for old ones
In reply to Hogan WangQuoted 56 lines · Hogan Wang
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write0xf0to0x402port notify qemu to stop vcpu after0x0cf8port wrote i440 configure register. qemu stop vcpu when catch0x402port wrote0xf0.seabios:/src/hw/pci.c
(quoted diff) +5
-0@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val) writeb(mmconfig_addr(bdf, addr), val); } else { outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD); + if (bdf == 0 && addr == 0x72 && val == 0xa) { + dprintf(1, "stop vcpu\n"); + outb(0xf0, 0x402); // notify qemu to stop vcpu + dprintf(1, "resume vcpu\n"); + } outb(val, PORT_PCI_DATA + (addr & 3)); } }qemu:hw/char/debugcon.c
(quoted diff) +3
-0@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val, printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val); #endif + if (ch == 0xf0) { + vm_stop(RUN_STATE_PAUSED); + } /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdiostep 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000
Quoted 5 lines
step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Great report, I copied it to the previous patch too.
Quoted 1 line
Before this patch, we can get KVM "emulation failure" error on vm2.
we can get -> we get
Quoted 1 line
This patch can fix it.
-> this patch fixes it
Quoted 12 lines
Signed-off-by Hogan Wang <[email protected]>--- hw/pci-host/i440fx.c | 31 +++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)hw/pci-host/i440fx.c +0
-0
hw/pci-host/i440fx.c typedef struct I440FXState { · line 67
Quoted 4 lines
hw/pci-host/i440fx.c +1
-0@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) not support i440FX-pcihost state
not support -> do not support
Quoted 14 lines
hw/pci-host/i440fx.c +7
-0+* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;@@ -98,8 +106,30 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque;
hw/pci-host/i440fx.c static void i440fx_write_config(PCIDevice *dev, · line 118
Quoted 10 lines
hw/pci-host/i440fx.c +8
-0+PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) { + dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]);
So I guess at this point we want to reset the register to 0, so it's not guest visible.
Quoted 6 lines
hw/pci-host/i440fx.c +6
-0+ } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{
hw/pci-host/i440fx.c static void i440fx_write_config(PCIDevice *dev, · line 134
Quoted 10 lines
hw/pci-host/i440fx.c +8
-0+PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + }return 0 ; }
And I guess we want a post_save hook to clear this?
Quoted 13 lines
hw/pci-host/i440fx.c +1
-0@@ -107,6 +137,7 @@ static const VMStateDescription vmstate_i440fx = { .name = "I440FX", .version_id = 3, .minimum_version_id = 3, + .pre_save = i440fx_pre_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),hw/pci-host/q35.c +0
-0
hw/pci-host/q35.c line 46
Quoted 4 lines
hw/pci-host/q35.c +1
-0@@ -43,6 +43,15 @@#define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) not support q35-pcihost state
not support -> do not support.
hw/pci-host/q35.c line 54
Quoted 8 lines
hw/pci-host/q35.c +8
-0+* migration, use some reserved INTEL MCH configuration registers to +* save/restore q35-pcihost config register. Refer to [Intel 3 Series +* Chipset Family Datasheet Table 5-1. DRAM Controller Register Address +* Map (D0:F0)] +*/ +#define Q35_PCI_HOST_CONFIG_REG 0x70 + +
extra empty line
Quoted 32 lines
hw/pci-host/q35.c +20
-0static void q35_host_realize (DeviceState *dev,Error **errp) {PCIHostState *pci =PCI_HOST_BRIDGE (dev);@@ -513,7 +522,27 @@ static void mch_update(MCHPCIState *mch)static int mch_post_load (void *opaque,int version_id) {MCHPCIState *mch = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE );mch_update (mch); +if (!s->mig_enabled) { + dev =PCI_DEVICE (mch); + s->config_reg =pci_get_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ]); + } +return 0 ; +} + +static int mch_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ], s->config_reg); + }return 0 ; }
hw/pci-host/q35.c static const VMStateDescription vmstate_mch = { · line 556
Quoted 7 lines
hw/pci-host/q35.c +1
-0@@ -521,6 +550,7 @@ static const VMStateDescription vmstate_mch = { .name = "mch", .version_id = 1, .minimum_version_id = 1, + .pre_save = mch_pre_save, .post_load = mch_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, MCHPCIState),
Same comments.
Quoted 3 lines
Signature · 1 line
2.27.0
PATCH v5 1/1 hw/pci-host: save/restore pci host config register for old ones
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write 0xf0 to 0x402 port notify qemu to stop vcpu after 0x0cf8 port wrote i440 configure register. qemu stop vcpu when catch 0x402 port wrote 0xf0.
seabios:/src/hw/pci.c
@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val)
writeb(mmconfig_addr(bdf, addr), val);
} else {
outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD);
+ if (bdf == 0 && addr == 0x72 && val == 0xa) {
+ dprintf(1, "stop vcpu\n");
+ outb(0xf0, 0x402); // notify qemu to stop vcpu
+ dprintf(1, "resume vcpu\n");
+ }
outb(val, PORT_PCI_DATA + (addr & 3));
}}
qemu:hw/char/debugcon.c
@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val,
printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val);#endif
+ if (ch == 0xf0) {
+ vm_stop(RUN_STATE_PAUSED);
+ }
/* XXX this blocks entire thread. Rewrite to use
* qemu_chr_fe_write and background I/O callbacks */
qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio
step 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000
step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Before this patch, we get KVM "emulation failure" error on vm2. This patch fixes it.
--- hw/pci-host/i440fx.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+)
hw/pci-host/i440fx.c +46 -0
@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) do not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;
@@ -98,15 +106,53 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) { + dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ],0 ); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + } +return 0 ; +} + +static int i440fx_post_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ],0 ); + }return 0 ; } +static const VMStateDescription vmstate_i440fx = { .name ="I440FX" , .version_id =3 , .minimum_version_id =3 , + .pre_save = i440fx_pre_save, + .post_save = i440fx_post_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),
hw/pci-host/q35.c +44 -0
64 lines not on this page · raw message
Signature · 1 line
2.27.0
Re: [PATCH v5] hw/pci-host: save/restore pci host config register for old ones
Quoted 92 lines · Hogan Wang
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write0xf0to0x402port notify qemu to stop vcpu after0x0cf8port wrote i440 configure register. qemu stop vcpu when catch0x402port wrote0xf0.seabios:/src/hw/pci.c
(quoted diff) +5
-0@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val) writeb(mmconfig_addr(bdf, addr), val); } else { outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD); + if (bdf == 0 && addr == 0x72 && val == 0xa) { + dprintf(1, "stop vcpu\n"); + outb(0xf0, 0x402); // notify qemu to stop vcpu + dprintf(1, "resume vcpu\n"); + } outb(val, PORT_PCI_DATA + (addr & 3)); } }qemu:hw/char/debugcon.c
(quoted diff) +3
-0@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val, printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val); #endif + if (ch == 0xf0) { + vm_stop(RUN_STATE_PAUSED); + } /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdiostep 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Before this patch, we get KVM "emulation failure" error on vm2. This patch fixes it.
Signed-off-by Hogan Wang <[email protected]>--- hw/pci-host/i440fx.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+)hw/pci-host/i440fx.c +8
-0@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) do not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;@@ -98,15 +106,53 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id)
hw/pci-host/i440fx.c static void i440fx_write_config(PCIDevice *dev, · line 116
Quoted 10 lines
hw/pci-host/i440fx.c +6
-0{PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) {
Thinking more about it, I think we should rename mig_enabled to config_reg_mig_enabled or something like this.
Quoted 23 lines
hw/pci-host/i440fx.c +23
-0+ dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ],0 ); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + } +return 0 ; +} + +static int i440fx_post_save (void *opaque) +{ +PCIDevice *dev = opaque;
hw/pci-host/i440fx.c static void i440fx_write_config(PCIDevice *dev, · line 149
Quoted 10 lines
hw/pci-host/i440fx.c +7
-0+PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ],0 ); + }return 0 ; } +
Extra empty line.
Quoted 82 lines
hw/pci-host/i440fx.c +2
-0static const VMStateDescription vmstate_i440fx = { .name ="I440FX" , .version_id =3 , .minimum_version_id =3 , + .pre_save = i440fx_pre_save, + .post_save = i440fx_post_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),hw/pci-host/q35.c +44
-0@@ -43,6 +43,14 @@#define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) do not support q35-pcihost state +* migration, use some reserved INTEL MCH configuration registers to +* save/restore q35-pcihost config register. Refer to [Intel 3 Series +* Chipset Family Datasheet Table 5-1. DRAM Controller Register Address +* Map (D0:F0)] +*/ +#define Q35_PCI_HOST_CONFIG_REG 0x70 +static void q35_host_realize (DeviceState *dev,Error **errp) {PCIHostState *pci =PCI_HOST_BRIDGE (dev);@@ -513,14 +521,50 @@ static void mch_update(MCHPCIState *mch)static int mch_post_load (void *opaque,int version_id) {MCHPCIState *mch = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE );mch_update (mch); +if (!s->mig_enabled) { + dev =PCI_DEVICE (mch); + s->config_reg =pci_get_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ]); +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ],0 ); + } +return 0 ; +} + +static int mch_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ], s->config_reg); + }return 0 ; } +static int mch_post_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ],0 ); + } +return 0 ; +} + +static const VMStateDescription vmstate_mch = { .name ="mch" , .version_id =1 , .minimum_version_id =1 , + .pre_save = mch_pre_save, + .post_save = mch_post_save, .post_load = mch_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, MCHPCIState),Signature · 1 line
2.27.0
Re: [PATCH v5] hw/pci-host: save/restore pci host config register for old ones
Quoted 100 lines · * Michael S. Tsirkin ([email protected]) wrote:
Quoted 99 lines · Hogan Wang
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write0xf0to0x402port notify qemu to stop vcpu after0x0cf8port wrote i440 configure register. qemu stop vcpu when catch0x402port wrote0xf0.seabios:/src/hw/pci.c
(quoted diff) +5
-0@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val) writeb(mmconfig_addr(bdf, addr), val); } else { outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD); + if (bdf == 0 && addr == 0x72 && val == 0xa) { + dprintf(1, "stop vcpu\n"); + outb(0xf0, 0x402); // notify qemu to stop vcpu + dprintf(1, "resume vcpu\n"); + } outb(val, PORT_PCI_DATA + (addr & 3)); } }qemu:hw/char/debugcon.c
(quoted diff) +3
-0@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val, printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val); #endif + if (ch == 0xf0) { + vm_stop(RUN_STATE_PAUSED); + } /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdiostep 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Before this patch, we get KVM "emulation failure" error on vm2. This patch fixes it.
Signed-off-by Hogan Wang <[email protected]>--- hw/pci-host/i440fx.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+)hw/pci-host/i440fx.c +12
-0@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) do not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;@@ -98,15 +106,53 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );
Quoted 6 lines
hw/pci-host/i440fx.c static void i440fx_write_config(PCIDevice *dev, · line 116
Quoted 3 lines
hw/pci-host/i440fx.c +2
-0i440fx_update_memory_mappings (d); + +if (!s->mig_enabled) {Thinking more about it, I think we should rename
mig_enabledtoconfig_reg_mig_enabledor something like this.
Agreed.
Dave
Quoted 112 lines
Quoted 24 lines
hw/pci-host/i440fx.c +23
-0+ dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ],0 ); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + } +return 0 ; +} + +static int i440fx_post_save (void *opaque) +{ +PCIDevice *dev = opaque;hw/pci-host/i440fx.c static void i440fx_write_config(PCIDevice *dev, · line 149
Quoted 10 lines
hw/pci-host/i440fx.c +7
-0+PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ],0 ); + }return 0 ; } +Extra empty line.
Quoted 74 lines
hw/pci-host/i440fx.c +2
-0static const VMStateDescription vmstate_i440fx = { .name ="I440FX" , .version_id =3 , .minimum_version_id =3 , + .pre_save = i440fx_pre_save, + .post_save = i440fx_post_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),hw/pci-host/q35.c +42
-0@@ -43,6 +43,14 @@#define Q35_PCI_HOST_HOLE64_SIZE_DEFAULT (1ULL << 35) +/* Older Q35 machines (5.0 and older) do not support q35-pcihost state +* migration, use some reserved INTEL MCH configuration registers to +* save/restore q35-pcihost config register. Refer to [Intel 3 Series +* Chipset Family Datasheet Table 5-1. DRAM Controller Register Address +* Map (D0:F0)] +*/ +#define Q35_PCI_HOST_CONFIG_REG 0x70 +static void q35_host_realize (DeviceState *dev,Error **errp) {PCIHostState *pci =PCI_HOST_BRIDGE (dev);@@ -513,14 +521,50 @@ static void mch_update(MCHPCIState *mch)static int mch_post_load (void *opaque,int version_id) {MCHPCIState *mch = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE );mch_update (mch); +if (!s->mig_enabled) { + dev =PCI_DEVICE (mch); + s->config_reg =pci_get_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ]); +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ],0 ); + } +return 0 ; +} + +static int mch_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ], s->config_reg); + }return 0 ; } +static int mch_post_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/q35" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->mig_enabled) { +pci_set_long (&dev->config[Q35_PCI_HOST_CONFIG_REG ],0 ); + } +return 0 ; +} + +static const VMStateDescription vmstate_mch = { .name ="mch" , .version_id =1 , .minimum_version_id =1 ,
Quoted 9 lines
Quoted 8 lines
hw/pci-host/q35.c +2
-0+ .pre_save = mch_pre_save, + .post_save = mch_post_save, .post_load = mch_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, MCHPCIState),Signature · 1 line
2.27.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH 2/6 hw/pci-host: save/restore pci host config register for old ones
The i440fx and q35 machines integrate i440FX or MCH PCI device by default. Refer to i440FX and ICH9-LPC spcifications, there are some reserved configuration registers can used to save/restore PCIHostState.config_reg. It's nasty but friendly to old ones.
Reproducer steps:
step 1. Make modifications to seabios and qemu for increase reproduction efficiency, write 0xf0 to 0x402 port notify qemu to stop vcpu after 0x0cf8 port wrote i440 configure register. qemu stop vcpu when catch 0x402 port wrote 0xf0.
seabios:/src/hw/pci.c
@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val)
writeb(mmconfig_addr(bdf, addr), val);
} else {
outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD);
+ if (bdf == 0 && addr == 0x72 && val == 0xa) {
+ dprintf(1, "stop vcpu\n");
+ outb(0xf0, 0x402); // notify qemu to stop vcpu
+ dprintf(1, "resume vcpu\n");
+ }
outb(val, PORT_PCI_DATA + (addr & 3));
}}
qemu:hw/char/debugcon.c
@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val,
printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val);#endif
+ if (ch == 0xf0) {
+ vm_stop(RUN_STATE_PAUSED);
+ }
/* XXX this blocks entire thread. Rewrite to use
* qemu_chr_fe_write and background I/O callbacks */
qemu_chr_fe_write_all(&s->chr, &ch, 1);step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio
step 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\ -netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\ -device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\ -device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\ -chardev file,id=seabios,path=/var/log/test.seabios,append=on\ -device isa-debugcon,iobase=0x402,chardev=seabios\ -monitor stdio \ -incoming tcp:127.0.0.1:8000
step 4. execute the following qmp command in vm1 to migrate. (qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu. (qemu) cont
Before this patch, we get KVM "emulation failure" error on vm2. This patch fixes it.
--- hw/pci-host/i440fx.c | 46 +++++++++++++++++++++++++++++++++++++++ hw/pci-host/q35.c | 44 +++++++++++++++++++++++++++++++++++++ hw/pci/pci_host.c | 4 ++-- include/hw/pci/pci_host.h | 2 +- 4 files changed, 93 insertions(+), 3 deletions(-)
hw/pci-host/i440fx.c +46 -0
@@ -64,6 +64,14 @@ typedef struct I440FXState {*/ #define I440FX_COREBOOT_RAM_SIZE 0x57 +/* Older I440FX machines (5.0 and older) do not support i440FX-pcihost state +* migration, use some reserved INTEL 82441 configuration registers to +* save/restore i440FX-pcihost config register. Refer to [INTEL 440FX PCISET +* 82441FX PCI AND MEMORY CONTROLLER (PMC) AND 82442FX DATA BUS ACCELERATOR +* (DBX) Table 1. PMC Configuration Space] +*/ +#define I440FX_PCI_HOST_CONFIG_REG 0x94 +static void i440fx_update_memory_mappings (PCII440FXState *d) {int i;
@@ -98,15 +106,53 @@ static void i440fx_write_config(PCIDevice *dev,static int i440fx_post_load (void *opaque,int version_id) {PCII440FXState *d = opaque; +PCIDevice *dev; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE );i440fx_update_memory_mappings (d); + +if (!s->config_reg_mig_enabled) { + dev =PCI_DEVICE (d); + s->config_reg =pci_get_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ]); +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ],0 ); + } +return 0 ; +} + +static int i440fx_pre_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->config_reg_mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ], + s->config_reg); + } +return 0 ; +} + +static int i440fx_post_save (void *opaque) +{ +PCIDevice *dev = opaque; +PCIHostState *s =OBJECT_CHECK (PCIHostState, +object_resolve_path ("/machine/i440fx" ,NULL ), +TYPE_PCI_HOST_BRIDGE ); +if (!s->config_reg_mig_enabled) { +pci_set_long (&dev->config[I440FX_PCI_HOST_CONFIG_REG ],0 ); + }return 0 ; } +static const VMStateDescription vmstate_i440fx = { .name ="I440FX" , .version_id =3 , .minimum_version_id =3 , + .pre_save = i440fx_pre_save, + .post_save = i440fx_post_save, .post_load = i440fx_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (parent_obj, PCII440FXState),
hw/pci-host/q35.c +44 -0
64 lines not on this page · raw message
hw/pci/pci_host.c +2 -2
@@ -205,7 +205,7 @@ const MemoryRegionOps pci_host_data_be_ops = {static bool pci_host_needed (void *opaque) {PCIHostState *s = opaque; -return s->mig_enabled; +return s->config_reg_mig_enabled; }const VMStateDescription vmstate_pcihost = {
@@ -221,7 +221,7 @@ const VMStateDescription vmstate_pcihost = {static Property pci_host_properties_common[] = {DEFINE_PROP_BOOL ("x-config-reg-migration-enabled" , PCIHostState, - mig_enabled, true), + config_reg_mig_enabled, true),DEFINE_PROP_END_OF_LIST (), };
include/hw/pci/pci_host.h +1 -1
@@ -45,7 +45,7 @@ struct PCIHostState {MemoryRegion data_mem;MemoryRegion mmcfg;uint32_t config_reg; -bool mig_enabled; +bool config_reg_mig_enabled;PCIBus *bus;QLIST_ENTRY (PCIHostState) next;
Signature · 1 line
2.27.0