From: Lin Ma <lma@suse.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, dgilbert@redhat.com, Lin Ma <lma@suse.com>
Subject: [PATCH 3/3] tests: add postcopy-uffd-usermode-only capability into migration-test
Date: Thu, 14 Oct 2021 17:15:51 +0800 [thread overview]
Message-ID: <20211014091551.15201-4-lma@suse.com> (raw)
In-Reply-To: <20211014091551.15201-1-lma@suse.com>
Signed-off-by: Lin Ma <lma@suse.com>
---
tests/qtest/migration-test.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index cc5e83d98a..0cd4f49bed 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -38,6 +38,7 @@
unsigned start_address;
unsigned end_address;
static bool uffd_feature_thread_id;
+static bool uffd_usermode_only;
/* A downtime where the test really should converge */
#define CONVERGE_DOWNTIME 1000
@@ -60,8 +61,12 @@ static bool ufd_version_check(void)
int ufd = syscall(__NR_userfaultfd, O_CLOEXEC);
if (ufd == -1) {
- g_test_message("Skipping test: userfaultfd not available");
- return false;
+ ufd = syscall(__NR_userfaultfd, O_CLOEXEC | UFFD_USER_MODE_ONLY);
+ if (ufd == -1) {
+ g_test_message("Skipping test: userfaultfd not available");
+ return false;
+ } else
+ uffd_usermode_only = true;
}
api_struct.api = UFFD_API;
@@ -670,6 +675,8 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
}
migrate_set_capability(from, "postcopy-ram", true);
+ if (uffd_usermode_only)
+ migrate_set_capability(to, "postcopy-uffd-usermode-only", true);
migrate_set_capability(to, "postcopy-ram", true);
migrate_set_capability(to, "postcopy-blocktime", true);
--
2.26.2
next prev parent reply other threads:[~2021-10-14 9:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-14 9:15 [PATCH 0/3] Postcopy migration: Add userfaultfd- user-mode-only capability Lin Ma
2021-10-14 9:15 ` [PATCH 1/3] migration: introduce postcopy-uffd-usermode-only capability Lin Ma
2021-10-14 9:15 ` [PATCH 2/3] migration: postcopy-uffd-usermode-only documentation Lin Ma
2021-10-14 9:15 ` Lin Ma [this message]
2021-10-14 23:43 ` [PATCH 0/3] Postcopy migration: Add userfaultfd- user-mode-only capability Peter Xu
2021-10-15 5:38 ` lma
2021-10-15 6:12 ` Peter Xu
2021-10-15 8:16 ` lma
2021-10-15 8:28 ` Peter Xu
2021-10-15 9:49 ` lma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211014091551.15201-4-lma@suse.com \
--to=lma@suse.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).