|
| From: | Jens Freimann |
| Subject: | Re: [Qemu-devel] [PATCH 4/4] tests/pxe-test: add testcase using vhost-user-bridge |
| Date: | Tue, 25 Jul 2017 11:17:29 +0200 |
| User-agent: | NeoMutt/20170714 (1.8.3) |
On Tue, Jul 25, 2017 at 01:06:51AM +0300, Michael S. Tsirkin wrote:
On Fri, Jul 21, 2017 at 11:55:53AM +0200, Jens Freimann wrote:From: Jens Freimann <address@hidden> Add a PXE testcase tunneling traffic through vhost-user-bridge process. Create a vhost-user-bridge process and connect it to qemu via a socket. Signed-off-by: Jens Freimann <address@hidden> --- tests/Makefile.include | 4 +- tests/pxe-test.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 142 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 7af278d..e40550c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -705,7 +705,8 @@ tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y) tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y) tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \ tests/boot-sector.o tests/acpi-utils.o $(libqos-obj-y) -tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj-y) +tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o \ + tests/vhost-user-bridge$(EXESUF) $(libqos-obj-y) tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y) tests/ds1338-test$(EXESUF): tests/ds1338-test.o $(libqos-imx-obj-y) tests/m25p80-test$(EXESUF): tests/m25p80-test.o @@ -834,6 +835,7 @@ $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y) $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) $(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=qemu-img$(EXESUF) \ + QTEST_VUBR_BINARY=./tests/vhost-user-bridge$(EXESUF) \ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 + 1))} \ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y) $(check-qtest-generic-y),"GTESTER","$@") $(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y) $(gcov-files-generic-y); do \ diff --git a/tests/pxe-test.c b/tests/pxe-test.c index 34282d3..d6379a8 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -5,7 +5,8 @@ * * Authors: * Michael S. Tsirkin <address@hidden>, - * Victor Kaplansky <address@hidden> + * Victor Kaplansky <address@hidden>, + * Jens Freimann <address@hidden> * * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. @@ -13,14 +14,150 @@ #include "qemu/osdep.h" #include <glib/gstdio.h> +#include <glib.h> #include "qemu-common.h" #include "libqtest.h" #include "boot-sector.h" +#include <sys/vfs.h> +#define LPORT 5555 +#define RPORT 4444 #define NETNAME "net0" +#define QEMU_CMD_MEM "--enable-kvm -m %d "\ + "-object memory-backend-file,id=mem,size=%dM,"\ + "mem-path=%s,share=on -numa node,memdev=mem -mem-prealloc " +#define QEMU_CMD_CHR " -chardev socket,id=%s,path=%s" +#define QEMU_CMD_NETDEV " -device virtio-net-pci,netdev=net0 "\ + " -netdev vhost-user,id=net0,chardev=%s,vhostforce "\ + " -netdev user,id=n0,tftp=./,bootfile=%s "\ + " -netdev socket,id=n1,fd=%d" +#define QEMU_CMD_NET " -device virtio-net-pci,netdev=n0 "\ + " -device virtio-net-pci,netdev=n1 " + +#define QEMU_CMD QEMU_CMD_MEM QEMU_CMD_CHR \ + QEMU_CMD_NETDEV QEMU_CMD_NET + +#define HUGETLBFS_MAGIC 0x958458f6 +#define VUBR_SOCK "vubr.sock" +#define MEMSZ 1024 static char disk[] = "tests/pxe-test-disk-XXXXXX"; +static const char *init_hugepagefs(const char *path) +{ + struct statfs fs; + int ret; + + if (access(path, R_OK | W_OK | X_OK)) { + g_test_message("access on path (%s): %s\n", path, strerror(errno)); + return NULL; + } + + do { + ret = statfs(path, &fs); + } while (ret != 0 && errno == EINTR); + + if (ret != 0) { + g_test_message("statfs on path (%s): %s\n", path, strerror(errno)); + return NULL; + } + + if (fs.f_type != HUGETLBFS_MAGIC) { + g_test_message("Warning: path not on HugeTLBFS: %s\n", path); + return NULL; + } + + return path; +}Why bother? Rest of the patchset works find on any filesystem. User set this for some reason, let's just roll with it.
We do it like this for the vhost-user testcase. Just to be sure: you're suggesting to just get rid of init_hugepagefs()?
regards,Jens
+ +static int vubr_create_socket(struct sockaddr_in *si_remote, int rport) +{ + int sock; + + if (inet_aton("127.0.0.1", (struct in_addr *) &si_remote->sin_addr.s_addr) + == 0) { + g_test_message("inet_aton failed\n"); + return -1; + } + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (sock == -1) { + g_test_message("socket creation failed\n"); + return -1; + } + if (connect(sock, (struct sockaddr *) si_remote, sizeof(*si_remote))) { + g_test_message("connect failed: %s", strerror(errno)); + return -1; + } + + return sock; +} + +static void test_pxe_vhost_user(void) +{ + char template[] = "/tmp/vhost-user-bridge-XXXXXX"; + char template2[] = "/tmp/hugepages-XXXXXX"; + gchar * vubr_args[] = {NULL, NULL, NULL, NULL}; + struct sockaddr_in si_remote = { + .sin_family = AF_INET, + .sin_port = htons(RPORT), + }; + const char *hugefs = NULL; + const char *tmpfs2 = NULL; + const char *tmpfs = NULL; + const char *root = NULL; + GError *error = NULL; + char *vubr_binary; + char *qemu_args; + GPid vubr_pid; + int sock = -1; + + tmpfs = mkdtemp(template); + if (!tmpfs) { + g_test_message("mkdtemp on path(%s): %s\n", + template, strerror(errno)); + } + vubr_binary = getenv("QTEST_VUBR_BINARY"); + g_assert(vubr_binary); + vubr_args[0] = g_strdup_printf("%s", vubr_binary); + vubr_args[1] = g_strdup_printf("-u"); + vubr_args[2] = g_strdup_printf("%s/%s", tmpfs, VUBR_SOCK); + g_spawn_async(NULL, vubr_args, NULL, + G_SPAWN_SEARCH_PATH_FROM_ENVP | + G_SPAWN_SEARCH_PATH, + NULL, NULL, &vubr_pid, &error); + g_assert_no_error(error); + + hugefs = getenv("QTEST_HUGETLBFS_PATH"); + if (hugefs) { + root = init_hugepagefs(hugefs); + g_assert(root); + } else { + tmpfs2 = mkdtemp(template2); + g_assert(tmpfs2); + root = tmpfs2; + } + + sock = vubr_create_socket(&si_remote, RPORT); + g_assert_cmpint(sock, !=, -1); + + qemu_args = g_strdup_printf(QEMU_CMD, MEMSZ, MEMSZ, (root), + "char0", vubr_args[2], "char0", + disk, sock); + qtest_start(qemu_args); + boot_sector_test(); + qtest_quit(global_qtest); + g_free(qemu_args); + g_free(vubr_args[0]); + g_free(vubr_args[1]); + g_free(vubr_args[2]); + g_assert_cmpint(g_remove(g_strdup_printf("%s/%s", tmpfs, VUBR_SOCK)), + ==, 0); + if (tmpfs2) { + g_assert_cmpint(rmdir(tmpfs2), ==, 0); + } + g_assert_cmpint(g_rmdir(tmpfs), ==, 0); +} + static void test_pxe_one(const char *params, bool ipv6) { char *args; @@ -65,6 +202,7 @@ int main(int argc, char *argv[]) if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { qtest_add_func("pxe/e1000", test_pxe_e1000); qtest_add_func("pxe/virtio", test_pxe_virtio_pci); + qtest_add_func("pxe/vhost-user", test_pxe_vhost_user); } else if (strcmp(arch, "ppc64") == 0) { qtest_add_func("pxe/virtio", test_pxe_virtio_pci); qtest_add_func("pxe/spapr-vlan", test_pxe_spapr_vlan); -- 2.9.4
| [Prev in Thread] | Current Thread | [Next in Thread] |