Skip to content

Commit

Permalink
s390x/kvm: fix small race reboot vs. cmma
Browse files Browse the repository at this point in the history
Right now we reset all devices before we reset the cmma states.  This
can result in the host kernel discarding guest pages that were
previously in the unused state but already contain a bios or a -kernel
file before the cmma reset has finished.  This race results in random
guest crashes or hangs during very early reboot.

Fixes: 1cd4e0f ("s390x/cmma: clean up cmma reset")
Cc: qemu-stable@nongnu.org
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
(cherry picked from commit 1a0e4c8)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
borntraeger authored and mdroth committed Mar 16, 2017
1 parent 5e40f28 commit 5f4b901
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion hw/s390x/s390-virtio.c
Expand Up @@ -204,8 +204,8 @@ void s390_machine_reset(void)
{
S390CPU *ipl_cpu = S390_CPU(qemu_get_cpu(0));

qemu_devices_reset();
s390_cmma_reset();
qemu_devices_reset();
s390_crypto_reset();

/* all cpus are stopped - configure and start the ipl cpu only */
Expand Down

0 comments on commit 5f4b901

Please sign in to comment.