@@ -68,6 +68,7 @@
#include "qemu/pmem.h"
#include "qemu/memfd.h"
+#include "qemu/env.h"
#include "migration/vmstate.h"
@@ -2256,7 +2257,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)
} else {
name = memory_region_name(new_block->mr);
if (memfd_alloc) {
- int mfd = -1; /* placeholder until next patch */
+ int mfd = getenv_fd(name);
mr->align = QEMU_VMALLOC_ALIGN;
if (mfd < 0) {
mfd = qemu_memfd_create(name, maxlen + mr->align,
@@ -2264,7 +2265,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)
if (mfd < 0) {
return;
}
+ setenv_fd(name, mfd);
}
+ qemu_clr_cloexec(mfd);
new_block->flags |= RAM_SHARED;
addr = file_ram_alloc(new_block, maxlen, mfd, false, errp);
trace_anon_memfd_alloc(name, maxlen, addr, mfd);
@@ -2521,6 +2524,7 @@ void qemu_ram_free(RAMBlock *block)
}
qemu_mutex_lock_ramlist();
+ unsetenv_fd(memory_region_name(block->mr));
QLIST_REMOVE_RCU(block, next);
ram_list.mru_block = NULL;
/* Write list before version */
new file mode 100644
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef MIGRATION_CPR_H
+#define MIGRATION_CPR_H
+
+#include "qapi/qapi-types-cpr.h"
+
+bool cpr_active(void);
+void cprsave(const char *file, CprMode mode, Error **errp);
+void cprload(const char *file, Error **errp);
+
+#endif
@@ -14,6 +14,7 @@ extern const char *qemu_name;
extern QemuUUID qemu_uuid;
extern bool qemu_uuid_set;
extern bool memfd_alloc;
+extern int start_on_wake;
void qemu_add_data_dir(const char *path);
@@ -1,5 +1,5 @@
common-obj-y += migration.o socket.o fd.o exec.o
-common-obj-y += tls.o channel.o savevm.o
+common-obj-y += tls.o channel.o savevm.o cpr.o
common-obj-y += colo.o colo-failover.o
common-obj-y += vmstate.o vmstate-types.o page_cache.o
common-obj-y += qemu-file.o global_state.o
new file mode 100644
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/xen/xen.h"
+#include "monitor/monitor.h"
+#include "migration.h"
+#include "migration/snapshot.h"
+#include "chardev/char.h"
+#include "migration/misc.h"
+#include "migration/cpr.h"
+#include "migration/global_state.h"
+#include "qemu-file-channel.h"
+#include "qemu-file.h"
+#include "savevm.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
+#include "io/channel-buffer.h"
+#include "io/channel-file.h"
+#include "sysemu/runstate.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/xen.h"
+#include "sysemu/replay.h"
+#include "hw/vfio/vfio-common.h"
+#include "hw/virtio/vhost.h"
+#include "qemu/env.h"
+
+static int cpr_is_active;
+
+bool cpr_active(void)
+{
+ return cpr_is_active;
+}
+
+QEMUFile *qf_file_open(const char *path, int flags, int mode,
+ const char *name, Error **errp)
+{
+ QIOChannelFile *fioc;
+ QIOChannel *ioc;
+ QEMUFile *f;
+
+ if (flags & O_RDWR) {
+ error_setg(errp, "qf_file_open %s: O_RDWR not supported", path);
+ return 0;
+ }
+
+ fioc = qio_channel_file_new_path(path, flags, mode, errp);
+ if (!fioc) {
+ return 0;
+ }
+
+ ioc = QIO_CHANNEL(fioc);
+ qio_channel_set_name(ioc, name);
+ f = (flags & O_WRONLY) ? qemu_fopen_channel_output(ioc) :
+ qemu_fopen_channel_input(ioc);
+ object_unref(OBJECT(fioc));
+ return f;
+}
+
+static int preserve_fd(const char *name, const char *val, void *handle)
+{
+ qemu_clr_cloexec(atoi(val));
+ return 0;
+}
+
+void cprsave(const char *file, CprMode mode, Error **errp)
+{
+ int ret = 0;
+ QEMUFile *f;
+ int saved_vm_running = runstate_is_running();
+ bool restart = (mode == CPR_MODE_RESTART);
+ bool reboot = (mode == CPR_MODE_REBOOT);
+
+ if (reboot && qemu_ram_volatile(errp)) {
+ return;
+ }
+
+ if (restart && xen_enabled()) {
+ error_setg(errp, "xen does not support cprsave restart");
+ return;
+ }
+
+ if (migrate_colo_enabled()) {
+ error_setg(errp, "error: cprsave does not support x-colo");
+ return;
+ }
+
+ if (replay_mode != REPLAY_MODE_NONE) {
+ error_setg(errp, "error: cprsave does not support replay");
+ return;
+ }
+
+ f = qf_file_open(file, O_CREAT | O_WRONLY | O_TRUNC, 0600, "cprsave", errp);
+ if (!f) {
+ return;
+ }
+
+ ret = global_state_store();
+ if (ret) {
+ error_setg(errp, "Error saving global state");
+ qemu_fclose(f);
+ return;
+ }
+ if (runstate_check(RUN_STATE_SUSPENDED)) {
+ /* Update timers_state before saving. Suspend did not so do. */
+ cpu_disable_ticks();
+ }
+ vm_stop(RUN_STATE_SAVE_VM);
+
+ cpr_is_active = true;
+ ret = qemu_save_device_state(f);
+ qemu_fclose(f);
+ if (ret < 0) {
+ error_setg(errp, QERR_IO_ERROR);
+ goto err;
+ }
+
+ if (ret < 0) {
+ if (!*errp) {
+ error_setg(errp, "qemu_savevm_state failed");
+ }
+ goto err;
+ }
+
+ if (reboot) {
+ no_shutdown = 0;
+ qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
+ } else if (restart) {
+ walkenv(FD_PREFIX, preserve_fd, 0);
+ setenv("QEMU_START_FREEZE", "", 1);
+ qemu_system_exec_request();
+ }
+ goto done;
+
+err:
+ if (saved_vm_running) {
+ vm_start();
+ }
+done:
+ cpr_is_active = false;
+ return;
+}
+
+void cprload(const char *file, Error **errp)
+{
+ QEMUFile *f;
+ int ret;
+ RunState state;
+
+ if (runstate_is_running()) {
+ error_setg(errp, "cprload called for a running VM");
+ return;
+ }
+
+ f = qf_file_open(file, O_RDONLY, 0, "cprload", errp);
+ if (!f) {
+ return;
+ }
+
+ if (qemu_get_be32(f) != QEMU_VM_FILE_MAGIC ||
+ qemu_get_be32(f) != QEMU_VM_FILE_VERSION) {
+ error_setg(errp, "error: %s is not a vmstate file", file);
+ return;
+ }
+
+ ret = qemu_load_device_state(f);
+ qemu_fclose(f);
+ if (ret < 0) {
+ error_setg(errp, "Error %d while loading VM state", ret);
+ return;
+ }
+
+ state = global_state_get_runstate();
+ if (state == RUN_STATE_RUNNING) {
+ vm_start();
+ } else {
+ runstate_set(state);
+ if (runstate_check(RUN_STATE_SUSPENDED)) {
+ start_on_wake = 1;
+ }
+ }
+}
@@ -64,5 +64,7 @@ int qemu_loadvm_state(QEMUFile *f);
void qemu_loadvm_state_cleanup(void);
int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis);
int qemu_load_device_state(QEMUFile *f);
+QEMUFile *qf_file_open(const char *path, int flags, int mode,
+ const char *name, Error **errp);
#endif
@@ -165,6 +165,7 @@ uint8_t *boot_splash_filedata;
int only_migratable; /* turn it off unless user states otherwise */
bool wakeup_suspend_enabled;
bool memfd_alloc;
+int start_on_wake;
static char **argv_main;
int icount_align_option;
@@ -604,6 +605,8 @@ static const RunStateTransition runstate_transitions_def[] = {
{ RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING },
{ RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE },
{ RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
+ { RUN_STATE_PRELAUNCH, RUN_STATE_SUSPENDED },
+ { RUN_STATE_PRELAUNCH, RUN_STATE_PAUSED },
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_PAUSED },
@@ -1527,7 +1530,17 @@ void qemu_system_wakeup_request(WakeupReason reason, Error **errp)
if (!(wakeup_reason_mask & (1 << reason))) {
return;
}
- runstate_set(RUN_STATE_RUNNING);
+
+ /*
+ * Must call vm_start if it has never been called, to invoke the state
+ * change callbacks for the first time.
+ */
+ if (start_on_wake) {
+ start_on_wake = 0;
+ vm_start();
+ } else {
+ runstate_set(RUN_STATE_RUNNING);
+ }
wakeup_reason = reason;
qemu_notify_event();
}
@@ -4510,6 +4523,12 @@ void qemu_init(int argc, char **argv, char **envp)
exit(0);
}
+ /* Equivalent to -S, but no need for parent to modify argv. */
+ if (getenv("QEMU_START_FREEZE")) {
+ unsetenv("QEMU_START_FREEZE");
+ autostart = 0;
+ }
+
if (incoming) {
Error *local_err = NULL;
qemu_start_incoming_migration(incoming, &local_err);
Provide the cprsave and cprload functions for live update. These save and restore VM state, with minimal guest pause time, so that qemu may be updated to a new version in between. cprsave stops the VM and saves vmstate to an ordinary file. It supports two modes: restart and reboot. For restart, cprsave exec's the qemu binary (or /usr/bin/qemu-exec if it exists) with the same argv. qemu restarts in a paused state and waits for the cprload command. To use the restart mode, qemu must be started with the memfd-alloc option. The memfd's are saved to the environment and kept open across exec, after which they are found from the environment and re-mmap'd. Hence guest ram is preserved in place, albeit with new virtual addresses in the qemu process. The caller resumes the guest by calling cprload, which loads state from the file. If the VM was running at cprsave time, then VM execution resumes. cprsave supports any type of guest image and block device, but the caller must not modify guest block devices between cprsave and cprload. For the reboot mode, cprsave saves state and exits qemu, and the caller is allowed to update the host kernel and system software and reboot. The caller resumes the guest by running qemu with the same arguments as the original process and calling cprload. To use this mode, guest ram must be mapped to a persistent shared memory file such as /dev/dax0.0 or /dev/shm PKRAM. The reboot mode supports vfio devices if the caller suspends the guest instead of stopping the VM, such as by issuing guest-suspend-ram to the qemu guest agent. The guest drivers' suspend methods flush outstanding requests and re-initialize the devices, and thus there is no device state to save and restore. The restart mode supports vfio devices in a subsequent patch. Signed-off-by: Steve Sistare <steven.sistare@oracle.com> --- exec.c | 6 +- include/migration/cpr.h | 17 +++++ include/sysemu/sysemu.h | 1 + migration/Makefile.objs | 2 +- migration/cpr.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++++ migration/savevm.h | 2 + softmmu/vl.c | 21 +++++- 7 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 include/migration/cpr.h create mode 100644 migration/cpr.c