rerandomize RNG seeds on reboot and handle record&replay
Subsystems (3)
v2 cover rerandomize RNG seeds on reboot and handle record&replay
When the system reboots, the rng seed that QEMU passes should be re-randomized, so that the new boot gets a new seed. This series wires that up for FDT.
Then, since the record&replay subsystem makes use of reset as well, we add a new reset cause for record&replay, so that we can avoid re-randomizing in these cases.
Jason A. Donenfeld (8):
device-tree: add re-randomization helper function
arm: re-randomize rng-seed on reboot
riscv: re-randomize rng-seed on reboot
openrisc: re-randomize rng-seed on reboot
rx: re-randomize rng-seed on reboot
mips: re-randomize rng-seed on reboot
reset: allow registering handlers that aren't called by snapshot
loading
reset: do not re-randomize RNG seed on snapshot load
hw/arm/aspeed.c | 4 ++-- hw/arm/boot.c | 2 ++ hw/arm/mps2-tz.c | 4 ++-- hw/core/reset.c | 15 ++++++++++++++- hw/hppa/machine.c | 4 ++-- hw/i386/microvm.c | 4 ++-- hw/i386/pc.c | 6 +++--- hw/i386/x86.c | 2 +- hw/mips/boston.c | 3 +++ hw/openrisc/boot.c | 3 +++ hw/ppc/pegasos2.c | 4 ++-- hw/ppc/pnv.c | 4 ++-- hw/ppc/spapr.c | 4 ++-- hw/riscv/boot.c | 3 +++ hw/rx/rx-gdbsim.c | 3 +++ hw/s390x/s390-virtio-ccw.c | 4 ++-- include/hw/boards.h | 2 +- include/sysemu/device_tree.h | 9 +++++++++ include/sysemu/reset.h | 5 ++++- migration/savevm.c | 2 +- qapi/run-state.json | 4 +++- softmmu/device_tree.c | 21 +++++++++++++++++++++ softmmu/runstate.c | 4 ++-- 23 files changed, 89 insertions(+), 27 deletions(-)
Signature · 1 line
2.37.3
PATCH v2 1/8 device-tree: add re-randomization helper function
When the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Several architectures require this functionality, so export a function for injecting a new seed into the given FDT.
--- include/sysemu/device_tree.h | 9 +++++++++ softmmu/device_tree.c | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+)
include/sysemu/device_tree.h +9 -0
@@ -196,6 +196,15 @@ int qemu_fdt_setprop_sized_cells_from_array(void *fdt, qdt_tmp); \ }) + +/** +* qemu_fdt_randomize_seeds: +* @fdt: device tree blob +* +* Re-randomize all "rng-seed" properties with new seeds. +*/ +void qemu_fdt_randomize_seeds (void *fdt); +#define FDT_PCI_RANGE_RELOCATABLE 0x80000000#define FDT_PCI_RANGE_PREFETCHABLE 0x40000000#define FDT_PCI_RANGE_ALIASED 0x20000000
softmmu/device_tree.c +21 -0
@@ -22,6 +22,7 @@#include "qemu/option.h" #include "qemu/bswap.h" #include "qemu/cutils.h" +#include "qemu/guest-random.h" #include "sysemu/device_tree.h" #include "hw/loader.h" #include "hw/boards.h"
@@ -643,3 +644,23 @@ out:g_free (propcells);return ret; } + +void qemu_fdt_randomize_seeds (void *fdt) +{ +int noffset, poffset, len; +const char *name; +uint8_t *data; + +for (noffset =fdt_next_node (fdt,0 ,NULL ); + noffset >=0 ; + noffset =fdt_next_node (fdt, noffset,NULL )) { +for (poffset =fdt_first_property_offset (fdt, noffset); + poffset >=0 ; + poffset =fdt_next_property_offset (fdt, poffset)) { + data = (uint8_t *)fdt_getprop_by_offset (fdt, poffset, &name, &len); +if (!data ||strcmp (name,"rng-seed" )) +continue ; +qemu_guest_getrandom_nofail (data, len); + } + } +}
Signature · 1 line
2.37.3
Re: [PATCH v2 1/8] device-tree: add re-randomization helper function
Quoted 9 lines · Jason A. Donenfeld
When the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Several architectures require this functionality, so export a function for injecting a new seed into the given FDT.
Cc Alistair Francis <[email protected]>Cc David Gibson <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Alistair
Quoted 65 lines
--- include/sysemu/device_tree.h | 9 +++++++++ softmmu/device_tree.c | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+)include/sysemu/device_tree.h +9
-0@@ -196,6 +196,15 @@ int qemu_fdt_setprop_sized_cells_from_array(void *fdt, qdt_tmp); \ }) + +/** +* qemu_fdt_randomize_seeds: +* @fdt: device tree blob +* +* Re-randomize all "rng-seed" properties with new seeds. +*/ +void qemu_fdt_randomize_seeds (void *fdt); +#define FDT_PCI_RANGE_RELOCATABLE 0x80000000#define FDT_PCI_RANGE_PREFETCHABLE 0x40000000#define FDT_PCI_RANGE_ALIASED 0x20000000softmmu/device_tree.c +21
-1@@ -22,6 +22,7 @@#include "qemu/option.h" #include "qemu/bswap.h" #include "qemu/cutils.h" +#include "qemu/guest-random.h" #include "sysemu/device_tree.h" #include "hw/loader.h" #include "hw/boards.h" @@ -643,3 +644,23 @@ out:g_free (propcells);return ret; } + +void qemu_fdt_randomize_seeds (void *fdt) +{ +int noffset, poffset, len; +const char *name; +uint8_t *data; + +for (noffset =fdt_next_node (fdt,0 ,NULL ); + noffset >=0 ; + noffset =fdt_next_node (fdt, noffset,NULL )) { +for (poffset =fdt_first_property_offset (fdt, noffset); + poffset >=0 ; + poffset =fdt_next_property_offset (fdt, poffset)) { + data = (uint8_t *)fdt_getprop_by_offset (fdt, poffset, &name, &len); +if (!data ||strcmp (name,"rng-seed" )) +continue ; +qemu_guest_getrandom_nofail (data, len); + } + } +} --2.37.3
PATCH v2 2/8 arm: re-randomize rng-seed on reboot
In reply to Jason A. DonenfeldWhen the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT.
--- hw/arm/boot.c | 1 + 1 file changed, 1 insertion(+)
hw/arm/boot.c +1 -0
@@ -683,6 +683,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,* the DTB is copied again upon reset, even if addr points into RAM. */ rom_add_blob_fixed_as ("dtb" , fdt, size, addr, as); +qemu_register_reset (qemu_fdt_randomize_seeds,rom_ptr_for_as (as, addr, size));g_free (fdt);
Signature · 1 line
2.37.3
PATCH v2 3/8 riscv: re-randomize rng-seed on reboot
In reply to Jason A. DonenfeldWhen the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT.
--- hw/riscv/boot.c | 3 +++ 1 file changed, 3 insertions(+)
hw/riscv/boot.c +3 -0
@@ -30,6 +30,7 @@#include "sysemu/device_tree.h" #include "sysemu/qtest.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include <libfdt.h>
@@ -241,6 +242,8 @@ uint64_t riscv_load_fdt(hwaddr dram_base, uint64_t mem_size, void *fdt)rom_add_blob_fixed_as ("fdt" , fdt, fdtsize, fdt_addr, &address_space_memory); +qemu_register_reset (qemu_fdt_randomize_seeds, +rom_ptr_for_as (&address_space_memory, fdt_addr, fdtsize));return fdt_addr; }
Signature · 1 line
2.37.3
Re: [PATCH v2 3/8] riscv: re-randomize rng-seed on reboot
Quoted 11 lines · Jason A. Donenfeld
When the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT.
Cc Palmer Dabbelt <[email protected]>Cc Alistair Francis <[email protected]>Cc Bin Meng <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Alistair
Quoted 29 lines
--- hw/riscv/boot.c | 3 +++ 1 file changed, 3 insertions(+)hw/riscv/boot.c +3
-1@@ -30,6 +30,7 @@#include "sysemu/device_tree.h" #include "sysemu/qtest.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include <libfdt.h> @@ -241,6 +242,8 @@ uint64_t riscv_load_fdt(hwaddr dram_base, uint64_t mem_size, void *fdt)rom_add_blob_fixed_as ("fdt" , fdt, fdtsize, fdt_addr, &address_space_memory); +qemu_register_reset (qemu_fdt_randomize_seeds, +rom_ptr_for_as (&address_space_memory, fdt_addr, fdtsize));return fdt_addr; } --2.37.3
PATCH v2 4/8 openrisc: re-randomize rng-seed on reboot
In reply to Jason A. DonenfeldWhen the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT.
--- hw/openrisc/boot.c | 3 +++ 1 file changed, 3 insertions(+)
hw/openrisc/boot.c +3 -0
@@ -14,6 +14,7 @@#include "hw/openrisc/boot.h" #include "sysemu/device_tree.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include <libfdt.h>
@@ -111,6 +112,8 @@ uint32_t openrisc_load_fdt(void *fdt, hwaddr load_start,rom_add_blob_fixed_as ("fdt" , fdt, fdtsize, fdt_addr, &address_space_memory); +qemu_register_reset (qemu_fdt_randomize_seeds, +rom_ptr_for_as (&address_space_memory, fdt_addr, fdtsize));return fdt_addr; }
Signature · 1 line
2.37.3
PATCH v2 5/8 rx: re-randomize rng-seed on reboot
In reply to Jason A. DonenfeldWhen the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT.
--- hw/rx/rx-gdbsim.c | 3 +++ 1 file changed, 3 insertions(+)
hw/rx/rx-gdbsim.c +3 -0
@@ -25,6 +25,7 @@#include "hw/rx/rx62n.h" #include "sysemu/qtest.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "qom/object.h"
@@ -148,6 +149,8 @@ static void rx_gdbsim_init(MachineState *machine) dtb_offset =ROUND_DOWN (machine->ram_size - dtb_size,16 );rom_add_blob_fixed ("dtb" , dtb, dtb_size,SDRAM_BASE + dtb_offset); +qemu_register_reset (qemu_fdt_randomize_seeds, +rom_ptr (SDRAM_BASE + dtb_offset, dtb_size));/* Set dtb address to R1 */ RX_CPU (first_cpu)->env.regs[1 ] =SDRAM_BASE + dtb_offset; }
Signature · 1 line
2.37.3
Re: [PATCH v2 5/8] rx: re-randomize rng-seed on reboot
Quoted 36 lines · Jason A. Donenfeld
When the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT.
Cc Yoshinori Sato <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>--- hw/rx/rx-gdbsim.c | 3 +++ 1 file changed, 3 insertions(+)hw/rx/rx-gdbsim.c +3
-0@@ -25,6 +25,7 @@#include "hw/rx/rx62n.h" #include "sysemu/qtest.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "qom/object.h" @@ -148,6 +149,8 @@ static void rx_gdbsim_init(MachineState *machine) dtb_offset =ROUND_DOWN (machine->ram_size - dtb_size,16 );rom_add_blob_fixed ("dtb" , dtb, dtb_size,SDRAM_BASE + dtb_offset); +qemu_register_reset (qemu_fdt_randomize_seeds, +rom_ptr (SDRAM_BASE + dtb_offset, dtb_size));/* Set dtb address to R1 */ RX_CPU (first_cpu)->env.regs[1 ] =SDRAM_BASE + dtb_offset; }Signature · 1 line
2.37.3
Signature · 1 line
Yosinori Sato
PATCH v2 6/8 mips: re-randomize rng-seed on reboot
In reply to Jason A. DonenfeldWhen the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT.
--- hw/mips/boston.c | 3 +++ 1 file changed, 3 insertions(+)
hw/mips/boston.c +3 -0
@@ -41,6 +41,7 @@#include "sysemu/sysemu.h" #include "sysemu/qtest.h" #include "sysemu/runstate.h" +#include "sysemu/reset.h" #include <libfdt.h> #include "qom/object.h"
@@ -810,6 +811,8 @@ static void boston_mach_init(MachineState *machine)/* Calculate real fdt size after filter */ dt_size =fdt_totalsize (dtb_load_data);rom_add_blob_fixed ("dtb" , dtb_load_data, dt_size, dtb_paddr); +qemu_register_reset (qemu_fdt_randomize_seeds, +rom_ptr (dtb_paddr, dt_size)); }else {/* Try to load file as FIT */ fit_err =load_fit (&boston_fit_loader, machine->kernel_filename, s);
Signature · 1 line
2.37.3
PATCH v2 7/8 reset: allow registering handlers that aren't called by snapshot loading
In reply to Jason A. DonenfeldSnapshot loading only expects to call deterministic handlers, not non-deterministic ones. So introduce a way of registering handlers that won't be called when reseting for snapshots.
--- hw/arm/aspeed.c | 4 ++-- hw/arm/mps2-tz.c | 4 ++-- hw/core/reset.c | 15 ++++++++++++++- hw/hppa/machine.c | 4 ++-- hw/i386/microvm.c | 4 ++-- hw/i386/pc.c | 6 +++--- hw/ppc/pegasos2.c | 4 ++-- hw/ppc/pnv.c | 4 ++-- hw/ppc/spapr.c | 4 ++-- hw/s390x/s390-virtio-ccw.c | 4 ++-- include/hw/boards.h | 2 +- include/sysemu/reset.h | 5 ++++- migration/savevm.c | 2 +- qapi/run-state.json | 4 +++- softmmu/runstate.c | 4 ++-- 15 files changed, 44 insertions(+), 26 deletions(-)
hw/arm/aspeed.c +2 -2
@@ -1349,12 +1349,12 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data)aspeed_soc_num_cpus (amc->soc_name); } -static void fby35_reset (MachineState *state) +static void fby35_reset (MachineState *state,ShutdownCause reason) {AspeedMachineState *bmc =ASPEED_MACHINE (state);AspeedGPIOState *gpio = &bmc->soc.gpio; -qemu_devices_reset (); +qemu_devices_reset (reason);/* Board ID: 7 (Class-1, 4 slots) */ object_property_set_bool (OBJECT (gpio),"gpioV4" , true, &error_fatal);
hw/arm/mps2-tz.c +2 -2
@@ -1239,7 +1239,7 @@ static void mps2_set_remap(Object *obj, const char *value, Error **errp) } } -static void mps2_machine_reset (MachineState *machine) +static void mps2_machine_reset (MachineState *machine,ShutdownCause reason) {MPS2TZMachineState *mms =MPS2TZ_MACHINE (machine);
@@ -1249,7 +1249,7 @@ static void mps2_machine_reset(MachineState *machine)* reset see the correct mapping. */ remap_memory (mms, mms->remap); -qemu_devices_reset (); +qemu_devices_reset (reason); }static void mps2tz_class_init (ObjectClass *oc,void *data)
hw/core/reset.c +14 -1
@@ -33,6 +33,7 @@ typedef struct QEMUResetEntry {QTAILQ_ENTRY (QEMUResetEntry) entry;QEMUResetHandler *func;void *opaque; +bool skip_on_snapshot_load; } QEMUResetEntry; static QTAILQ_HEAD(, QEMUResetEntry) reset_handlers =
@@ -47,6 +48,16 @@ void qemu_register_reset(QEMUResetHandler *func, void *opaque)QTAILQ_INSERT_TAIL (&reset_handlers, re, entry); } +void qemu_register_reset_nosnapshotload (QEMUResetHandler *func,void *opaque) +{ +QEMUResetEntry *re =g_new0 (QEMUResetEntry,1 ); + + re->func = func; + re->opaque = opaque; + re->skip_on_snapshot_load = true; +QTAILQ_INSERT_TAIL (&reset_handlers, re, entry); +} +void qemu_unregister_reset (QEMUResetHandler *func,void *opaque) {QEMUResetEntry *re;
@@ -60,12 +71,14 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque) } } -void qemu_devices_reset (void ) +void qemu_devices_reset (ShutdownCause reason) {QEMUResetEntry *re, *nre;/* reset all devices */ QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) { +if (reason ==SHUTDOWN_CAUSE_SNAPSHOT_LOAD && re->skip_on_snapshot_load) +continue ; re->func (re->opaque); } }
hw/hppa/machine.c +2 -2
@@ -411,12 +411,12 @@ static void machine_hppa_init(MachineState *machine) cpu[0 ]->env.gr[19 ] =FW_CFG_IO_BASE ; } -static void hppa_machine_reset (MachineState *ms) +static void hppa_machine_reset (MachineState *ms,ShutdownCause reason) {unsigned int smp_cpus = ms->smp.cpus;int i; -qemu_devices_reset (); +qemu_devices_reset (reason);/* Start all CPUs at the firmware entry point. * Monarch CPU will initialize firmware, secondary CPUs
hw/i386/microvm.c +2 -2
@@ -467,7 +467,7 @@ static void microvm_machine_state_init(MachineState *machine)microvm_devices_init (mms); } -static void microvm_machine_reset (MachineState *machine) +static void microvm_machine_reset (MachineState *machine,ShutdownCause reason) {MicrovmMachineState *mms =MICROVM_MACHINE (machine);CPUState *cs;
@@ -480,7 +480,7 @@ static void microvm_machine_reset(MachineState *machine) mms->kernel_cmdline_fixed = true; } -qemu_devices_reset (); +qemu_devices_reset (reason);CPU_FOREACH (cs) { cpu =X86_CPU (cs);
hw/i386/pc.c +3 -3
@@ -1846,12 +1846,12 @@ static void pc_machine_initfn(Object *obj)cxl_machine_init (obj, &pcms->cxl_devices_state); } -static void pc_machine_reset (MachineState *machine) +static void pc_machine_reset (MachineState *machine,ShutdownCause reason) {CPUState *cs;X86CPU *cpu; -qemu_devices_reset (); +qemu_devices_reset (reason);/* Reset APIC after devices have been reset to cancel * any changes that qemu_devices_reset() might have done.
@@ -1868,7 +1868,7 @@ static void pc_machine_reset(MachineState *machine)static void pc_machine_wakeup (MachineState *machine) {cpu_synchronize_all_states (); -pc_machine_reset (machine); +pc_machine_reset (machine,SHUTDOWN_CAUSE_NONE );cpu_synchronize_all_post_reset (); }
hw/ppc/pegasos2.c +2 -2
@@ -248,14 +248,14 @@ static void pegasos2_pci_config_write(Pegasos2MachineState *pm, int bus,pegasos2_mv_reg_write (pm, pcicfg +4 , len, val); } -static void pegasos2_machine_reset (MachineState *machine) +static void pegasos2_machine_reset (MachineState *machine,ShutdownCause reason) {Pegasos2MachineState *pm =PEGASOS2_MACHINE (machine);void *fdt;uint64_t d[2 ];int sz; -qemu_devices_reset (); +qemu_devices_reset (reason);if (!pm->vof) {return ;/* Firmware should set up machine so nothing to do */ }
hw/ppc/pnv.c +2 -2
@@ -643,13 +643,13 @@ static void pnv_powerdown_notify(Notifier *n, void *opaque) } } -static void pnv_reset (MachineState *machine) +static void pnv_reset (MachineState *machine,ShutdownCause reason) {PnvMachineState *pnv =PNV_MACHINE (machine);IPMIBmc *bmc;void *fdt; -qemu_devices_reset (); +qemu_devices_reset (reason);/* * The machine should provide by default an internal BMC simulator.
hw/ppc/spapr.c +2 -2
@@ -1623,7 +1623,7 @@ void spapr_check_mmu_mode(bool guest_radix) } } -static void spapr_machine_reset (MachineState *machine) +static void spapr_machine_reset (MachineState *machine,ShutdownCause reason) {SpaprMachineState *spapr =SPAPR_MACHINE (machine);PowerPCCPU *first_ppc_cpu;
@@ -1649,7 +1649,7 @@ static void spapr_machine_reset(MachineState *machine)spapr_setup_hpt (spapr); } -qemu_devices_reset (); +qemu_devices_reset (reason);spapr_ovec_cleanup (spapr->ov5_cas); spapr->ov5_cas =spapr_ovec_new ();
hw/s390x/s390-virtio-ccw.c +2 -2
@@ -405,7 +405,7 @@ static void s390_pv_prepare_reset(S390CcwMachineState *ms)s390_pv_prep_reset (); } -static void s390_machine_reset (MachineState *machine) +static void s390_machine_reset (MachineState *machine,ShutdownCause reason) {S390CcwMachineState *ms =S390_CCW_MACHINE (machine);enum s390_reset reset_type;
@@ -427,7 +427,7 @@ static void s390_machine_reset(MachineState *machine)s390_machine_unprotect (ms); } -qemu_devices_reset (); +qemu_devices_reset (reason);s390_crypto_reset ();/* configure and start the ipl CPU only */
include/hw/boards.h +1 -1
@@ -231,7 +231,7 @@ struct MachineClass {const char *deprecation_reason;void (*init)(MachineState *state); -void (*reset)(MachineState *state); +void (*reset)(MachineState *state,ShutdownCause reason);void (*wakeup)(MachineState *state);int (*kvm_type)(MachineState *machine,const char *arg);
include/sysemu/reset.h +4 -1
@@ -1,10 +1,13 @@#ifndef QEMU_SYSEMU_RESET_H #define QEMU_SYSEMU_RESET_H +#include "qapi/qapi-events-run-state.h" +typedef void QEMUResetHandler (void *opaque);void qemu_register_reset (QEMUResetHandler *func,void *opaque); +void qemu_register_reset_nosnapshotload (QEMUResetHandler *func,void *opaque);void qemu_unregister_reset (QEMUResetHandler *func,void *opaque); -void qemu_devices_reset (void ); +void qemu_devices_reset (ShutdownCause reason);#endif
migration/savevm.c +1 -1
@@ -3058,7 +3058,7 @@ bool load_snapshot(const char *name, const char *vmstate, goto err_drain; } -qemu_system_reset (SHUTDOWN_CAUSE_NONE ); +qemu_system_reset (SHUTDOWN_CAUSE_SNAPSHOT_LOAD ); mis->from_src_file = f;if (!yank_register_instance (MIGRATION_YANK_INSTANCE , errp)) {
qapi/run-state.json +3 -1
@@ -86,12 +86,14 @@ # ignores --no-reboot. This is useful for sanitizing # hypercalls on s390 that are used during kexec/kdump/boot # +# @snapshot-load: A snapshot is being loaded by the record & replay subsystem. +# ## { 'enum': 'ShutdownCause', # Beware, shutdown_caused_by_guest() depends on enumeration order 'data': [ 'none', 'host-error', 'host-qmp-quit', 'host-qmp-system-reset', 'host-signal', 'host-ui', 'guest-shutdown', 'guest-reset', - 'guest-panic', 'subsystem-reset'] } + 'guest-panic', 'subsystem-reset', 'snapshot-load'] } ## # @StatusInfo:
softmmu/runstate.c +2 -2
@@ -441,9 +441,9 @@ void qemu_system_reset(ShutdownCause reason)cpu_synchronize_all_states ();if (mc && mc->reset) { - mc->reset (current_machine); + mc->reset (current_machine, reason); }else { -qemu_devices_reset (); +qemu_devices_reset (reason); }if (reason && reason !=SHUTDOWN_CAUSE_SUBSYSTEM_RESET ) {qapi_event_send_reset (shutdown_caused_by_guest (reason), reason);
Signature · 1 line
2.37.3
PATCH v2 8/8 reset: do not re-randomize RNG seed on snapshot load
In reply to Jason A. DonenfeldSnapshot loading is supposed to be deterministic, so we shouldn't re-randomize the various seeds used.
--- hw/arm/boot.c | 3 ++- hw/i386/x86.c | 2 +- hw/mips/boston.c | 2 +- hw/openrisc/boot.c | 2 +- hw/riscv/boot.c | 2 +- hw/rx/rx-gdbsim.c | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-)
hw/arm/boot.c +2 -1
@@ -683,7 +683,8 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,* the DTB is copied again upon reset, even if addr points into RAM. */ rom_add_blob_fixed_as ("dtb" , fdt, size, addr, as); -qemu_register_reset (qemu_fdt_randomize_seeds,rom_ptr_for_as (as, addr, size)); +qemu_register_reset_nosnapshotload (qemu_fdt_randomize_seeds, +rom_ptr_for_as (as, addr, size));g_free (fdt);
hw/i386/x86.c +1 -1
@@ -1111,7 +1111,7 @@ void x86_load_linux(X86MachineState *x86ms, setup_data->type =cpu_to_le32 (SETUP_RNG_SEED ); setup_data->len =cpu_to_le32 (RNG_SEED_LENGTH );qemu_guest_getrandom_nofail (setup_data->data,RNG_SEED_LENGTH ); -qemu_register_reset (reset_rng_seed, setup_data); +qemu_register_reset_nosnapshotload (reset_rng_seed, setup_data);fw_cfg_add_bytes_callback (fw_cfg,FW_CFG_KERNEL_DATA , reset_rng_seed,NULL , setup_data, kernel, kernel_size, true); }else {
hw/mips/boston.c +1 -1
@@ -811,7 +811,7 @@ static void boston_mach_init(MachineState *machine)/* Calculate real fdt size after filter */ dt_size =fdt_totalsize (dtb_load_data);rom_add_blob_fixed ("dtb" , dtb_load_data, dt_size, dtb_paddr); -qemu_register_reset (qemu_fdt_randomize_seeds, +qemu_register_reset_nosnapshotload (qemu_fdt_randomize_seeds,rom_ptr (dtb_paddr, dt_size)); }else {/* Try to load file as FIT */
hw/openrisc/boot.c +1 -1
@@ -112,7 +112,7 @@ uint32_t openrisc_load_fdt(void *fdt, hwaddr load_start,rom_add_blob_fixed_as ("fdt" , fdt, fdtsize, fdt_addr, &address_space_memory); -qemu_register_reset (qemu_fdt_randomize_seeds, +qemu_register_reset_nosnapshotload (qemu_fdt_randomize_seeds,rom_ptr_for_as (&address_space_memory, fdt_addr, fdtsize));return fdt_addr;
hw/riscv/boot.c +1 -1
@@ -242,7 +242,7 @@ uint64_t riscv_load_fdt(hwaddr dram_base, uint64_t mem_size, void *fdt)rom_add_blob_fixed_as ("fdt" , fdt, fdtsize, fdt_addr, &address_space_memory); -qemu_register_reset (qemu_fdt_randomize_seeds, +qemu_register_reset_nosnapshotload (qemu_fdt_randomize_seeds,rom_ptr_for_as (&address_space_memory, fdt_addr, fdtsize));return fdt_addr;
hw/rx/rx-gdbsim.c +1 -1
@@ -149,7 +149,7 @@ static void rx_gdbsim_init(MachineState *machine) dtb_offset =ROUND_DOWN (machine->ram_size - dtb_size,16 );rom_add_blob_fixed ("dtb" , dtb, dtb_size,SDRAM_BASE + dtb_offset); -qemu_register_reset (qemu_fdt_randomize_seeds, +qemu_register_reset_nosnapshotload (qemu_fdt_randomize_seeds,rom_ptr (SDRAM_BASE + dtb_offset, dtb_size));/* Set dtb address to R1 */ RX_CPU (first_cpu)->env.regs[1 ] =SDRAM_BASE + dtb_offset;
Signature · 1 line
2.37.3
Quoted 8 lines · Jason A. Donenfeld
When the system reboots, the rng seed that QEMU passes should be re-randomized, so that the new boot gets a new seed. This series wires that up for FDT.
Then, since the record&replay subsystem makes use of reset as well, we add a new reset cause for record&replay, so that we can avoid re-randomizing in these cases.
Quoted 10 lines
Jason A. Donenfeld (8):
device-tree: add re-randomization helper function
arm: re-randomize rng-seed on reboot
riscv: re-randomize rng-seed on reboot
openrisc: re-randomize rng-seed on reboot
rx: re-randomize rng-seed on reboot
mips: re-randomize rng-seed on reboot
reset: allow registering handlers that aren't called by snapshot
loading
reset: do not re-randomize RNG seed on snapshot load
You need to invert the patch order so that the series is bisectable. At the moment you still introduce the reported bug, then fix it in the final patch.
r~
Quoted 20 lines · Richard Henderson
Quoted 8 lines · Jason A. Donenfeld
When the system reboots, the rng seed that QEMU passes should be re-randomized, so that the new boot gets a new seed. This series wires that up for FDT.
Then, since the record&replay subsystem makes use of reset as well, we add a new reset cause for record&replay, so that we can avoid re-randomizing in these cases.
Quoted 10 lines
Jason A. Donenfeld (8):
device-tree: add re-randomization helper function
arm: re-randomize rng-seed on reboot
riscv: re-randomize rng-seed on reboot
openrisc: re-randomize rng-seed on reboot
rx: re-randomize rng-seed on reboot
mips: re-randomize rng-seed on reboot
reset: allow registering handlers that aren't called by snapshot
loading
reset: do not re-randomize RNG seed on snapshot load
Quoted 2 lines
You need to invert the patch order so that the series is bisectable. At the moment you still introduce the reported bug, then fix it in the final patch.
I was afraid of that. Okay, will do. v+1 coming your way.
Jason