[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/20] tests: migration-test: Add dirty ring test
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 02/20] tests: migration-test: Add dirty ring test |
Date: |
Thu, 1 Jul 2021 15:15:27 +0100 |
From: Peter Xu <peterx@redhat.com>
Add dirty ring test if kernel supports it. Add the dirty ring parameter on
source should be mostly enough, but let's change the dest too to make them
match always.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20210615175523.439830-3-peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
tests/qtest/migration-test.c | 58 ++++++++++++++++++++++++++++++++++--
1 file changed, 55 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index d9225f58d4..9ef6b47135 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -27,6 +27,10 @@
#include "migration-helpers.h"
#include "tests/migration/migration-test.h"
+#if defined(__linux__)
+#include "linux/kvm.h"
+#endif
+
/* TODO actually test the results and get rid of this */
#define qtest_qmp_discard_response(...) qobject_unref(qtest_qmp(__VA_ARGS__))
@@ -467,6 +471,8 @@ typedef struct {
bool use_shmem;
/* only launch the target process */
bool only_target;
+ /* Use dirty ring if true; dirty logging otherwise */
+ bool use_dirty_ring;
char *opts_source;
char *opts_target;
} MigrateStart;
@@ -573,11 +579,13 @@ static int test_migrate_start(QTestState **from,
QTestState **to,
shmem_opts = g_strdup("");
}
- cmd_source = g_strdup_printf("-accel kvm -accel tcg%s%s "
+ cmd_source = g_strdup_printf("-accel kvm%s -accel tcg%s%s "
"-name source,debug-threads=on "
"-m %s "
"-serial file:%s/src_serial "
"%s %s %s %s",
+ args->use_dirty_ring ?
+ ",dirty-ring-size=4096" : "",
machine_opts ? " -machine " : "",
machine_opts ? machine_opts : "",
memory_size, tmpfs,
@@ -587,12 +595,14 @@ static int test_migrate_start(QTestState **from,
QTestState **to,
*from = qtest_init(cmd_source);
}
- cmd_target = g_strdup_printf("-accel kvm -accel tcg%s%s "
+ cmd_target = g_strdup_printf("-accel kvm%s -accel tcg%s%s "
"-name target,debug-threads=on "
"-m %s "
"-serial file:%s/dest_serial "
"-incoming %s "
"%s %s %s %s",
+ args->use_dirty_ring ?
+ ",dirty-ring-size=4096" : "",
machine_opts ? " -machine " : "",
machine_opts ? machine_opts : "",
memory_size, tmpfs, uri,
@@ -785,12 +795,14 @@ static void test_baddest(void)
test_migrate_end(from, to, false);
}
-static void test_precopy_unix(void)
+static void test_precopy_unix_common(bool dirty_ring)
{
g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
MigrateStart *args = migrate_start_new();
QTestState *from, *to;
+ args->use_dirty_ring = dirty_ring;
+
if (test_migrate_start(&from, &to, uri, args)) {
return;
}
@@ -825,6 +837,18 @@ static void test_precopy_unix(void)
test_migrate_end(from, to, true);
}
+static void test_precopy_unix(void)
+{
+ /* Using default dirty logging */
+ test_precopy_unix_common(false);
+}
+
+static void test_precopy_unix_dirty_ring(void)
+{
+ /* Using dirty ring tracking */
+ test_precopy_unix_common(true);
+}
+
#if 0
/* Currently upset on aarch64 TCG */
static void test_ignore_shared(void)
@@ -1369,6 +1393,29 @@ static void test_multifd_tcp_cancel(void)
test_migrate_end(from, to2, true);
}
+static bool kvm_dirty_ring_supported(void)
+{
+#if defined(__linux__)
+ int ret, kvm_fd = open("/dev/kvm", O_RDONLY);
+
+ if (kvm_fd < 0) {
+ return false;
+ }
+
+ ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, KVM_CAP_DIRTY_LOG_RING);
+ close(kvm_fd);
+
+ /* We test with 4096 slots */
+ if (ret < 4096) {
+ return false;
+ }
+
+ return true;
+#else
+ return false;
+#endif
+}
+
int main(int argc, char **argv)
{
char template[] = "/tmp/migration-test-XXXXXX";
@@ -1438,6 +1485,11 @@ int main(int argc, char **argv)
qtest_add_func("/migration/multifd/tcp/zstd", test_multifd_tcp_zstd);
#endif
+ if (kvm_dirty_ring_supported()) {
+ qtest_add_func("/migration/dirty_ring",
+ test_precopy_unix_dirty_ring);
+ }
+
ret = g_test_run();
g_assert_cmpint(ret, ==, 0);
--
2.31.1
- [PULL 00/20] migration queue, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 01/20] tests: migration-test: Still run the rest even if uffd missing, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 02/20] tests: migration-test: Add dirty ring test,
Dr. David Alan Gilbert (git) <=
- [PULL 03/20] migration: fix the memory overwriting risk in add_to_iovec, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 04/20] migration: Move yank outside qemu_start_incoming_migration(), Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 05/20] migration: Allow reset of postcopy_recover_triggered when failed, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 06/20] migration: move wait-unplug loop to its own function, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 07/20] migration: failover: continue to wait card unplug on error, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 08/20] virtiofsd: use GDateTime for formatting timestamp for debug messages, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 09/20] docs: describe the security considerations with virtiofsd xattr mapping, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 10/20] virtiofsd: Don't allow file creation with FUSE_OPEN, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 11/20] virtiofsd: Fix fuse setxattr() API change issue, Dr. David Alan Gilbert (git), 2021/07/01
- [PULL 12/20] virtiofsd: Fix xattr operations overwriting errno, Dr. David Alan Gilbert (git), 2021/07/01