Skip to contentSkip to conversation

vhost-user block device backend implementation

PATCH Superseded Coiby Xu 4 participants 10 messages Mar 9, 2020 – May 4, 2020

Subsystems (2)

v5 of 10 Superseded Latest is v10 →

lore
Share & tools
lore

Coiby Xu

author
#0 lore raw

v5 cover vhost-user block device backend implementation

v5:
* re-use vu_kick_cb in libvhost-user
* keeping processing VhostUserMsg in the same coroutine until there is detachment/attachment of AIOContext
* Spawn separate coroutine for each VuVirtqElement
* Other changes including relocating vhost-user-blk-server.c, coding style etc.

v4:
* add object properties in class_init
* relocate vhost-user-blk-test
* other changes including using SocketAddress, coding style, etc.

v3:
* separate generic vhost-user-server code from vhost-user-blk-server code
* re-write vu_message_read and kick hander function as coroutines to directly call blk_co_preadv, blk_co_pwritev, etc.
* add aio_context notifier functions to support multi-threading model
* other fixes regarding coding style, warning report, etc.

v2:
* Only enable this feauture for Linux because eventfd is a Linux-specific feature

This patch series is an implementation of vhost-user block device backend server, thanks to Stefan and Kevin's guidance.

Vhost-user block device backend server is a UserCreatable object and can be started using object_add,

(qemu) object_add vhost-user-blk-server,id=ID,unix-socket=/tmp/vhost-user-blk_vhost.socket,node-name=DRIVE_NAME,writable=off,blk-size=512 (qemu) object_del ID

or appending the "-object" option when starting QEMU,

  $ -object vhost-user-blk-server,id=disk,unix-socket=/tmp/vhost-user-blk_vhost.socket,node-name=DRIVE_NAME,writable=off,blk-size=512

Then vhost-user client can connect to the server backend. For example, QEMU could act as a client,

  $ -m 256 -object memory-backend-memfd,id=mem,size=256M,share=on -numa node,memdev=mem -chardev socket,id=char1,path=/tmp/vhost-user-blk_vhost.socket -device vhost-user-blk-pci,id=blk0,chardev=char1

And guest OS could access this vhost-user block device after mouting it.

Coiby Xu (5):
allow vu_message_read to be replaced
generic vhost user server
vhost-user block device backend server
a standone-alone tool to directly share disk image file via vhost-user
protocol
new qTest case to test the vhost-user-blk-server

 Makefile                                   |   4 +
 block/Makefile.objs                        |   3 +
 block/export/vhost-user-blk-server.c       | 727 +++++++++++++++++++++
 block/export/vhost-user-blk-server.h       |  21 +
 configure                                  |   3 +
 contrib/libvhost-user/libvhost-user-glib.c |   2 +-
 contrib/libvhost-user/libvhost-user.c      |  10 +-
 contrib/libvhost-user/libvhost-user.h      |   6 +
 qemu-vu.c                                  | 252 +++++++
 softmmu/vl.c                               |   4 +
 tests/Makefile.include                     |   3 +-
 tests/qtest/Makefile.include               |   2 +
 tests/qtest/libqos/vhost-user-blk.c        | 126 ++++
 tests/qtest/libqos/vhost-user-blk.h        |  44 ++
 tests/qtest/vhost-user-blk-test.c          | 694 ++++++++++++++++++++
 tests/vhost-user-bridge.c                  |   2 +
 tools/virtiofsd/fuse_virtio.c              |   4 +-
 util/Makefile.objs                         |   3 +
 util/vhost-user-server.c                   | 360 ++++++++++
 util/vhost-user-server.h                   |  57 ++
 20 files changed, 2318 insertions(+), 9 deletions(-)
 create mode 100644 block/export/vhost-user-blk-server.c
 create mode 100644 block/export/vhost-user-blk-server.h
 create mode 100644 qemu-vu.c
 create mode 100644 tests/qtest/libqos/vhost-user-blk.c
 create mode 100644 tests/qtest/libqos/vhost-user-blk.h
 create mode 100644 tests/qtest/vhost-user-blk-test.c
 create mode 100644 util/vhost-user-server.c
 create mode 100644 util/vhost-user-server.h

--
2.25.1

author
#1 lore raw

PATCH v5 1/5 allow vu_message_read to be replaced

Allow vu_message_read to be replaced by one which will make use of the QIOChannel functions. Thus reading vhost-user message won't stall the guest.

Remove watch for kick fd in vu_deinit. When QEMU as vhost-user client process is restarted in gdb, QEMU as vhost-user-server will still dispatch the event. When vu_kick_cb is trying to access vq->kick_fd, a segmentation fault will occur since vq has become a NULL pointer.

---
 contrib/libvhost-user/libvhost-user-glib.c |  2 +-
 contrib/libvhost-user/libvhost-user.c      | 11 ++++++-----
 contrib/libvhost-user/libvhost-user.h      |  6 ++++++
 tests/vhost-user-bridge.c                  |  2 ++
 tools/virtiofsd/fuse_virtio.c              |  4 ++--
 5 files changed, 17 insertions(+), 8 deletions(-)
contrib/libvhost-user/libvhost-user-glib.c +1 -1
index 53f1ca4cdd..0df2ec9271 100644
@@ -147,7 +147,7 @@ vug_init(VugDev *dev, uint16_t max_queues, int socket,
     g_assert(dev);
     g_assert(iface);
 
-    if (!vu_init(&dev->parent, max_queues, socket, panic, set_watch,
+    if (!vu_init(&dev->parent, max_queues, socket, panic, NULL, set_watch,
                  remove_watch, iface)) {
         return false;
     }
contrib/libvhost-user/libvhost-user.c +6 -5
index 3bca996c62..0c7368baa2 100644
@@ -67,8 +67,6 @@
 /* The version of inflight buffer */
 #define INFLIGHT_VERSION 1
 
-#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
-
 /* The version of the protocol we support */
 #define VHOST_USER_VERSION 1
 #define LIBVHOST_USER_DEBUG 0
@@ -412,7 +410,7 @@ vu_process_message_reply(VuDev *dev, const VhostUserMsg *vmsg)
         goto out;
     }
 
-    if (!vu_message_read(dev, dev->slave_fd, &msg_reply)) {
+    if (!dev->read_msg(dev, dev->slave_fd, &msg_reply)) {
         goto out;
     }
 
@@ -647,7 +645,7 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg)
     /* Wait for QEMU to confirm that it's registered the handler for the
      * faults.
      */
-    if (!vu_message_read(dev, dev->sock, vmsg) ||
+    if (!dev->read_msg(dev, dev->sock, vmsg) ||
         vmsg->size != sizeof(vmsg->payload.u64) ||
         vmsg->payload.u64 != 0) {
         vu_panic(dev, "failed to receive valid ack for postcopy set-mem-table");
@@ -1653,7 +1651,7 @@ vu_dispatch(VuDev *dev)
     int reply_requested;
     bool need_reply, success = false;
 
-    if (!vu_message_read(dev, dev->sock, &vmsg)) {
+    if (!dev->read_msg(dev, dev->sock, &vmsg)) {
         goto end;
     }
 
@@ -1704,6 +1702,7 @@ vu_deinit(VuDev *dev)
         }
 
         if (vq->kick_fd != -1) {
+            dev->remove_watch(dev, vq->kick_fd);
             close(vq->kick_fd);
             vq->kick_fd = -1;
         }
@@ -1751,6 +1750,7 @@ vu_init(VuDev *dev,
         uint16_t max_queues,
         int socket,
         vu_panic_cb panic,
+        vu_read_msg_cb read_msg,
         vu_set_watch_cb set_watch,
         vu_remove_watch_cb remove_watch,
         const VuDevIface *iface)
@@ -1768,6 +1768,7 @@ vu_init(VuDev *dev,
 
     dev->sock = socket;
     dev->panic = panic;
+    dev->read_msg = read_msg ? read_msg : vu_message_read;
     dev->set_watch = set_watch;
     dev->remove_watch = remove_watch;
     dev->iface = iface;
contrib/libvhost-user/libvhost-user.h +6 -0
index 6fc8000e99..7e3f0c8598 100644
@@ -30,6 +30,8 @@
 
 #define VHOST_MEMORY_MAX_NREGIONS 8
 
+#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
+
 typedef enum VhostSetConfigType {
     VHOST_SET_CONFIG_TYPE_MASTER = 0,
     VHOST_SET_CONFIG_TYPE_MIGRATION = 1,
@@ -205,6 +207,7 @@ typedef uint64_t (*vu_get_features_cb) (VuDev *dev);
 typedef void (*vu_set_features_cb) (VuDev *dev, uint64_t features);
 typedef int (*vu_process_msg_cb) (VuDev *dev, VhostUserMsg *vmsg,
                                   int *do_reply);
+typedef bool (*vu_read_msg_cb) (VuDev *dev, int sock, VhostUserMsg *vmsg);
 typedef void (*vu_queue_set_started_cb) (VuDev *dev, int qidx, bool started);
 typedef bool (*vu_queue_is_processed_in_order_cb) (VuDev *dev, int qidx);
 typedef int (*vu_get_config_cb) (VuDev *dev, uint8_t *config, uint32_t len);
@@ -373,6 +376,8 @@ struct VuDev {
     bool broken;
     uint16_t max_queues;
 
+    /* allowing vu_read_msg_cb to be replaced */
+    vu_read_msg_cb read_msg;
     /* @set_watch: add or update the given fd to the watch set,
      * call cb when condition is met */
     vu_set_watch_cb set_watch;
@@ -416,6 +421,7 @@ bool vu_init(VuDev *dev,
              uint16_t max_queues,
              int socket,
              vu_panic_cb panic,
+             vu_read_msg_cb read_msg,
              vu_set_watch_cb set_watch,
              vu_remove_watch_cb remove_watch,
              const VuDevIface *iface);
tests/vhost-user-bridge.c +2 -0
index 6c3d490611..bd43607a4d 100644
@@ -520,6 +520,7 @@ vubr_accept_cb(int sock, void *ctx)
                  VHOST_USER_BRIDGE_MAX_QUEUES,
                  conn_fd,
                  vubr_panic,
+                 NULL,
                  vubr_set_watch,
                  vubr_remove_watch,
                  &vuiface)) {
@@ -573,6 +574,7 @@ vubr_new(const char *path, bool client)
                      VHOST_USER_BRIDGE_MAX_QUEUES,
                      dev->sock,
                      vubr_panic,
+                     NULL,
                      vubr_set_watch,
                      vubr_remove_watch,
                      &vuiface)) {
tools/virtiofsd/fuse_virtio.c +2 -2
index 3b6d16a041..666945c897 100644
@@ -980,8 +980,8 @@ int virtio_session_mount(struct fuse_session *se)
     se->vu_socketfd = data_sock;
     se->virtio_dev->se = se;
     pthread_rwlock_init(&se->virtio_dev->vu_dispatch_rwlock, NULL);
-    vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, fv_set_watch,
-            fv_remove_watch, &fv_iface);
+    vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL,
+            fv_set_watch, fv_remove_watch, &fv_iface);
 
     return 0;
 }

--
2.25.1

Reviewed-by on v5 1/5
#2 lore raw

Re: [PATCH v5 1/5] allow vu_message_read to be replaced

Quoted 22 lines · Coiby Xu
contrib/libvhost-user/libvhost-user.h +3 -0
index 6fc8000e99..7e3f0c8598 100644
@@ -30,6 +30,8 @@
 
 #define VHOST_MEMORY_MAX_NREGIONS 8
 
+#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
+
 typedef enum VhostSetConfigType {
     VHOST_SET_CONFIG_TYPE_MASTER = 0,
     VHOST_SET_CONFIG_TYPE_MIGRATION = 1,
@@ -205,6 +207,7 @@ typedef uint64_t (*vu_get_features_cb) (VuDev *dev);
 typedef void (*vu_set_features_cb) (VuDev *dev, uint64_t features);
 typedef int (*vu_process_msg_cb) (VuDev *dev, VhostUserMsg *vmsg,
                                   int *do_reply);
+typedef bool (*vu_read_msg_cb) (VuDev *dev, int sock, VhostUserMsg *vmsg);
 typedef void (*vu_queue_set_started_cb) (VuDev *dev, int qidx, bool started);
 typedef bool (*vu_queue_is_processed_in_order_cb) (VuDev *dev, int qidx);
 typedef int (*vu_get_config_cb) (VuDev *dev, uint8_t *config, uint32_t len);

contrib/libvhost-user/libvhost-user.h struct VuDev { · line 380

Quoted 5 lines
contrib/libvhost-user/libvhost-user.h +2 -0
@@ -373,6 +376,8 @@ struct VuDev {
     bool broken;
     uint16_t max_queues;
 
+    /* allowing vu_read_msg_cb to be replaced */
+    vu_read_msg_cb read_msg;

Please document this function pointer fully so it's clear how custom implementations of this function should behave. The return value should be explained.

author
#3 lore raw

PATCH v5 2/5 generic vhost user server

In reply to Coiby Xu

Sharing QEMU devices via vhost-user protocol

---
 util/Makefile.objs       |   3 +
 util/vhost-user-server.c | 360 +++++++++++++++++++++++++++++++++++++++
 util/vhost-user-server.h |  57 ++++++
 3 files changed, 420 insertions(+)
 create mode 100644 util/vhost-user-server.c
 create mode 100644 util/vhost-user-server.h
util/Makefile.objs +3 -0
index 6b38b67cf1..d207b5f981 100644
@@ -37,6 +37,9 @@ util-obj-y += readline.o
 util-obj-y += rcu.o
 util-obj-$(CONFIG_MEMBARRIER) += sys_membarrier.o
 util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o
+ifdef CONFIG_LINUX
+util-obj-y += vhost-user-server.o
+endif
 util-obj-y += qemu-coroutine-sleep.o
 util-obj-y += qemu-co-shared-resource.o
 util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o
util/vhost-user-server.c new file +360 -0

360 lines not on this page · raw message

util/vhost-user-server.h new file +57 -0

57 lines not on this page · raw message

--
2.25.1

#4 lore raw

Re: [PATCH v5 2/5] generic vhost user server

util/Makefile.objs util-obj-y += readline.o · line 42

Quoted 11 lines · Coiby Xu
util/Makefile.objs +3 -0
index 6b38b67cf1..d207b5f981 100644
@@ -37,6 +37,9 @@ util-obj-y += readline.o
 util-obj-y += rcu.o
 util-obj-$(CONFIG_MEMBARRIER) += sys_membarrier.o
 util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o
+ifdef CONFIG_LINUX
+util-obj-y += vhost-user-server.o
+endif

Please use the more common form (which is also more concise):

util-obj-$(CONFIG_LINUX) += vhost-user-server.o

Quoted 36 lines
util/Makefile.objs +36 -0
+static bool coroutine_fn
+vu_message_read(VuDev *vu_dev, int conn_fd, VhostUserMsg *vmsg)
+{
+    struct iovec iov = {
+        .iov_base = (char *)vmsg,
+        .iov_len = VHOST_USER_HDR_SIZE,
+    };
+    int rc, read_bytes = 0;
+    /*
+     * Store fds/nfds returned from qio_channel_readv_full into
+     * temporary variables.
+     *
+     * VhostUserMsg is a packed structure, gcc will complain about passing
+     * pointer to a packed structure member if we pass &VhostUserMsg.fd_num
+     * and &VhostUserMsg.fds directly when calling qio_channel_readv_full,
+     * thus two temporary variables nfds and fds are used here.
+     */
+    size_t nfds = 0, nfds_t = 0;
+    int *fds = NULL, *fds_t = NULL;
+    VuClientInfo *client = container_of(vu_dev, VuClientInfo, vu_dev);
+    QIOChannel *ioc = client->ioc;
+
+    Error *local_err = NULL;
+    assert(qemu_in_coroutine());
+    do {
+        /*
+         * qio_channel_readv_full may have short reads, keeping calling it
+         * until getting VHOST_USER_HDR_SIZE or 0 bytes in total
+         */
+        rc = qio_channel_readv_full(ioc, &iov, 1, &fds_t, &nfds_t, &local_err);
+        if (rc < 0) {
+            if (rc == QIO_CHANNEL_ERR_BLOCK) {
+                qio_channel_yield(ioc, G_IO_IN);
+                continue;
+            } else {
+                error_report_err(local_err);

util/Makefile.objs util-obj-y += readline.o

Quoted 10 lines
util/Makefile.objs +10 -0
+                return false;
+            }
+        }
+        read_bytes += rc;
+        fds = g_renew(int, fds_t, nfds + nfds_t);
+        memcpy(fds + nfds, fds_t, nfds_t);
+        nfds += nfds_t;
+        if (read_bytes == VHOST_USER_HDR_SIZE || rc == 0) {
+            break;
+        }

Does this loop work? I can't see where iov_base and iov_len are updated, so I guess the beginning of vmsg would be overwritten instead of concatenating each readv iteration.

util/Makefile.objs

Quoted 2 lines
util/Makefile.objs +2 -0
+    } while (true);
+    assert(nfds <= VHOST_MEMORY_MAX_NREGIONS);

The client is untrusted. Please handle errors explicitly and do not use assertion failures that can be triggered by the client.

util/vhost-user-server.h

Quoted 6 lines
util/vhost-user-server.h new file +0 -0
new file mode 100644
index 0000000000..1a6b5e4ea9
@@ -0,0 +1,57 @@

Missing license header and #ifndef VHOST_USER_SERVER_H.

Quoted 4 lines
util/vhost-user-server.h new file +4 -0
+#include "contrib/libvhost-user/libvhost-user.h"
+#include "io/channel-socket.h"
+#include "io/channel-file.h"
+#include "io/net-listener.h"

util/vhost-user-server.h line 14

Quoted 10 lines
util/vhost-user-server.h new file +10 -0
+#include "qemu/error-report.h"
+#include "qapi/error.h"
+#include "standard-headers/linux/virtio_blk.h"
+
+typedef struct VuClientInfo VuClientInfo;
+
+typedef struct VuServer {
+    QIONetListener *listener;
+    AioContext *ctx;
+    QTAILQ_HEAD(, VuClientInfo) clients;

The convention is that only one client can be connected to a vhost-user UNIX domain at any given time.

Multiple devices can be exported by creating multiple vhost-user UNIX domain sockets.

Therefore it seems unnecessary to have a list of connected clients. Have I misunderstood something?

util/vhost-user-server.h line 22

Quoted 8 lines
util/vhost-user-server.h new file +8 -0
+    void (*device_panic_notifier)(struct VuClientInfo *client) ;
+    int max_queues;
+    const VuDevIface *vu_iface;
+    /*
+     * @ptr_in_device: VuServer pointer memory location in vhost-user device
+     * struct, so later container_of can be used to get device destruct
+     */
+    void *ptr_in_device;

Is this an opaque pointer that the device implementation will use? If so, please call it "opaque" and remove the comment. "opaque" is the standard name that is used and there is no need to explain it.

util/vhost-user-server.h line 23

Quoted 1 line
util/vhost-user-server.h new file +1 -0
+    bool close;

This field is unused. Please drop it and introduce it in the patch that needs it.

util/vhost-user-server.h line 33

Quoted 10 lines
util/vhost-user-server.h new file +10 -0
+} VuServer;
+
+typedef struct KickInfo {
+    VuDev *vu_dev;
+    int fd; /*kick fd*/
+    long index; /*queue index*/
+    vu_watch_cb cb;
+} KickInfo;
+
+struct VuClientInfo {

This could be inlined into VuServer since there should only be one client connected to a vhost-user UNIX domain socket at any given time.

author
#5 lore raw

PATCH v5 3/5 vhost-user block device backend server

In reply to Coiby Xu

By making use of libvhost, multiple block device drives can be exported and each drive can serve multiple clients simultaneously. Since vhost-user-server needs a block drive to be created first, delay the creation of this object.

---
 block/Makefile.objs                  |   3 +
 block/export/vhost-user-blk-server.c | 727 +++++++++++++++++++++++++++
 block/export/vhost-user-blk-server.h |  21 +
 softmmu/vl.c                         |   4 +
 4 files changed, 755 insertions(+)
 create mode 100644 block/export/vhost-user-blk-server.c
 create mode 100644 block/export/vhost-user-blk-server.h
block/Makefile.objs +3 -0
index 3bcb35c81d..5ffc5bb2ff 100644
@@ -24,6 +24,9 @@ block-obj-y += throttle-groups.o
 block-obj-$(CONFIG_LINUX) += nvme.o
 
 block-obj-y += nbd.o
+ifdef CONFIG_LINUX
+block-obj-y += export/vhost-user-blk-server.o ../contrib/libvhost-user/libvhost-user.o
+endif
 block-obj-$(CONFIG_SHEEPDOG) += sheepdog.o
 block-obj-$(CONFIG_LIBISCSI) += iscsi.o
 block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o
block/export/vhost-user-blk-server.c new file +727 -0

727 lines not on this page · raw message

block/export/vhost-user-blk-server.h new file +21 -0
new file mode 100644
index 0000000000..03381d11f4
@@ -0,0 +1,21 @@
+#include "util/vhost-user-server.h"
+typedef struct VuBlockDev VuBlockDev;
+#define TYPE_VHOST_USER_BLK_SERVER "vhost-user-blk-server"
+#define VHOST_USER_BLK_SERVER(obj) \
+   OBJECT_CHECK(VuBlockDev, obj, TYPE_VHOST_USER_BLK_SERVER)
+
+/* vhost user block device */
+struct VuBlockDev {
+    Object parent_obj;
+    char *node_name;
+    SocketAddress *addr;
+    bool exit_when_panic;
+    AioContext *ctx;
+    VuServer *vu_server;
+    uint32_t blk_size;
+    BlockBackend *backend;
+    QIOChannelSocket *sioc;
+    QTAILQ_ENTRY(VuBlockDev) next;
+    struct virtio_blk_config blkcfg;
+    bool writable;
+};
softmmu/vl.c +4 -0
index 5549f4b619..e5fd75d436 100644
@@ -2520,6 +2520,10 @@ static bool object_create_initial(const char *type, QemuOpts *opts)
     }
 #endif
 
+    /* Reason: vhost-user-blk-server property "node-name" */
+    if (g_str_equal(type, "vhost-user-blk-server")) {
+        return false;
+    }
     /*
      * Reason: filter-* property "netdev" etc.
      */

--
2.25.1

author
#6 lore raw

PATCH v5 4/5 a standone-alone tool to directly share disk image file via vhost-user protocol

In reply to Coiby Xu

vhost-user-blk could have played as vhost-user backend but it only supports raw file and don't support VIRTIO_BLK_T_DISCARD and VIRTIO_BLK_T_WRITE_ZEROES operations on raw file (ioctl(fd, BLKDISCARD) is only valid for real block device).

Kevin's qemu-storage-daemon will be used to replace this tool after his patches are merged into the mainline QEMU.

---
 Makefile  |   4 +
 configure |   3 +
 qemu-vu.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 259 insertions(+)
 create mode 100644 qemu-vu.c
Makefile +4 -0
index 9d4b224126..6da192222d 100644
@@ -585,6 +585,10 @@ qemu-img.o: qemu-img-cmds.h
 
 qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
 qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
+
+ifdef CONFIG_LINUX
+qemu-vu$(EXESUF): qemu-vu.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
+endif
 qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
 
 qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS)
configure +3 -0
index fab6281eb7..53dd9fb88f 100755
@@ -6318,6 +6318,9 @@ if test "$want_tools" = "yes" ; then
   if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
     tools="qemu-nbd\$(EXESUF) $tools"
   fi
+  if [ "$linux" = "yes" ] ; then
+    tools="qemu-vu\$(EXESUF) $tools"
+  fi
   if [ "$ivshmem" = "yes" ]; then
     tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
   fi
qemu-vu.c new file +252 -0

252 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#7 lore raw

PATCH v5 5/5 new qTest case to test the vhost-user-blk-server

In reply to Coiby Xu

This test case has the same tests as tests/virtio-blk-test.c except for tests have block_resize.

---
 tests/Makefile.include              |   3 +-
 tests/qtest/Makefile.include        |   2 +
 tests/qtest/libqos/vhost-user-blk.c | 126 +++++
 tests/qtest/libqos/vhost-user-blk.h |  44 ++
 tests/qtest/vhost-user-blk-test.c   | 694 ++++++++++++++++++++++++++++
 5 files changed, 868 insertions(+), 1 deletion(-)
 create mode 100644 tests/qtest/libqos/vhost-user-blk.c
 create mode 100644 tests/qtest/libqos/vhost-user-blk.h
 create mode 100644 tests/qtest/vhost-user-blk-test.c
tests/Makefile.include +2 -1
index edcbd475aa..0fccc7573e 100644
@@ -631,7 +631,8 @@ endef
 $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/all $(check-qtest-y)
 	$(call do_test_human,$(check-qtest-$*-y:%=tests/qtest/%$(EXESUF)) $(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)), \
 	  QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
-	  QTEST_QEMU_IMG=qemu-img$(EXESUF))
+	  QTEST_QEMU_IMG=./qemu-img$(EXESUF) \
+	  QTEST_QEMU_VU_BINARY=./qemu-vu$(EXESUF))
 
 check-unit: $(check-unit-y)
 	$(call do_test_human, $^)
tests/qtest/Makefile.include +2 -0
index 383b0ab217..868ff7ab1e 100644
@@ -185,6 +185,7 @@ libqos-obj-y += tests/qtest/libqos/virtio.o
 libqos-obj-$(CONFIG_VIRTFS) += tests/qtest/libqos/virtio-9p.o
 libqos-obj-y += tests/qtest/libqos/virtio-balloon.o
 libqos-obj-y += tests/qtest/libqos/virtio-blk.o
+libqos-obj-$(CONFIG_LINUX) += tests/qtest/libqos/vhost-user-blk.o
 libqos-obj-y += tests/qtest/libqos/virtio-mmio.o
 libqos-obj-y += tests/qtest/libqos/virtio-net.o
 libqos-obj-y += tests/qtest/libqos/virtio-pci.o
@@ -228,6 +229,7 @@ qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/qtest/vhost-user-test.o $(chardev
 qos-test-obj-y += tests/qtest/virtio-test.o
 qos-test-obj-$(CONFIG_VIRTFS) += tests/qtest/virtio-9p-test.o
 qos-test-obj-y += tests/qtest/virtio-blk-test.o
+qos-test-obj-$(CONFIG_LINUX) += tests/qtest/vhost-user-blk-test.o
 qos-test-obj-y += tests/qtest/virtio-net-test.o
 qos-test-obj-y += tests/qtest/virtio-rng-test.o
 qos-test-obj-y += tests/qtest/virtio-scsi-test.o
tests/qtest/libqos/vhost-user-blk.c new file +126 -0

126 lines not on this page · raw message

tests/qtest/libqos/vhost-user-blk.h new file +44 -0

44 lines not on this page · raw message

tests/qtest/vhost-user-blk-test.c new file +694 -0

694 lines not on this page · raw message

Signature · 1 line
2.25.1
#8 lore raw
In reply to Coiby Xu
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-clang@ubuntu build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-ubuntu V=1 NETWORK=1
time make docker-test-clang@ubuntu SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===

  LINK    scsi/qemu-pr-helper
  LINK    qemu-bridge-helper
  LINK    virtiofsd

/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of /usr/bin/ld: rpc_createerr@@GLIBC_2.2.5/lib/x86_64-linux-gnu/libtirpc.so.3' overridden by definition from : warning: common of /lib/x86_64-linux-gnu/libc.so.6 rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6

  GEN     cris-softmmu/hmp-commands.h
  GEN     hppa-softmmu/hmp-commands.h
  GEN     alpha-softmmu/hmp-commands.h
---
  CC      mips64el-softmmu/qapi/qapi-commands.o
  CC      i386-softmmu/hw/i386/vmmouse.o
  CC      hppa-softmmu/trace/generated-helpers.o

/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6

  CC      mipsel-softmmu/memory.o
  CC      arm-softmmu/hw/arm/musicpal.o
  CC      alpha-softmmu/target/alpha/gdbstub.o
---
  CC      arm-softmmu/hw/arm/gumstix.o
  CC      i386-softmmu/hw/i386/../xenpv/xen_machine_pv.o
  CC      aarch64-softmmu/hw/arm/gumstix.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      i386-softmmu/hw/i386/kvm/clock.o
  CC      aarch64-softmmu/hw/arm/spitz.o
  CC      arm-softmmu/hw/arm/spitz.o
---
  CC      mips64el-softmmu/trace/generated-helpers.o
  CC      aarch64-softmmu/hw/arm/bcm2836.o
  GEN     nios2-softmmu/config-devices.h
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  GEN     nios2-softmmu/config-target.h
  CC      arm-softmmu/hw/arm/stm32f405_soc.o
  CC      arm-softmmu/hw/arm/fsl-imx25.o
---
  CC      moxie-softmmu/tcg/tcg-common.o
  CC      mipsel-softmmu/hw/display/vhost-user-gpu-pci.o
  LINK    mips-softmmu/qemu-system-mips
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  GEN     or1k-softmmu/hmp-commands.h
  GEN     or1k-softmmu/hmp-commands-info.h
  GEN     or1k-softmmu/config-devices.h
---
  GEN     ppc-softmmu/config-target.h
  CC      ppc-softmmu/exec.o
  GEN     ppc64-softmmu/hmp-commands.h
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  GEN     ppc64-softmmu/hmp-commands-info.h
  GEN     ppc64-softmmu/config-devices.h
  GEN     ppc64-softmmu/config-target.h
---
  CC      mipsel-softmmu/qapi/qapi-types-misc-target.o
  GEN     s390x-softmmu/gdbstub-xml.c
  CC      ppc-softmmu/hw/vfio/calxeda-xgmac.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      aarch64-softmmu/qapi/qapi-commands-misc-target.o
  CC      mipsel-softmmu/qapi/qapi-types.o
  CC      riscv32-softmmu/hw/display/virtio-gpu-3d.o
---
  CC      mipsel-softmmu/target/mips/translate.o
  CC      or1k-softmmu/target/openrisc/machine.o
  CC      s390x-softmmu/accel/tcg/tcg-runtime.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      arm-softmmu/target/arm/machine.o
  CC      nios2-softmmu/target/nios2/mmu.o
  CC      sh4-softmmu/accel/tcg/cpu-exec-common.o
---
  CC      mipsel-softmmu/target/mips/op_helper.o
  CC      aarch64-softmmu/target/arm/cpu64.o
  CC      sh4-softmmu/hw/block/dataplane/virtio-blk.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      riscv64-softmmu/hw/virtio/vhost-backend.o
  CC      ppc-softmmu/hw/ppc/ppc_booke.o
  CC      ppc64-softmmu/hw/rtc/mc146818rtc.o
---
  CC      riscv32-softmmu/hw/virtio/virtio-iommu-pci.o
  LINK    mipsel-softmmu/qemu-system-mipsel
  CC      ppc-softmmu/hw/ppc/rs6000_mc.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      riscv64-softmmu/hw/virtio/virtio-rng-pci.o
  CC      riscv64-softmmu/hw/virtio/virtio-balloon-pci.o
  CC      ppc64-softmmu/hw/vfio/pci-quirks.o
---
  CC      sh4-softmmu/hw/scsi/virtio-scsi-dataplane.o
  CC      sparc-softmmu/balloon.o
  CC      aarch64-softmmu/target/arm/vec_helper.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  GEN     trace/generated-helpers.c
  CC      sparc-softmmu/ioport.o
  CC      riscv64-softmmu/hw/virtio/virtio-iommu-pci.o
---
  CC      ppc64-softmmu/hw/virtio/virtio-net-pci.o
  CC      riscv32-softmmu/hw/riscv/sifive_u.o
  CC      sh4-softmmu/hw/virtio/vhost-user-blk-pci.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      sparc-softmmu/hw/sparc/leon3.o
  CC      riscv64-softmmu/hw/riscv/sifive_u_otp.o
  CC      sh4-softmmu/hw/virtio/vhost-user-input-pci.o
---
  CC      ppc64-softmmu/hw/ppc/spapr_hcall.o
  CC      riscv64-softmmu/qapi/qapi-commands-machine-target.o
  CC      ppc64-softmmu/hw/ppc/spapr_iommu.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      sparc64-softmmu/disas.o
  CC      sparc-softmmu/qapi/qapi-init-commands.o
  CC      sh4-softmmu/hw/sh4/r2d.o
---
  CC      sparc64-softmmu/hw/virtio/vhost-backend.o
  CC      tricore-softmmu/qapi/qapi-init-commands.o
  GEN     x86_64-softmmu/config-devices.h
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      ppc-softmmu/softmmu/main.o
  GEN     x86_64-softmmu/config-target.h
  CC      s390x-softmmu/hw/s390x/ccw-device.o
  CC      ppc64-softmmu/qapi/qapi-introspect.o
  CC      unicore32-softmmu/target/unicore32/translate.o
  CC      sparc64-softmmu/hw/virtio/vhost-user.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      tricore-softmmu/softmmu/vl.o
  CC      x86_64-softmmu/exec.o
  CC      tricore-softmmu/target/tricore/translate.o
---
  CC      ppc64-softmmu/qapi/qapi-types-misc-target.o
  CC      sparc64-softmmu/hw/virtio/virtio-balloon.o
  CC      ppc-softmmu/trace/generated-helpers.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      x86_64-softmmu/exec-vary.o
  CC      unicore32-softmmu/target/unicore32/op_helper.o
  CC      sh4eb-softmmu/target/sh4/helper.o
---
  CC      ppc64-softmmu/qapi/qapi-events-misc-target.o
  CC      sparc64-softmmu/hw/virtio/vhost-vsock-pci.o
  CC      sparc64-softmmu/hw/virtio/vhost-user-blk-pci.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      ppc64-softmmu/qapi/qapi-events.o
  GEN     trace/generated-helpers.c
  CC      xtensa-softmmu/exec-vary.o
---
  CC      sparc64-softmmu/hw/virtio/virtio-net-pci.o
  CC      sparc64-softmmu/hw/virtio/virtio-serial-pci.o
  CC      s390x-softmmu/qapi/qapi-commands-misc-target.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      s390x-softmmu/qapi/qapi-commands.o
  CC      x86_64-softmmu/ioport.o
  CC      xtensa-softmmu/ioport.o
---
  CC      xtensa-softmmu/accel/stubs/kvm-stub.o
  CC      xtensa-softmmu/accel/tcg/tcg-all.o
  CC      xtensaeb-softmmu/arch_init.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      xtensaeb-softmmu/cpus.o
  CC      xtensaeb-softmmu/gdbstub.o
  CC      sparc64-softmmu/qapi/qapi-types.o
---
  CC      aarch64_be-linux-user/disas.o
  CC      x86_64-softmmu/hw/block/dataplane/virtio-blk.o
  CC      arm-linux-user/tcg/tcg-op-gvec.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      cris-linux-user/exec-vary.o
  CC      cris-linux-user/tcg/tcg.o
  GEN     aarch64-linux-user/gdbstub-xml.c
---
  CC      armeb-linux-user/accel/tcg/user-exec-stub.o
  CC      s390x-softmmu/target/s390x/arch_dump.o
  CC      xtensa-softmmu/hw/virtio/virtio-crypto-pci.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      cris-linux-user/linux-user/syscall.o
  CC      x86_64-softmmu/hw/net/virtio-net.o
  CC      armeb-linux-user/linux-user/main.o
---
  CC      hppa-linux-user/accel/stubs/whpx-stub.o
  CC      alpha-linux-user/linux-user/strace.o
  GEN     trace/generated-helpers.c
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      xtensaeb-softmmu/hw/vfio/pci.o
  CC      xtensa-softmmu/hw/virtio/vhost-user-input-pci.o
  CC      x86_64-softmmu/hw/scsi/vhost-scsi-common.o
---
  CC      arm-linux-user/linux-user/arm/cpu_loop.o
  CC      alpha-linux-user/linux-user/alpha/signal.o
  CC      xtensa-softmmu/hw/virtio/virtio-scsi-pci.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      armeb-linux-user/linux-user/uname.o
  CC      cris-linux-user/linux-user/uname.o
  CCAS    cris-linux-user/linux-user/safe-syscall.o
---
  CC      i386-linux-user/target/i386/svm_helper.o
  CC      mipsn32-linux-user/accel/tcg/translate-all.o
  CC      mipsn32-linux-user/accel/tcg/translator.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      mipsel-linux-user/linux-user/uname.o
  CC      microblazeel-linux-user/trace/control-target.o
  CC      mips-linux-user/target/mips/cpu.o
---
  CC      ppc64abi32-linux-user/fpu/softfloat.o
  CC      mipsn32el-linux-user/linux-user/signal.o
  CC      ppc64abi32-linux-user/disas.o
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  CC      ppc-linux-user/accel/stubs/hax-stub.o
  CC      s390x-linux-user/exec-vary.o
  CC      s390x-linux-user/tcg/tcg.o
---
  LINK    tests/test-visitor-serialization
  LINK    tests/test-iov
  LINK    tests/test-bitmap
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  LINK    tests/test-aio
  LINK    tests/test-aio-multithread
  LINK    tests/test-throttle
  LINK    tests/test-thread-pool

/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-hbitmap
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-bdrv-drain
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-bdrv-graph-mod
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-blockjob
LINK tests/test-blockjob-txn
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-block-backend
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-block-iothread
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-image-locking
LINK tests/test-x86-cpuid
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-xbzrle
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
LINK tests/test-vmstate
LINK tests/test-cutils
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6

  LINK    tests/test-shift128
  LINK    tests/test-mul64
  LINK    tests/test-int128
---
  LINK    tests/test-write-threshold
  LINK    tests/test-crypto-hash
  LINK    tests/test-crypto-hmac
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
  LINK    tests/test-crypto-cipher
  LINK    tests/test-crypto-secret
  LINK    tests/test-crypto-tlscredsx509

---
FLOAT TEST float-to-int
FLOAT TEST sub
FLOAT TEST mul
/usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6
FLOAT TEST float-to-uint
FLOAT TEST mulAdd
FLOAT TEST div
---
TEST check-qtest-x86_64: tests/qtest/intel-hda-test
qemu-system-ppc64: total memory for NUMA nodes (0x8000000) should equal RAM size (0x20000000)
Broken pipe
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) /tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
qemu-vu: vu_panic: disconnect
TEST check-qtest-x86_64: tests/qtest/ivshmem-test
Aborted (core dumped)
ERROR - too few tests run (expected 85, got 59)
make: *** [/tmp/qemu-test/src/tests/Makefile.include:632: check-qtest-ppc64] Error 1
make: *** Waiting for unfinished jobs....
TEST check-qtest-x86_64: tests/qtest/dbus-vmstate-test
TEST check-qtest-aarch64: tests/qtest/qom-test
---

  TEST    check-qtest-x86_64: tests/qtest/machine-none-test
  TEST    check-qtest-x86_64: tests/qtest/qmp-test
  TEST    check-qtest-x86_64: tests/qtest/qmp-cmd-test

/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here /tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null /usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect

  TEST    check-qtest-x86_64: tests/qtest/qom-test
  TEST    check-qtest-aarch64: tests/qtest/test-hmp
  TEST    check-qtest-x86_64: tests/qtest/test-hmp
  TEST    check-qtest-x86_64: tests/qtest/qos-test

/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
/tmp/qemu-test/src/util/vhost-user-server.c:102:16: runtime error: null pointer passed as argument 1, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:102:28: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
/tmp/qemu-test/src/util/vhost-user-server.c:110:23: runtime error: null pointer passed as argument 2, which is declared to never be null
/usr/include/string.h:43:28: note: nonnull attribute specified here
qemu-vu: vu_panic: disconnect
TEST check-qtest-aarch64: tests/qtest/qos-test
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=3a5f868350d645a1a62abc6fead5818e', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-sffs5eec/src/docker-src.2020-03-09-06.30.05.21992:/var/tmp/qemu:z,ro', 'qemu:ubuntu', '/var/tmp/qemu/run', 'test-clang']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=3a5f868350d645a1a62abc6fead5818e
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-sffs5eec/src'
make: *** [docker-run-test-clang@ubuntu] Error 2

real 18m57.807s
user 0m10.453s

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-clang@ubuntu/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

#9 lore raw
In reply to Coiby Xu
Quoted 7 lines · Coiby Xu

v5:
* re-use vu_kick_cb in libvhost-user
* keeping processing VhostUserMsg in the same coroutine until there is detachment/attachment of AIOContext
* Spawn separate coroutine for each VuVirtqElement
* Other changes including relocating vhost-user-blk-server.c, coding style etc.

Hi Coiby,
Sorry I haven't fully reviewed this series yet. Do you have a new revision that I should review instead?

Thanks,
Stefan