vhost-user block device backend implementation
v3 cover vhost-user block device backend implementation
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):
extend libvhost to support IOThread and coroutine
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 + Makefile.target | 1 + backends/Makefile.objs | 2 + backends/vhost-user-blk-server.c | 716 ++++++++++++++++++++++++++ backends/vhost-user-blk-server.h | 21 + configure | 3 + contrib/libvhost-user/libvhost-user.c | 54 +- contrib/libvhost-user/libvhost-user.h | 38 +- qemu-vu.c | 252 +++++++++ tests/libqos/vhost-user-blk.c | 126 +++++ tests/libqos/vhost-user-blk.h | 44 ++ tests/vhost-user-blk-test.c | 694 +++++++++++++++++++++++++ util/Makefile.objs | 3 + util/vhost-user-server.c | 429 ++++++++++++++++ util/vhost-user-server.h | 56 ++ vl.c | 4 + 16 files changed, 2440 insertions(+), 7 deletions(-) create mode 100644 backends/vhost-user-blk-server.c create mode 100644 backends/vhost-user-blk-server.h create mode 100644 qemu-vu.c create mode 100644 tests/libqos/vhost-user-blk.c create mode 100644 tests/libqos/vhost-user-blk.h create mode 100644 tests/vhost-user-blk-test.c create mode 100644 util/vhost-user-server.c create mode 100644 util/vhost-user-server.h
--
2.25.0
PATCH v3 1/5 extend libvhost to support IOThread and coroutine
Previously libvhost dispatch events in its own GMainContext. Now vhost-user client's kick event can be dispatched in block device drive's AioContext thus IOThread is supported. And also allow vu_message_read and vu_kick_cb to be replaced so QEMU can run them as coroutines.
--- contrib/libvhost-user/libvhost-user.c | 54 ++++++++++++++++++++++++--- contrib/libvhost-user/libvhost-user.h | 38 ++++++++++++++++++- 2 files changed, 85 insertions(+), 7 deletions(-)
contrib/libvhost-user/libvhost-user.c +49 -5
@@ -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
@@ -260,7 +258,7 @@ have_userfault(void) }static bool -vu_message_read (VuDev *dev,int conn_fd,VhostUserMsg *vmsg) +vu_message_read_ (VuDev *dev,int conn_fd,VhostUserMsg *vmsg) {char control[CMSG_SPACE (VHOST_MEMORY_MAX_NREGIONS *sizeof (int ))] = { };struct iovec iov = {
@@ -328,6 +326,17 @@ fail:return false; } +static bool vu_message_read (VuDev *dev,int conn_fd,VhostUserMsg *vmsg) +{ +vu_read_msg_cb read_msg; +if (dev->co_iface) { + read_msg = dev->co_iface->read_msg; + }else { + read_msg = vu_message_read_; + } +return read_msg (dev, conn_fd, vmsg); +} +static bool vu_message_write (VuDev *dev,int conn_fd,VhostUserMsg *vmsg) {
@@ -1075,9 +1084,14 @@ vu_set_vring_kick_exec(VuDev *dev, VhostUserMsg *vmsg) }if (dev->vq[index].kick_fd !=-1 && dev->vq[index].handler) { +if (dev->set_watch_packed_data) { + dev->set_watch_packed_data (dev, dev->vq[index].kick_fd,VU_WATCH_IN , + dev->co_iface->kick_callback, + (void *)(long )index); + }else { dev->set_watch (dev, dev->vq[index].kick_fd,VU_WATCH_IN , vu_kick_cb, (void *)(long )index); - + }DPRINT ("Waiting for kicks on fd: %d for vq: %d\n" , dev->vq[index].kick_fd, index); }
@@ -1097,8 +1111,14 @@ void vu_set_queue_handler(VuDev *dev, VuVirtq *vq, vq->handler = handler;if (vq->kick_fd >=0 ) {if (handler) { +if (dev->set_watch_packed_data) { + dev->set_watch_packed_data (dev, vq->kick_fd,VU_WATCH_IN , + dev->co_iface->kick_callback, + (void *)(long )qidx); + }else { dev->set_watch (dev, vq->kick_fd,VU_WATCH_IN , vu_kick_cb, (void *)(long )qidx); + } }else { dev->remove_watch (dev, vq->kick_fd); }
@@ -1627,6 +1647,12 @@ vu_deinit(VuDev *dev) }if (vq->kick_fd !=-1 ) { +/* remove watch for kick_fd +* When client process is running in gdb and +* quit command is run in gdb, QEMU will still dispatch the event +* which will cause segment fault in the callback function +*/ + dev->remove_watch (dev, vq->kick_fd);close (vq->kick_fd); vq->kick_fd =-1 ; }
@@ -1682,7 +1708,7 @@ vu_init(VuDev *dev,assert (max_queues >0 );assert (socket >=0 ); -assert (set_watch); +/* assert(set_watch); */ assert (remove_watch);assert (iface);assert (panic);
@@ -1715,6 +1741,24 @@ vu_init(VuDev *dev,return true; } +bool +vu_init_packed_data (VuDev *dev, +uint16_t max_queues, +int socket, +vu_panic_cb panic, +vu_set_watch_cb_packed_data set_watch_packed_data, +vu_remove_watch_cb remove_watch, +const VuDevIface *iface, +const CoIface *co_iface) +{ +if (vu_init (dev, max_queues, socket, panic,NULL , remove_watch, iface)) { + dev->set_watch_packed_data = set_watch_packed_data; + dev->co_iface = co_iface; +return true; + } +return false; +} +VuVirtq *vu_get_queue (VuDev *dev,int qidx) {
contrib/libvhost-user/libvhost-user.h +36 -2
@@ -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,
@@ -201,6 +203,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);
@@ -208,6 +211,20 @@ typedef int (*vu_set_config_cb) (VuDev *dev, const uint8_t *data, uint32_t offset, uint32_t size, uint32_t flags); +typedef void (*vu_watch_cb_packed_data ) (void *packed_data); + +typedef void (*vu_set_watch_cb_packed_data ) (VuDev *dev,int fd,int condition, +vu_watch_cb_packed_data cb, +void *data); +/* +* allowing vu_read_msg_cb and kick_callback to be replaced so QEMU +* can run them as coroutines +*/ +typedef struct CoIface { +vu_read_msg_cb read_msg; +vu_watch_cb_packed_data kick_callback; +}CoIface ; + typedef struct VuDevIface { /* called by VHOST_USER_GET_FEATURES to get the features bitmask */ vu_get_features_cb get_features;
@@ -372,7 +389,8 @@ struct VuDev {/* @set_watch: add or update the given fd to the watch set, * call cb when condition is met */ vu_set_watch_cb set_watch; - +/* AIO dispatch will only one data pointer to callback function */ +vu_set_watch_cb_packed_data set_watch_packed_data;/* @remove_watch: remove the given fd from the watch set */ vu_remove_watch_cb remove_watch;
@@ -380,7 +398,7 @@ struct VuDev {* re-initialize */ vu_panic_cb panic;const VuDevIface *iface; - +const CoIface *co_iface;/* Postcopy data */ int postcopy_ufd;bool postcopy_listening;
@@ -417,6 +435,22 @@ bool vu_init(VuDev *dev, const VuDevIface *iface); +/** +* vu_init_packed_data: +* Same as vu_init except for set_watch_packed_data which will pack +* two parameters into a struct thus QEMU aio_dispatch can pass the +* required data to callback function. +* +* Returns: true on success, false on failure. +**/ +bool vu_init_packed_data (VuDev *dev, +uint16_t max_queues, +int socket, +vu_panic_cb panic, +vu_set_watch_cb_packed_data set_watch_packed_data, +vu_remove_watch_cb remove_watch, +const VuDevIface *iface, +const CoIface *co_iface);/** * vu_deinit: * @dev: a VuDev context
Signature · 1 line
2.25.0
PATCH v3 2/5 generic vhost user server
In reply to Coiby XuSharing QEMU devices via vhost-user protocol
--- util/Makefile.objs | 3 + util/vhost-user-server.c | 429 +++++++++++++++++++++++++++++++++++++++ util/vhost-user-server.h | 56 +++++ 3 files changed, 489 insertions(+) create mode 100644 util/vhost-user-server.c create mode 100644 util/vhost-user-server.h
util/Makefile.objs +3 -0
@@ -36,6 +36,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 +429 -0
429 lines not on this page · raw message
util/vhost-user-server.h new file +56 -0
56 lines not on this page · raw message
--
2.25.0
PATCH v3 3/5 vhost-user block device backend server
In reply to Coiby XuBy 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.
--- Makefile.target | 1 + backends/Makefile.objs | 2 + backends/vhost-user-blk-server.c | 716 +++++++++++++++++++++++++++++++ backends/vhost-user-blk-server.h | 21 + vl.c | 4 + 5 files changed, 744 insertions(+) create mode 100644 backends/vhost-user-blk-server.c create mode 100644 backends/vhost-user-blk-server.h
Makefile.target +1 -0
@@ -159,6 +159,7 @@ obj-y += monitor/ obj-y += qapi/ obj-y += memory.o obj-y += memory_mapping.o +obj-$(CONFIG_LINUX) += ../contrib/libvhost-user/libvhost-user.o obj-y += migration/ram.o LIBS := $(libs_softmmu) $(LIBS)
backends/Makefile.objs +2 -0
@@ -14,6 +14,8 @@ common-obj-y += cryptodev-vhost.o common-obj-$(CONFIG_VHOST_CRYPTO) += cryptodev-vhost-user.o endif +common-obj-$(CONFIG_LINUX) += vhost-user-blk-server.o + common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) += vhost-user.o common-obj-$(CONFIG_LINUX) += hostmem-memfd.o
backends/vhost-user-blk-server.c new file +716 -0
716 lines not on this page · raw message
backends/vhost-user-blk-server.h new file +21 -0
@@ -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; +char *unix_socket; +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; +};
vl.c +4 -0
@@ -2572,6 +2572,10 @@ static bool object_create_initial(const char *type, QemuOpts *opts) }#endif +/* Reason: vhost-user-server property "name" */ +if (g_str_equal (type,"vhost-user-blk-server" )) { +return false; + }/* * Reason: filter-* property "netdev" etc. */
Signature · 1 line
2.25.0
PATCH v3 4/5 a standone-alone tool to directly share disk image file via vhost-user protocol
In reply to Coiby Xuvhost-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).
In the future Kevin's qemu-storage-daemon will be used to replace this tool.
--- Makefile | 4 + configure | 3 + qemu-vu.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 259 insertions(+) create mode 100644 qemu-vu.c
Makefile +4 -0
@@ -572,6 +572,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) libvhost-user.a +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
@@ -6217,6 +6217,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
--
2.25.0
Re: [PATCH v3 4/5] a standone-alone tool to directly share disk image file via vhost-user protocol
I forgot to put backends/vhost-user-blk-server.o as dependency for qemu-vu target in Makefile,
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 backends/vhost-user-blk-server.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) libvhost-user.a
+endif
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y)
$(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
I also noticed in the latest version of QEMU, make check-qtest somehow doesn't run qos-test. If you need to run vhost-user-blk testsuite, please execute the following command after applying the above fix and the 5th patch,
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=./qemu-img QTEST_QEMU_VU_BINARY=./qemu-vu tests/qos-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl --test-name="qos-test"
Quoted 305 lines · 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_DISCARDandVIRTIO_BLK_T_WRITE_ZEROESoperations on raw file (ioctl(fd, BLKDISCARD)is only valid for real block device).In the future Kevin's qemu-storage-daemon will be used to replace this tool.
Signed-off-by Coiby Xu <[email protected]>--- Makefile | 4 + configure | 3 + qemu-vu.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 259 insertions(+) create mode 100644 qemu-vu.cMakefile +4
-0@@ -572,6 +572,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) libvhost-user.a +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@@ -6217,6 +6217,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" fiqemu-vu.c new file +252
-1@@ -0,0 +1,252 @@ +/* +* Copyright (C) 2020 Coiby Xu <[email protected]> +* +* standone-alone vhost-user-blk device server backend +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; under version 2 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include <getopt.h> +#include <libgen.h> +#include "backends/vhost-user-blk-server.h" +#include "block/block_int.h" +#include "io/net-listener.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" +#include "qemu/config-file.h" +#include "qemu/cutils.h" +#include "qemu/main-loop.h" +#include "qemu/module.h" +#include "qemu/option.h" +#include "qemu-common.h" +#include "qemu-version.h" +#include "qom/object_interfaces.h" +#include "sysemu/block-backend.h" +#define QEMU_VU_OPT_CACHE 256 +#define QEMU_VU_OPT_AIO 257 +#define QEMU_VU_OBJ_ID "vu_disk" +static QemuOptsList qemu_object_opts = { + .name ="object" , + .implied_opt_name ="qom-type" , + .head =QTAILQ_HEAD_INITIALIZER (qemu_object_opts.head), + .desc = { + { } + }, +}; +static char *srcpath; + +static void usage (const char *name) +{ + (printf) ( +"Usage: %s [OPTIONS] FILE\n" +" or: %s -L [OPTIONS]\n" +"QEMU Vhost-user Server Utility\n" +"\n" +" -h, --help display this help and exit\n" +" -V, --version output version information and exit\n" +"\n" +"Connection properties:\n" +" -k, --socket=PATH path to the unix socket\n" +"\n" +"General purpose options:\n" +" -e, -- exit-panic When the panic callback is called, the program\n" +" will exit. Useful for make check-qtest.\n" +"\n" +"Block device options:\n" +" -f, --format=FORMAT set image format (raw, qcow2, ...)\n" +" -r, --read-only export read-only\n" +" -n, --nocache disable host cache\n" +" --cache=MODE set cache mode (none, writeback, ...)\n" +" --aio=MODE set AIO mode (native or threads)\n" +"\n" +QEMU_HELP_BOTTOM "\n" + , name, name); +} + +static void version (const char *name) +{ +printf ( +"%s " QEMU_FULL_VERSION "\n" +"Written by Coiby Xu, based on qemu-nbd by Anthony Liguori\n" +"\n" +QEMU_COPYRIGHT "\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" + , name); +} + +static VuBlockDev *vu_block_device; + +static void vus_shutdown (void ) +{ + +Error *local_err =NULL ; +job_cancel_sync_all (); +bdrv_close_all (); +user_creatable_del (QEMU_VU_OBJ_ID , &local_err); +} + +int main (int argc,char **argv) +{ +BlockBackend *blk; +BlockDriverState *bs; +bool readonly = false; +char *sockpath =NULL ; +const char *sopt ="hVrnvek:f:" ; +struct option lopt[] = { + {"help" , no_argument,NULL ,'h' }, + {"version" , no_argument,NULL ,'V' }, + {"exit-panic" , no_argument,NULL ,'e' }, + {"socket" , required_argument,NULL ,'k' }, + {"read-only" , no_argument,NULL ,'r' }, + {"nocache" , no_argument,NULL ,'n' }, + {"cache" , required_argument,NULL ,QEMU_VU_OPT_CACHE }, + {"aio" , required_argument,NULL ,QEMU_VU_OPT_AIO }, + {"format" , required_argument,NULL ,'f' }, + {NULL ,0 ,NULL ,0 } + }; +int ch; +int opt_ind =0 ; +int flags =BDRV_O_RDWR ; +bool seen_cache = false; +bool seen_aio = false; +const char *fmt =NULL ; +Error *local_err =NULL ; +QDict *options =NULL ; +bool writethrough = true; +bool exit_when_panic = false; + +error_init (argv[0 ]); + +module_call_init (MODULE_INIT_QOM ); +qemu_init_exec_dir (argv[0 ]); + +while ((ch =getopt_long (argc, argv, sopt, lopt, &opt_ind)) !=-1 ) { +switch (ch) { +case 'e' : + exit_when_panic = true; +break ; +case 'n' : + optarg = (char *)"none" ; +/* fallthrough */ +case QEMU_VU_OPT_CACHE : +if (seen_cache) { +error_report ("-n and --cache can only be specified once" ); +exit (EXIT_FAILURE ); + } + seen_cache = true; +if (bdrv_parse_cache_mode (optarg, &flags, &writethrough) ==-1 ) { +error_report ("Invalid cache mode `%s'" , optarg); +exit (EXIT_FAILURE ); + } +break ; +case QEMU_VU_OPT_AIO : +if (seen_aio) { +error_report ("--aio can only be specified once" ); +exit (EXIT_FAILURE ); + } + seen_aio = true; +if (!strcmp (optarg,"native" )) { + flags |=BDRV_O_NATIVE_AIO ; + }else if (!strcmp (optarg,"threads" )) { +/* this is the default */ + }else { +error_report ("invalid aio mode `%s'" , optarg); +exit (EXIT_FAILURE ); + } +break ; +case 'r' : + readonly = true; + flags &= ~BDRV_O_RDWR ; +break ; +case 'k' : + sockpath = optarg; +if (sockpath[0 ] !='/' ) { +error_report ("socket path must be absolute" ); +exit (EXIT_FAILURE ); + } +break ; +case 'f' : + fmt = optarg; +break ; +case 'V' : +version (argv[0 ]); +exit (0 ); +break ; +case 'h' : +usage (argv[0 ]); +exit (0 ); +break ; +case '?' : +error_report ("Try `%s --help' for more information." , argv[0 ]); +exit (EXIT_FAILURE ); + } + } + +if ((argc - optind) !=1 ) { +error_report ("Invalid number of arguments" ); +error_printf ("Try `%s --help' for more information.\n" , argv[0 ]); +exit (EXIT_FAILURE ); + } +if (qemu_init_main_loop (&local_err)) { +error_report_err (local_err); +exit (EXIT_FAILURE ); + } +bdrv_init (); + + srcpath = argv[optind]; +if (fmt) { + options =qdict_new (); +qdict_put_str (options,"driver" , fmt); + } + blk =blk_new_open (srcpath,NULL , options, flags, &local_err); + +if (!blk) { +error_reportf_err (local_err,"Failed to blk_new_open '%s': " , + argv[optind]); +exit (EXIT_FAILURE ); + } + bs =blk_bs (blk); + +char buf[300 ]; +snprintf (buf,300 ,"%s,id=%s,node-name=%s,unix-socket=%s,writable=%s" , +TYPE_VHOST_USER_BLK_SERVER ,QEMU_VU_OBJ_ID ,bdrv_get_node_name (bs), + sockpath, !readonly ?"on" :"off" ); +/* While calling user_creatable_del, 'object' group is required */ +qemu_add_opts (&qemu_object_opts); +QemuOpts *opts =qemu_opts_parse (&qemu_object_opts, buf, true, &local_err); +if (local_err) { +error_report_err (local_err); + goto error; + } + +Object *obj =user_creatable_add_opts (opts, &local_err); + +if (local_err) { +error_report_err (local_err); + goto error; + } + + vu_block_device =VHOST_USER_BLK_SERVER (obj); + vu_block_device->exit_when_panic = exit_when_panic; + +do { +main_loop_wait (false); + }while (!vu_block_device->exit_when_panic || !vu_block_device->vu_server->close); + + error: +vus_shutdown (); +exit (EXIT_SUCCESS ); +} --
Quoted 2 lines
2.25.0
--
Best regards,
Coiby
PATCH v3 5/5 new qTest case to test the vhost-user-blk-server
In reply to Coiby XuThis test case has the same tests as tests/virtio-blk-test.c except for tests have block_resize.
--- tests/libqos/vhost-user-blk.c | 126 ++++++ tests/libqos/vhost-user-blk.h | 44 +++ tests/vhost-user-blk-test.c | 694 ++++++++++++++++++++++++++++++++++ 3 files changed, 864 insertions(+) create mode 100644 tests/libqos/vhost-user-blk.c create mode 100644 tests/libqos/vhost-user-blk.h create mode 100644 tests/vhost-user-blk-test.c
tests/libqos/vhost-user-blk.c new file +126 -0
@@ -0,0 +1,126 @@ +/* +* libqos driver framework +* +* Copyright (c) 2018 Emanuele Giuseppe Esposito <[email protected]> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License version 2 as published by the Free Software Foundation. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see <http://www.gnu.org/licenses/> +*/ + +#include "qemu/osdep.h" +#include "libqtest.h" +#include "qemu/module.h" +#include "standard-headers/linux/virtio_blk.h" +#include "libqos/qgraph.h" +#include "libqos/vhost-user-blk.h" + +#define PCI_SLOT 0x04 +#define PCI_FN 0x00 + +/* virtio-blk-device */ +static void *qvhost_user_blk_get_driver (QVhostUserBlk *v_blk, +const char *interface) +{ +if (!g_strcmp0 (interface,"vhost-user-blk" )) { +return v_blk; + } +if (!g_strcmp0 (interface,"virtio" )) { +return v_blk->vdev; + } + +fprintf (stderr,"%s not present in vhost-user-blk-device\n" , interface); +g_assert_not_reached (); +} + +static void *qvhost_user_blk_device_get_driver (void *object, +const char *interface) +{ +QVhostUserBlkDevice *v_blk = object; +return qvhost_user_blk_get_driver (&v_blk->blk, interface); +} + +static void *vhost_user_blk_device_create (void *virtio_dev, +QGuestAllocator *t_alloc, +void *addr) +{ +QVhostUserBlkDevice *vhost_user_blk =g_new0 (QVhostUserBlkDevice,1 ); +QVhostUserBlk *interface = &vhost_user_blk->blk; + + interface->vdev = virtio_dev; + + vhost_user_blk->obj.get_driver = qvhost_user_blk_device_get_driver; + +return &vhost_user_blk->obj; +} + +/* virtio-blk-pci */ +static void *qvhost_user_blk_pci_get_driver (void *object,const char *interface) +{ +QVhostUserBlkPCI *v_blk = object; +if (!g_strcmp0 (interface,"pci-device" )) { +return v_blk->pci_vdev.pdev; + } +return qvhost_user_blk_get_driver (&v_blk->blk, interface); +} + +static void *vhost_user_blk_pci_create (void *pci_bus,QGuestAllocator *t_alloc, +void *addr) +{ +QVhostUserBlkPCI *vhost_user_blk =g_new0 (QVhostUserBlkPCI,1 ); +QVhostUserBlk *interface = &vhost_user_blk->blk; +QOSGraphObject *obj = &vhost_user_blk->pci_vdev.obj; + +virtio_pci_init (&vhost_user_blk->pci_vdev, pci_bus, addr); + interface->vdev = &vhost_user_blk->pci_vdev.vdev; + + g_assert_cmphex(interface->vdev->device_type, ==, VIRTIO_ID_BLOCK); + + obj->get_driver = qvhost_user_blk_pci_get_driver; + +return obj; +} + +static void vhost_user_blk_register_nodes (void ) +{ +/* +* FIXME: every test using these two nodes needs to setup a +* -drive,id=drive0 otherwise QEMU is not going to start. +* Therefore, we do not include "produces" edge for virtio +* and pci-device yet. +*/ + +char *arg =g_strdup_printf ("id=drv0,chardev=char1,addr=%x.%x" , +PCI_SLOT ,PCI_FN ); + +QPCIAddress addr = { + .devfn =QPCI_DEVFN (PCI_SLOT ,PCI_FN ), + }; + +QOSGraphEdgeOptions opts = { }; + +/* virtio-blk-device */ +/** opts.extra_device_opts = "drive=drive0"; */ +qos_node_create_driver ("vhost-user-blk-device" , vhost_user_blk_device_create); +qos_node_consumes ("vhost-user-blk-device" ,"virtio-bus" , &opts); +qos_node_produces ("vhost-user-blk-device" ,"vhost-user-blk" ); + +/* virtio-blk-pci */ + opts.extra_device_opts = arg; +add_qpci_address (&opts, &addr); +qos_node_create_driver ("vhost-user-blk-pci" , vhost_user_blk_pci_create); +qos_node_consumes ("vhost-user-blk-pci" ,"pci-bus" , &opts); +qos_node_produces ("vhost-user-blk-pci" ,"vhost-user-blk" ); + +g_free (arg); +} + +libqos_init (vhost_user_blk_register_nodes);
tests/libqos/vhost-user-blk.h new file +44 -0
44 lines not on this page · raw message
tests/vhost-user-blk-test.c new file +694 -0
694 lines not on this page · raw message
--
2.25.0