From nobody Mon Feb 9 18:45:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600962493; cv=none; d=zohomail.com; s=zohoarc; b=nrQmhsHnPN6v9Gw5OE9da/rPfQkaRSxvKLHLlllD7UB5vF/yYsUGXS2SM2yOfhY4FK3W+d6bJmCoFj9aeEmwCTznIyx6ElVwPQ3Nt7Xi0U2H6TJReYXHDasUZEhjG11ETZIhIH+wT0SWTIiI4TbibPEomN9SQYVI63gzR+8SP5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600962493; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zIZj/wieORrZNqV6Knj43krVEYFypt6HxQRZDwMfogQ=; b=RyqgZ1LE2z3pqPXWME+XekgT/YUDWylRyb/7BL3vDbmxSRM/MHGrtQbjeY4V2ssLbDdgVYGfDGWrfA7t9Mq1Z3io5YtDzK77awpWBKpwVqVyCKpyrrC9RIu1m2buJeZxgB72/K+kHEQBsJ2SJnAZhJ3FYvlEOZNYtCqr3Ft79RE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600962493781186.24410592226002; Thu, 24 Sep 2020 08:48:13 -0700 (PDT) Received: from localhost ([::1]:37346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLTTg-0004fn-63 for importer@patchew.org; Thu, 24 Sep 2020 11:48:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLSzC-0006Pg-NL for qemu-devel@nongnu.org; Thu, 24 Sep 2020 11:16:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kLSz6-0003xA-R3 for qemu-devel@nongnu.org; Thu, 24 Sep 2020 11:16:42 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-02Tyw13BM7yRK1MEt0JTiw-1; Thu, 24 Sep 2020 11:16:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07AEA800475; Thu, 24 Sep 2020 15:16:31 +0000 (UTC) Received: from localhost (ovpn-114-5.ams2.redhat.com [10.36.114.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8791219C66; Thu, 24 Sep 2020 15:16:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600960596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zIZj/wieORrZNqV6Knj43krVEYFypt6HxQRZDwMfogQ=; b=OmwOJSXzXrc13eLhERZc3KSba2/ElKAplobj8VCsLz3GbGVPlJ7qfcCFJ2Jr1hPO+0ailz KRihpvvnud1v8a+22vXWYBXZb3Y6sxoA5v3sdS0h7UuiDjATRX7bRYdYl2LQ4eiZ76BVwe 1dDWX6wsUXseiIqooB2b7XjQ+hSl9Ow= X-MC-Unique: 02Tyw13BM7yRK1MEt0JTiw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 11/13] block/export: convert vhost-user-blk server to block export API Date: Thu, 24 Sep 2020 16:15:47 +0100 Message-Id: <20200924151549.913737-12-stefanha@redhat.com> In-Reply-To: <20200924151549.913737-1-stefanha@redhat.com> References: <20200924151549.913737-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/22 23:02:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.199, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, Markus Armbruster , Coiby Xu , Max Reitz , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Use the new QAPI block exports API instead of defining our own QOM objects. This is a large change because the lifecycle of VuBlockDev needs to follow BlockExportDriver. QOM properties are replaced by QAPI options objects. VuBlockDev is renamed VuBlkExport and contains a BlockExport field. Several fields can be dropped since BlockExport already has equivalents. The file names and meson build integration will be adjusted in a future patch. libvhost-user should probably be built as a static library that is linked into QEMU instead of as a .c file that results in duplicate compilation. The new command-line syntax is: $ qemu-storage-daemon \ --blockdev file,node-name=3Ddrive0,filename=3Dtest.img \ --export vhost-user-blk,node-name=3Ddrive0,id=3Dexport0,unix-socket= =3D/tmp/vhost-user-blk.sock Note that unix-socket is optional because we may wish to accept chardevs too in the future. Signed-off-by: Stefan Hajnoczi Acked-by: Markus Armbruster --- v2: * Replace str unix-socket with SocketAddress addr to match NBD and support file descriptor passing * Make addr mandatory [Markus] * Update vhost-user-blk-test.c to use --export syntax --- qapi/block-export.json | 21 +- block/export/vhost-user-blk-server.h | 23 +- block/export/export.c | 8 +- block/export/vhost-user-blk-server.c | 452 +++++++-------------------- tests/qtest/vhost-user-blk-test.c | 2 +- util/vhost-user-server.c | 10 +- block/export/meson.build | 1 + block/meson.build | 1 - 8 files changed, 158 insertions(+), 360 deletions(-) diff --git a/qapi/block-export.json b/qapi/block-export.json index ace0d66e17..2e44625bb1 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -84,6 +84,21 @@ 'data': { '*name': 'str', '*description': 'str', '*bitmap': 'str' } } =20 +## +# @BlockExportOptionsVhostUserBlk: +# +# A vhost-user-blk block export. +# +# @addr: The vhost-user socket on which to listen. Both 'unix' and 'fd' +# SocketAddress types are supported. Passed fds must be UNIX domain +# sockets. +# @logical-block-size: Logical block size in bytes. Defaults to 512 bytes. +# +# Since: 5.2 +## +{ 'struct': 'BlockExportOptionsVhostUserBlk', + 'data': { 'addr': 'SocketAddress', '*logical-block-size': 'size' } } + ## # @NbdServerAddOptions: # @@ -180,11 +195,12 @@ # An enumeration of block export types # # @nbd: NBD export +# @vhost-user-blk: vhost-user-blk export (since 5.2) # # Since: 4.2 ## { 'enum': 'BlockExportType', - 'data': [ 'nbd' ] } + 'data': [ 'nbd', 'vhost-user-blk' ] } =20 ## # @BlockExportOptions: @@ -213,7 +229,8 @@ '*writethrough': 'bool' }, 'discriminator': 'type', 'data': { - 'nbd': 'BlockExportOptionsNbd' + 'nbd': 'BlockExportOptionsNbd', + 'vhost-user-blk': 'BlockExportOptionsVhostUserBlk' } } =20 ## diff --git a/block/export/vhost-user-blk-server.h b/block/export/vhost-user= -blk-server.h index f06f37c4c8..fcf46fc8a5 100644 --- a/block/export/vhost-user-blk-server.h +++ b/block/export/vhost-user-blk-server.h @@ -10,27 +10,10 @@ =20 #ifndef VHOST_USER_BLK_SERVER_H #define VHOST_USER_BLK_SERVER_H -#include "util/vhost-user-server.h" =20 -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) +#include "block/export.h" =20 -/* vhost user block device */ -struct VuBlockDev { - Object parent_obj; - char *node_name; - SocketAddress *addr; - AioContext *ctx; - VuServer vu_server; - bool running; - uint32_t blk_size; - BlockBackend *backend; - QIOChannelSocket *sioc; - QTAILQ_ENTRY(VuBlockDev) next; - struct virtio_blk_config blkcfg; - bool writable; -}; +/* For block/export/export.c */ +extern const BlockExportDriver blk_exp_vhost_user_blk; =20 #endif /* VHOST_USER_BLK_SERVER_H */ diff --git a/block/export/export.c b/block/export/export.c index 87516d1e05..d0c7590911 100644 --- a/block/export/export.c +++ b/block/export/export.c @@ -17,6 +17,9 @@ #include "sysemu/block-backend.h" #include "block/export.h" #include "block/nbd.h" +#if CONFIG_LINUX +#include "block/export/vhost-user-blk-server.h" +#endif #include "qapi/error.h" #include "qapi/qapi-commands-block-export.h" #include "qapi/qapi-events-block-export.h" @@ -24,6 +27,9 @@ =20 static const BlockExportDriver *blk_exp_drivers[] =3D { &blk_exp_nbd, +#if CONFIG_LINUX + &blk_exp_vhost_user_blk, +#endif }; =20 /* Only accessed from the main thread */ @@ -123,7 +129,7 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Er= ror **errp) assert(drv->instance_size >=3D sizeof(BlockExport)); exp =3D g_malloc0(drv->instance_size); *exp =3D (BlockExport) { - .drv =3D &blk_exp_nbd, + .drv =3D drv, .refcount =3D 1, .user_owned =3D true, .id =3D g_strdup(export->id), diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user= -blk-server.c index 44d3c45fa2..91fc7040b2 100644 --- a/block/export/vhost-user-blk-server.c +++ b/block/export/vhost-user-blk-server.c @@ -11,6 +11,9 @@ */ #include "qemu/osdep.h" #include "block/block.h" +#include "contrib/libvhost-user/libvhost-user.h" +#include "standard-headers/linux/virtio_blk.h" +#include "util/vhost-user-server.h" #include "vhost-user-blk-server.h" #include "qapi/error.h" #include "qom/object_interfaces.h" @@ -24,7 +27,7 @@ struct virtio_blk_inhdr { unsigned char status; }; =20 -typedef struct VuBlockReq { +typedef struct VuBlkReq { VuVirtqElement elem; int64_t sector_num; size_t size; @@ -32,9 +35,19 @@ typedef struct VuBlockReq { struct virtio_blk_outhdr out; VuServer *server; struct VuVirtq *vq; -} VuBlockReq; +} VuBlkReq; =20 -static void vu_block_req_complete(VuBlockReq *req) +/* vhost user block device */ +typedef struct { + BlockExport export; + VuServer vu_server; + uint32_t blk_size; + QIOChannelSocket *sioc; + struct virtio_blk_config blkcfg; + bool writable; +} VuBlkExport; + +static void vu_blk_req_complete(VuBlkReq *req) { VuDev *vu_dev =3D &req->server->vu_dev; =20 @@ -45,14 +58,9 @@ static void vu_block_req_complete(VuBlockReq *req) free(req); } =20 -static VuBlockDev *get_vu_block_device_by_server(VuServer *server) -{ - return container_of(server, VuBlockDev, vu_server); -} - static int coroutine_fn -vu_block_discard_write_zeroes(VuBlockReq *req, struct iovec *iov, - uint32_t iovcnt, uint32_t type) +vu_blk_discard_write_zeroes(BlockBackend *blk, struct iovec *iov, + uint32_t iovcnt, uint32_t type) { struct virtio_blk_discard_write_zeroes desc; ssize_t size =3D iov_to_buf(iov, iovcnt, 0, &desc, sizeof(desc)); @@ -61,16 +69,14 @@ vu_block_discard_write_zeroes(VuBlockReq *req, struct i= ovec *iov, return -EINVAL; } =20 - VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(req->server); uint64_t range[2] =3D { le64_to_cpu(desc.sector) << 9, le32_to_cpu(desc.num_sectors) << 9 }; if (type =3D=3D VIRTIO_BLK_T_DISCARD) { - if (blk_co_pdiscard(vdev_blk->backend, range[0], range[1]) =3D=3D = 0) { + if (blk_co_pdiscard(blk, range[0], range[1]) =3D=3D 0) { return 0; } } else if (type =3D=3D VIRTIO_BLK_T_WRITE_ZEROES) { - if (blk_co_pwrite_zeroes(vdev_blk->backend, - range[0], range[1], 0) =3D=3D 0) { + if (blk_co_pwrite_zeroes(blk, range[0], range[1], 0) =3D=3D 0) { return 0; } } @@ -78,22 +84,15 @@ vu_block_discard_write_zeroes(VuBlockReq *req, struct i= ovec *iov, return -EINVAL; } =20 -static int coroutine_fn vu_block_flush(VuBlockReq *req) +static void coroutine_fn vu_blk_virtio_process_req(void *opaque) { - VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(req->server); - BlockBackend *backend =3D vdev_blk->backend; - return blk_co_flush(backend); -} - -static void coroutine_fn vu_block_virtio_process_req(void *opaque) -{ - VuBlockReq *req =3D opaque; + VuBlkReq *req =3D opaque; VuServer *server =3D req->server; VuVirtqElement *elem =3D &req->elem; uint32_t type; =20 - VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(server); - BlockBackend *backend =3D vdev_blk->backend; + VuBlkExport *vexp =3D container_of(server, VuBlkExport, vu_server); + BlockBackend *blk =3D vexp->export.blk; =20 struct iovec *in_iov =3D elem->in_sg; struct iovec *out_iov =3D elem->out_sg; @@ -133,16 +132,19 @@ static void coroutine_fn vu_block_virtio_process_req(= void *opaque) bool is_write =3D type & VIRTIO_BLK_T_OUT; req->sector_num =3D le64_to_cpu(req->out.sector); =20 - int64_t offset =3D req->sector_num * vdev_blk->blk_size; + if (is_write && !vexp->writable) { + req->in->status =3D VIRTIO_BLK_S_IOERR; + break; + } + + int64_t offset =3D req->sector_num * vexp->blk_size; QEMUIOVector qiov; if (is_write) { qemu_iovec_init_external(&qiov, out_iov, out_num); - ret =3D blk_co_pwritev(backend, offset, qiov.size, - &qiov, 0); + ret =3D blk_co_pwritev(blk, offset, qiov.size, &qiov, 0); } else { qemu_iovec_init_external(&qiov, in_iov, in_num); - ret =3D blk_co_preadv(backend, offset, qiov.size, - &qiov, 0); + ret =3D blk_co_preadv(blk, offset, qiov.size, &qiov, 0); } if (ret >=3D 0) { req->in->status =3D VIRTIO_BLK_S_OK; @@ -152,7 +154,7 @@ static void coroutine_fn vu_block_virtio_process_req(vo= id *opaque) break; } case VIRTIO_BLK_T_FLUSH: - if (vu_block_flush(req) =3D=3D 0) { + if (blk_co_flush(blk) =3D=3D 0) { req->in->status =3D VIRTIO_BLK_S_OK; } else { req->in->status =3D VIRTIO_BLK_S_IOERR; @@ -169,8 +171,13 @@ static void coroutine_fn vu_block_virtio_process_req(v= oid *opaque) case VIRTIO_BLK_T_DISCARD: case VIRTIO_BLK_T_WRITE_ZEROES: { int rc; - rc =3D vu_block_discard_write_zeroes(req, &elem->out_sg[1], - out_num, type); + + if (!vexp->writable) { + req->in->status =3D VIRTIO_BLK_S_IOERR; + break; + } + + rc =3D vu_blk_discard_write_zeroes(blk, &elem->out_sg[1], out_num,= type); if (rc =3D=3D 0) { req->in->status =3D VIRTIO_BLK_S_OK; } else { @@ -183,22 +190,22 @@ static void coroutine_fn vu_block_virtio_process_req(= void *opaque) break; } =20 - vu_block_req_complete(req); + vu_blk_req_complete(req); return; =20 err: - free(elem); + free(req); } =20 -static void vu_block_process_vq(VuDev *vu_dev, int idx) +static void vu_blk_process_vq(VuDev *vu_dev, int idx) { VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); VuVirtq *vq =3D vu_get_queue(vu_dev, idx); =20 while (1) { - VuBlockReq *req; + VuBlkReq *req; =20 - req =3D vu_queue_pop(vu_dev, vq, sizeof(VuBlockReq)); + req =3D vu_queue_pop(vu_dev, vq, sizeof(VuBlkReq)); if (!req) { break; } @@ -207,26 +214,26 @@ static void vu_block_process_vq(VuDev *vu_dev, int id= x) req->vq =3D vq; =20 Coroutine *co =3D - qemu_coroutine_create(vu_block_virtio_process_req, req); + qemu_coroutine_create(vu_blk_virtio_process_req, req); qemu_coroutine_enter(co); } } =20 -static void vu_block_queue_set_started(VuDev *vu_dev, int idx, bool starte= d) +static void vu_blk_queue_set_started(VuDev *vu_dev, int idx, bool started) { VuVirtq *vq; =20 assert(vu_dev); =20 vq =3D vu_get_queue(vu_dev, idx); - vu_set_queue_handler(vu_dev, vq, started ? vu_block_process_vq : NULL); + vu_set_queue_handler(vu_dev, vq, started ? vu_blk_process_vq : NULL); } =20 -static uint64_t vu_block_get_features(VuDev *dev) +static uint64_t vu_blk_get_features(VuDev *dev) { uint64_t features; VuServer *server =3D container_of(dev, VuServer, vu_dev); - VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(server); + VuBlkExport *vexp =3D container_of(server, VuBlkExport, vu_server); features =3D 1ull << VIRTIO_BLK_F_SIZE_MAX | 1ull << VIRTIO_BLK_F_SEG_MAX | 1ull << VIRTIO_BLK_F_TOPOLOGY | @@ -240,35 +247,35 @@ static uint64_t vu_block_get_features(VuDev *dev) 1ull << VIRTIO_RING_F_EVENT_IDX | 1ull << VHOST_USER_F_PROTOCOL_FEATURES; =20 - if (!vdev_blk->writable) { + if (!vexp->writable) { features |=3D 1ull << VIRTIO_BLK_F_RO; } =20 return features; } =20 -static uint64_t vu_block_get_protocol_features(VuDev *dev) +static uint64_t vu_blk_get_protocol_features(VuDev *dev) { return 1ull << VHOST_USER_PROTOCOL_F_CONFIG | 1ull << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD; } =20 static int -vu_block_get_config(VuDev *vu_dev, uint8_t *config, uint32_t len) +vu_blk_get_config(VuDev *vu_dev, uint8_t *config, uint32_t len) { + /* TODO blkcfg must be little-endian for VIRTIO 1.0 */ VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); - VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(server); - memcpy(config, &vdev_blk->blkcfg, len); - + VuBlkExport *vexp =3D container_of(server, VuBlkExport, vu_server); + memcpy(config, &vexp->blkcfg, len); return 0; } =20 static int -vu_block_set_config(VuDev *vu_dev, const uint8_t *data, +vu_blk_set_config(VuDev *vu_dev, const uint8_t *data, uint32_t offset, uint32_t size, uint32_t flags) { VuServer *server =3D container_of(vu_dev, VuServer, vu_dev); - VuBlockDev *vdev_blk =3D get_vu_block_device_by_server(server); + VuBlkExport *vexp =3D container_of(server, VuBlkExport, vu_server); uint8_t wce; =20 /* don't support live migration */ @@ -282,8 +289,8 @@ vu_block_set_config(VuDev *vu_dev, const uint8_t *data, } =20 wce =3D *data; - vdev_blk->blkcfg.wce =3D wce; - blk_set_enable_write_cache(vdev_blk->backend, wce); + vexp->blkcfg.wce =3D wce; + blk_set_enable_write_cache(vexp->export.blk, wce); return 0; } =20 @@ -295,7 +302,7 @@ vu_block_set_config(VuDev *vu_dev, const uint8_t *data, * of vu_process_message. * */ -static int vu_block_process_msg(VuDev *dev, VhostUserMsg *vmsg, int *do_re= ply) +static int vu_blk_process_msg(VuDev *dev, VhostUserMsg *vmsg, int *do_repl= y) { if (vmsg->request =3D=3D VHOST_USER_NONE) { dev->panic(dev, "disconnect"); @@ -304,29 +311,29 @@ static int vu_block_process_msg(VuDev *dev, VhostUser= Msg *vmsg, int *do_reply) return false; } =20 -static const VuDevIface vu_block_iface =3D { - .get_features =3D vu_block_get_features, - .queue_set_started =3D vu_block_queue_set_started, - .get_protocol_features =3D vu_block_get_protocol_features, - .get_config =3D vu_block_get_config, - .set_config =3D vu_block_set_config, - .process_msg =3D vu_block_process_msg, +static const VuDevIface vu_blk_iface =3D { + .get_features =3D vu_blk_get_features, + .queue_set_started =3D vu_blk_queue_set_started, + .get_protocol_features =3D vu_blk_get_protocol_features, + .get_config =3D vu_blk_get_config, + .set_config =3D vu_blk_set_config, + .process_msg =3D vu_blk_process_msg, }; =20 static void blk_aio_attached(AioContext *ctx, void *opaque) { - VuBlockDev *vub_dev =3D opaque; - vhost_user_server_attach_aio_context(&vub_dev->vu_server, ctx); + VuBlkExport *vexp =3D opaque; + vhost_user_server_attach_aio_context(&vexp->vu_server, ctx); } =20 static void blk_aio_detach(void *opaque) { - VuBlockDev *vub_dev =3D opaque; - vhost_user_server_detach_aio_context(&vub_dev->vu_server); + VuBlkExport *vexp =3D opaque; + vhost_user_server_detach_aio_context(&vexp->vu_server); } =20 static void -vu_block_initialize_config(BlockDriverState *bs, +vu_blk_initialize_config(BlockDriverState *bs, struct virtio_blk_config *config, uint32_t blk_= size) { config->capacity =3D bdrv_getlength(bs) >> BDRV_SECTOR_BITS; @@ -343,290 +350,67 @@ vu_block_initialize_config(BlockDriverState *bs, config->max_write_zeroes_seg =3D 1; } =20 -static VuBlockDev *vu_block_init(VuBlockDev *vu_block_device, Error **errp) +static void vu_blk_exp_request_shutdown(BlockExport *exp) { + VuBlkExport *vexp =3D container_of(exp, VuBlkExport, export); =20 - BlockBackend *blk; - Error *local_error =3D NULL; - const char *node_name =3D vu_block_device->node_name; - bool writable =3D vu_block_device->writable; - uint64_t perm =3D BLK_PERM_CONSISTENT_READ; - int ret; - - AioContext *ctx; - - BlockDriverState *bs =3D bdrv_lookup_bs(node_name, node_name, &local_e= rror); - - if (!bs) { - error_propagate(errp, local_error); - return NULL; - } - - if (bdrv_is_read_only(bs)) { - writable =3D false; - } - - if (writable) { - perm |=3D BLK_PERM_WRITE; - } - - ctx =3D bdrv_get_aio_context(bs); - aio_context_acquire(ctx); - bdrv_invalidate_cache(bs, NULL); - aio_context_release(ctx); - - /* - * Don't allow resize while the vhost user server is running, - * otherwise we don't care what happens with the node. - */ - blk =3D blk_new(bdrv_get_aio_context(bs), perm, - BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE_UNCHANGED | - BLK_PERM_WRITE | BLK_PERM_GRAPH_MOD); - ret =3D blk_insert_bs(blk, bs, errp); - - if (ret < 0) { - goto fail; - } - - blk_set_enable_write_cache(blk, false); - - blk_set_allow_aio_context_change(blk, true); - - vu_block_device->blkcfg.wce =3D 0; - vu_block_device->backend =3D blk; - if (!vu_block_device->blk_size) { - vu_block_device->blk_size =3D BDRV_SECTOR_SIZE; - } - vu_block_device->blkcfg.blk_size =3D vu_block_device->blk_size; - blk_set_guest_block_size(blk, vu_block_device->blk_size); - vu_block_initialize_config(bs, &vu_block_device->blkcfg, - vu_block_device->blk_size); - return vu_block_device; - -fail: - blk_unref(blk); - return NULL; -} - -static void vu_block_deinit(VuBlockDev *vu_block_device) -{ - if (vu_block_device->backend) { - blk_remove_aio_context_notifier(vu_block_device->backend, blk_aio_= attached, - blk_aio_detach, vu_block_device); - } - - blk_unref(vu_block_device->backend); -} - -static void vhost_user_blk_server_stop(VuBlockDev *vu_block_device) -{ - vhost_user_server_stop(&vu_block_device->vu_server); - vu_block_deinit(vu_block_device); -} - -static void vhost_user_blk_server_start(VuBlockDev *vu_block_device, - Error **errp) -{ - AioContext *ctx; - SocketAddress *addr =3D vu_block_device->addr; - - if (!vu_block_init(vu_block_device, errp)) { - return; - } - - ctx =3D bdrv_get_aio_context(blk_bs(vu_block_device->backend)); - - if (!vhost_user_server_start(&vu_block_device->vu_server, addr, ctx, - VHOST_USER_BLK_MAX_QUEUES, &vu_block_ifac= e, - errp)) { - goto error; - } - - blk_add_aio_context_notifier(vu_block_device->backend, blk_aio_attache= d, - blk_aio_detach, vu_block_device); - vu_block_device->running =3D true; - return; - - error: - vu_block_deinit(vu_block_device); -} - -static bool vu_prop_modifiable(VuBlockDev *vus, Error **errp) -{ - if (vus->running) { - error_setg(errp, "The property can't be modified " - "while the server is running"); - return false; - } - return true; -} - -static void vu_set_node_name(Object *obj, const char *value, Error **errp) -{ - VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); - - if (!vu_prop_modifiable(vus, errp)) { - return; - } - - if (vus->node_name) { - g_free(vus->node_name); - } - - vus->node_name =3D g_strdup(value); -} - -static char *vu_get_node_name(Object *obj, Error **errp) -{ - VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); - return g_strdup(vus->node_name); -} - -static void free_socket_addr(SocketAddress *addr) -{ - g_free(addr->u.q_unix.path); - g_free(addr); -} - -static void vu_set_unix_socket(Object *obj, const char *value, - Error **errp) -{ - VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); - - if (!vu_prop_modifiable(vus, errp)) { - return; - } - - if (vus->addr) { - free_socket_addr(vus->addr); - } - - SocketAddress *addr =3D g_new0(SocketAddress, 1); - addr->type =3D SOCKET_ADDRESS_TYPE_UNIX; - addr->u.q_unix.path =3D g_strdup(value); - vus->addr =3D addr; + vhost_user_server_stop(&vexp->vu_server); } =20 -static char *vu_get_unix_socket(Object *obj, Error **errp) +static int vu_blk_exp_create(BlockExport *exp, BlockExportOptions *opts, + Error **errp) { - VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); - return g_strdup(vus->addr->u.q_unix.path); -} - -static bool vu_get_block_writable(Object *obj, Error **errp) -{ - VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); - return vus->writable; -} - -static void vu_set_block_writable(Object *obj, bool value, Error **errp) -{ - VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); - - if (!vu_prop_modifiable(vus, errp)) { - return; - } - - vus->writable =3D value; -} - -static void vu_get_blk_size(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); - uint32_t value =3D vus->blk_size; - - visit_type_uint32(v, name, &value, errp); -} - -static void vu_set_blk_size(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - VuBlockDev *vus =3D VHOST_USER_BLK_SERVER(obj); - + VuBlkExport *vexp =3D container_of(exp, VuBlkExport, export); + BlockExportOptionsVhostUserBlk *vu_opts =3D &opts->u.vhost_user_blk; Error *local_err =3D NULL; - uint32_t value; + uint64_t logical_block_size; =20 - if (!vu_prop_modifiable(vus, errp)) { - return; - } + vexp->writable =3D opts->writable; + vexp->blkcfg.wce =3D 0; =20 - visit_type_uint32(v, name, &value, &local_err); - if (local_err) { - goto out; + if (vu_opts->has_logical_block_size) { + logical_block_size =3D vu_opts->logical_block_size; + } else { + logical_block_size =3D BDRV_SECTOR_SIZE; } - - check_block_size(object_get_typename(obj), name, value, &local_err); + check_block_size(exp->id, "logical-block-size", logical_block_size, + &local_err); if (local_err) { - goto out; + error_propagate(errp, local_err); + return -EINVAL; + } + vexp->blk_size =3D logical_block_size; + blk_set_guest_block_size(exp->blk, logical_block_size); + vu_blk_initialize_config(blk_bs(exp->blk), &vexp->blkcfg, + logical_block_size); + + blk_set_allow_aio_context_change(exp->blk, true); + blk_add_aio_context_notifier(exp->blk, blk_aio_attached, blk_aio_detac= h, + vexp); + + if (!vhost_user_server_start(&vexp->vu_server, vu_opts->addr, exp->ctx, + VHOST_USER_BLK_MAX_QUEUES, &vu_blk_iface, + errp)) { + blk_remove_aio_context_notifier(exp->blk, blk_aio_attached, + blk_aio_detach, vexp); + return -EADDRNOTAVAIL; } =20 - vus->blk_size =3D value; - -out: - error_propagate(errp, local_err); -} - -static void vhost_user_blk_server_instance_finalize(Object *obj) -{ - VuBlockDev *vub =3D VHOST_USER_BLK_SERVER(obj); - - vhost_user_blk_server_stop(vub); - - /* - * Unlike object_property_add_str, object_class_property_add_str - * doesn't have a release method. Thus manual memory freeing is - * needed. - */ - free_socket_addr(vub->addr); - g_free(vub->node_name); -} - -static void vhost_user_blk_server_complete(UserCreatable *obj, Error **err= p) -{ - VuBlockDev *vub =3D VHOST_USER_BLK_SERVER(obj); - - vhost_user_blk_server_start(vub, errp); + return 0; } =20 -static void vhost_user_blk_server_class_init(ObjectClass *klass, - void *class_data) +static void vu_blk_exp_delete(BlockExport *exp) { - UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(klass); - ucc->complete =3D vhost_user_blk_server_complete; - - object_class_property_add_bool(klass, "writable", - vu_get_block_writable, - vu_set_block_writable); - - object_class_property_add_str(klass, "node-name", - vu_get_node_name, - vu_set_node_name); - - object_class_property_add_str(klass, "unix-socket", - vu_get_unix_socket, - vu_set_unix_socket); + VuBlkExport *vexp =3D container_of(exp, VuBlkExport, export); =20 - object_class_property_add(klass, "logical-block-size", "uint32", - vu_get_blk_size, vu_set_blk_size, - NULL, NULL); + blk_remove_aio_context_notifier(exp->blk, blk_aio_attached, blk_aio_de= tach, + vexp); } =20 -static const TypeInfo vhost_user_blk_server_info =3D { - .name =3D TYPE_VHOST_USER_BLK_SERVER, - .parent =3D TYPE_OBJECT, - .instance_size =3D sizeof(VuBlockDev), - .instance_finalize =3D vhost_user_blk_server_instance_finalize, - .class_init =3D vhost_user_blk_server_class_init, - .interfaces =3D (InterfaceInfo[]) { - {TYPE_USER_CREATABLE}, - {} - }, +const BlockExportDriver blk_exp_vhost_user_blk =3D { + .type =3D BLOCK_EXPORT_TYPE_VHOST_USER_BLK, + .instance_size =3D sizeof(VuBlkExport), + .create =3D vu_blk_exp_create, + .delete =3D vu_blk_exp_delete, + .request_shutdown =3D vu_blk_exp_request_shutdown, }; - -static void vhost_user_blk_server_register_types(void) -{ - type_register_static(&vhost_user_blk_server_info); -} - -type_init(vhost_user_blk_server_register_types) diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk= -test.c index d4ccac6b54..42e4cfde82 100644 --- a/tests/qtest/vhost-user-blk-test.c +++ b/tests/qtest/vhost-user-blk-test.c @@ -674,7 +674,7 @@ static char *start_vhost_user_blk(GString *cmd_line, in= t vus_instances) img_path =3D drive_create(); g_string_append_printf(storage_daemon_command, "--blockdev driver=3Dfile,node-name=3Ddisk%d,filename=3D%s " - "--object vhost-user-blk-server,id=3Ddisk%d,unix-socket=3D%s," + "--export type=3Dvhost-user-blk,id=3Ddisk%d,addr.type=3Dunix,a= ddr.path=3D%s," "node-name=3Ddisk%i,writable=3Don ", i, img_path, i, sock_path, i); =20 diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c index d8b8c08b5f..2a27139eb8 100644 --- a/util/vhost-user-server.c +++ b/util/vhost-user-server.c @@ -408,7 +408,15 @@ bool vhost_user_server_start(VuServer *server, Error **errp) { QEMUBH *bh; - QIONetListener *listener =3D qio_net_listener_new(); + QIONetListener *listener; + + if (socket_addr->type !=3D SOCKET_ADDRESS_TYPE_UNIX && + socket_addr->type !=3D SOCKET_ADDRESS_TYPE_FD) { + error_setg(errp, "Only socket address types 'unix' and 'fd' are su= pported"); + return false; + } + + listener =3D qio_net_listener_new(); if (qio_net_listener_open_sync(listener, socket_addr, 1, errp) < 0) { object_unref(OBJECT(listener)); diff --git a/block/export/meson.build b/block/export/meson.build index 558ef35d38..ef3a9576f7 100644 --- a/block/export/meson.build +++ b/block/export/meson.build @@ -1 +1,2 @@ block_ss.add(files('export.c')) +block_ss.add(when: 'CONFIG_LINUX', if_true: files('vhost-user-blk-server.c= ', '../../contrib/libvhost-user/libvhost-user.c')) diff --git a/block/meson.build b/block/meson.build index cd52104c84..0b38dc36f7 100644 --- a/block/meson.build +++ b/block/meson.build @@ -60,7 +60,6 @@ block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-w= in32.c', 'win32-aio.c') block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref,= iokit]) block_ss.add(when: 'CONFIG_LIBISCSI', if_true: files('iscsi-opts.c')) block_ss.add(when: 'CONFIG_LINUX', if_true: files('nvme.c')) -block_ss.add(when: 'CONFIG_LINUX', if_true: files('export/vhost-user-blk-s= erver.c', '../contrib/libvhost-user/libvhost-user.c')) block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c')) block_ss.add(when: 'CONFIG_SHEEPDOG', if_true: files('sheepdog.c')) block_ss.add(when: ['CONFIG_LINUX_AIO', libaio], if_true: files('linux-aio= .c')) --=20 2.26.2