mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
migration: cpr-state
CPR must save state that is needed after QEMU is restarted, when devices are realized. Thus the extra state cannot be saved in the migration channel, as objects must already exist before that channel can be loaded. Instead, define auxilliary state structures and vmstate descriptions, not associated with any registered object, and serialize the aux state to a cpr-specific channel in cpr_state_save. Deserialize in cpr_state_load after QEMU restarts, before devices are realized. Provide accessors for clients to register file descriptors for saving. The mechanism for passing the fd's to the new process will be specific to each migration mode, and added in subsequent patches. Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Reviewed-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com> Link: https://lore.kernel.org/r/1736967650-129648-8-git-send-email-steven.sistare@oracle.com Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
parent
91792807d1
commit
e7d79011a4
5 changed files with 232 additions and 0 deletions
25
include/migration/cpr.h
Normal file
25
include/migration/cpr.h
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2021, 2024 Oracle and/or its affiliates.
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MIGRATION_CPR_H
|
||||||
|
#define MIGRATION_CPR_H
|
||||||
|
|
||||||
|
#include "qapi/qapi-types-migration.h"
|
||||||
|
|
||||||
|
#define QEMU_CPR_FILE_MAGIC 0x51435052
|
||||||
|
#define QEMU_CPR_FILE_VERSION 0x00000001
|
||||||
|
|
||||||
|
void cpr_save_fd(const char *name, int id, int fd);
|
||||||
|
void cpr_delete_fd(const char *name, int id);
|
||||||
|
int cpr_find_fd(const char *name, int id);
|
||||||
|
|
||||||
|
int cpr_state_save(MigrationChannel *channel, Error **errp);
|
||||||
|
int cpr_state_load(MigrationChannel *channel, Error **errp);
|
||||||
|
void cpr_state_close(void);
|
||||||
|
struct QIOChannel *cpr_state_ioc(void);
|
||||||
|
|
||||||
|
#endif
|
198
migration/cpr.c
Normal file
198
migration/cpr.c
Normal file
|
@ -0,0 +1,198 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2021-2024 Oracle and/or its affiliates.
|
||||||
|
*
|
||||||
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
|
* See the COPYING file in the top-level directory.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "qemu/osdep.h"
|
||||||
|
#include "qapi/error.h"
|
||||||
|
#include "migration/cpr.h"
|
||||||
|
#include "migration/misc.h"
|
||||||
|
#include "migration/options.h"
|
||||||
|
#include "migration/qemu-file.h"
|
||||||
|
#include "migration/savevm.h"
|
||||||
|
#include "migration/vmstate.h"
|
||||||
|
#include "system/runstate.h"
|
||||||
|
#include "trace.h"
|
||||||
|
|
||||||
|
/*************************************************************************/
|
||||||
|
/* cpr state container for all information to be saved. */
|
||||||
|
|
||||||
|
typedef QLIST_HEAD(CprFdList, CprFd) CprFdList;
|
||||||
|
|
||||||
|
typedef struct CprState {
|
||||||
|
CprFdList fds;
|
||||||
|
} CprState;
|
||||||
|
|
||||||
|
static CprState cpr_state;
|
||||||
|
|
||||||
|
/****************************************************************************/
|
||||||
|
|
||||||
|
typedef struct CprFd {
|
||||||
|
char *name;
|
||||||
|
unsigned int namelen;
|
||||||
|
int id;
|
||||||
|
int fd;
|
||||||
|
QLIST_ENTRY(CprFd) next;
|
||||||
|
} CprFd;
|
||||||
|
|
||||||
|
static const VMStateDescription vmstate_cpr_fd = {
|
||||||
|
.name = "cpr fd",
|
||||||
|
.version_id = 1,
|
||||||
|
.minimum_version_id = 1,
|
||||||
|
.fields = (VMStateField[]) {
|
||||||
|
VMSTATE_UINT32(namelen, CprFd),
|
||||||
|
VMSTATE_VBUFFER_ALLOC_UINT32(name, CprFd, 0, NULL, namelen),
|
||||||
|
VMSTATE_INT32(id, CprFd),
|
||||||
|
VMSTATE_INT32(fd, CprFd),
|
||||||
|
VMSTATE_END_OF_LIST()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
void cpr_save_fd(const char *name, int id, int fd)
|
||||||
|
{
|
||||||
|
CprFd *elem = g_new0(CprFd, 1);
|
||||||
|
|
||||||
|
trace_cpr_save_fd(name, id, fd);
|
||||||
|
elem->name = g_strdup(name);
|
||||||
|
elem->namelen = strlen(name) + 1;
|
||||||
|
elem->id = id;
|
||||||
|
elem->fd = fd;
|
||||||
|
QLIST_INSERT_HEAD(&cpr_state.fds, elem, next);
|
||||||
|
}
|
||||||
|
|
||||||
|
static CprFd *find_fd(CprFdList *head, const char *name, int id)
|
||||||
|
{
|
||||||
|
CprFd *elem;
|
||||||
|
|
||||||
|
QLIST_FOREACH(elem, head, next) {
|
||||||
|
if (!strcmp(elem->name, name) && elem->id == id) {
|
||||||
|
return elem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
void cpr_delete_fd(const char *name, int id)
|
||||||
|
{
|
||||||
|
CprFd *elem = find_fd(&cpr_state.fds, name, id);
|
||||||
|
|
||||||
|
if (elem) {
|
||||||
|
QLIST_REMOVE(elem, next);
|
||||||
|
g_free(elem->name);
|
||||||
|
g_free(elem);
|
||||||
|
}
|
||||||
|
|
||||||
|
trace_cpr_delete_fd(name, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
int cpr_find_fd(const char *name, int id)
|
||||||
|
{
|
||||||
|
CprFd *elem = find_fd(&cpr_state.fds, name, id);
|
||||||
|
int fd = elem ? elem->fd : -1;
|
||||||
|
|
||||||
|
trace_cpr_find_fd(name, id, fd);
|
||||||
|
return fd;
|
||||||
|
}
|
||||||
|
/*************************************************************************/
|
||||||
|
#define CPR_STATE "CprState"
|
||||||
|
|
||||||
|
static const VMStateDescription vmstate_cpr_state = {
|
||||||
|
.name = CPR_STATE,
|
||||||
|
.version_id = 1,
|
||||||
|
.minimum_version_id = 1,
|
||||||
|
.fields = (VMStateField[]) {
|
||||||
|
VMSTATE_QLIST_V(fds, CprState, 1, vmstate_cpr_fd, CprFd, next),
|
||||||
|
VMSTATE_END_OF_LIST()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
/*************************************************************************/
|
||||||
|
|
||||||
|
static QEMUFile *cpr_state_file;
|
||||||
|
|
||||||
|
QIOChannel *cpr_state_ioc(void)
|
||||||
|
{
|
||||||
|
return qemu_file_get_ioc(cpr_state_file);
|
||||||
|
}
|
||||||
|
|
||||||
|
int cpr_state_save(MigrationChannel *channel, Error **errp)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
QEMUFile *f;
|
||||||
|
MigMode mode = migrate_mode();
|
||||||
|
|
||||||
|
trace_cpr_state_save(MigMode_str(mode));
|
||||||
|
|
||||||
|
/* set f based on mode in a later patch in this series */
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
qemu_put_be32(f, QEMU_CPR_FILE_MAGIC);
|
||||||
|
qemu_put_be32(f, QEMU_CPR_FILE_VERSION);
|
||||||
|
|
||||||
|
ret = vmstate_save_state(f, &vmstate_cpr_state, &cpr_state, 0);
|
||||||
|
if (ret) {
|
||||||
|
error_setg(errp, "vmstate_save_state error %d", ret);
|
||||||
|
qemu_fclose(f);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Close the socket only partially so we can later detect when the other
|
||||||
|
* end closes by getting a HUP event.
|
||||||
|
*/
|
||||||
|
qemu_fflush(f);
|
||||||
|
qio_channel_shutdown(qemu_file_get_ioc(f), QIO_CHANNEL_SHUTDOWN_WRITE,
|
||||||
|
NULL);
|
||||||
|
cpr_state_file = f;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int cpr_state_load(MigrationChannel *channel, Error **errp)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
uint32_t v;
|
||||||
|
QEMUFile *f;
|
||||||
|
MigMode mode = 0;
|
||||||
|
|
||||||
|
/* set f and mode based on other parameters later in this patch series */
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
trace_cpr_state_load(MigMode_str(mode));
|
||||||
|
|
||||||
|
v = qemu_get_be32(f);
|
||||||
|
if (v != QEMU_CPR_FILE_MAGIC) {
|
||||||
|
error_setg(errp, "Not a migration stream (bad magic %x)", v);
|
||||||
|
qemu_fclose(f);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
v = qemu_get_be32(f);
|
||||||
|
if (v != QEMU_CPR_FILE_VERSION) {
|
||||||
|
error_setg(errp, "Unsupported migration stream version %d", v);
|
||||||
|
qemu_fclose(f);
|
||||||
|
return -ENOTSUP;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = vmstate_load_state(f, &vmstate_cpr_state, &cpr_state, 1);
|
||||||
|
if (ret) {
|
||||||
|
error_setg(errp, "vmstate_load_state error %d", ret);
|
||||||
|
qemu_fclose(f);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Let the caller decide when to close the socket (and generate a HUP event
|
||||||
|
* for the sending side).
|
||||||
|
*/
|
||||||
|
cpr_state_file = f;
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
void cpr_state_close(void)
|
||||||
|
{
|
||||||
|
if (cpr_state_file) {
|
||||||
|
qemu_fclose(cpr_state_file);
|
||||||
|
cpr_state_file = NULL;
|
||||||
|
}
|
||||||
|
}
|
|
@ -14,6 +14,7 @@ system_ss.add(files(
|
||||||
'block-active.c',
|
'block-active.c',
|
||||||
'channel.c',
|
'channel.c',
|
||||||
'channel-block.c',
|
'channel-block.c',
|
||||||
|
'cpr.c',
|
||||||
'cpu-throttle.c',
|
'cpu-throttle.c',
|
||||||
'dirtyrate.c',
|
'dirtyrate.c',
|
||||||
'exec.c',
|
'exec.c',
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "system/cpu-throttle.h"
|
#include "system/cpu-throttle.h"
|
||||||
#include "rdma.h"
|
#include "rdma.h"
|
||||||
#include "ram.h"
|
#include "ram.h"
|
||||||
|
#include "migration/cpr.h"
|
||||||
#include "migration/global_state.h"
|
#include "migration/global_state.h"
|
||||||
#include "migration/misc.h"
|
#include "migration/misc.h"
|
||||||
#include "migration.h"
|
#include "migration.h"
|
||||||
|
|
|
@ -342,6 +342,13 @@ colo_receive_message(const char *msg) "Receive '%s' message"
|
||||||
# colo-failover.c
|
# colo-failover.c
|
||||||
colo_failover_set_state(const char *new_state) "new state %s"
|
colo_failover_set_state(const char *new_state) "new state %s"
|
||||||
|
|
||||||
|
# cpr.c
|
||||||
|
cpr_save_fd(const char *name, int id, int fd) "%s, id %d, fd %d"
|
||||||
|
cpr_delete_fd(const char *name, int id) "%s, id %d"
|
||||||
|
cpr_find_fd(const char *name, int id, int fd) "%s, id %d returns %d"
|
||||||
|
cpr_state_save(const char *mode) "%s mode"
|
||||||
|
cpr_state_load(const char *mode) "%s mode"
|
||||||
|
|
||||||
# block-dirty-bitmap.c
|
# block-dirty-bitmap.c
|
||||||
send_bitmap_header_enter(void) ""
|
send_bitmap_header_enter(void) ""
|
||||||
send_bitmap_bits(uint32_t flags, uint64_t start_sector, uint32_t nr_sectors, uint64_t data_size) "flags: 0x%x, start_sector: %" PRIu64 ", nr_sectors: %" PRIu32 ", data_size: %" PRIu64
|
send_bitmap_bits(uint32_t flags, uint64_t start_sector, uint32_t nr_sectors, uint64_t data_size) "flags: 0x%x, start_sector: %" PRIu64 ", nr_sectors: %" PRIu32 ", data_size: %" PRIu64
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue