mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 10:13:56 -06:00
migration 1st pull for 9.0
- We lost Juan and Leo in the maintainers file - Steven's suspend state fix - Steven's fix for coverity on migrate_mode - Avihai's migration cleanup series -----BEGIN PGP SIGNATURE----- iIgEABYKADAWIQS5GE3CDMRX2s990ak7X8zN86vXBgUCZZY0TxIccGV0ZXJ4QHJl ZGhhdC5jb20ACgkQO1/MzfOr1wbSxgEAoM5g3wkc22lpAlRpU+hJUqT9NVOVQSK+ Fk7XJYTdSgABAKzykA6hAmU5Kj+yVI6jI874SVZbs2FWpFs4osvsKk4D =sfuM -----END PGP SIGNATURE----- Merge tag 'migration-20240104-pull-request' of https://gitlab.com/peterx/qemu into staging migration 1st pull for 9.0 - We lost Juan and Leo in the maintainers file - Steven's suspend state fix - Steven's fix for coverity on migrate_mode - Avihai's migration cleanup series # -----BEGIN PGP SIGNATURE----- # # iIgEABYKADAWIQS5GE3CDMRX2s990ak7X8zN86vXBgUCZZY0TxIccGV0ZXJ4QHJl # ZGhhdC5jb20ACgkQO1/MzfOr1wbSxgEAoM5g3wkc22lpAlRpU+hJUqT9NVOVQSK+ # Fk7XJYTdSgABAKzykA6hAmU5Kj+yVI6jI874SVZbs2FWpFs4osvsKk4D # =sfuM # -----END PGP SIGNATURE----- # gpg: Signature made Thu 04 Jan 2024 04:30:07 GMT # gpg: using EDDSA key B9184DC20CC457DACF7DD1A93B5FCCCDF3ABD706 # gpg: issuer "peterx@redhat.com" # gpg: Good signature from "Peter Xu <xzpeter@gmail.com>" [unknown] # gpg: aka "Peter Xu <peterx@redhat.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B918 4DC2 0CC4 57DA CF7D D1A9 3B5F CCCD F3AB D706 * tag 'migration-20240104-pull-request' of https://gitlab.com/peterx/qemu: (26 commits) migration: fix coverity migrate_mode finding migration/multifd: Remove unnecessary usage of local Error migration: Remove unnecessary usage of local Error migration: Fix migration_channel_read_peek() error path migration/multifd: Remove error_setg() in migration_ioc_process_incoming() migration/multifd: Fix leaking of Error in TLS error flow migration/multifd: Simplify multifd_channel_connect() if else statement migration/multifd: Fix error message in multifd_recv_initial_packet() migration: Remove errp parameter in migration_fd_process_incoming() migration: Refactor migration_incoming_setup() migration: Remove nulling of hostname in migrate_init() migration: Remove migrate_max_downtime() declaration tests/qtest: postcopy migration with suspend tests/qtest: precopy migration with suspend tests/qtest: option to suspend during migration tests/qtest: migration events migration: preserve suspended for bg_migration migration: preserve suspended for snapshot migration: preserve suspended runstate migration: propagate suspended runstate ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
c8193acc07
28 changed files with 386 additions and 200 deletions
|
|
@ -24,26 +24,19 @@
|
|||
*/
|
||||
#define MIGRATION_STATUS_WAIT_TIMEOUT 120
|
||||
|
||||
bool migrate_watch_for_stop(QTestState *who, const char *name,
|
||||
QDict *event, void *opaque)
|
||||
{
|
||||
bool *seen = opaque;
|
||||
|
||||
if (g_str_equal(name, "STOP")) {
|
||||
*seen = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool migrate_watch_for_resume(QTestState *who, const char *name,
|
||||
bool migrate_watch_for_events(QTestState *who, const char *name,
|
||||
QDict *event, void *opaque)
|
||||
{
|
||||
bool *seen = opaque;
|
||||
QTestMigrationState *state = opaque;
|
||||
|
||||
if (g_str_equal(name, "RESUME")) {
|
||||
*seen = true;
|
||||
if (g_str_equal(name, "STOP")) {
|
||||
state->stop_seen = true;
|
||||
return true;
|
||||
} else if (g_str_equal(name, "SUSPEND")) {
|
||||
state->suspend_seen = true;
|
||||
return true;
|
||||
} else if (g_str_equal(name, "RESUME")) {
|
||||
state->resume_seen = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,14 @@
|
|||
|
||||
#include "libqtest.h"
|
||||
|
||||
bool migrate_watch_for_stop(QTestState *who, const char *name,
|
||||
QDict *event, void *opaque);
|
||||
bool migrate_watch_for_resume(QTestState *who, const char *name,
|
||||
typedef struct QTestMigrationState {
|
||||
bool stop_seen;
|
||||
bool resume_seen;
|
||||
bool suspend_seen;
|
||||
bool suspend_me;
|
||||
} QTestMigrationState;
|
||||
|
||||
bool migrate_watch_for_events(QTestState *who, const char *name,
|
||||
QDict *event, void *opaque);
|
||||
|
||||
G_GNUC_PRINTF(3, 4)
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@
|
|||
unsigned start_address;
|
||||
unsigned end_address;
|
||||
static bool uffd_feature_thread_id;
|
||||
static bool got_src_stop;
|
||||
static bool got_dst_resume;
|
||||
static QTestMigrationState src_state;
|
||||
static QTestMigrationState dst_state;
|
||||
|
||||
/*
|
||||
* An initial 3 MB offset is used as that corresponds
|
||||
|
|
@ -133,7 +133,7 @@ static char *bootpath;
|
|||
#include "tests/migration/aarch64/a-b-kernel.h"
|
||||
#include "tests/migration/s390x/a-b-bios.h"
|
||||
|
||||
static void bootfile_create(char *dir)
|
||||
static void bootfile_create(char *dir, bool suspend_me)
|
||||
{
|
||||
const char *arch = qtest_get_arch();
|
||||
unsigned char *content;
|
||||
|
|
@ -143,6 +143,7 @@ static void bootfile_create(char *dir)
|
|||
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
||||
/* the assembled x86 boot sector should be exactly one sector large */
|
||||
g_assert(sizeof(x86_bootsect) == 512);
|
||||
x86_bootsect[SYM_suspend_me - SYM_start] = suspend_me;
|
||||
content = x86_bootsect;
|
||||
len = sizeof(x86_bootsect);
|
||||
} else if (g_str_equal(arch, "s390x")) {
|
||||
|
|
@ -177,7 +178,7 @@ static void bootfile_delete(void)
|
|||
/*
|
||||
* Wait for some output in the serial output file,
|
||||
* we get an 'A' followed by an endless string of 'B's
|
||||
* but on the destination we won't have the A.
|
||||
* but on the destination we won't have the A (unless we enabled suspend/resume)
|
||||
*/
|
||||
static void wait_for_serial(const char *side)
|
||||
{
|
||||
|
|
@ -230,6 +231,27 @@ static void wait_for_serial(const char *side)
|
|||
} while (true);
|
||||
}
|
||||
|
||||
static void wait_for_stop(QTestState *who, QTestMigrationState *state)
|
||||
{
|
||||
if (!state->stop_seen) {
|
||||
qtest_qmp_eventwait(who, "STOP");
|
||||
}
|
||||
}
|
||||
|
||||
static void wait_for_resume(QTestState *who, QTestMigrationState *state)
|
||||
{
|
||||
if (!state->resume_seen) {
|
||||
qtest_qmp_eventwait(who, "RESUME");
|
||||
}
|
||||
}
|
||||
|
||||
static void wait_for_suspend(QTestState *who, QTestMigrationState *state)
|
||||
{
|
||||
if (state->suspend_me && !state->suspend_seen) {
|
||||
qtest_qmp_eventwait(who, "SUSPEND");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* It's tricky to use qemu's migration event capability with qtest,
|
||||
* events suddenly appearing confuse the qmp()/hmp() responses.
|
||||
|
|
@ -277,21 +299,19 @@ static void read_blocktime(QTestState *who)
|
|||
qobject_unref(rsp_return);
|
||||
}
|
||||
|
||||
/*
|
||||
* Wait for two changes in the migration pass count, but bail if we stop.
|
||||
*/
|
||||
static void wait_for_migration_pass(QTestState *who)
|
||||
{
|
||||
uint64_t initial_pass = get_migration_pass(who);
|
||||
uint64_t pass;
|
||||
uint64_t pass, prev_pass = 0, changes = 0;
|
||||
|
||||
/* Wait for the 1st sync */
|
||||
while (!got_src_stop && !initial_pass) {
|
||||
usleep(1000);
|
||||
initial_pass = get_migration_pass(who);
|
||||
}
|
||||
|
||||
do {
|
||||
while (changes < 2 && !src_state.stop_seen && !src_state.suspend_seen) {
|
||||
usleep(1000);
|
||||
pass = get_migration_pass(who);
|
||||
} while (pass == initial_pass && !got_src_stop);
|
||||
changes += (pass != prev_pass);
|
||||
prev_pass = pass;
|
||||
}
|
||||
}
|
||||
|
||||
static void check_guests_ram(QTestState *who)
|
||||
|
|
@ -571,6 +591,12 @@ static void migrate_wait_for_dirty_mem(QTestState *from,
|
|||
usleep(1000 * 10);
|
||||
} while (qtest_readq(to, marker_address) != MAGIC_MARKER);
|
||||
|
||||
|
||||
/* If suspended, src only iterates once, and watch_byte may never change */
|
||||
if (src_state.suspend_me) {
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* Now ensure that already transferred bytes are
|
||||
* dirty again from the guest workload. Note the
|
||||
|
|
@ -617,10 +643,7 @@ static void migrate_postcopy_start(QTestState *from, QTestState *to)
|
|||
{
|
||||
qtest_qmp_assert_success(from, "{ 'execute': 'migrate-start-postcopy' }");
|
||||
|
||||
if (!got_src_stop) {
|
||||
qtest_qmp_eventwait(from, "STOP");
|
||||
}
|
||||
|
||||
wait_for_stop(from, &src_state);
|
||||
qtest_qmp_eventwait(to, "RESUME");
|
||||
}
|
||||
|
||||
|
|
@ -637,6 +660,8 @@ typedef struct {
|
|||
bool use_dirty_ring;
|
||||
const char *opts_source;
|
||||
const char *opts_target;
|
||||
/* suspend the src before migrating to dest. */
|
||||
bool suspend_me;
|
||||
} MigrateStart;
|
||||
|
||||
/*
|
||||
|
|
@ -756,8 +781,11 @@ static int test_migrate_start(QTestState **from, QTestState **to,
|
|||
}
|
||||
}
|
||||
|
||||
got_src_stop = false;
|
||||
got_dst_resume = false;
|
||||
dst_state = (QTestMigrationState) { };
|
||||
src_state = (QTestMigrationState) { };
|
||||
bootfile_create(tmpfs, args->suspend_me);
|
||||
src_state.suspend_me = args->suspend_me;
|
||||
|
||||
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
||||
memory_size = "150M";
|
||||
|
||||
|
|
@ -848,8 +876,8 @@ static int test_migrate_start(QTestState **from, QTestState **to,
|
|||
if (!args->only_target) {
|
||||
*from = qtest_init_with_env(QEMU_ENV_SRC, cmd_source);
|
||||
qtest_qmp_set_event_callback(*from,
|
||||
migrate_watch_for_stop,
|
||||
&got_src_stop);
|
||||
migrate_watch_for_events,
|
||||
&src_state);
|
||||
}
|
||||
|
||||
cmd_target = g_strdup_printf("-accel kvm%s -accel tcg "
|
||||
|
|
@ -869,8 +897,8 @@ static int test_migrate_start(QTestState **from, QTestState **to,
|
|||
ignore_stderr);
|
||||
*to = qtest_init_with_env(QEMU_ENV_DST, cmd_target);
|
||||
qtest_qmp_set_event_callback(*to,
|
||||
migrate_watch_for_resume,
|
||||
&got_dst_resume);
|
||||
migrate_watch_for_events,
|
||||
&dst_state);
|
||||
|
||||
/*
|
||||
* Remove shmem file immediately to avoid memory leak in test failed case.
|
||||
|
|
@ -1319,6 +1347,7 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
|
|||
|
||||
/* Wait for the first serial output from the source */
|
||||
wait_for_serial("src_serial");
|
||||
wait_for_suspend(from, &src_state);
|
||||
|
||||
g_autofree char *uri = migrate_get_socket_address(to, "socket-address");
|
||||
migrate_qmp(from, uri, "{}");
|
||||
|
|
@ -1336,6 +1365,11 @@ static void migrate_postcopy_complete(QTestState *from, QTestState *to,
|
|||
{
|
||||
wait_for_migration_complete(from);
|
||||
|
||||
if (args->start.suspend_me) {
|
||||
/* wakeup succeeds only if guest is suspended */
|
||||
qtest_qmp_assert_success(to, "{'execute': 'system_wakeup'}");
|
||||
}
|
||||
|
||||
/* Make sure we get at least one "B" on destination */
|
||||
wait_for_serial("dest_serial");
|
||||
|
||||
|
|
@ -1369,6 +1403,15 @@ static void test_postcopy(void)
|
|||
test_postcopy_common(&args);
|
||||
}
|
||||
|
||||
static void test_postcopy_suspend(void)
|
||||
{
|
||||
MigrateCommon args = {
|
||||
.start.suspend_me = true,
|
||||
};
|
||||
|
||||
test_postcopy_common(&args);
|
||||
}
|
||||
|
||||
static void test_postcopy_compress(void)
|
||||
{
|
||||
MigrateCommon args = {
|
||||
|
|
@ -1703,6 +1746,7 @@ static void test_precopy_common(MigrateCommon *args)
|
|||
/* Wait for the first serial output from the source */
|
||||
if (args->result == MIG_TEST_SUCCEED) {
|
||||
wait_for_serial("src_serial");
|
||||
wait_for_suspend(from, &src_state);
|
||||
}
|
||||
|
||||
if (args->live) {
|
||||
|
|
@ -1717,9 +1761,7 @@ static void test_precopy_common(MigrateCommon *args)
|
|||
*/
|
||||
if (args->result == MIG_TEST_SUCCEED) {
|
||||
qtest_qmp_assert_success(from, "{ 'execute' : 'stop'}");
|
||||
if (!got_src_stop) {
|
||||
qtest_qmp_eventwait(from, "STOP");
|
||||
}
|
||||
wait_for_stop(from, &src_state);
|
||||
migrate_ensure_converge(from);
|
||||
}
|
||||
}
|
||||
|
|
@ -1765,9 +1807,8 @@ static void test_precopy_common(MigrateCommon *args)
|
|||
*/
|
||||
wait_for_migration_complete(from);
|
||||
|
||||
if (!got_src_stop) {
|
||||
qtest_qmp_eventwait(from, "STOP");
|
||||
}
|
||||
wait_for_stop(from, &src_state);
|
||||
|
||||
} else {
|
||||
wait_for_migration_complete(from);
|
||||
/*
|
||||
|
|
@ -1780,8 +1821,11 @@ static void test_precopy_common(MigrateCommon *args)
|
|||
qtest_qmp_assert_success(to, "{ 'execute' : 'cont'}");
|
||||
}
|
||||
|
||||
if (!got_dst_resume) {
|
||||
qtest_qmp_eventwait(to, "RESUME");
|
||||
wait_for_resume(to, &dst_state);
|
||||
|
||||
if (args->start.suspend_me) {
|
||||
/* wakeup succeeds only if guest is suspended */
|
||||
qtest_qmp_assert_success(to, "{'execute': 'system_wakeup'}");
|
||||
}
|
||||
|
||||
wait_for_serial("dest_serial");
|
||||
|
|
@ -1821,9 +1865,7 @@ static void test_file_common(MigrateCommon *args, bool stop_src)
|
|||
|
||||
if (stop_src) {
|
||||
qtest_qmp_assert_success(from, "{ 'execute' : 'stop'}");
|
||||
if (!got_src_stop) {
|
||||
qtest_qmp_eventwait(from, "STOP");
|
||||
}
|
||||
wait_for_stop(from, &src_state);
|
||||
}
|
||||
|
||||
if (args->result == MIG_TEST_QMP_ERROR) {
|
||||
|
|
@ -1844,10 +1886,7 @@ static void test_file_common(MigrateCommon *args, bool stop_src)
|
|||
if (stop_src) {
|
||||
qtest_qmp_assert_success(to, "{ 'execute' : 'cont'}");
|
||||
}
|
||||
|
||||
if (!got_dst_resume) {
|
||||
qtest_qmp_eventwait(to, "RESUME");
|
||||
}
|
||||
wait_for_resume(to, &dst_state);
|
||||
|
||||
wait_for_serial("dest_serial");
|
||||
|
||||
|
|
@ -1875,6 +1914,34 @@ static void test_precopy_unix_plain(void)
|
|||
test_precopy_common(&args);
|
||||
}
|
||||
|
||||
static void test_precopy_unix_suspend_live(void)
|
||||
{
|
||||
g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
|
||||
MigrateCommon args = {
|
||||
.listen_uri = uri,
|
||||
.connect_uri = uri,
|
||||
/*
|
||||
* despite being live, the test is fast because the src
|
||||
* suspends immediately.
|
||||
*/
|
||||
.live = true,
|
||||
.start.suspend_me = true,
|
||||
};
|
||||
|
||||
test_precopy_common(&args);
|
||||
}
|
||||
|
||||
static void test_precopy_unix_suspend_notlive(void)
|
||||
{
|
||||
g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
|
||||
MigrateCommon args = {
|
||||
.listen_uri = uri,
|
||||
.connect_uri = uri,
|
||||
.start.suspend_me = true,
|
||||
};
|
||||
|
||||
test_precopy_common(&args);
|
||||
}
|
||||
|
||||
static void test_precopy_unix_dirty_ring(void)
|
||||
{
|
||||
|
|
@ -1966,9 +2033,7 @@ static void test_ignore_shared(void)
|
|||
|
||||
migrate_wait_for_dirty_mem(from, to);
|
||||
|
||||
if (!got_src_stop) {
|
||||
qtest_qmp_eventwait(from, "STOP");
|
||||
}
|
||||
wait_for_stop(from, &src_state);
|
||||
|
||||
qtest_qmp_eventwait(to, "RESUME");
|
||||
|
||||
|
|
@ -2503,7 +2568,7 @@ static void test_migrate_auto_converge(void)
|
|||
break;
|
||||
}
|
||||
usleep(20);
|
||||
g_assert_false(got_src_stop);
|
||||
g_assert_false(src_state.stop_seen);
|
||||
} while (true);
|
||||
/* The first percentage of throttling should be at least init_pct */
|
||||
g_assert_cmpint(percentage, >=, init_pct);
|
||||
|
|
@ -2842,9 +2907,7 @@ static void test_multifd_tcp_cancel(void)
|
|||
|
||||
migrate_ensure_converge(from);
|
||||
|
||||
if (!got_src_stop) {
|
||||
qtest_qmp_eventwait(from, "STOP");
|
||||
}
|
||||
wait_for_stop(from, &src_state);
|
||||
qtest_qmp_eventwait(to2, "RESUME");
|
||||
|
||||
wait_for_serial("dest_serial");
|
||||
|
|
@ -2985,7 +3048,9 @@ static int64_t get_limit_rate(QTestState *who)
|
|||
static QTestState *dirtylimit_start_vm(void)
|
||||
{
|
||||
QTestState *vm = NULL;
|
||||
g_autofree gchar *
|
||||
g_autofree gchar *cmd = NULL;
|
||||
|
||||
bootfile_create(tmpfs, false);
|
||||
cmd = g_strdup_printf("-accel kvm,dirty-ring-size=4096 "
|
||||
"-name dirtylimit-test,debug-threads=on "
|
||||
"-m 150M -smp 1 "
|
||||
|
|
@ -3177,7 +3242,7 @@ static void test_migrate_dirty_limit(void)
|
|||
throttle_us_per_full =
|
||||
read_migrate_property_int(from, "dirty-limit-throttle-time-per-round");
|
||||
usleep(100);
|
||||
g_assert_false(got_src_stop);
|
||||
g_assert_false(src_state.stop_seen);
|
||||
}
|
||||
|
||||
/* Now cancel migrate and wait for dirty limit throttle switch off */
|
||||
|
|
@ -3189,7 +3254,7 @@ static void test_migrate_dirty_limit(void)
|
|||
throttle_us_per_full =
|
||||
read_migrate_property_int(from, "dirty-limit-throttle-time-per-round");
|
||||
usleep(100);
|
||||
g_assert_false(got_src_stop);
|
||||
g_assert_false(src_state.stop_seen);
|
||||
} while (throttle_us_per_full != 0 && --max_try_count);
|
||||
|
||||
/* Assert dirty limit is not in service */
|
||||
|
|
@ -3218,7 +3283,7 @@ static void test_migrate_dirty_limit(void)
|
|||
throttle_us_per_full =
|
||||
read_migrate_property_int(from, "dirty-limit-throttle-time-per-round");
|
||||
usleep(100);
|
||||
g_assert_false(got_src_stop);
|
||||
g_assert_false(src_state.stop_seen);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -3277,7 +3342,7 @@ static bool kvm_dirty_ring_supported(void)
|
|||
int main(int argc, char **argv)
|
||||
{
|
||||
bool has_kvm, has_tcg;
|
||||
bool has_uffd;
|
||||
bool has_uffd, is_x86;
|
||||
const char *arch;
|
||||
g_autoptr(GError) err = NULL;
|
||||
const char *qemu_src = getenv(QEMU_ENV_SRC);
|
||||
|
|
@ -3307,6 +3372,7 @@ int main(int argc, char **argv)
|
|||
|
||||
has_uffd = ufd_version_check();
|
||||
arch = qtest_get_arch();
|
||||
is_x86 = !strcmp(arch, "i386") || !strcmp(arch, "x86_64");
|
||||
|
||||
/*
|
||||
* On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG
|
||||
|
|
@ -3334,10 +3400,16 @@ int main(int argc, char **argv)
|
|||
g_get_tmp_dir(), err->message);
|
||||
}
|
||||
g_assert(tmpfs);
|
||||
bootfile_create(tmpfs);
|
||||
|
||||
module_call_init(MODULE_INIT_QOM);
|
||||
|
||||
if (is_x86) {
|
||||
qtest_add_func("/migration/precopy/unix/suspend/live",
|
||||
test_precopy_unix_suspend_live);
|
||||
qtest_add_func("/migration/precopy/unix/suspend/notlive",
|
||||
test_precopy_unix_suspend_notlive);
|
||||
}
|
||||
|
||||
if (has_uffd) {
|
||||
qtest_add_func("/migration/postcopy/plain", test_postcopy);
|
||||
qtest_add_func("/migration/postcopy/recovery/plain",
|
||||
|
|
@ -3355,7 +3427,10 @@ int main(int argc, char **argv)
|
|||
qtest_add_func("/migration/postcopy/recovery/double-failures",
|
||||
test_postcopy_recovery_double_fail);
|
||||
#endif /* _WIN32 */
|
||||
|
||||
if (is_x86) {
|
||||
qtest_add_func("/migration/postcopy/suspend",
|
||||
test_postcopy_suspend);
|
||||
}
|
||||
}
|
||||
|
||||
qtest_add_func("/migration/bad_dest", test_baddest);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue