Hello Andreas,
On Tue, Mar 4, 2014 at 7:39 PM, Andreas Färber <afaer...@suse.de> wrote: > Am 04.03.2014 19:23, schrieb Antonios Motakis: > > This test creates a 'server' chardev to listen for vhost-user messages. > > Once VHOST_USER_SET_MEM_TABLE is received it mmaps each received region, > > and read 1k bytes from it. The read data is compared to data from readl. > > > > The test requires hugetlbfs to be already mounted and writable. The mount > > point defaults to '/hugetlbfs' and can be specified via the environment > > variable QTEST_HUGETLBFS_PATH. > > > > The rom pc-bios/pxe-virtio.rom is used to instantiate a virtio > pcicontroller. > > > > Signed-off-by: Antonios Motakis <a.mota...@virtualopensystems.com> > > Signed-off-by: Nikolay Nikolaev <n.nikol...@virtualopensystems.com> > > --- > > tests/Makefile | 4 + > > tests/vhost-user-test.c | 309 > ++++++++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 313 insertions(+) > > create mode 100644 tests/vhost-user-test.c > > > > diff --git a/tests/Makefile b/tests/Makefile > > index b17d41e..85bcae5 100644 > > --- a/tests/Makefile > > +++ b/tests/Makefile > > @@ -110,6 +110,7 @@ check-qtest-i386-y += tests/vmxnet3-test$(EXESUF) > > gcov-files-i386-y += hw/net/vmxnet3.c > > gcov-files-i386-y += hw/net/vmxnet_rx_pkt.c > > gcov-files-i386-y += hw/net/vmxnet_tx_pkt.c > > +check-qtest-i386-y += tests/vhost-user-test$(EXESUF) > > Not sure if I've asked already, but doesn't this test depend on certain > Linux host support (hugetlbfs, vhost module)? > > We depend on hugetlbfs being not only available, but also mounted and writable by us. Otherwise the test will fail. We don't depend on vhost being available in the kernel; we do our own thing with a userspace vhost implementation, which is provided. So there is no external dependency related to vhost. The only external dependency is hugetlbfs (which we can't avoid, the feature we are testing relies on it). > One more comment below: > > > check-qtest-x86_64-y = $(check-qtest-i386-y) > > gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c > > gcov-files-x86_64-y = $(subst > i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y)) > > @@ -241,8 +242,11 @@ tests/ipoctal232-test$(EXESUF): > tests/ipoctal232-test.o > > tests/qom-test$(EXESUF): tests/qom-test.o > > tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y) > > tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o > $(libqos-pc-obj-y) > > +tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o > qemu-timer.o libqemuutil.a libqemustub.a > > tests/qemu-iotests/socket_scm_helper$(EXESUF): > tests/qemu-iotests/socket_scm_helper.o > > > > +LIBS+= -lutil > > + > > # QTest rules > > > > TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) > > diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c > > new file mode 100644 > > index 0000000..a7160f8 > > --- /dev/null > > +++ b/tests/vhost-user-test.c > > @@ -0,0 +1,309 @@ > > +/* > > + * QTest testcase for the vhost-user > > + * > > + * Copyright (c) 2014 Virtual Open Systems Sarl. > > + * > > + * This work is licensed under the terms of the GNU GPL, version 2 or > later. > > + * See the COPYING file in the top-level directory. > > + * > > + */ > > + > > +#include "libqtest.h" > > +#include "qemu/option.h" > > +#include "sysemu/char.h" > > +#include "sysemu/sysemu.h" > > + > > +#include <glib.h> > > +#include <linux/vhost.h> > > +#include <sys/mman.h> > > +#include <sys/vfs.h> > > +#include <qemu/sockets.h> > > + > > +#define QEMU_CMD_ACCEL " -machine accel=tcg" > > +#define QEMU_CMD_MEM " -mem-path %s,share=on" > > +#define QEMU_CMD_CHR " -chardev socket,id=chr0,path=%s" > > +#define QEMU_CMD_NETDEV " -netdev > vhost-user,id=net0,chardev=chr0,vhostforce" > > +#define QEMU_CMD_NET " -device virtio-net-pci,netdev=net0 " > > +#define QEMU_CMD_ROM " -option-rom ../pc-bios/pxe-virtio.rom" > > + > > +#define QEMU_CMD QEMU_CMD_ACCEL QEMU_CMD_MEM QEMU_CMD_CHR \ > > + QEMU_CMD_NETDEV QEMU_CMD_NET QEMU_CMD_ROM > > + > > +#define HUGETLBFS_MAGIC 0x958458f6 > > + > > +/*********** FROM hw/virtio/vhost-user.c > *************************************/ > > + > > +#define VHOST_MEMORY_MAX_NREGIONS 8 > > + > > +typedef enum VhostUserRequest { > > + VHOST_USER_NONE = 0, > > + VHOST_USER_GET_FEATURES = 1, > > + VHOST_USER_SET_FEATURES = 2, > > + VHOST_USER_SET_OWNER = 3, > > + VHOST_USER_RESET_OWNER = 4, > > + VHOST_USER_SET_MEM_TABLE = 5, > > + VHOST_USER_SET_LOG_BASE = 6, > > + VHOST_USER_SET_LOG_FD = 7, > > + VHOST_USER_SET_VRING_NUM = 8, > > + VHOST_USER_SET_VRING_ADDR = 9, > > + VHOST_USER_SET_VRING_BASE = 10, > > + VHOST_USER_GET_VRING_BASE = 11, > > + VHOST_USER_SET_VRING_KICK = 12, > > + VHOST_USER_SET_VRING_CALL = 13, > > + VHOST_USER_SET_VRING_ERR = 14, > > + VHOST_USER_MAX > > +} VhostUserRequest; > > + > > +typedef struct VhostUserMemoryRegion { > > + uint64_t guest_phys_addr; > > + uint64_t memory_size; > > + uint64_t userspace_addr; > > +} VhostUserMemoryRegion; > > + > > +typedef struct VhostUserMemory { > > + uint32_t nregions; > > + uint32_t padding; > > + VhostUserMemoryRegion regions[VHOST_MEMORY_MAX_NREGIONS]; > > +} VhostUserMemory; > > + > > +typedef struct VhostUserMsg { > > + VhostUserRequest request; > > + > > +#define VHOST_USER_VERSION_MASK (0x3) > > +#define VHOST_USER_REPLY_MASK (0x1<<2) > > + uint32_t flags; > > + uint32_t size; /* the following payload size */ > > + union { > > + uint64_t u64; > > + struct vhost_vring_state state; > > + struct vhost_vring_addr addr; > > + VhostUserMemory memory; > > + }; > > +} QEMU_PACKED VhostUserMsg; > > + > > +static VhostUserMsg m __attribute__ ((unused)); > > +#define VHOST_USER_HDR_SIZE (sizeof(m.request) \ > > + + sizeof(m.flags) \ > > + + sizeof(m.size)) > > + > > +#define VHOST_USER_PAYLOAD_SIZE (sizeof(m) - VHOST_USER_HDR_SIZE) > > + > > +/* The version of the protocol we support */ > > +#define VHOST_USER_VERSION (0x1) > > > +/*****************************************************************************/ > > + > > +int fds_num = 0, fds[VHOST_MEMORY_MAX_NREGIONS]; > > +static VhostUserMemory memory; > > +static GMutex data_mutex; > > +static GCond data_cond; > > + > > +static void read_guest_mem(void) > > +{ > > + uint32_t *guest_mem; > > + gint64 end_time; > > + int i, j; > > + > > + g_mutex_lock(&data_mutex); > > + > > + end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; > > + while (!fds_num) { > > + if (!g_cond_wait_until(&data_cond, &data_mutex, end_time)) { > > + /* timeout has passed */ > > + g_assert(fds_num); > > + break; > > + } > > + } > > + > > + /* check for sanity */ > > + g_assert_cmpint(fds_num, >, 0); > > + g_assert_cmpint(fds_num, ==, memory.nregions); > > + > > + /* iterate all regions */ > > + for (i = 0; i < fds_num; i++) { > > + > > + /* We'll check only he region statring at 0x0, suppose it is */ > > + if (memory.regions[i].guest_phys_addr != 0x0) { > > + continue; > > + } > > + > > + g_assert_cmpint(memory.regions[i].memory_size, >, 1024); > > + > > + guest_mem = mmap(0, memory.regions[i].memory_size, > > + PROT_READ | PROT_WRITE, MAP_SHARED, fds[i], 0); > > + > > + for (j = 0; j < 256; j++) { > > + uint32_t a = readl(memory.regions[i].guest_phys_addr + j*4); > > + uint32_t b = guest_mem[j]; > > + > > + g_assert_cmpint(a, ==, b); > > + } > > + > > + munmap(guest_mem, memory.regions[i].memory_size); > > + } > > + > > + g_assert_cmpint(1, ==, 1); > > + g_mutex_unlock(&data_mutex); > > +} > > + > > +static void *thread_function(void *data) > > +{ > > + GMainLoop *loop; > > + loop = g_main_loop_new(NULL, FALSE); > > + g_main_loop_run(loop); > > + return NULL; > > +} > > + > > +static int chr_can_read(void *opaque) > > +{ > > + return VHOST_USER_HDR_SIZE; > > +} > > + > > +static void chr_read(void *opaque, const uint8_t *buf, int size) > > +{ > > + CharDriverState *chr = opaque; > > + VhostUserMsg msg; > > + uint8_t *p = (uint8_t *) &msg; > > + int fd; > > + > > + if (size != VHOST_USER_HDR_SIZE) { > > + g_test_message("Wrong message size received %d\n", size); > > + return; > > + } > > + > > + memcpy(p, buf, VHOST_USER_HDR_SIZE); > > + > > + if (msg.size) { > > + p += VHOST_USER_HDR_SIZE; > > + qemu_chr_fe_read_all(chr, p, msg.size); > > + } > > + > > + switch (msg.request) { > > + case VHOST_USER_GET_FEATURES: > > + /* send back features to qemu */ > > + msg.flags |= VHOST_USER_REPLY_MASK; > > + msg.size = sizeof(m.u64); > > + msg.u64 = 0; > > + p = (uint8_t *) &msg; > > + qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); > > + break; > > + > > + case VHOST_USER_GET_VRING_BASE: > > + /* send back vring base to qemu */ > > + msg.flags |= VHOST_USER_REPLY_MASK; > > + msg.size = sizeof(m.state); > > + msg.state.num = 0; > > + p = (uint8_t *) &msg; > > + qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); > > + break; > > + > > + case VHOST_USER_SET_MEM_TABLE: > > + /* received the mem table */ > > + memcpy(&memory, &msg.memory, sizeof(msg.memory)); > > + fds_num = qemu_chr_fe_get_msgfds(chr, fds, sizeof(fds) / > sizeof(int)); > > + > > + /* signal the test that it can continue */ > > + g_cond_signal(&data_cond); > > + g_mutex_unlock(&data_mutex); > > + break; > > + > > + case VHOST_USER_SET_VRING_KICK: > > + case VHOST_USER_SET_VRING_CALL: > > + /* consume the fd */ > > + qemu_chr_fe_get_msgfds(chr, &fd, 1); > > + /* > > + * This is a non-blocking eventfd. > > + * The receive function forces it to be blocking, > > + * so revert it back to non-blocking. > > + */ > > + qemu_set_nonblock(fd); > > + break; > > + default: > > + break; > > + } > > +} > > + > > +static const char *init_hugepagefs(void) > > +{ > > + const char *path; > > + struct statfs fs; > > + int ret; > > + > > + path = getenv("QTEST_HUGETLBFS_PATH"); > > + if (!path) { > > + path = "/hugetlbfs"; > > + } > > + > > + if (access(path, R_OK | W_OK | X_OK)) { > > + g_test_message("access on path (%s): %s\n", path, > strerror(errno)); > > + return 0; > > + } > > + > > + 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 0; > > + } > > + > > + if (fs.f_type != HUGETLBFS_MAGIC) { > > + g_test_message("Warning: path not on HugeTLBFS: %s\n", path); > > + return 0; > > + } > > + > > + return path; > > +} > > + > > +int main(int argc, char **argv) > > +{ > > + QTestState *s = NULL; > > + CharDriverState *chr = NULL; > > + const char *hugefs = 0; > > + char *socket_path = 0; > > + char *qemu_cmd = 0; > > + char *chr_path = 0; > > + int ret; > > + > > + g_test_init(&argc, &argv, NULL); > > + > > + module_call_init(MODULE_INIT_QOM); > > + > > + hugefs = init_hugepagefs(); > > + g_assert(hugefs); > > + > > + socket_path = g_strdup_printf("/tmp/vhost-%d.sock", getpid()); > > + > > + /* create char dev and add read handlers */ > > + qemu_add_opts(&qemu_chardev_opts); > > + chr_path = g_strdup_printf("unix:%s,server,nowait", socket_path); > > + chr = qemu_chr_new("chr0", chr_path, NULL); > > + g_free(chr_path); > > + qemu_chr_add_handlers(chr, chr_can_read, chr_read, NULL, chr); > > + > > + /* run the main loop thread so the chardev may operate */ > > + g_mutex_init(&data_mutex); > > + g_cond_init(&data_cond); > > + g_mutex_lock(&data_mutex); > > + g_thread_new(NULL, thread_function, NULL); > > + > > + qemu_cmd = g_strdup_printf(QEMU_CMD, hugefs, socket_path); > > + s = qtest_start(qemu_cmd); > > + g_free(qemu_cmd); > > + > > + qtest_add_func("/vhost-user/read-guest-mem", read_guest_mem); > > + > > + ret = g_test_run(); > > + > > + if (s) { > > + qtest_quit(s); > > + } > > + > > + /* cleanup */ > > + unlink(socket_path); > > + g_free(socket_path); > > I think this is probably too late to unlink in case the test fails, > should probably be moved to right after qtest_start()? > > Ack > Thanks for your efforts on this test! > > Thanks for your review! > Regards, > Andreas > > > + g_cond_clear(&data_cond); > > + g_mutex_clear(&data_mutex); > > + > > + return ret; > > +} > > > > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg > -- Antonios Motakis Virtual Open Systems