Prasad Pandit <ppan...@redhat.com> writes:
> From: Prasad Pandit <p...@fedoraproject.org>
>
> Add new qtests to run postcopy migration with multifd
> channels enabled.
>
> Signed-off-by: Prasad Pandit <p...@fedoraproject.org>
> ---
> tests/qtest/migration/compression-tests.c | 13 ++++++++
> tests/qtest/migration/framework.c | 4 +++
> tests/qtest/migration/postcopy-tests.c | 23 +++++++++++++
> tests/qtest/migration/precopy-tests.c | 19 +++++++++++
> tests/qtest/migration/tls-tests.c | 40 +++++++++++++++++++++++
> 5 files changed, 99 insertions(+)
>
> v6:
> - Reorder, make this the second patch in this series.
>
> v5:
> -
> https://lore.kernel.org/qemu-devel/20250205122712.229151-1-ppan...@redhat.com/T/#t
>
> diff --git a/tests/qtest/migration/compression-tests.c
> b/tests/qtest/migration/compression-tests.c
> index 4558a7b9ff..d4d6b3c4de 100644
> --- a/tests/qtest/migration/compression-tests.c
> +++ b/tests/qtest/migration/compression-tests.c
> @@ -40,6 +40,17 @@ static void test_multifd_tcp_zstd(void)
> };
> test_precopy_common(&args);
> }
> +
> +static void test_multifd_postcopy_tcp_zstd(void)
> +{
> + MigrateCommon args = {
> + .listen_uri = "defer",
> + .caps[MIGRATION_CAPABILITY_POSTCOPY_RAM] = true,
> + .start_hook = migrate_hook_start_precopy_tcp_multifd_zstd,
> + };
> +
> + test_precopy_common(&args);
> +}
> #endif /* CONFIG_ZSTD */
>
> #ifdef CONFIG_QATZIP
> @@ -172,6 +183,8 @@ void migration_test_add_compression(MigrationTestEnv *env)
> #ifdef CONFIG_ZSTD
> migration_test_add("/migration/multifd/tcp/plain/zstd",
> test_multifd_tcp_zstd);
> + migration_test_add("/migration/multifd+postcopy/tcp/plain/zstd",
> + test_multifd_postcopy_tcp_zstd);
> #endif
>
> #ifdef CONFIG_QATZIP
> diff --git a/tests/qtest/migration/framework.c
> b/tests/qtest/migration/framework.c
> index 82aaa13e85..2396405b51 100644
> --- a/tests/qtest/migration/framework.c
> +++ b/tests/qtest/migration/framework.c
> @@ -469,6 +469,10 @@ static int migrate_postcopy_prepare(QTestState
> **from_ptr,
> args->caps[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME] = true;
> args->caps[MIGRATION_CAPABILITY_POSTCOPY_RAM] = true;
> set_migration_capabilities(from, to, args);
> + if (args->caps[MIGRATION_CAPABILITY_MULTIFD]) {
> + migrate_set_parameter_int(from, "multifd-channels", 8);
> + migrate_set_parameter_int(to, "multifd-channels", 8);
> + }
>
> migrate_ensure_non_converge(from);
> migrate_prepare_for_dirty_mem(from);
> diff --git a/tests/qtest/migration/postcopy-tests.c
> b/tests/qtest/migration/postcopy-tests.c
> index b0e70a6367..32fe7b0324 100644
> --- a/tests/qtest/migration/postcopy-tests.c
> +++ b/tests/qtest/migration/postcopy-tests.c
> @@ -90,6 +90,25 @@ static void
> migration_test_add_postcopy_smoke(MigrationTestEnv *env)
> }
> }
>
> +static void test_multifd_postcopy(void)
> +{
> + MigrateCommon args = {
> + .caps[MIGRATION_CAPABILITY_MULTIFD] = true,
> + };
> +
> + test_postcopy_common(&args);
> +}
> +
> +static void test_multifd_postcopy_preempt(void)
> +{
> + MigrateCommon args = {
> + .caps[MIGRATION_CAPABILITY_MULTIFD] = true,
> + .caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT] = true,
> + };
> +
> + test_postcopy_common(&args);
> +}
> +
> void migration_test_add_postcopy(MigrationTestEnv *env)
> {
> migration_test_add_postcopy_smoke(env);
> @@ -110,6 +129,10 @@ void migration_test_add_postcopy(MigrationTestEnv *env)
> "/migration/postcopy/recovery/double-failures/reconnect",
> test_postcopy_recovery_fail_reconnect);
>
> + migration_test_add("/migration/multifd+postcopy/plain",
> + test_multifd_postcopy);
> + migration_test_add("/migration/multifd+postcopy/preempt/plain",
> + test_multifd_postcopy_preempt);
For postcopy-tests.c I'd use /migration/postcopy/multifd so we can run
them all via command-line. These are also the only ones actually doing
postcopy migration. We need to distinguish multifd+postcopy proper from
merely postcopy-ram=true.
> if (env->is_x86) {
> migration_test_add("/migration/postcopy/suspend",
> test_postcopy_suspend);
> diff --git a/tests/qtest/migration/precopy-tests.c
> b/tests/qtest/migration/precopy-tests.c
> index e5d8c49dbe..2126cb8e2c 100644
> --- a/tests/qtest/migration/precopy-tests.c
> +++ b/tests/qtest/migration/precopy-tests.c
> @@ -33,6 +33,7 @@
> #define DIRTYLIMIT_TOLERANCE_RANGE 25 /* MB/s */
>
> static char *tmpfs;
> +static bool postcopy_ram = false;
>
> static void test_precopy_unix_plain(void)
> {
> @@ -465,6 +466,11 @@ static void test_multifd_tcp_cancel(void)
> migrate_ensure_non_converge(from);
> migrate_prepare_for_dirty_mem(from);
>
> + if (postcopy_ram) {
> + migrate_set_capability(from, "postcopy-ram", true);
> + migrate_set_capability(to, "postcopy-ram", true);
> + }
> +
> migrate_set_parameter_int(from, "multifd-channels", 16);
> migrate_set_parameter_int(to, "multifd-channels", 16);
>
> @@ -506,6 +512,10 @@ static void test_multifd_tcp_cancel(void)
> return;
> }
>
> + if (postcopy_ram) {
> + migrate_set_capability(to2, "postcopy-ram", true);
> + }
> +
> migrate_set_parameter_int(to2, "multifd-channels", 16);
>
> migrate_set_capability(to2, "multifd", true);
> @@ -529,6 +539,13 @@ static void test_multifd_tcp_cancel(void)
> migrate_end(from, to2, true);
> }
>
> +static void test_multifd_postcopy_tcp_cancel(void)
> +{
> + postcopy_ram = true;
> + test_multifd_tcp_cancel();
> + postcopy_ram = false;
You could pass this in, there's just one other caller.
> +}
> +
> static void calc_dirty_rate(QTestState *who, uint64_t calc_time)
> {
> qtest_qmp_assert_success(who,
> @@ -1001,6 +1018,8 @@ void migration_test_add_precopy(MigrationTestEnv *env)
> test_multifd_tcp_zero_page_legacy);
> migration_test_add("/migration/multifd/tcp/plain/zero-page/none",
> test_multifd_tcp_no_zero_page);
> + migration_test_add("migration/multifd+postcopy/tcp/plain/cancel",
> + test_multifd_postcopy_tcp_cancel);
> if (g_str_equal(env->arch, "x86_64")
> && env->has_kvm && env->has_dirty_ring) {
>
> diff --git a/tests/qtest/migration/tls-tests.c
> b/tests/qtest/migration/tls-tests.c
> index 30ab79e058..ce57f0cb5d 100644
> --- a/tests/qtest/migration/tls-tests.c
> +++ b/tests/qtest/migration/tls-tests.c
> @@ -393,6 +393,17 @@ static void test_postcopy_recovery_tls_psk(void)
> test_postcopy_recovery_common(&args);
> }
>
> +static void test_multifd_postcopy_recovery_tls_psk(void)
> +{
> + MigrateCommon args = {
> + .start_hook = migrate_hook_start_tls_psk_match,
> + .end_hook = migrate_hook_end_tls_psk,
> + .caps[MIGRATION_CAPABILITY_MULTIFD] = true,
> + };
> +
> + test_postcopy_recovery_common(&args);
> +}
> +
> /* This contains preempt+recovery+tls test altogether */
> static void test_postcopy_preempt_all(void)
> {
> @@ -405,6 +416,17 @@ static void test_postcopy_preempt_all(void)
> test_postcopy_recovery_common(&args);
> }
>
> +static void test_multifd_postcopy_preempt_recovery_tls_psk(void)
> +{
> + MigrateCommon args = {
> + .start_hook = migrate_hook_start_tls_psk_match,
> + .end_hook = migrate_hook_end_tls_psk,
> + .caps[MIGRATION_CAPABILITY_MULTIFD] = true,
> + };
> +
> + test_postcopy_recovery_common(&args);
> +}
> +
> static void test_precopy_unix_tls_psk(void)
> {
> g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
> @@ -651,6 +673,18 @@ static void test_multifd_tcp_tls_psk_mismatch(void)
> test_precopy_common(&args);
> }
>
> +static void test_multifd_postcopy_tcp_tls_psk_match(void)
> +{
> + MigrateCommon args = {
> + .listen_uri = "defer",
> + .caps[MIGRATION_CAPABILITY_MULTIFD] = true,
> + .start_hook = migrate_hook_start_multifd_tcp_tls_psk_match,
> + .end_hook = migrate_hook_end_tls_psk,
> + };
> +
> + test_precopy_common(&args);
> +}
> +
> #ifdef CONFIG_TASN1
> static void test_multifd_tcp_tls_x509_default_host(void)
> {
> @@ -762,6 +796,10 @@ void migration_test_add_tls(MigrationTestEnv *env)
> test_postcopy_preempt_tls_psk);
> migration_test_add("/migration/postcopy/preempt/recovery/tls/psk",
> test_postcopy_preempt_all);
> + migration_test_add("/migration/multifd+postcopy/recovery/tls/psk",
> + test_multifd_postcopy_recovery_tls_psk);
> +
> migration_test_add("/migration/multifd+postcopy/preempt/recovery/tls/psk",
> + test_multifd_postcopy_preempt_recovery_tls_psk);
> }
> #ifdef CONFIG_TASN1
> migration_test_add("/migration/precopy/unix/tls/x509/default-host",
> @@ -793,6 +831,8 @@ void migration_test_add_tls(MigrationTestEnv *env)
> test_multifd_tcp_tls_psk_match);
> migration_test_add("/migration/multifd/tcp/tls/psk/mismatch",
> test_multifd_tcp_tls_psk_mismatch);
> + migration_test_add("/migration/multifd+postcopy/tcp/tls/psk/match",
> + test_multifd_postcopy_tcp_tls_psk_match);
> #ifdef CONFIG_TASN1
> migration_test_add("/migration/multifd/tcp/tls/x509/default-host",
> test_multifd_tcp_tls_x509_default_host);
> --
> 2.48.1
