From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoqdC-0006nu-BQ for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:28:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZoqdA-0006cZ-Vd for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:28:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49395) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoqdA-0006c1-Lk for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:28:28 -0400 Date: Wed, 21 Oct 2015 13:28:24 +0300 From: "Michael S. Tsirkin" Message-ID: <1445423133-5119-33-git-send-email-mst@redhat.com> References: <1445423133-5119-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1445423133-5119-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 32/38] vhost-user-test: add live-migration test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Yuanhan Liu , Gonglei , Thibaut Collet , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= From: Marc-Andr=E9 Lureau This test checks that the log fd is given to the migration source, and mark dirty pages during migration. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Tested-by: Thibaut Collet --- tests/vhost-user-test.c | 171 ++++++++++++++++++++++++++++++++++++++++++= +++++- 1 file changed, 169 insertions(+), 2 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 791d849..ef22e3e 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -12,6 +12,7 @@ =20 #include "libqtest.h" #include "qemu/option.h" +#include "qemu/range.h" #include "sysemu/char.h" #include "sysemu/sysemu.h" =20 @@ -47,6 +48,9 @@ #define VHOST_MEMORY_MAX_NREGIONS 8 =20 #define VHOST_USER_F_PROTOCOL_FEATURES 30 +#define VHOST_USER_PROTOCOL_F_LOG_SHMFD 1 + +#define VHOST_LOG_PAGE 0x1000 =20 typedef enum VhostUserRequest { VHOST_USER_NONE =3D 0, @@ -117,6 +121,7 @@ typedef struct TestServer { VhostUserMemory memory; GMutex data_mutex; GCond data_cond; + int log_fd; } TestServer; =20 #if !GLIB_CHECK_VERSION(2, 32, 0) @@ -238,7 +243,8 @@ static void chr_read(void *opaque, const uint8_t *buf= , int size) /* send back features to qemu */ msg.flags |=3D VHOST_USER_REPLY_MASK; msg.size =3D sizeof(m.u64); - msg.u64 =3D 0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES; + msg.u64 =3D 0x1ULL << VHOST_F_LOG_ALL | + 0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES; p =3D (uint8_t *) &msg; qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); break; @@ -252,7 +258,7 @@ static void chr_read(void *opaque, const uint8_t *buf= , int size) /* send back features to qemu */ msg.flags |=3D VHOST_USER_REPLY_MASK; msg.size =3D sizeof(m.u64); - msg.u64 =3D 0; + msg.u64 =3D 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD; p =3D (uint8_t *) &msg; qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); break; @@ -286,6 +292,21 @@ static void chr_read(void *opaque, const uint8_t *bu= f, int size) */ qemu_set_nonblock(fd); break; + + case VHOST_USER_SET_LOG_BASE: + if (s->log_fd !=3D -1) { + close(s->log_fd); + s->log_fd =3D -1; + } + qemu_chr_fe_get_msgfds(chr, &s->log_fd, 1); + msg.flags |=3D VHOST_USER_REPLY_MASK; + msg.size =3D 0; + p =3D (uint8_t *) &msg; + qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE); + + g_cond_signal(&s->data_cond); + break; + default: break; } @@ -337,6 +358,8 @@ static TestServer *test_server_new(const gchar *name) g_mutex_init(&server->data_mutex); g_cond_init(&server->data_cond); =20 + server->log_fd =3D -1; + return server; } =20 @@ -358,12 +381,155 @@ static void test_server_free(TestServer *server) close(server->fds[i]); } =20 + if (server->log_fd !=3D -1) { + close(server->log_fd); + } + unlink(server->socket_path); g_free(server->socket_path); =20 + + g_free(server->chr_name); g_free(server); } =20 +static void wait_for_log_fd(TestServer *s) +{ + gint64 end_time; + + g_mutex_lock(&s->data_mutex); + end_time =3D g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; + while (s->log_fd =3D=3D -1) { + if (!g_cond_wait_until(&s->data_cond, &s->data_mutex, end_time))= { + /* timeout has passed */ + g_assert(s->log_fd !=3D -1); + break; + } + } + + g_mutex_unlock(&s->data_mutex); +} + +static void write_guest_mem(TestServer *s, uint32 seed) +{ + uint32_t *guest_mem; + int i, j; + size_t size; + + wait_for_fds(s); + + /* iterate all regions */ + for (i =3D 0; i < s->fds_num; i++) { + + /* We'll write only the region statring at 0x0 */ + if (s->memory.regions[i].guest_phys_addr !=3D 0x0) { + continue; + } + + g_assert_cmpint(s->memory.regions[i].memory_size, >, 1024); + + size =3D s->memory.regions[i].memory_size + + s->memory.regions[i].mmap_offset; + + guest_mem =3D mmap(0, size, PROT_READ | PROT_WRITE, + MAP_SHARED, s->fds[i], 0); + + g_assert(guest_mem !=3D MAP_FAILED); + guest_mem +=3D (s->memory.regions[i].mmap_offset / sizeof(*guest= _mem)); + + for (j =3D 0; j < 256; j++) { + guest_mem[j] =3D seed + j; + } + + munmap(guest_mem, s->memory.regions[i].memory_size); + break; + } +} + +static guint64 get_log_size(TestServer *s) +{ + guint64 log_size =3D 0; + int i; + + for (i =3D 0; i < s->memory.nregions; ++i) { + VhostUserMemoryRegion *reg =3D &s->memory.regions[i]; + guint64 last =3D range_get_last(reg->guest_phys_addr, + reg->memory_size); + log_size =3D MAX(log_size, last / (8 * VHOST_LOG_PAGE) + 1); + } + + return log_size; +} + +static void test_migrate(void) +{ + TestServer *s =3D test_server_new("src"); + TestServer *dest =3D test_server_new("dest"); + const char *uri =3D "tcp:127.0.0.1:1234"; + QTestState *global =3D global_qtest, *from, *to; + gchar *cmd; + QDict *rsp; + guint8 *log; + guint64 size; + + cmd =3D GET_QEMU_CMDE(s, 2, ""); + from =3D qtest_start(cmd); + g_free(cmd); + + wait_for_fds(s); + size =3D get_log_size(s); + g_assert_cmpint(size, =3D=3D, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * = 8)); + + cmd =3D GET_QEMU_CMDE(dest, 2, " -incoming %s", uri); + to =3D qtest_init(cmd); + g_free(cmd); + + /* slow down migration to have time to fiddle with log */ + /* TODO: qtest could learn to break on some places */ + rsp =3D qmp("{ 'execute': 'migrate_set_speed'," + "'arguments': { 'value': 10 } }"); + g_assert(qdict_haskey(rsp, "return")); + QDECREF(rsp); + + cmd =3D g_strdup_printf("{ 'execute': 'migrate'," + "'arguments': { 'uri': '%s' } }", + uri); + rsp =3D qmp(cmd); + g_free(cmd); + g_assert(qdict_haskey(rsp, "return")); + QDECREF(rsp); + + wait_for_log_fd(s); + + log =3D mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, s->log_fd,= 0); + g_assert(log !=3D MAP_FAILED); + + /* modify first page */ + write_guest_mem(s, 0x42); + log[0] =3D 1; + munmap(log, size); + + /* speed things up */ + rsp =3D qmp("{ 'execute': 'migrate_set_speed'," + "'arguments': { 'value': 0 } }"); + g_assert(qdict_haskey(rsp, "return")); + QDECREF(rsp); + + qmp_eventwait("STOP"); + + global_qtest =3D to; + qmp_eventwait("RESUME"); + + read_guest_mem(dest); + + qtest_quit(to); + test_server_free(dest); + qtest_quit(from); + test_server_free(s); + + global_qtest =3D global; +} + int main(int argc, char **argv) { QTestState *s =3D NULL; @@ -403,6 +569,7 @@ int main(int argc, char **argv) g_free(qemu_cmd); =20 qtest_add_data_func("/vhost-user/read-guest-mem", server, read_guest= _mem); + qtest_add_func("/vhost-user/migrate", test_migrate); =20 ret =3D g_test_run(); =20 --=20 MST