tests/qtest/migration: Update framework to allow using HVF accelerator
cover tests/qtest/migration: Update framework to allow using HVF accelerator
Hi,
This series modify few bits of the migration QTest framework to allow running the tests using the HVF framework (also leaving the possibilty for other ones, removing the KVM/TCG restriction).
Philippe Mathieu-Daudé (7):
migration/dirtyrate: Do not unlock cpu_list lock twice tests/qtest/migration: Make 'has_dirty_ring' generic tests/qtest/migration: Initialize MigrationTestEnv::arch early tests/qtest/migration: Pass accelerator arguments as machine option tests/qtest/migration: Add MigrationTestEnv::has_hvf field tests/qtest/migration: Run aarch64/HVF tests using GICv2 tests/qtest/migration: Allow using accelerators different of TCG / KVM
tests/qtest/migration/framework.h | 1 + migration/dirtyrate.c | 1 - tests/qtest/migration/framework.c | 43 ++++++++++++++------------- tests/qtest/migration/precopy-tests.c | 6 ++-- 4 files changed, 26 insertions(+), 25 deletions(-)
Signature · 1 line
2.47.1
PATCH 1/7 migration/dirtyrate: Do not unlock cpu_list lock twice
&qemu_cpu_list_lock is locked within the WITH_QEMU_LOCK_GUARD() context, then unlocked. No need to manually unlock it.
--- migration/dirtyrate.c | 1 - 1 file changed, 1 deletion(-)
migration/dirtyrate.c +0 -1
@@ -174,7 +174,6 @@ retry:if (gen_id !=cpu_list_generation_id_get ()) {g_free (records);g_free (stat->rates); -cpu_list_unlock (); goto retry; }vcpu_dirty_stat_collect (records, false);
Signature · 1 line
2.47.1
Re: [PATCH 1/7] migration/dirtyrate: Do not unlock cpu_list lock twice
Quoted 14 lines · Philippe Mathieu-Daudé
&qemu_cpu_list_lockis locked within theWITH_QEMU_LOCK_GUARD()context, then unlocked. No need to manually unlock it.Fixes 370ed600296 ("cpu: expose qemu_cpu_list_lock for lock-guard use")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- migration/dirtyrate.c | 1 - 1 file changed, 1 deletion(-)migration/dirtyrate.c +0
-0
migration/dirtyrate.c retry: · line 179
Quoted 7 lines
migration/dirtyrate.c +0
-1@@ -174,7 +174,6 @@ retry:if (gen_id !=cpu_list_generation_id_get ()) {g_free (records);g_free (stat->rates); -cpu_list_unlock (); goto retry; }vcpu_dirty_stat_collect (records, false);
Re: [PATCH 1/7] migration/dirtyrate: Do not unlock cpu_list lock twice
In reply to Philippe Mathieu-DaudéQuoted 8 lines · Philippe Mathieu-Daudé
&qemu_cpu_list_lockis locked within theWITH_QEMU_LOCK_GUARD()context, then unlocked. No need to manually unlock it.Fixes 370ed600296 ("cpu: expose qemu_cpu_list_lock for lock-guard use")Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- migration/dirtyrate.c | 1 - 1 file changed, 1 deletion(-)
r~
PATCH 2/7 tests/qtest/migration: Make 'has_dirty_ring' generic
In reply to Philippe Mathieu-DaudéKeep accelerator knowledge limited within MigrationTestEnv, expose a generic %has_dirty_ring value, only checking for KVM when initializing it in migration_get_env().
--- tests/qtest/migration/framework.c | 2 +- tests/qtest/migration/precopy-tests.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-)
tests/qtest/migration/framework.c +1 -1
@@ -946,7 +946,7 @@ MigrationTestEnv *migration_get_env(void)return env; } - env->has_dirty_ring =kvm_dirty_ring_supported (); + env->has_dirty_ring = env->has_kvm &&kvm_dirty_ring_supported (); env->has_uffd =ufd_version_check (&env->uffd_feature_thread_id); env->arch =qtest_get_arch (); env->is_x86 = !strcmp (env->arch,"i386" ) || !strcmp (env->arch,"x86_64" );
tests/qtest/migration/precopy-tests.c +2 -4
@@ -983,8 +983,7 @@ void migration_test_add_precopy(MigrationTestEnv *env)if (g_test_slow ()) {migration_test_add ("/migration/auto_converge" , test_auto_converge); -if (g_str_equal (env->arch,"x86_64" ) && - env->has_kvm && env->has_dirty_ring) { +if (g_str_equal (env->arch,"x86_64" ) && env->has_dirty_ring) {migration_test_add ("/dirty_limit" , test_dirty_limit); }
@@ -999,8 +998,7 @@ void migration_test_add_precopy(MigrationTestEnv *env) test_multifd_tcp_no_zero_page);migration_test_add ("/migration/multifd/tcp/plain/cancel" , test_multifd_tcp_cancel); -if (g_str_equal (env->arch,"x86_64" ) - && env->has_kvm && env->has_dirty_ring) { +if (g_str_equal (env->arch,"x86_64" ) && env->has_dirty_ring) {migration_test_add ("/migration/dirty_ring" , test_precopy_unix_dirty_ring);
Signature · 1 line
2.47.1
Re: [PATCH 2/7] tests/qtest/migration: Make 'has_dirty_ring' generic
Quoted 5 lines · Philippe Mathieu-Daudé
Keep accelerator knowledge limited within MigrationTestEnv, expose a generic %has_dirty_ring value, only checking for KVM when initializing it in
migration_get_env().Signed-off-by Philippe Mathieu-Daudé <[email protected]>
PATCH 3/7 tests/qtest/migration: Initialize MigrationTestEnv::arch early
In reply to Philippe Mathieu-DaudéSome tests expect MigrationTestEnv::arch to be set. Initialize it early enough to avoid SIGSEGV, for example like the following g_str_equal() call in migration/precopy-tests.c:
954 void migration_test_add_precopy(MigrationTestEnv *env)
955 {
...
1001 if (g_str_equal(env->arch, "x86_64") && env->has_dirty_ring) {
1002
1003 migration_test_add("/migration/dirty_ring",
1004 test_precopy_unix_dirty_ring);--- tests/qtest/migration/framework.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/qtest/migration/framework.c +2 -1
@@ -938,6 +938,8 @@ MigrationTestEnv *migration_get_env(void)exit (1 ); } + env->arch =qtest_get_arch (); + env->has_kvm =qtest_has_accel ("kvm" ); env->has_tcg =qtest_has_accel ("tcg" );
@@ -948,7 +950,6 @@ MigrationTestEnv *migration_get_env(void) env->has_dirty_ring = env->has_kvm &&kvm_dirty_ring_supported (); env->has_uffd =ufd_version_check (&env->uffd_feature_thread_id); - env->arch =qtest_get_arch (); env->is_x86 = !strcmp (env->arch,"i386" ) || !strcmp (env->arch,"x86_64" ); env->tmpfs =g_dir_make_tmp ("migration-test-XXXXXX" , &err);
Signature · 1 line
2.47.1
Re: [PATCH 3/7] tests/qtest/migration: Initialize MigrationTestEnv::arch early
Quoted 31 lines · Philippe Mathieu-Daudé
Some tests expect
MigrationTestEnv::archto be set. Initialize it early enough to avoid SIGSEGV, for example like the followingg_str_equal()call inmigration/precopy-tests.c:954 void migration_test_add_precopy(MigrationTestEnv *env) 955 { ... 1001 if (g_str_equal(env->arch, "x86_64") && env->has_dirty_ring) { 1002 1003 migration_test_add("/migration/dirty_ring", 1004 test_precopy_unix_dirty_ring);Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/qtest/migration/framework.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)tests/qtest/migration/framework.c +2
-0@@ -938,6 +938,8 @@ MigrationTestEnv *migration_get_env(void)exit (1 ); } + env->arch =qtest_get_arch (); + env->has_kvm =qtest_has_accel ("kvm" ); env->has_tcg =qtest_has_accel ("tcg" );
tests/qtest/migration/framework.c MigrationTestEnv *migration_get_env(void) · line 955
Quoted 7 lines
tests/qtest/migration/framework.c +0
-1@@ -948,7 +950,6 @@ MigrationTestEnv *migration_get_env(void) env->has_dirty_ring = env->has_kvm &&kvm_dirty_ring_supported (); env->has_uffd =ufd_version_check (&env->uffd_feature_thread_id); - env->arch =qtest_get_arch (); env->is_x86 = !strcmp (env->arch,"i386" ) || !strcmp (env->arch,"x86_64" ); env->tmpfs =g_dir_make_tmp ("migration-test-XXXXXX" , &err);
The change itself is fine, but I think the actual issue is that we shouldn't be calling g_test_skip() from migration_get_env(). There's no point adding a bunch of tests if none of them will run because there's no supported accel present. So:
if (!env->has_tcg && !env->has_kvm) {
- g_test_skip("No KVM or TCG accelerator available");
- return env;
+ g_test_message("No KVM or TCG accelerator available");
+ exit(0);
}Re: [PATCH 3/7] tests/qtest/migration: Initialize MigrationTestEnv::arch early
In reply to Philippe Mathieu-DaudéQuoted 12 lines · Philippe Mathieu-Daudé
Some tests
expectMigrationTestEnv::archto be set. Initialize it early enough to avoid SIGSEGV, for example like the followingg_str_equal()call inmigration/precopy-tests.c:954 void migration_test_add_precopy(MigrationTestEnv *env) 955 { ... 1001 if (g_str_equal(env->arch, "x86_64") && env->has_dirty_ring) { 1002 1003 migration_test_add("/migration/dirty_ring", 1004 test_precopy_unix_dirty_ring);
Quoted 4 lines
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- tests/qtest/migration/framework.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
r~
PATCH 4/7 tests/qtest/migration: Pass accelerator arguments as machine option
In reply to Philippe Mathieu-DaudéThe '-accel' CLI option is handler as sugar property as '-machine,accel='. Replace the migration tests command line, only using the best accelerator available (first hardware, then software).
--- tests/qtest/migration/framework.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
tests/qtest/migration/framework.c +16 -12
@@ -214,8 +214,9 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri,const gchar *ignore_stderr; g_autofree char *shmem_opts = NULL; g_autofree char *shmem_path = NULL; -const char *kvm_opts =NULL ; -const char *arch =qtest_get_arch (); +const char *accel_args =NULL ; +const MigrationTestEnv *env =migration_get_env (); +const char *arch = env->arch;const char *memory_size;const char *machine_alias, *machine_opts ="" ; g_autofree char *machine = NULL;
@@ -296,8 +297,15 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, memory_size, shmem_path); } -if (args->use_dirty_ring) { - kvm_opts =",dirty-ring-size=4096" ; +if (env->has_kvm) { +if (args->use_dirty_ring) { + accel_args ="kvm,dirty-ring-size=4096" ; + }else { + accel_args ="kvm" ; + } + }else { +assert (env->has_tcg); + accel_args ="tcg" ; }if (!qtest_has_machine (machine_alias)) {
@@ -311,14 +319,12 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri,g_test_message ("Using machine type: %s" , machine); - cmd_source = g_strdup_printf("-accel kvm%s -accel tcg " - "-machine %s,%s " + cmd_source = g_strdup_printf("-machine %s,%s,accel=%s " "-name source,debug-threads=on " "-m %s " "-serial file:%s/src_serial " "%s %s %s %s", - kvm_opts ? kvm_opts : "", - machine, machine_opts, + machine, machine_opts, accel_args, memory_size, tmpfs, arch_opts ? arch_opts : "", shmem_opts ? shmem_opts : "",
@@ -332,15 +338,13 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, &src_state); } - cmd_target = g_strdup_printf("-accel kvm%s -accel tcg " - "-machine %s,%s " + cmd_target = g_strdup_printf("-machine %s,%s,accel=%s " "-name target,debug-threads=on " "-m %s " "-serial file:%s/dest_serial " "-incoming %s " "%s %s %s %s", - kvm_opts ? kvm_opts : "", - machine, machine_opts, + machine, machine_opts, accel_args, memory_size, tmpfs, uri, arch_opts ? arch_opts : "", shmem_opts ? shmem_opts : "",
Signature · 1 line
2.47.1
Re: [PATCH 4/7] tests/qtest/migration: Pass accelerator arguments as machine option
Quoted 32 lines · Philippe Mathieu-Daudé
The '-accel' CLI option is handler as sugar property as '-machine,accel='. Replace the migration tests command line, only using the best accelerator available (first hardware, then software).
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/qtest/migration/framework.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)tests/qtest/migration/framework.c +3
-4@@ -214,8 +214,9 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri,const gchar *ignore_stderr; g_autofree char *shmem_opts = NULL; g_autofree char *shmem_path = NULL; -const char *kvm_opts =NULL ; -const char *arch =qtest_get_arch (); +const char *accel_args =NULL ; +const MigrationTestEnv *env =migration_get_env (); +const char *arch = env->arch;const char *memory_size;const char *machine_alias, *machine_opts ="" ; g_autofree char *machine = NULL;@@ -296,8 +297,15 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, memory_size, shmem_path); } -if (args->use_dirty_ring) { - kvm_opts =",dirty-ring-size=4096" ;
tests/qtest/migration/framework.c int migrate_start(QTestState **from, QTestState **to, const char *uri, · line 309
Quoted 10 lines
tests/qtest/migration/framework.c +9
-0+if (env->has_kvm) { +if (args->use_dirty_ring) { + accel_args ="kvm,dirty-ring-size=4096" ; + }else { + accel_args ="kvm" ; + } + }else { +assert (env->has_tcg); + accel_args ="tcg" ; }
I don't think this approach works when testing across architectures. IIUC has_kvm will be true whenever the *test* can access /dev/kvm. Which means if we run on a x86 while testing qemu-system-s390x, then has_kvm==true but we actually need to use TCG, so the fallback in the QEMU binary (-accel kvm -accel tcg) will be automatically used.
Quoted 37 lines
tests/qtest/migration/framework.c +4
-8if (!qtest_has_machine (machine_alias)) {@@ -311,14 +319,12 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri,g_test_message ("Using machine type: %s" , machine); - cmd_source = g_strdup_printf("-accel kvm%s -accel tcg " - "-machine %s,%s " + cmd_source = g_strdup_printf("-machine %s,%s,accel=%s " "-name source,debug-threads=on " "-m %s " "-serial file:%s/src_serial " "%s %s %s %s", - kvm_opts ? kvm_opts : "", - machine, machine_opts, + machine, machine_opts, accel_args, memory_size, tmpfs, arch_opts ? arch_opts : "", shmem_opts ? shmem_opts : "",@@ -332,15 +338,13 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, &src_state); } - cmd_target = g_strdup_printf("-accel kvm%s -accel tcg " - "-machine %s,%s " + cmd_target = g_strdup_printf("-machine %s,%s,accel=%s " "-name target,debug-threads=on " "-m %s " "-serial file:%s/dest_serial " "-incoming %s " "%s %s %s %s", - kvm_opts ? kvm_opts : "", - machine, machine_opts, + machine, machine_opts, accel_args, memory_size, tmpfs, uri, arch_opts ? arch_opts : "", shmem_opts ? shmem_opts : "",
Re: [PATCH 4/7] tests/qtest/migration: Pass accelerator arguments as machine option
In reply to Philippe Mathieu-DaudéQuoted 4 lines · Philippe Mathieu-Daudé
The '-accel' CLI option is handler as sugar property as '-machine,accel='. Replace the migration tests command line, only using the best accelerator available (first hardware, then software).
Is that really true? I thought -accel was split from -machine explicitly because of the introduction of accelerator parameters, just like dirty-ring-size. Otherwise you risk confusing accelerator parameters and machine parameters.
r~
PATCH 5/7 tests/qtest/migration: Add MigrationTestEnv::has_hvf field
In reply to Philippe Mathieu-DaudéAllow tests to tune their parameters when running on HVF.
--- tests/qtest/migration/framework.h | 1 + tests/qtest/migration/framework.c | 1 + 2 files changed, 2 insertions(+)
tests/qtest/migration/framework.h +1 -0
@@ -19,6 +19,7 @@ typedef struct MigrationTestEnv { bool has_kvm; + bool has_hvf; bool has_tcg; bool has_uffd; bool uffd_feature_thread_id;
tests/qtest/migration/framework.c +1 -0
@@ -945,6 +945,7 @@ MigrationTestEnv *migration_get_env(void) env->arch =qtest_get_arch (); env->has_kvm =qtest_has_accel ("kvm" ); + env->has_hvf =qtest_has_accel ("hvf" ); env->has_tcg =qtest_has_accel ("tcg" );if (!env->has_tcg && !env->has_kvm) {
Signature · 1 line
2.47.1
Re: [PATCH 5/7] tests/qtest/migration: Add MigrationTestEnv::has_hvf field
Quoted 3 lines · Philippe Mathieu-Daudé
Allow tests to tune their parameters when running on HVF.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Re: [PATCH 5/7] tests/qtest/migration: Add MigrationTestEnv::has_hvf field
In reply to Philippe Mathieu-DaudéQuoted 7 lines · Philippe Mathieu-Daudé
Allow tests to tune their parameters when running on HVF.
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- tests/qtest/migration/framework.h | 1 + tests/qtest/migration/framework.c | 1 + 2 files changed, 2 insertions(+)
r~
Quoted 6 lines · Philippe Mathieu-Daudé
Hi,
This series modify few bits of the migration QTest framework to allow running the tests using the HVF framework (also leaving the possibilty for other ones, removing the KVM/TCG restriction).
Forgot to mention:
Based-on: <[email protected]>
"tests/qtest: Make qtest_has_accel() generic"
Quoted 8 lines
Philippe Mathieu-Daudé (7):
migration/dirtyrate: Do not unlockcpu_listlock twice tests/qtest/migration: Make 'has_dirty_ring' generic tests/qtest/migration: InitializeMigrationTestEnv::archearly tests/qtest/migration: Pass accelerator arguments as machine option tests/qtest/migration: AddMigrationTestEnv::has_hvffield tests/qtest/migration: Run aarch64/HVF tests using GICv2 tests/qtest/migration: Allow using accelerators different of TCG / KVM
RFC PATCH 6/7 tests/qtest/migration: Run aarch64/HVF tests using GICv2
In reply to Philippe Mathieu-DaudéGICv3 isn't supported on aarch64/HVF, but GICv2 is.
---
RFC: Test eventually timeouts :(
tests/qtest/migration/framework.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tests/qtest/migration/framework.c +3 -1
@@ -266,7 +266,7 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, }else if (strcmp (arch,"aarch64" ) ==0 ) { memory_size ="150M" ; machine_alias ="virt" ; - machine_opts ="gic-version=3" ; + machine_opts = env->has_hvf ?"gic-version=2" :"gic-version=3" ; arch_opts =g_strdup_printf ("-cpu max -kernel %s" , bootpath); start_address =ARM_TEST_MEM_START ; end_address =ARM_TEST_MEM_END ;
@@ -303,6 +303,8 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, }else { accel_args ="kvm" ; } + }else if (env->has_hvf) { + accel_args ="hvf" ; }else {assert (env->has_tcg); accel_args ="tcg" ;
Signature · 1 line
2.47.1
Re: [RFC PATCH 6/7] tests/qtest/migration: Run aarch64/HVF tests using GICv2
Quoted 1 line · Philippe Mathieu-Daudé
GICv3 isn't supported on aarch64/HVF, but GICv2 is.
Commit bdb0ade663c7 ("tests/migration-test: Stick with gicv3 in aarch64 test"), which set gic-version=3, says:
Quoted 6 lines
Switch to a static gic version "3" rather than using version "max", so that GIC should be stable now across any future QEMU binaries for migration-test.
Here the version can actually be anything as long as the ABI is stable.
So I think we should always set gic-version=2 so that gic-version will not vary with hosts.
Quoted 30 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
RFC: Test eventually timeouts :(tests/qtest/migration/framework.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tests/qtest/migration/framework.c +3
-1@@ -266,7 +266,7 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, }else if (strcmp (arch,"aarch64" ) ==0 ) { memory_size ="150M" ; machine_alias ="virt" ; - machine_opts ="gic-version=3" ; + machine_opts = env->has_hvf ?"gic-version=2" :"gic-version=3" ; arch_opts =g_strdup_printf ("-cpu max -kernel %s" , bootpath); start_address =ARM_TEST_MEM_START ; end_address =ARM_TEST_MEM_END ;@@ -303,6 +303,8 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, }else { accel_args ="kvm" ; } + }else if (env->has_hvf) { + accel_args ="hvf" ; }else {assert (env->has_tcg); accel_args ="tcg" ;
Re: [RFC PATCH 6/7] tests/qtest/migration: Run aarch64/HVF tests using GICv2
In reply to Philippe Mathieu-DaudéQuoted 1 line · Philippe Mathieu-Daudé
GICv3 isn't supported on aarch64/HVF, but GICv2 is.
Hmm. I'm still trying to get my head around this patch series and QTest in general, but in my experience GICv3 works fine with HVF? (Device name "arm-gicv3") Can you clarify what you mean or why this difference is needed?
Quoted 37 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
RFC: Test eventually timeouts :(tests/qtest/migration/framework.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tests/qtest/migration/framework.c +1
-1@@ -266,7 +266,7 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, }else if (strcmp (arch,"aarch64" ) ==0 ) { memory_size ="150M" ; machine_alias ="virt" ; - machine_opts ="gic-version=3" ; + machine_opts = env->has_hvf ?"gic-version=2" :"gic-version=3" ; arch_opts =g_strdup_printf ("-cpu max -kernel %s" , bootpath); start_address =ARM_TEST_MEM_START ;end_address = ARM_TEST_MEM_END;tests/qtest/migration/framework.c +2
-0@@ -303,6 +303,8 @@ int migrate_start(QTestState **from, QTestState **to,const char *uri, } else { accel_args ="kvm" ; } + }else if (env->has_hvf) { + accel_args ="hvf" ; }else {assert (env->has_tcg);accel_args = "tcg";--
2.47.1
PATCH 7/7 tests/qtest/migration: Allow using accelerators different of TCG / KVM
In reply to Philippe Mathieu-DaudéThere is no particular reason to restrict all the framework to TCG or KVM, since we can check on a per-test basis which accelerator is available (via MigrationTestEnv::has_$ACCEL).
--- tests/qtest/migration/framework.c | 5 ----- 1 file changed, 5 deletions(-)
tests/qtest/migration/framework.c +0 -5
@@ -950,11 +950,6 @@ MigrationTestEnv *migration_get_env(void) env->has_hvf =qtest_has_accel ("hvf" ); env->has_tcg =qtest_has_accel ("tcg" ); -if (!env->has_tcg && !env->has_kvm) { -g_test_skip ("No KVM or TCG accelerator available" ); -return env; - } - env->has_dirty_ring = env->has_kvm &&kvm_dirty_ring_supported (); env->has_uffd =ufd_version_check (&env->uffd_feature_thread_id); env->is_x86 = !strcmp (env->arch,"i386" ) || !strcmp (env->arch,"x86_64" );
Signature · 1 line
2.47.1
Re: [PATCH 7/7] tests/qtest/migration: Allow using accelerators different of TCG / KVM
Quoted 3 lines · Philippe Mathieu-Daudé
There is no particular reason to restrict all the framework to TCG or KVM, since we can check on a per-test basis which accelerator is available (via MigrationTestEnv::has_$ACCEL).
The reason is:
CONFIG_KVM=nCONFIG_TCG=n
The check is about "there is no accelerator at all".
Quoted 22 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/qtest/migration/framework.c | 5 ----- 1 file changed, 5 deletions(-)tests/qtest/migration/framework.c +0
-5@@ -950,11 +950,6 @@ MigrationTestEnv *migration_get_env(void) env->has_hvf =qtest_has_accel ("hvf" ); env->has_tcg =qtest_has_accel ("tcg" ); -if (!env->has_tcg && !env->has_kvm) { -g_test_skip ("No KVM or TCG accelerator available" ); -return env; - } - env->has_dirty_ring = env->has_kvm &&kvm_dirty_ring_supported (); env->has_uffd =ufd_version_check (&env->uffd_feature_thread_id); env->is_x86 = !strcmp (env->arch,"i386" ) || !strcmp (env->arch,"x86_64" );
Re: [PATCH 7/7] tests/qtest/migration: Allow using accelerators different of TCG / KVM
Quoted 6 lines · Fabiano Rosas
Quoted 3 lines · Philippe Mathieu-Daudé
There is no particular reason to restrict all the framework to TCG or KVM, since we can check on a per-test basis which accelerator is available (via MigrationTestEnv::has_$ACCEL).
Quoted 6 lines
The reason is:
CONFIG_KVM=nCONFIG_TCG=nThe check is about "there is no accelerator at all".
We perform the no accelerator check in meson.build on a per-target basis. So you'll never have a qemu-system-foo binary with zero accelerators.
r~
Re: [PATCH 7/7] tests/qtest/migration: Allow using accelerators different of TCG / KVM
Quoted 9 lines · Richard Henderson
Quoted 8 lines · Fabiano Rosas
Quoted 3 lines · Philippe Mathieu-Daudé
There is no particular reason to restrict all the framework to TCG or KVM, since we can check on a per-test basis which accelerator is available (via MigrationTestEnv::has_$ACCEL).
The reason is:
Quoted 8 lines
Quoted 4 lines
CONFIG_KVM=nCONFIG_TCG=nThe check is about "there is no accelerator at all".
We perform the no accelerator check in meson.build on a per-target basis. So you'll never have a qemu-system-foo binary with zero accelerators.
Ok, the issue was not zero accelerators, but Xen. On aarch64, this produces a binary with no TCG nor KVM:
--target-list=x86_64-softmmu --disable-tcg --enable-xen
Re: [PATCH 7/7] tests/qtest/migration: Allow using accelerators different of TCG / KVM
Quoted 16 lines · Fabiano Rosas
Quoted 14 lines · Richard Henderson
Quoted 12 lines · Fabiano Rosas
Quoted 3 lines · Philippe Mathieu-Daudé
There is no particular reason to restrict all the framework to TCG or KVM, since we can check on a per-test basis which accelerator is available (via MigrationTestEnv::has_$ACCEL).
The reason is:
CONFIG_KVM=nCONFIG_TCG=nThe check is about "there is no accelerator at all".
Quoted 8 lines
Quoted 3 lines
We perform the no accelerator check in meson.build on a per-target basis. So you'll never have a qemu-system-foo binary with zero accelerators.
Ok, the issue was not zero accelerators, but Xen. On aarch64, this produces a binary with no TCG nor KVM:
--target-list=x86_64-softmmu --disable-tcg --enable-xen
Right. Phil's patch set specifically mentions HVF, but there's no reason Xen can't be better handled too. Unless there's something explicit about Xen that cannot be handled here? But even then, the if condition needs updating.
r~
Re: [PATCH 7/7] tests/qtest/migration: Allow using accelerators different of TCG / KVM
In reply to Philippe Mathieu-DaudéQuoted 8 lines · Philippe Mathieu-Daudé
There is no particular reason to restrict all the framework to TCG or KVM, since we can check on a per-test basis which accelerator is available (viaMigrationTestEnv::has_$ACCEL).
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- tests/qtest/migration/framework.c | 5 ----- 1 file changed, 5 deletions(-)
r~
Cc'ing Peter and Alex who asked how HVF is tested.
Quoted 15 lines · Philippe Mathieu-Daudé
Hi,
This series modify few bits of the migration QTest framework to allow running the tests using the HVF framework (also leaving the possibilty for other ones, removing the KVM/TCG restriction).
Philippe Mathieu-Daudé (7):
migration/dirtyrate: Do not unlockcpu_listlock twice tests/qtest/migration: Make 'has_dirty_ring' generic tests/qtest/migration: InitializeMigrationTestEnv::archearly tests/qtest/migration: Pass accelerator arguments as machine option tests/qtest/migration: AddMigrationTestEnv::has_hvffield tests/qtest/migration: Run aarch64/HVF tests using GICv2 tests/qtest/migration: Allow using accelerators different of TCG / KVM