From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCuV6-00061E-Kx for qemu-devel@nongnu.org; Tue, 14 Jun 2016 15:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCuV4-0001TH-5z for qemu-devel@nongnu.org; Tue, 14 Jun 2016 15:59:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCuV3-0001TD-Tn for qemu-devel@nongnu.org; Tue, 14 Jun 2016 15:59:50 -0400 Date: Tue, 14 Jun 2016 22:59:48 +0300 From: "Michael S. Tsirkin" Message-ID: <20160614225948-mutt-send-email-mst@redhat.com> References: <1465934227-16558-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: <1465934227-16558-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 11/32] test: start vhost-user reconnect test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Victor Kaplansky , Yuanhan Liu , Paolo Bonzini From: Marc-Andr=E9 Lureau This is a simple reconnect test, that simply checks if vhost-user reconnection is possible and restore the state. A more complete test would actually manipulate and check the ring contents (such extended testing would benefit from the libvhost-user proposed in QEMU list to avoid duplication of ring manipulations) Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Victor Kaplansky Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/vhost-user-test.c | 136 ++++++++++++++++++++++++++++++++++++++++++= ------ 1 file changed, 119 insertions(+), 17 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 6961596..6dfd2ae 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -34,7 +34,7 @@ #define QEMU_CMD_ACCEL " -machine accel=3Dtcg" #define QEMU_CMD_MEM " -m %d -object memory-backend-file,id=3Dmem,siz= e=3D%dM,"\ "mem-path=3D%s,share=3Don -numa node,memdev=3Dme= m" -#define QEMU_CMD_CHR " -chardev socket,id=3D%s,path=3D%s" +#define QEMU_CMD_CHR " -chardev socket,id=3D%s,path=3D%s%s" #define QEMU_CMD_NETDEV " -netdev vhost-user,id=3Dnet0,chardev=3D%s,vhos= tforce" #define QEMU_CMD_NET " -device virtio-net-pci,netdev=3Dnet0,romfile=3D= ./pc-bios/pxe-virtio.rom" =20 @@ -246,7 +246,12 @@ static void chr_read(void *opaque, const uint8_t *bu= f, int size) =20 if (msg.size) { p +=3D VHOST_USER_HDR_SIZE; - g_assert_cmpint(qemu_chr_fe_read_all(chr, p, msg.size), =3D=3D, = msg.size); + size =3D qemu_chr_fe_read_all(chr, p, msg.size); + if (size !=3D msg.size) { + g_test_message("Wrong message size received %d !=3D %d\n", + size, msg.size); + return; + } } =20 switch (msg.request) { @@ -363,17 +368,10 @@ static const char *init_hugepagefs(const char *path= ) static TestServer *test_server_new(const gchar *name) { TestServer *server =3D g_new0(TestServer, 1); - gchar *chr_path; =20 server->socket_path =3D g_strdup_printf("%s/%s.sock", tmpfs, name); server->mig_path =3D g_strdup_printf("%s/%s.mig", tmpfs, name); - - chr_path =3D g_strdup_printf("unix:%s,server,nowait", server->socket= _path); server->chr_name =3D g_strdup_printf("chr-%s", name); - server->chr =3D qemu_chr_new(server->chr_name, chr_path, NULL); - g_free(chr_path); - - qemu_chr_add_handlers(server->chr, chr_can_read, chr_read, NULL, ser= ver); =20 g_mutex_init(&server->data_mutex); g_cond_init(&server->data_cond); @@ -383,13 +381,34 @@ static TestServer *test_server_new(const gchar *nam= e) return server; } =20 -#define GET_QEMU_CMD(s) = \ - g_strdup_printf(QEMU_CMD, 512, 512, (root), (s)->chr_name, = \ - (s)->socket_path, (s)->chr_name) +static void test_server_create_chr(TestServer *server, const gchar *opt) +{ + gchar *chr_path; =20 -#define GET_QEMU_CMDE(s, mem, extra, ...) = \ - g_strdup_printf(QEMU_CMD extra, (mem), (mem), (root), (s)->chr_name,= \ - (s)->socket_path, (s)->chr_name, ##__VA_ARGS__) + chr_path =3D g_strdup_printf("unix:%s%s", server->socket_path, opt); + server->chr =3D qemu_chr_new(server->chr_name, chr_path, NULL); + g_free(chr_path); + + qemu_chr_add_handlers(server->chr, chr_can_read, chr_read, NULL, ser= ver); +} + +static void test_server_listen(TestServer *server) +{ + test_server_create_chr(server, ",server,nowait"); +} + +static inline void test_server_connect(TestServer *server) +{ + test_server_create_chr(server, ",reconnect=3D1"); +} + +#define GET_QEMU_CMD(s) \ + g_strdup_printf(QEMU_CMD, 512, 512, (root), (s)->chr_name, \ + (s)->socket_path, "", (s)->chr_name) + +#define GET_QEMU_CMDE(s, mem, chr_opts, extra, ...) = \ + g_strdup_printf(QEMU_CMD extra, (mem), (mem), (root), (s)->chr_name,= \ + (s)->socket_path, (chr_opts), (s)->chr_name, ##__VA_= ARGS__) =20 static gboolean _test_server_free(TestServer *server) { @@ -537,7 +556,10 @@ static void test_migrate(void) guint8 *log; guint64 size; =20 - cmd =3D GET_QEMU_CMDE(s, 2, ""); + test_server_listen(s); + test_server_listen(dest); + + cmd =3D GET_QEMU_CMDE(s, 2, "", ""); from =3D qtest_start(cmd); g_free(cmd); =20 @@ -545,7 +567,7 @@ static void test_migrate(void) size =3D get_log_size(s); g_assert_cmpint(size, =3D=3D, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * = 8)); =20 - cmd =3D GET_QEMU_CMDE(dest, 2, " -incoming %s", uri); + cmd =3D GET_QEMU_CMDE(dest, 2, "", " -incoming %s", uri); to =3D qtest_init(cmd); g_free(cmd); =20 @@ -605,6 +627,80 @@ static void test_migrate(void) global_qtest =3D global; } =20 +#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS +static void wait_for_rings_started(TestServer *s, size_t count) +{ + gint64 end_time; + + g_mutex_lock(&s->data_mutex); + end_time =3D g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; + while (ctpop64(s->rings) !=3D count) { + if (!g_cond_wait_until(&s->data_cond, &s->data_mutex, end_time))= { + /* timeout has passed */ + g_assert_cmpint(ctpop64(s->rings), =3D=3D, count); + break; + } + } + + g_mutex_unlock(&s->data_mutex); +} + +static gboolean +reconnect_cb(gpointer user_data) +{ + TestServer *s =3D user_data; + + qemu_chr_disconnect(s->chr); + + return FALSE; +} + +static gpointer +connect_thread(gpointer data) +{ + TestServer *s =3D data; + + /* wait for qemu to start before first try, to avoid extra warnings = */ + g_usleep(G_USEC_PER_SEC); + test_server_connect(s); + + return NULL; +} + +static void test_reconnect_subprocess(void) +{ + TestServer *s =3D test_server_new("reconnect"); + char *cmd; + + g_thread_new("connect", connect_thread, s); + cmd =3D GET_QEMU_CMDE(s, 2, ",server", ""); + qtest_start(cmd); + g_free(cmd); + + wait_for_fds(s); + wait_for_rings_started(s, 2); + + /* reconnect */ + s->fds_num =3D 0; + s->rings =3D 0; + g_idle_add(reconnect_cb, s); + wait_for_fds(s); + wait_for_rings_started(s, 2); + + qtest_end(); + test_server_free(s); + return; +} + +static void test_reconnect(void) +{ + gchar *path =3D g_strdup_printf("/%s/vhost-user/reconnect/subprocess= ", + qtest_get_arch()); + g_test_trap_subprocess(path, 0, 0); + g_test_trap_assert_passed(); +} +#endif + int main(int argc, char **argv) { QTestState *s =3D NULL; @@ -636,6 +732,7 @@ int main(int argc, char **argv) } =20 server =3D test_server_new("test"); + test_server_listen(server); =20 loop =3D g_main_loop_new(NULL, FALSE); /* run the main loop thread so the chardev may operate */ @@ -648,6 +745,11 @@ int main(int argc, char **argv) =20 qtest_add_data_func("/vhost-user/read-guest-mem", server, read_guest= _mem); qtest_add_func("/vhost-user/migrate", test_migrate); +#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS + qtest_add_func("/vhost-user/reconnect/subprocess", + test_reconnect_subprocess); + qtest_add_func("/vhost-user/reconnect", test_reconnect); +#endif =20 ret =3D g_test_run(); =20 --=20 MST