From patchwork Fri Apr 1 11:16:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 8722941 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 23BFEC0553 for ; Fri, 1 Apr 2016 11:19:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E325820390 for ; Fri, 1 Apr 2016 11:18:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B95B120379 for ; Fri, 1 Apr 2016 11:18:57 +0000 (UTC) Received: from localhost ([::1]:43512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alx6O-0000IL-Tr for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Apr 2016 07:18:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alx4u-0006TL-5i for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alx4p-0001rF-2n for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:24 -0400 Received: from mail-qk0-x22c.google.com ([2607:f8b0:400d:c09::22c]:34232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alx4o-0001r9-T0 for qemu-devel@nongnu.org; Fri, 01 Apr 2016 07:17:19 -0400 Received: by mail-qk0-x22c.google.com with SMTP id r184so1729054qkc.1 for ; Fri, 01 Apr 2016 04:17:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kl6dc2jQhPdvnKoEAGr1SrY3ND3GuojU8OCzL7bZ4wM=; b=FScg8ZsCp0iqZJwENY9STpEJJgvTIAGGim8H//bKxwkUmA9ixBNXBgM+6XSwvApD4J VyoAGzm73s9TiPF0ivx1QKwNJ6h1Z3KcvlyqbqVHvusxa1sYQN346oJE0QSJoRyPsalM lnS2K8dvvsh2piX5D0iKdLGdrOA/WbMd9WO86yXwp7Yq78tBabbyeTp67SAXfjTrPs3H NG66xGk3T7hJ1GGsQXwf+DJ+h7Lf44jFydC3Giu9TejrrkDoKp0ibsuup+4mEgzcnU8b EKkvrRDdUwzRXRtylJQeSIupfOWx7aNsuFmR8Ph4PsG7GfbfU7Z0UEaVEQHqk0yuwBWK Tbiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kl6dc2jQhPdvnKoEAGr1SrY3ND3GuojU8OCzL7bZ4wM=; b=U3Jv5N7C8mWB5X2a545R28vXma7Qu6aybS/GTec8XYgvgnRNF3QzGRGo/XQbFMVww7 EflPD8/VEwKZuIUr62I/eKkUTKwSv3tyInPX2aFGX2bvwPJeebNOSMw+ADTHK0Wf63OH kTgv+6A7t3/waOjptBhEJwuFZSpJicttwqP6q46CsA/HDofQ2OUW7/Sp/l5iOPlmUNfb 6lPrmu1p7ywL4v56JCT990dIfgiVAbLXlcwLA3kSgO+9ePhm4FiiwUNAQVkuzu08UppR 4Xkdt46P5Y32o/zQbGX6esucJEYvnsjvvtlpi4gDMQ2MGv03fnhfpLsr+48XS2WAL2VP XNRw== X-Gm-Message-State: AD7BkJIAsZWp2HSOQfQaiTsqtsceNaTBIiqKD98/Ci1umYA/v/OJofCpsLAfI9se2tE/9g== X-Received: by 10.55.40.146 with SMTP id o18mr17688505qko.36.1459509438572; Fri, 01 Apr 2016 04:17:18 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id 64sm5872362qgy.34.2016.04.01.04.17.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Apr 2016 04:17:17 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Fri, 1 Apr 2016 13:16:27 +0200 Message-Id: <1459509388-6185-18-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1459509388-6185-1-git-send-email-marcandre.lureau@redhat.com> References: <1459509388-6185-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::22c Cc: Yuanhan Liu , "Michael S. Tsirkin" , Ilya Maximets , jonshin@cisco.com, Tetsuya Mukawa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH 17/18] test: start vhost-user reconnect test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Check that SLAVE_FD & SHUTDOWN message work and that the master asked for the ring read status. Signed-off-by: Marc-André Lureau --- tests/Makefile | 2 +- tests/vhost-user-test.c | 184 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 170 insertions(+), 16 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 9293d49..8e4807e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -577,7 +577,7 @@ tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y) tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y) tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y) tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o -tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y) $(test-io-obj-y) +tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y) $(test-io-obj-y) $(libqos-pc-obj-y) $(libqos-virtio-obj-y) tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 6961596..17ebfd1 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -21,6 +21,12 @@ #include #include #include +#include "libqos/pci-pc.h" +#include "libqos/virtio.h" +#include "libqos/virtio-pci.h" +#include "libqos/malloc.h" +#include "libqos/malloc-pc.h" +#include "libqos/malloc-generic.h" /* GLIB version compatibility flags */ #if !GLIB_CHECK_VERSION(2, 26, 0) @@ -34,7 +40,7 @@ #define QEMU_CMD_ACCEL " -machine accel=tcg" #define QEMU_CMD_MEM " -m %d -object memory-backend-file,id=mem,size=%dM,"\ "mem-path=%s,share=on -numa node,memdev=mem" -#define QEMU_CMD_CHR " -chardev socket,id=%s,path=%s" +#define QEMU_CMD_CHR " -chardev socket,id=%s,path=%s%s" #define QEMU_CMD_NETDEV " -netdev vhost-user,id=net0,chardev=%s,vhostforce" #define QEMU_CMD_NET " -device virtio-net-pci,netdev=net0,romfile=./pc-bios/pxe-virtio.rom" @@ -49,6 +55,7 @@ #define VHOST_USER_F_PROTOCOL_FEATURES 30 #define VHOST_USER_PROTOCOL_F_LOG_SHMFD 1 +#define VHOST_USER_PROTOCOL_F_SLAVE_CHANNEL 3 #define VHOST_LOG_PAGE 0x1000 @@ -71,9 +78,16 @@ typedef enum VhostUserRequest { VHOST_USER_GET_PROTOCOL_FEATURES = 15, VHOST_USER_SET_PROTOCOL_FEATURES = 16, VHOST_USER_SET_VRING_ENABLE = 18, + VHOST_USER_SET_SLAVE_FD = 20, VHOST_USER_MAX } VhostUserRequest; +typedef enum VhostUserSlaveRequest { + VHOST_USER_SLAVE_NONE = 0, + VHOST_USER_SLAVE_SHUTDOWN = 1, + VHOST_USER_SLAVE_MAX +} VhostUserSlaveRequest; + typedef struct VhostUserMemoryRegion { uint64_t guest_phys_addr; uint64_t memory_size; @@ -119,6 +133,8 @@ static VhostUserMsg m __attribute__ ((unused)); /* The version of the protocol we support */ #define VHOST_USER_VERSION (0x1) + +#define VIRTIO_QUEUE_MAX 1024 /*****************************************************************************/ typedef struct TestServer { @@ -133,6 +149,8 @@ typedef struct TestServer { GCond data_cond; int log_fd; uint64_t rings; + int slave_fd; + uint16_t set_base[VIRTIO_QUEUE_MAX]; } TestServer; #if !GLIB_CHECK_VERSION(2, 32, 0) @@ -269,7 +287,8 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) /* send back features to qemu */ msg.flags |= VHOST_USER_REPLY_MASK; msg.size = sizeof(m.payload.u64); - msg.payload.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD; + msg.payload.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD | + 1 << VHOST_USER_PROTOCOL_F_SLAVE_CHANNEL; p = (uint8_t *) &msg; qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); break; @@ -324,6 +343,12 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) case VHOST_USER_SET_VRING_BASE: assert(msg.payload.state.index < 2); s->rings |= 0x1ULL << msg.payload.state.index; + s->set_base[msg.payload.state.index] = msg.payload.state.num; + break; + + case VHOST_USER_SET_SLAVE_FD: + qemu_chr_fe_get_msgfds(chr, &s->slave_fd, 1); + g_cond_signal(&s->data_cond); break; default: @@ -360,7 +385,7 @@ static const char *init_hugepagefs(const char *path) return path; } -static TestServer *test_server_new(const gchar *name) +static TestServer *test_server_new(const gchar *name, const gchar *chr_opt) { TestServer *server = g_new0(TestServer, 1); gchar *chr_path; @@ -368,7 +393,8 @@ static TestServer *test_server_new(const gchar *name) server->socket_path = g_strdup_printf("%s/%s.sock", tmpfs, name); server->mig_path = g_strdup_printf("%s/%s.mig", tmpfs, name); - chr_path = g_strdup_printf("unix:%s,server,nowait", server->socket_path); + chr_path = g_strdup_printf(chr_opt ?: "unix:%s,server,nowait", + server->socket_path); server->chr_name = g_strdup_printf("chr-%s", name); server->chr = qemu_chr_new(server->chr_name, chr_path, NULL); g_free(chr_path); @@ -379,17 +405,18 @@ static TestServer *test_server_new(const gchar *name) g_cond_init(&server->data_cond); server->log_fd = -1; + server->slave_fd = -1; return server; } -#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_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, extra, ...) \ - g_strdup_printf(QEMU_CMD extra, (mem), (mem), (root), (s)->chr_name, \ - (s)->socket_path, (s)->chr_name, ##__VA_ARGS__) +#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__) static gboolean _test_server_free(TestServer *server) { @@ -405,6 +432,10 @@ static gboolean _test_server_free(TestServer *server) close(server->log_fd); } + if (server->slave_fd != -1) { + close(server->slave_fd); + } + unlink(server->socket_path); g_free(server->socket_path); @@ -527,8 +558,8 @@ GSourceFuncs test_migrate_source_funcs = { static void test_migrate(void) { - TestServer *s = test_server_new("src"); - TestServer *dest = test_server_new("dest"); + TestServer *s = test_server_new("src", NULL); + TestServer *dest = test_server_new("dest", NULL); char *uri = g_strdup_printf("%s%s", "unix:", dest->mig_path); QTestState *global = global_qtest, *from, *to; GSource *source; @@ -537,7 +568,7 @@ static void test_migrate(void) guint8 *log; guint64 size; - cmd = GET_QEMU_CMDE(s, 2, ""); + cmd = GET_QEMU_CMDE(s, 2, "", ""); from = qtest_start(cmd); g_free(cmd); @@ -545,7 +576,7 @@ static void test_migrate(void) size = get_log_size(s); g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8)); - cmd = GET_QEMU_CMDE(dest, 2, " -incoming %s", uri); + cmd = GET_QEMU_CMDE(dest, 2, "", " -incoming %s", uri); to = qtest_init(cmd); g_free(cmd); @@ -605,6 +636,128 @@ static void test_migrate(void) global_qtest = global; } +static void wait_for_slave_fd(TestServer *s) +{ + gint64 end_time; + + g_mutex_lock(&s->data_mutex); + end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; + while (s->slave_fd == -1) { + if (!g_cond_wait_until(&s->data_cond, &s->data_mutex, end_time)) { + /* timeout has passed */ + g_assert(s->slave_fd != -1); + break; + } + } + + g_mutex_unlock(&s->data_mutex); +} + +static void wait_for_rings_started(TestServer *s, size_t count) +{ + gint64 end_time; + + g_mutex_lock(&s->data_mutex); + end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; + while (ctpop64(s->rings) == count) { + if (!g_cond_wait_until(&s->data_cond, &s->data_mutex, end_time)) { + /* timeout has passed */ + g_assert_cmpint(ctpop64(s->rings), ==, count); + break; + } + } + + g_mutex_unlock(&s->data_mutex); +} + +#define PCI_SLOT 0x04 + +static QVirtioPCIDevice *virtio_net_pci_init(QPCIBus *bus, int slot) +{ + QVirtioPCIDevice *dev; + + dev = qvirtio_pci_device_find(bus, QVIRTIO_NET_DEVICE_ID); + g_assert(dev != NULL); + g_assert_cmphex(dev->vdev.device_type, ==, QVIRTIO_NET_DEVICE_ID); + + qvirtio_pci_device_enable(dev); + qvirtio_reset(&qvirtio_pci, &dev->vdev); + qvirtio_set_acknowledge(&qvirtio_pci, &dev->vdev); + qvirtio_set_driver(&qvirtio_pci, &dev->vdev); + + return dev; +} + +static void virtio_driver_init(const QVirtioBus *bus, QVirtioDevice *dev) +{ + uint32_t features; + + features = qvirtio_get_features(bus, dev); + features = features & ~(QVIRTIO_F_BAD_FEATURE | + QVIRTIO_F_RING_INDIRECT_DESC | + QVIRTIO_F_RING_EVENT_IDX); + qvirtio_set_features(bus, dev, features); + + qvirtio_set_driver_ok(bus, dev); +} + +static void test_reconnect(void) +{ + TestServer *s = test_server_new("reconnect", "unix:%s,reconnect=1"); + QTestState *global = global_qtest, *from; + VhostUserMsg msg = { + .request = VHOST_USER_SLAVE_SHUTDOWN, + .flags = VHOST_USER_VERSION + }; + gchar *cmd; + int ret; + QPCIBus *bus; + QVirtioPCIDevice *dev; + QGuestAllocator *alloc; + + cmd = GET_QEMU_CMDE(s, 2, ",server", ""); + from = qtest_start(cmd); + wait_for_slave_fd(s); + g_free(cmd); + + bus = qpci_init_pc(); + dev = virtio_net_pci_init(bus, PCI_SLOT); + alloc = pc_alloc_init(); + virtio_driver_init(&qvirtio_pci, &dev->vdev); + + wait_for_rings_started(s, 2); + + /* request shutdown */ + ret = send(s->slave_fd, &msg, VHOST_USER_HDR_SIZE, 0); + g_assert_cmpint(ret, ==, VHOST_USER_HDR_SIZE); + ret = read(s->slave_fd, &msg, VHOST_USER_HDR_SIZE); + g_assert_cmpint(ret, ==, VHOST_USER_HDR_SIZE); + g_assert_cmpint(msg.payload.u64, ==, 0); + g_assert_cmpint(s->rings, ==, 0); + + close(s->slave_fd); + s->slave_fd = -1; + + /* reconnect */ + s->fds_num = 0; + qemu_chr_disconnect(s->chr); + wait_for_fds(s); + + /* FIXME: manipulate vring to change last used index */ + g_assert_cmpint(s->set_base[0], ==, 0); + g_assert_cmpint(s->set_base[1], ==, 0); + + pc_alloc_uninit(alloc); + qvirtio_pci_device_disable(dev); + g_free(dev); + qpci_free_pc(bus); + + qtest_quit(from); + test_server_free(s); + + global_qtest = global; +} + int main(int argc, char **argv) { QTestState *s = NULL; @@ -635,7 +788,7 @@ int main(int argc, char **argv) root = tmpfs; } - server = test_server_new("test"); + server = test_server_new("test", NULL); loop = g_main_loop_new(NULL, FALSE); /* run the main loop thread so the chardev may operate */ @@ -648,6 +801,7 @@ int main(int argc, char **argv) qtest_add_data_func("/vhost-user/read-guest-mem", server, read_guest_mem); qtest_add_func("/vhost-user/migrate", test_migrate); + qtest_add_func("/vhost-user/reconnect", test_reconnect); ret = g_test_run();