acpi: Bodge acpi_index migration
PATCH 1/1 acpi: Bodge acpi_index migration
From: "Dr. David Alan Gilbert" <[email protected]>
The 'acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because VMSTATE_PCI_HOTPLUG is a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.
It worries me just when (a) actually happens.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)
hw/acpi/acpi-pci-hotplug-stub.c +0 -4
@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}
hw/acpi/pcihp.c +0 -6
@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,
hw/acpi/piix4.c +10 -1
@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from
@@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {
include/hw/acpi/pcihp.h +0 -2
@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \
Signature · 1 line
2.35.1
Quoted 5 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.
that's true only for the field that's part of PCIDEvice, however AcpiPciHpState::acpi_index is runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying it
Quoted 8 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.
I'm a bit confused by description,
do you have a reproducer for me to try?
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \
Quoted 5 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 2 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
Quoted 8 lines
Quoted 3 lines
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.that's true only for the field that's part of PCIDEvice, however
AcpiPciHpState::acpi_indexis runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying it
So this patch only changes the piix4.c version; I'm confused, is there a AcpiPciHpState::acpi_index that's runtime setable in there?
Quoted 10 lines
Quoted 9 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.
Quoted 2 lines
I'm a bit confused by description,
do you have a reproducer for me to try?
Yeh, see the linked gitlab case command line:
https://gitlab.com/qemu-project/qemu/-/issues/932
./x86_64-softmmu/qemu-system-x86_64 -M pc-q35-6.2 -m 512 -device virtio-scsi-pci,id=scsihw0,bus=pcie.0,addr=0x5,acpi-index=3 -drive if=none,my.qcow2,format=qcow2,id=drive-scsi0,node-name=scsi0 -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' -nographic
just migrating from a 6.2 to a head triggers this.
Dave
Quoted 96 lines
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 28 lines · * Dr. David Alan Gilbert ([email protected]) wrote:
Quoted 5 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 2 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
Quoted 8 lines
Quoted 3 lines
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.that's true only for the field that's part of PCIDEvice, however
AcpiPciHpState::acpi_indexis runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying itSo this patch only changes the
piix4.cversion; I'm confused, is there aAcpiPciHpState::acpi_indexthat's runtime setable in there?Quoted 10 lines
Quoted 9 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.
Quoted 7 lines
Quoted 2 lines
I'm a bit confused by description,
do you have a reproducer for me to try?Yeh, see the linked gitlab case command line:
https://gitlab.com/qemu-project/qemu/-/issues/932./x86_64-softmmu/qemu-system-x86_64 -M pc-q35-6.2 -m 512 -device virtio-scsi-pci,id=scsihw0,bus=pcie.0,addr=0x5,acpi-index=3 -drive if=none,my.qcow2,format=qcow2,id=drive-scsi0,node-name=scsi0 -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' -nographic
Oops no, wrong line; -M pc-i440fx-6.2 triggers this; q35 doesn't.
Dave
Quoted 102 lines
just migrating from a 6.2 to a head triggers this.
Dave
Quoted 96 lines
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 32 lines · Dr. David Alan Gilbert
Quoted 31 lines · * Dr. David Alan Gilbert ([email protected]) wrote:
Quoted 5 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 2 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
Quoted 8 lines
Quoted 3 lines
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.that's true only for the field that's part of PCIDEvice, however
AcpiPciHpState::acpi_indexis runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying itSo this patch only changes the
piix4.cversion; I'm confused, is there aAcpiPciHpState::acpi_indexthat's runtime setable in there?Quoted 12 lines
Quoted 9 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.I'm a bit confused by description,
do you have a reproducer for me to try?
Quoted 8 lines
Quoted 4 lines
Yeh, see the linked gitlab case command line:
https://gitlab.com/qemu-project/qemu/-/issues/932./x86_64-softmmu/qemu-system-x86_64 -M pc-q35-6.2 -m 512 -device virtio-scsi-pci,id=scsihw0,bus=pcie.0,addr=0x5,acpi-index=3 -drive if=none,my.qcow2,format=qcow2,id=drive-scsi0,node-name=scsi0 -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' -nographic
Oops no, wrong line; -M pc-i440fx-6.2 triggers this; q35 doesn't.
Dave
Igor were you able to reproduce?
Quoted 104 lines
Quoted 102 lines
just migrating from a 6.2 to a head triggers this.
Dave
Quoted 96 lines
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UKSignature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 10 lines · On Wed, 6 Apr 2022 10:38:51 +0100 "Dr. David Alan Gilbert"…
Quoted 9 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 5 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.
Quoted 9 lines
Quoted 4 lines
that's true only for the field that's part of PCIDEvice, however
AcpiPciHpState::acpi_indexis runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying itSo this patch only changes the
piix4.cversion; I'm confused, is there aAcpiPciHpState::acpi_indexthat's runtime setable in there?Quoted 1 line
Quoted 1 line
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState,
^^^ AcpiPciHpState
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
vmstate_test_use_acpi_hotplug_bridge,
-vmstate_acpi_pcihp_use_acpi_index),
hw/acpi/pcihp.c:pci_write():
s->acpi_index = object_property_get_uint(o, "acpi-index", NULL);
s->acpi_index is runtime value that is supposed to be migrated if it's set to something other then 0
I may have botched VMSTATE_PCI_HOTPLUG, intent was to migrate AcpiPciHpState::acpi_index if necessary. But I'm not sure how
if I used correct approach for to migrate an optional value
i.e. maybe instead of VMSTATE_UINT32_TEST(pcihp.acpi_index, state, test_acpi_index) I should've used subsection, because destination has no clue if acpi_index would be transmitted over wire or not?
Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.I'm a bit confused by description,
do you have a reproducer for me to try?
Quoted 6 lines
Yeh, see the linked gitlab case command line:
https://gitlab.com/qemu-project/qemu/-/issues/932./x86_64-softmmu/qemu-system-x86_64 -M pc-q35-6.2 -m 512 -device virtio-scsi-pci,id=scsihw0,bus=pcie.0,addr=0x5,acpi-index=3 -drive if=none,my.qcow2,format=qcow2,id=drive-scsi0,node-name=scsi0 -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' -nographic
just migrating from a 6.2 to a head triggers this.
Over here any migration from qemu-6.2 to HEAD at 3d31fe4d662f13c7 fails even without acpi-index, as simple as this:
qemu-system-x86_64-6.2 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio (qemu) stop
(qemu) migrate "exec:gzip -c > STATEFILE.gz"
qemu-system-x86_64-7.0 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio -incoming "exec: gzip -c -d STATEFILE.gz"
(qemu) qemu-system-x86_64-7.0: Missing section footer for 0000:00:01.3/piix4_pm qemu-system-x86_64-7.0: load of migration failed: Invalid argument
Like you pointed out in gitlab issue, vmstate_acpi_pcihp_use_acpi_index is broken. Following applied to HEAD should fix immediate issue on destination reading random value:
hw/acpi/piix4.c +6 -1
@@ -269,6 +269,11 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +static bool vmstate_piix4_need_acpi_index (void *opaque,int version_id) +{ +PIIX4PMState *s =PIIX4_PM (opaque); +return vmstate_acpi_pcihp_use_acpi_index (&(s->acpi_pci_hotplug), version_id); +}/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from
@@ -299,7 +304,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_piix4_need_acpi_index ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {
Quoted 98 lines
Dave
Quoted 96 lines
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \
Quoted 80 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 10 lines · On Wed, 6 Apr 2022 10:38:51 +0100 "Dr. David Alan Gilbert"…
Quoted 9 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 5 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.Quoted 9 lines
Quoted 4 lines
that's true only for the field that's part of PCIDEvice, however
AcpiPciHpState::acpi_indexis runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying itSo this patch only changes the
piix4.cversion; I'm confused, is there aAcpiPciHpState::acpi_indexthat's runtime setable in there?Quoted 1 line
Quoted 1 line
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState,
^^^ AcpiPciHpState
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
vmstate_test_use_acpi_hotplug_bridge,
-vmstate_acpi_pcihp_use_acpi_index),hw/acpi/pcihp.c:pci_write():
s->acpi_index = object_property_get_uint(o, "acpi-index", NULL);
s->acpi_indexis runtime value that is supposed to be migrated if it's set to something other then 0I may have botched
VMSTATE_PCI_HOTPLUG, intent was to migrateAcpiPciHpState::acpi_indexif necessary. But I'm not sure how
if I used correct approach for to migrate an optional value
i.e. maybe instead ofVMSTATE_UINT32_TEST(pcihp.acpi_index, state, test_acpi_index)I should've used subsection, because destination has no clue ifacpi_indexwould be transmitted over wire or not?Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.I'm a bit confused by description,
do you have a reproducer for me to try?Quoted 6 lines
Yeh, see the linked gitlab case command line:
https://gitlab.com/qemu-project/qemu/-/issues/932./x86_64-softmmu/qemu-system-x86_64 -M pc-q35-6.2 -m 512 -device virtio-scsi-pci,id=scsihw0,bus=pcie.0,addr=0x5,acpi-index=3 -drive if=none,my.qcow2,format=qcow2,id=drive-scsi0,node-name=scsi0 -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' -nographic
just migrating from a 6.2 to a head triggers this.
Over here any migration from qemu-6.2 to HEAD at
3d31fe4d662f13c7fails even without acpi-index, as simple as this:qemu-system-x86_64-6.2 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio (qemu) stop
(qemu) migrate "exec:gzip -c > STATEFILE.gz"qemu-system-x86_64-7.0 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio -incoming "exec: gzip -c -d STATEFILE.gz"
(qemu) qemu-system-x86_64-7.0: Missing section footer for 0000:00:01.3/piix4_pm qemu-system-x86_64-7.0: load of migration failed: Invalid argument
Like you pointed out in gitlab issue,
vmstate_acpi_pcihp_use_acpi_indexis broken. Following applied to HEAD should fix immediate issue on destination reading random value:hw/acpi/piix4.c +0
-0
hw/acpi/piix4.c static bool piix4_vmstate_need_smbus(void *opaque, int version_id) · line 276
Quoted 8 lines
hw/acpi/piix4.c +5
-0@@ -269,6 +269,11 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +static bool vmstate_piix4_need_acpi_index (void *opaque,int version_id) +{ +PIIX4PMState *s =PIIX4_PM (opaque); +return vmstate_acpi_pcihp_use_acpi_index (&(s->acpi_pci_hotplug), version_id); +}
But if acpi_index was set on the source 6.2 host, it won't send the index, but the 7.0 would expect it, and it would fail in the same way wouldn't it?
Dave
Quoted 113 lines
hw/acpi/piix4.c +1
-1/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -299,7 +304,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_piix4_need_acpi_index ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {Quoted 100 lines
Dave
Quoted 96 lines
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 84 lines · On Wed, 6 Apr 2022 17:11:09 +0100 "Dr. David Alan Gilbert"…
Quoted 83 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 10 lines · On Wed, 6 Apr 2022 10:38:51 +0100 "Dr. David Alan Gilbert"…
Quoted 9 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 5 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.Quoted 9 lines
Quoted 4 lines
that's true only for the field that's part of PCIDEvice, however
AcpiPciHpState::acpi_indexis runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying itSo this patch only changes the
piix4.cversion; I'm confused, is there aAcpiPciHpState::acpi_indexthat's runtime setable in there?Quoted 1 line
Quoted 1 line
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState,
^^^ AcpiPciHpState
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
vmstate_test_use_acpi_hotplug_bridge,
-vmstate_acpi_pcihp_use_acpi_index),hw/acpi/pcihp.c:pci_write():
s->acpi_index = object_property_get_uint(o, "acpi-index", NULL);
s->acpi_indexis runtime value that is supposed to be migrated if it's set to something other then 0I may have botched
VMSTATE_PCI_HOTPLUG, intent was to migrateAcpiPciHpState::acpi_indexif necessary. But I'm not sure how
if I used correct approach for to migrate an optional value
i.e. maybe instead ofVMSTATE_UINT32_TEST(pcihp.acpi_index, state, test_acpi_index)I should've used subsection, because destination has no clue ifacpi_indexwould be transmitted over wire or not?Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.I'm a bit confused by description,
do you have a reproducer for me to try?Quoted 6 lines
Yeh, see the linked gitlab case command line:
https://gitlab.com/qemu-project/qemu/-/issues/932./x86_64-softmmu/qemu-system-x86_64 -M pc-q35-6.2 -m 512 -device virtio-scsi-pci,id=scsihw0,bus=pcie.0,addr=0x5,acpi-index=3 -drive if=none,my.qcow2,format=qcow2,id=drive-scsi0,node-name=scsi0 -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' -nographic
just migrating from a 6.2 to a head triggers this.
Over here any migration from qemu-6.2 to HEAD at
3d31fe4d662f13c7fails even without acpi-index, as simple as this:qemu-system-x86_64-6.2 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio (qemu) stop
(qemu) migrate "exec:gzip -c > STATEFILE.gz"qemu-system-x86_64-7.0 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio -incoming "exec: gzip -c -d STATEFILE.gz"
(qemu) qemu-system-x86_64-7.0: Missing section footer for 0000:00:01.3/piix4_pm qemu-system-x86_64-7.0: load of migration failed: Invalid argument
Like you pointed out in gitlab issue,
vmstate_acpi_pcihp_use_acpi_indexis broken. Following applied to HEAD should fix immediate issue on destination reading random value:hw/acpi/piix4.c +0
-0@@ -269,6 +269,11 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); }
Quoted 9 lines
hw/acpi/piix4.c static bool piix4_vmstate_need_smbus(void *opaque, int version_id) · line 276
Quoted 5 lines
hw/acpi/piix4.c +5
-0+static bool vmstate_piix4_need_acpi_index (void *opaque,int version_id) +{ +PIIX4PMState *s =PIIX4_PM (opaque); +return vmstate_acpi_pcihp_use_acpi_index (&(s->acpi_pci_hotplug), version_id); +}But if
acpi_indexwas set on the source 6.2 host, it won't send the index, but the 7.0 would expect it, and it would fail in the same way wouldn't it?
With piix4 fixed up 7.0 won't expect field as s->acpi_index initialized to 0 so check will always return 0 and the field won't be expected.
( testing confirms it).
If test on 6.2 host somehow manages to return 1, destination won't
be able to accept it, because it has no idea about it (that is not fixable, I'm afraid).
For Q35 we set check to NULL
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug,
ICH9LPCPMRegs,
NULL, NULL),
which if I read vmstate_load_state() correctly will always expect the field and will always store fields since field->version_id == 0 for VMSTATE_UINT32_TEST.
So we can't remove field without breaking Q35.
Net effect:
* not send the field for PC machine (ever)
* send field always for Q35 (always)
So your patch is good with fixed commit message
and a comment close to the field that it's not really used with piix4
And to make migration of acpi_index on PC machine working, we need add an extra subsection that should be able to handle conditional value.
Quoted 116 lines
Dave
Quoted 113 lines
hw/acpi/piix4.c +1
-1/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -299,7 +304,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_piix4_need_acpi_index ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {Quoted 100 lines
Dave
Quoted 96 lines
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \
Quoted 108 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 84 lines · On Wed, 6 Apr 2022 17:11:09 +0100 "Dr. David Alan Gilbert"…
Quoted 83 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 10 lines · On Wed, 6 Apr 2022 10:38:51 +0100 "Dr. David Alan Gilbert"…
Quoted 9 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 5 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.Quoted 9 lines
Quoted 4 lines
that's true only for the field that's part of PCIDEvice, however
AcpiPciHpState::acpi_indexis runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying itSo this patch only changes the
piix4.cversion; I'm confused, is there aAcpiPciHpState::acpi_indexthat's runtime setable in there?Quoted 1 line
Quoted 1 line
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState,
^^^ AcpiPciHpState
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
vmstate_test_use_acpi_hotplug_bridge,
-vmstate_acpi_pcihp_use_acpi_index),hw/acpi/pcihp.c:pci_write():
s->acpi_index = object_property_get_uint(o, "acpi-index", NULL);
s->acpi_indexis runtime value that is supposed to be migrated if it's set to something other then 0I may have botched
VMSTATE_PCI_HOTPLUG, intent was to migrateAcpiPciHpState::acpi_indexif necessary. But I'm not sure how
if I used correct approach for to migrate an optional value
i.e. maybe instead ofVMSTATE_UINT32_TEST(pcihp.acpi_index, state, test_acpi_index)I should've used subsection, because destination has no clue ifacpi_indexwould be transmitted over wire or not?Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.I'm a bit confused by description,
do you have a reproducer for me to try?Quoted 6 lines
Yeh, see the linked gitlab case command line:
https://gitlab.com/qemu-project/qemu/-/issues/932./x86_64-softmmu/qemu-system-x86_64 -M pc-q35-6.2 -m 512 -device virtio-scsi-pci,id=scsihw0,bus=pcie.0,addr=0x5,acpi-index=3 -drive if=none,my.qcow2,format=qcow2,id=drive-scsi0,node-name=scsi0 -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' -nographic
just migrating from a 6.2 to a head triggers this.
Over here any migration from qemu-6.2 to HEAD at
3d31fe4d662f13c7fails even without acpi-index, as simple as this:qemu-system-x86_64-6.2 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio (qemu) stop
(qemu) migrate "exec:gzip -c > STATEFILE.gz"qemu-system-x86_64-7.0 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio -incoming "exec: gzip -c -d STATEFILE.gz"
(qemu) qemu-system-x86_64-7.0: Missing section footer for 0000:00:01.3/piix4_pm qemu-system-x86_64-7.0: load of migration failed: Invalid argument
Like you pointed out in gitlab issue,
vmstate_acpi_pcihp_use_acpi_indexis broken. Following applied to HEAD should fix immediate issue on destination reading random value:hw/acpi/piix4.c +0
-0@@ -269,6 +269,11 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); }Quoted 9 lines
hw/acpi/piix4.c static bool piix4_vmstate_need_smbus(void *opaque, int version_id) · line 276
Quoted 5 lines
hw/acpi/piix4.c +5
-0+static bool vmstate_piix4_need_acpi_index (void *opaque,int version_id) +{ +PIIX4PMState *s =PIIX4_PM (opaque); +return vmstate_acpi_pcihp_use_acpi_index (&(s->acpi_pci_hotplug), version_id); +}But if
acpi_indexwas set on the source 6.2 host, it won't send the index, but the 7.0 would expect it, and it would fail in the same way wouldn't it?With piix4 fixed up 7.0 won't expect field as
s->acpi_indexinitialized to 0 so check will always return 0 and the field won't be expected.
( testing confirms it).
If test on 6.2 host somehow manages to return 1, destination won't
be able to accept it, because it has no idea about it (that is not fixable, I'm afraid).For Q35 we set check to NULL
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug,
ICH9LPCPMRegs,
NULL, NULL),
Quoted 5 lines
which if I read
vmstate_load_state()correctly will always expect the field and will always store fields sincefield->version_id== 0 forVMSTATE_UINT32_TEST.So we can't remove field without breaking Q35.
Yes.
Quoted 6 lines
Net effect:
* not send the field for PC machine (ever)
* send field always for Q35 (always)So your patch is good with fixed commit message
and a comment close to the field that it's not really used with piix4
Could you write a new commit message based on mine?
Quoted 3 lines
And to make migration of
acpi_indexon PC machine working, we need add an extra subsection that should be able to handle conditional value.
Yes; I hadn't realised acpi_index was actually writeable.
Dave
Quoted 118 lines
Quoted 117 lines
Dave
Quoted 113 lines
hw/acpi/piix4.c +1
-1/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -299,7 +304,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_piix4_need_acpi_index ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {Quoted 100 lines
Dave
Quoted 96 lines
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 117 lines · On Wed, 6 Apr 2022 18:36:41 +0100 "Dr. David Alan Gilbert"…
Quoted 108 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 84 lines · On Wed, 6 Apr 2022 17:11:09 +0100 "Dr. David Alan Gilbert"…
Quoted 83 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 10 lines · On Wed, 6 Apr 2022 10:38:51 +0100 "Dr. David Alan Gilbert"…
Quoted 9 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 5 lines · On Wed, 6 Apr 2022 09:35:31 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
The '
acpi_index' field is a statically configured field, which for some reason is migrated; this never makes much sense because it's command line static.Quoted 9 lines
Quoted 4 lines
that's true only for the field that's part of PCIDEvice, however
AcpiPciHpState::acpi_indexis runtime state and _must_ be migrated if set, otherwise guest might get wrong index if it's in process of querying itSo this patch only changes the
piix4.cversion; I'm confused, is there aAcpiPciHpState::acpi_indexthat's runtime setable in there?Quoted 1 line
Quoted 1 line
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState,
^^^ AcpiPciHpState
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
vmstate_test_use_acpi_hotplug_bridge,
-vmstate_acpi_pcihp_use_acpi_index),hw/acpi/pcihp.c:pci_write():
s->acpi_index = object_property_get_uint(o, "acpi-index", NULL);
s->acpi_indexis runtime value that is supposed to be migrated if it's set to something other then 0I may have botched
VMSTATE_PCI_HOTPLUG, intent was to migrateAcpiPciHpState::acpi_indexif necessary. But I'm not sure how
if I used correct approach for to migrate an optional value
i.e. maybe instead ofVMSTATE_UINT32_TEST(pcihp.acpi_index, state, test_acpi_index)I should've used subsection, because destination has no clue ifacpi_indexwould be transmitted over wire or not?Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
However, on piix4 it's conditional, and the condition/test function ends up having the wrong pointer passed to it (it gets a PIIX4PMState not the AcpiPciHpState it was expecting, because
VMSTATE_PCI_HOTPLUGis a macro and not another struct). This means the field is randomly loaded/saved based on a random pointer. In 6.x this random pointer randomly seems to get 0 for everyone (!); in 7.0rc it's getting junk and trying to load a field that the source didn't send. The migration stream gets out of line and hits the section footer.I'm a bit confused by description,
do you have a reproducer for me to try?Quoted 6 lines
Yeh, see the linked gitlab case command line:
https://gitlab.com/qemu-project/qemu/-/issues/932./x86_64-softmmu/qemu-system-x86_64 -M pc-q35-6.2 -m 512 -device virtio-scsi-pci,id=scsihw0,bus=pcie.0,addr=0x5,acpi-index=3 -drive if=none,my.qcow2,format=qcow2,id=drive-scsi0,node-name=scsi0 -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0' -nographic
just migrating from a 6.2 to a head triggers this.
Over here any migration from qemu-6.2 to HEAD at
3d31fe4d662f13c7fails even without acpi-index, as simple as this:qemu-system-x86_64-6.2 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio (qemu) stop
(qemu) migrate "exec:gzip -c > STATEFILE.gz"qemu-system-x86_64-7.0 -M pc-i440fx-6.2 -m 512 -vnc :0 -monitor stdio -incoming "exec: gzip -c -d STATEFILE.gz"
(qemu) qemu-system-x86_64-7.0: Missing section footer for 0000:00:01.3/piix4_pm qemu-system-x86_64-7.0: load of migration failed: Invalid argument
Like you pointed out in gitlab issue,
vmstate_acpi_pcihp_use_acpi_indexis broken. Following applied to HEAD should fix immediate issue on destination reading random value:hw/acpi/piix4.c +0
-0@@ -269,6 +269,11 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); }Quoted 9 lines
hw/acpi/piix4.c static bool piix4_vmstate_need_smbus(void *opaque, int version_id) · line 276
Quoted 5 lines
hw/acpi/piix4.c +5
-0+static bool vmstate_piix4_need_acpi_index (void *opaque,int version_id) +{ +PIIX4PMState *s =PIIX4_PM (opaque); +return vmstate_acpi_pcihp_use_acpi_index (&(s->acpi_pci_hotplug), version_id); +}But if
acpi_indexwas set on the source 6.2 host, it won't send the index, but the 7.0 would expect it, and it would fail in the same way wouldn't it?With piix4 fixed up 7.0 won't expect field as
s->acpi_indexinitialized to 0 so check will always return 0 and the field won't be expected.
( testing confirms it).
If test on 6.2 host somehow manages to return 1, destination won't
be able to accept it, because it has no idea about it (that is not fixable, I'm afraid).For Q35 we set check to NULL
VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug,
ICH9LPCPMRegs,
NULL, NULL),Quoted 5 lines
which if I read
vmstate_load_state()correctly will always expect the field and will always store fields sincefield->version_id== 0 forVMSTATE_UINT32_TEST.So we can't remove field without breaking Q35.
Yes.
Quoted 8 lines
Quoted 6 lines
Net effect:
* not send the field for PC machine (ever)
* send field always for Q35 (always)So your patch is good with fixed commit message
and a comment close to the field that it's not really used with piix4Could you write a new commit message based on mine?
I ended up rewriting patch (kept removals), but replaced test_never with compat knob 'send field always for 7.0 and don't end it ever for older' to match q35 and so we wouldn't have to add subsection for piix4 only.
Will post it shortly.
Quoted 127 lines
Quoted 4 lines
And to make migration of
acpi_indexon PC machine working, we need add an extra subsection that should be able to handle conditional value.Yes; I hadn't realised
acpi_indexwas actually writeable.Dave
Quoted 118 lines
Quoted 117 lines
Dave
Quoted 113 lines
hw/acpi/piix4.c +1
-1/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -299,7 +304,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_piix4_need_acpi_index ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {Quoted 100 lines
Dave
Quoted 96 lines
Quoted 95 lines
The bodge is on piix4 never to load the field:
a) Most 6.x builds never send it, so most of the time the migration will work.
b) We can backport this fix to 6.x to remove the boobytrap.
c) It should never have made a difference anyway since the acpi-index is command line configured and should be correct on the destination anyway
d) ich9 is still sending/receiving this (unconditionally all the time) but due to (c) should never notice. We could follow up to make it skip.It worries me just when (a) actually happens.
Fixes b32bd76 ("pci: introduce acpi-index property for PCI device")Resolves: https://gitlab.com/qemu-project/qemu/-/issues/932
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/acpi/acpi-pci-hotplug-stub.c | 4 ---- hw/acpi/pcihp.c | 6 ------ hw/acpi/piix4.c | 11 ++++++++++- include/hw/acpi/pcihp.h | 2 -- 4 files changed, 10 insertions(+), 13 deletions(-)hw/acpi/acpi-pci-hotplug-stub.c +0
-4@@ -41,7 +41,3 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off)return ; } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -return false; -}hw/acpi/pcihp.c +0
-6@@ -554,12 +554,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, OBJ_PROP_FLAG_READ); } -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id) -{ -AcpiPciHpState *s = opaque; -return s->acpi_index; -} -const VMStateDescription vmstate_acpi_pcihp_pci_status = { .name ="acpi_pcihp_pci_status" , .version_id =1 ,hw/acpi/piix4.c +10
-1@@ -267,6 +267,15 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id)return pm_smbus_vmstate_needed (); } +/* +* This is a fudge to turn off the acpi_index field, whose +* test was always broken on piix4. +*/ +static bool vmstate_test_never (void *opaque,int version_id) +{ +return false; +} +/* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -297,7 +306,7 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus),VMSTATE_PCI_HOTPLUG (acpi_pci_hotplug ,PIIX4PMState ,vmstate_test_use_acpi_hotplug_bridge , -vmstate_acpi_pcihp_use_acpi_index ), +vmstate_test_never ),VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription*[]) {include/hw/acpi/pcihp.h +0
-2@@ -73,8 +73,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off);extern const VMStateDescription vmstate_acpi_pcihp_pci_status; -bool vmstate_acpi_pcihp_use_acpi_index (void *opaque,int version_id); -#define VMSTATE_PCI_HOTPLUG (pcihp, state, test_pcihp, test_acpi_index) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \