Add virtio-fs (experimental)
PATCH v3 1/3 virtio: Add virito_fs linux headers
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Pull in the virtio_fs.h linux header and the constant for the virtiofs ID.
--- include/standard-headers/linux/virtio_fs.h | 41 +++++++++++++++++++++ include/standard-headers/linux/virtio_ids.h | 1 + 2 files changed, 42 insertions(+) create mode 100644 include/standard-headers/linux/virtio_fs.h
include/standard-headers/linux/virtio_fs.h new file +41 -0
@@ -0,0 +1,41 @@ +#ifndef _LINUX_VIRTIO_FS_H +#define _LINUX_VIRTIO_FS_H +/* This header is BSD licensed so anyone can use the definitions to implement +* compatible drivers/servers. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of IBM nor the names of its contributors +* may be used to endorse or promote products derived from this software +* without specific prior written permission. +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND +* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE +* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +* SUCH DAMAGE. */ +#include "standard-headers/linux/types.h" +#include "standard-headers/linux/virtio_ids.h" +#include "standard-headers/linux/virtio_config.h" +#include "standard-headers/linux/virtio_types.h" + +struct virtio_fs_config { +/* Filesystem name (UTF-8, not NUL-terminated, padded with NULs) */ +uint8_t tag[36 ]; + +/* Number of request queues */ +uint32_t num_request_queues; +}QEMU_PACKED ; + +#endif /* _LINUX_VIRTIO_FS_H */
include/standard-headers/linux/virtio_ids.h +1 -0
@@ -43,6 +43,7 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_FS 26/* virtio filesystem */ #define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */
Signature · 1 line
2.21.0
PATCH v3 2/3 virtio: add vhost-user-fs base device
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
The virtio-fs virtio device provides shared file system access using the FUSE protocol carried over virtio.
The actual file server is implemented in an external vhost-user-fs device backend process.
--- configure | 13 ++ hw/virtio/Makefile.objs | 1 + hw/virtio/vhost-user-fs.c | 299 ++++++++++++++++++++++++++++++ include/hw/virtio/vhost-user-fs.h | 45 +++++ 4 files changed, 358 insertions(+) create mode 100644 hw/virtio/vhost-user-fs.c create mode 100644 include/hw/virtio/vhost-user-fs.h
configure +13 -0
@@ -382,6 +382,7 @@ vhost_crypto="" vhost_scsi="" vhost_vsock="" vhost_user="" +vhost_user_fs="" kvm="no" hax="no" hvf="no"
@@ -1294,6 +1295,10 @@ for opt do ;; --enable-vhost-vsock) vhost_vsock="yes" ;; + --disable-vhost-user-fs) vhost_user_fs="no" + ;; + --enable-vhost-user-fs) vhost_user_fs="yes" + ;; --disable-opengl) opengl="no" ;; --enable-opengl) opengl="yes"
@@ -2232,6 +2237,10 @@ test "$vhost_crypto" = "" && vhost_crypto=$vhost_user if test "$vhost_crypto" = "yes" && test "$vhost_user" = "no"; then error_exit "--enable-vhost-crypto requires --enable-vhost-user" fi +test "$vhost_user_fs" = "" && vhost_user_fs=$vhost_user +if test "$vhost_user_fs" = "yes" && test "$vhost_user" = "no"; then + error_exit "--enable-vhost-user-fs requires --enable-vhost-user" +fi # OR the vhost-kernel and vhost-user values for simplicity if test "$vhost_net" = ""; then
@@ -6374,6 +6383,7 @@ echo "vhost-crypto support $vhost_crypto" echo "vhost-scsi support $vhost_scsi" echo "vhost-vsock support $vhost_vsock" echo "vhost-user support $vhost_user" +echo "vhost-user-fs support $vhost_user_fs" echo "Trace backends $trace_backends" if have_backend "simple"; then echo "Trace output file $trace_file-<pid>"
@@ -6873,6 +6883,9 @@ fi if test "$vhost_user" = "yes" ; then echo "CONFIG_VHOST_USER=y" >> $config_host_mak fi +if test "$vhost_user_fs" = "yes" ; then + echo "CONFIG_VHOST_USER_FS=y" >> $config_host_mak +fi if test "$blobs" = "yes" ; then echo "INSTALL_BLOBS=yes" >> $config_host_mak fi
hw/virtio/Makefile.objs +1 -0
@@ -11,6 +11,7 @@ common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o common-obj-$(CONFIG_VIRTIO_MMIO) += virtio-mmio.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon.o obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-crypto.o +obj-$(CONFIG_VHOST_USER_FS) += vhost-user-fs.o obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) += virtio-pmem-pci.o
hw/virtio/vhost-user-fs.c new file +299 -0
299 lines not on this page · raw message
include/hw/virtio/vhost-user-fs.h new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
2.21.0
v3 cover Add virtio-fs (experimental)
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This set of patches adds the core of the virtio-fs support to qemu;
it's marked experimental since the kernel patch isn't in yet; but it's nearly there; the spec has passed the voting stage, and the kernel changes are queued in fuse-next.
A future set of patches will add the optional DAX mapping support.
The actual qemu change is pretty minimal, since it's really only
a virtio device with some queues.
Some links:
Mailing list: https://www.redhat.com/mailman/listinfo/virtio-fs
Dev tree: Including filesystem daemon: https://gitlab.com/virtio-fs/qemu
kernel:
dev world:
https://gitlab.com/virtio-fs/linux
fuse next:
https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git/log/?h=for-next
virtio spec changes:
https://lists.oasis-open.org/archives/virtio-dev/201908/msg00112.html
v3
Split the kernel header update out
The contents correspond to the fuse-next world+a patch Stefan just sent to make that use the newer 'num_request_queues' name
Update copyright year,
Remove the assert in vuf_handle_output
the virtio core code sometimes calls it during cleanup if the daemon dies first
(I've not changed the comment about guest_notifier_mask/virtio-pci
since that's copied in a bunch of virtio code going back ~5 years)
Dr. David Alan Gilbert (3):
virtio: Add virito_fs linux headers
virtio: add vhost-user-fs base device
virtio: add vhost-user-fs-pci device
configure | 13 + hw/virtio/Makefile.objs | 2 + hw/virtio/vhost-user-fs-pci.c | 85 ++++++ hw/virtio/vhost-user-fs.c | 299 ++++++++++++++++++++ include/hw/virtio/vhost-user-fs.h | 45 +++ include/standard-headers/linux/virtio_fs.h | 41 +++ include/standard-headers/linux/virtio_ids.h | 1 + 7 files changed, 486 insertions(+) create mode 100644 hw/virtio/vhost-user-fs-pci.c create mode 100644 hw/virtio/vhost-user-fs.c create mode 100644 include/hw/virtio/vhost-user-fs.h create mode 100644 include/standard-headers/linux/virtio_fs.h
Signature · 1 line
2.21.0
PATCH v3 3/3 virtio: add vhost-user-fs-pci device
From: "Dr. David Alan Gilbert" <[email protected]>
Add the PCI version of vhost-user-fs.
Launch QEMU like this:
qemu -chardev socket,path=/tmp/vhost-fs.sock,id=chr0
-device x-vhost-user-fs-pci,tag=myfs,chardev=chr0
--- hw/virtio/Makefile.objs | 1 + hw/virtio/vhost-user-fs-pci.c | 85 +++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 hw/virtio/vhost-user-fs-pci.c
hw/virtio/Makefile.objs +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_VHOST_USER_FS) += vhost-user-fs.o obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) += virtio-pmem-pci.o +obj-$(call land,$(CONFIG_VHOST_USER_FS),$(CONFIG_VIRTIO_PCI)) += vhost-user-fs-pci.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o ifeq ($(CONFIG_VIRTIO_PCI),y)
hw/virtio/vhost-user-fs-pci.c new file +85 -0
85 lines not on this page · raw message
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH v3 3/3] virtio: add vhost-user-fs-pci device
Quoted 86 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add the PCI version of vhost-user-fs.
Launch QEMU like this:
qemu -chardev socket,path=/tmp/vhost-fs.sock,id=chr0
-device x-vhost-user-fs-pci,tag=myfs,chardev=chr0Signed-off-by Stefan Hajnoczi <[email protected]>Signed-off-by Sebastien Boeuf <[email protected]>Signed-off-by Dr. David Alan Gilbert <[email protected]>Reviewed-by Cornelia Huck <[email protected]>--- hw/virtio/Makefile.objs | 1 + hw/virtio/vhost-user-fs-pci.c | 85 +++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 hw/virtio/vhost-user-fs-pci.chw/virtio/Makefile.objs +1
-0@@ -15,6 +15,7 @@ obj-$(CONFIG_VHOST_USER_FS) += vhost-user-fs.o obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) += virtio-pmem-pci.o +obj-$(call land,$(CONFIG_VHOST_USER_FS),$(CONFIG_VIRTIO_PCI)) += vhost-user-fs-pci.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o ifeq ($(CONFIG_VIRTIO_PCI),y)hw/virtio/vhost-user-fs-pci.c new file +49
-0@@ -0,0 +1,85 @@ +/* +* Vhost-user filesystem virtio device PCI glue +* +* Copyright 2018-2019 Red Hat, Inc. +* +* Authors: +* Dr. David Alan Gilbert <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or +* (at your option) any later version. See the COPYING file in the +* top-level directory. +*/ + +#include "qemu/osdep.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/vhost-user-fs.h" +#include "virtio-pci.h" + +struct VHostUserFSPCI { +VirtIOPCIProxy parent_obj; +VHostUserFS vdev; +}; + +typedef struct VHostUserFSPCI VHostUserFSPCI ; + +#define TYPE_VHOST_USER_FS_PCI "vhost-user-fs-pci-base" + +#define VHOST_USER_FS_PCI (obj) \ + OBJECT_CHECK(VHostUserFSPCI, (obj), TYPE_VHOST_USER_FS_PCI) + +static Property vhost_user_fs_pci_properties[] = { +DEFINE_PROP_UINT32 ("vectors" , VirtIOPCIProxy, nvectors, +DEV_NVECTORS_UNSPECIFIED ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void vhost_user_fs_pci_realize (VirtIOPCIProxy *vpci_dev,Error **errp) +{ +VHostUserFSPCI *dev =VHOST_USER_FS_PCI (vpci_dev); +DeviceState *vdev =DEVICE (&dev->vdev); + +if (vpci_dev->nvectors ==DEV_NVECTORS_UNSPECIFIED ) { + vpci_dev->nvectors = dev->vdev.conf.num_request_queues +1 ; + } + +qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); +object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +} +
hw/virtio/vhost-user-fs-pci.c line 59
Quoted 10 lines
hw/virtio/vhost-user-fs-pci.c new file +10
-0+static void vhost_user_fs_pci_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +VirtioPCIClass *k =VIRTIO_PCI_CLASS (klass); +PCIDeviceClass *pcidev_k =PCI_DEVICE_CLASS (klass); + k->realize = vhost_user_fs_pci_realize; +set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); + dc->props = vhost_user_fs_pci_properties; + pcidev_k->vendor_id =PCI_VENDOR_ID_REDHAT_QUMRANET ; + pcidev_k->device_id =0 ;/* Set by virtio-pci based on virtio id */
Why not set *PCI_DEVICE_ID_VIRTIO_FS* here just like virtio_blk? I'm not very familiar with this code, and just compare it with the other same logic.
Thanks,
Jun
Re: [Qemu-devel] [PATCH v3 2/3] virtio: add vhost-user-fs base device
In reply to Dr. David Alan Gilbert (git)Quoted 313 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
The virtio-fs virtio device provides shared file system access using the FUSE protocol carried over virtio.
The actual file server is implemented in an external vhost-user-fs device backend process.Signed-off-by Stefan Hajnoczi <[email protected]>Signed-off-by Sebastien Boeuf <[email protected]>Signed-off-by Dr. David Alan Gilbert <[email protected]>--- configure | 13 ++ hw/virtio/Makefile.objs | 1 + hw/virtio/vhost-user-fs.c | 299 ++++++++++++++++++++++++++++++ include/hw/virtio/vhost-user-fs.h | 45 +++++ 4 files changed, 358 insertions(+) create mode 100644 hw/virtio/vhost-user-fs.c create mode 100644 include/hw/virtio/vhost-user-fs.hconfigure +13
-0@@ -382,6 +382,7 @@ vhost_crypto="" vhost_scsi="" vhost_vsock="" vhost_user="" +vhost_user_fs="" kvm="no" hax="no" hvf="no"@@ -1294,6 +1295,10 @@ for opt do ;; --enable-vhost-vsock) vhost_vsock="yes" ;; + --disable-vhost-user-fs) vhost_user_fs="no" + ;; + --enable-vhost-user-fs) vhost_user_fs="yes" + ;; --disable-opengl) opengl="no" ;; --enable-opengl) opengl="yes"@@ -2232,6 +2237,10 @@ test "$vhost_crypto" = "" && vhost_crypto=$vhost_user if test "$vhost_crypto" = "yes" && test "$vhost_user" = "no"; then error_exit "--enable-vhost-crypto requires --enable-vhost-user" fi +test "$vhost_user_fs" = "" && vhost_user_fs=$vhost_user +if test "$vhost_user_fs" = "yes" && test "$vhost_user" = "no"; then + error_exit "--enable-vhost-user-fs requires --enable-vhost-user" +fi # OR the vhost-kernel and vhost-user values for simplicity if test "$vhost_net" = ""; then@@ -6374,6 +6383,7 @@ echo "vhost-crypto support $vhost_crypto" echo "vhost-scsi support $vhost_scsi" echo "vhost-vsock support $vhost_vsock" echo "vhost-user support $vhost_user" +echo "vhost-user-fs support $vhost_user_fs" echo "Trace backends $trace_backends" if have_backend "simple"; then echo "Trace output file $trace_file-<pid>"@@ -6873,6 +6883,9 @@ fi if test "$vhost_user" = "yes" ; then echo "CONFIG_VHOST_USER=y" >> $config_host_mak fi +if test "$vhost_user_fs" = "yes" ; then + echo "CONFIG_VHOST_USER_FS=y" >> $config_host_mak +fi if test "$blobs" = "yes" ; then echo "INSTALL_BLOBS=yes" >> $config_host_mak fihw/virtio/Makefile.objs +1
-0@@ -11,6 +11,7 @@ common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o common-obj-$(CONFIG_VIRTIO_MMIO) += virtio-mmio.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon.o obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-crypto.o +obj-$(CONFIG_VHOST_USER_FS) += vhost-user-fs.o obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) += virtio-pmem-pci.ohw/virtio/vhost-user-fs.c new file +224
-0@@ -0,0 +1,299 @@ +/* +* Vhost-user filesystem virtio device +* +* Copyright 2018-2019 Red Hat, Inc. +* +* Authors: +* Stefan Hajnoczi <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or +* (at your option) any later version. See the COPYING file in the +* top-level directory. +*/ + +#include "qemu/osdep.h" +#include <sys/ioctl.h> +#include "standard-headers/linux/virtio_fs.h" +#include "qapi/error.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/virtio-bus.h" +#include "hw/virtio/virtio-access.h" +#include "qemu/error-report.h" +#include "hw/virtio/vhost-user-fs.h" +#include "monitor/monitor.h" + +static void vuf_get_config (VirtIODevice *vdev,uint8_t *config) +{ +VHostUserFS *fs =VHOST_USER_FS (vdev); +struct virtio_fs_config fscfg = {}; + +memcpy ((char *)fscfg.tag, fs->conf.tag, +MIN (strlen (fs->conf.tag) +1 ,sizeof (fscfg.tag))); + +virtio_stl_p (vdev, &fscfg.num_request_queues, fs->conf.num_request_queues); + +memcpy (config, &fscfg,sizeof (fscfg)); +} + +static void vuf_start (VirtIODevice *vdev) +{ +VHostUserFS *fs =VHOST_USER_FS (vdev); +BusState *qbus =BUS (qdev_get_parent_bus (DEVICE (vdev))); +VirtioBusClass *k =VIRTIO_BUS_GET_CLASS (qbus); +int ret; +int i; + +if (!k->set_guest_notifiers) { +error_report ("binding does not support guest notifiers" ); +return ; + } + + ret =vhost_dev_enable_notifiers (&fs->vhost_dev, vdev); +if (ret <0 ) { +error_report ("Error enabling host notifiers: %d" , -ret); +return ; + } + + ret = k->set_guest_notifiers (qbus->parent, fs->vhost_dev.nvqs, true); +if (ret <0 ) { +error_report ("Error binding guest notifier: %d" , -ret); + goto err_host_notifiers; + } + + fs->vhost_dev.acked_features = vdev->guest_features; + ret =vhost_dev_start (&fs->vhost_dev, vdev); +if (ret <0 ) { +error_report ("Error starting vhost: %d" , -ret); + goto err_guest_notifiers; + } + +/* +* guest_notifier_mask/pending not used yet, so just unmask +* everything here. virtio-pci will do the right thing by +* enabling/disabling irqfd. +*/ +for (i =0 ; i < fs->vhost_dev.nvqs; i++) { +vhost_virtqueue_mask (&fs->vhost_dev, vdev, i, false); + } + +return ; + +err_guest_notifiers: + k->set_guest_notifiers (qbus->parent, fs->vhost_dev.nvqs, false); +err_host_notifiers: +vhost_dev_disable_notifiers (&fs->vhost_dev, vdev); +} + +static void vuf_stop (VirtIODevice *vdev) +{ +VHostUserFS *fs =VHOST_USER_FS (vdev); +BusState *qbus =BUS (qdev_get_parent_bus (DEVICE (vdev))); +VirtioBusClass *k =VIRTIO_BUS_GET_CLASS (qbus); +int ret; + +if (!k->set_guest_notifiers) { +return ; + } + +vhost_dev_stop (&fs->vhost_dev, vdev); + + ret = k->set_guest_notifiers (qbus->parent, fs->vhost_dev.nvqs, false); +if (ret <0 ) { +error_report ("vhost guest notifier cleanup failed: %d" , ret); +return ; + } + +vhost_dev_disable_notifiers (&fs->vhost_dev, vdev); +} + +static void vuf_set_status (VirtIODevice *vdev,uint8_t status) +{ +VHostUserFS *fs =VHOST_USER_FS (vdev); +bool should_start = status &VIRTIO_CONFIG_S_DRIVER_OK ; + +if (!vdev->vm_running) { + should_start = false; + } + +if (fs->vhost_dev.started == should_start) { +return ; + } + +if (should_start) { +vuf_start (vdev); + }else { +vuf_stop (vdev); + } +} + +static uint64_t vuf_get_features (VirtIODevice *vdev, +uint64_t requested_features, +Error **errp) +{ +/* No feature bits used yet */ +return requested_features; +} + +static void vuf_handle_output (VirtIODevice *vdev,VirtQueue *vq) +{ +/* +* Not normally called; it's the daemon that handles the queue; +* however virtio's cleanup path can call this. +*/ +} + +static void vuf_guest_notifier_mask (VirtIODevice *vdev,int idx, +bool mask) +{ +VHostUserFS *fs =VHOST_USER_FS (vdev); + +vhost_virtqueue_mask (&fs->vhost_dev, vdev, idx, mask); +} + +static bool vuf_guest_notifier_pending (VirtIODevice *vdev,int idx) +{ +VHostUserFS *fs =VHOST_USER_FS (vdev); + +return vhost_virtqueue_pending (&fs->vhost_dev, idx); +} + +static void vuf_device_realize (DeviceState *dev,Error **errp) +{ +VirtIODevice *vdev =VIRTIO_DEVICE (dev); +VHostUserFS *fs =VHOST_USER_FS (dev); +unsigned int i; +size_t len; +int ret; + +if (!fs->conf.chardev.chr) { +error_setg (errp,"missing chardev" ); +return ; + } + +if (!fs->conf.tag) { +error_setg (errp,"missing tag property" ); +return ; + } + len =strlen (fs->conf.tag); +if (len ==0 ) { +error_setg (errp,"tag property cannot be empty" ); +return ; + } + if (len > sizeof_field(struct virtio_fs_config, tag)) { +error_setg (errp,"tag property must be %zu bytes or less" , + sizeof_field(struct virtio_fs_config, tag)); +return ; + } + +if (fs->conf.num_request_queues ==0 ) { +error_setg (errp,"num-request-queues property must be larger than 0" ); +return ; + } + +if (!is_power_of_2 (fs->conf.queue_size)) { +error_setg (errp,"queue-size property must be a power of 2" ); +return ; + } + +if (fs->conf.queue_size >VIRTQUEUE_MAX_SIZE ) { +error_setg (errp,"queue-size property must be %u or smaller" , +VIRTQUEUE_MAX_SIZE ); +return ; + } + +if (!vhost_user_init (&fs->vhost_user, &fs->conf.chardev, errp)) { +return ; + } + +virtio_init (vdev,"vhost-user-fs" ,VIRTIO_ID_FS , +sizeof (struct virtio_fs_config )); + +/* Hiprio queue */ +virtio_add_queue (vdev, fs->conf.queue_size, vuf_handle_output); + +/* Request queues */ +for (i =0 ; i < fs->conf.num_request_queues; i++) { +virtio_add_queue (vdev, fs->conf.queue_size, vuf_handle_output); + } + +/* 1 high prio queue, plus the number configured */ + fs->vhost_dev.nvqs =1 + fs->conf.num_request_queues; + fs->vhost_dev.vqs = g_new0(struct vhost_virtqueue, fs->vhost_dev.nvqs); + ret =vhost_dev_init (&fs->vhost_dev, &fs->vhost_user, +VHOST_BACKEND_TYPE_USER ,0 ); +if (ret <0 ) {
hw/virtio/vhost-user-fs.c line 234
Quoted 10 lines
hw/virtio/vhost-user-fs.c new file +10
-0+error_setg_errno (errp, -ret,"vhost_dev_init failed" ); + goto err_virtio; + } + +return ; + +err_virtio: +vhost_user_cleanup (&fs->vhost_user); +virtio_cleanup (vdev); +g_free (fs->vhost_dev.vqs);
Adding 'fs->vhost_dev.vqs = NULL;' looks better.
Jun
Re: [Qemu-devel] [PATCH v3 3/3] virtio: add vhost-user-fs-pci device
In reply to piaojunQuoted 95 lines · piaojun
Quoted 92 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Add the PCI version of vhost-user-fs.
Launch QEMU like this:
qemu -chardev socket,path=/tmp/vhost-fs.sock,id=chr0
-device x-vhost-user-fs-pci,tag=myfs,chardev=chr0Signed-off-by Stefan Hajnoczi <[email protected]>Signed-off-by Sebastien Boeuf <[email protected]>Signed-off-by Dr. David Alan Gilbert <[email protected]>Reviewed-by Cornelia Huck <[email protected]>--- hw/virtio/Makefile.objs | 1 + hw/virtio/vhost-user-fs-pci.c | 85 +++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 hw/virtio/vhost-user-fs-pci.chw/virtio/Makefile.objs +1
-0@@ -15,6 +15,7 @@ obj-$(CONFIG_VHOST_USER_FS) += vhost-user-fs.o obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o obj-$(CONFIG_VIRTIO_PMEM) += virtio-pmem.o common-obj-$(call land,$(CONFIG_VIRTIO_PMEM),$(CONFIG_VIRTIO_PCI)) += virtio-pmem-pci.o +obj-$(call land,$(CONFIG_VHOST_USER_FS),$(CONFIG_VIRTIO_PCI)) += vhost-user-fs-pci.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o ifeq ($(CONFIG_VIRTIO_PCI),y)hw/virtio/vhost-user-fs-pci.c new file +55
-0@@ -0,0 +1,85 @@ +/* +* Vhost-user filesystem virtio device PCI glue +* +* Copyright 2018-2019 Red Hat, Inc. +* +* Authors: +* Dr. David Alan Gilbert <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or +* (at your option) any later version. See the COPYING file in the +* top-level directory. +*/ + +#include "qemu/osdep.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/vhost-user-fs.h" +#include "virtio-pci.h" + +struct VHostUserFSPCI { +VirtIOPCIProxy parent_obj; +VHostUserFS vdev; +}; + +typedef struct VHostUserFSPCI VHostUserFSPCI ; + +#define TYPE_VHOST_USER_FS_PCI "vhost-user-fs-pci-base" + +#define VHOST_USER_FS_PCI (obj) \ + OBJECT_CHECK(VHostUserFSPCI, (obj), TYPE_VHOST_USER_FS_PCI) + +static Property vhost_user_fs_pci_properties[] = { +DEFINE_PROP_UINT32 ("vectors" , VirtIOPCIProxy, nvectors, +DEV_NVECTORS_UNSPECIFIED ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void vhost_user_fs_pci_realize (VirtIOPCIProxy *vpci_dev,Error **errp) +{ +VHostUserFSPCI *dev =VHOST_USER_FS_PCI (vpci_dev); +DeviceState *vdev =DEVICE (&dev->vdev); + +if (vpci_dev->nvectors ==DEV_NVECTORS_UNSPECIFIED ) { + vpci_dev->nvectors = dev->vdev.conf.num_request_queues +1 ; + } + +qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus)); +object_property_set_bool (OBJECT (vdev), true,"realized" , errp); +} + +static void vhost_user_fs_pci_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +VirtioPCIClass *k =VIRTIO_PCI_CLASS (klass); +PCIDeviceClass *pcidev_k =PCI_DEVICE_CLASS (klass); + k->realize = vhost_user_fs_pci_realize;
Quoted 8 lines
hw/virtio/vhost-user-fs-pci.c line 59
Quoted 4 lines
hw/virtio/vhost-user-fs-pci.c new file +4
-0+set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); + dc->props = vhost_user_fs_pci_properties; + pcidev_k->vendor_id =PCI_VENDOR_ID_REDHAT_QUMRANET ; + pcidev_k->device_id =0 ;/* Set by virtio-pci based on virtio id */ Why not set *PCI_DEVICE_ID_VIRTIO_FS* here just like
virtio_blk? I'm not very familiar with this code, and just compare it with the other same logic.
The comment indicates that virtio-pci computes the correct PCI Device ID based on the VIRTIO Device ID. The PCI Device ID depends on the Legacy/Transitional/Modern mode supported by the device and therefore cannot be hardcoded. If we set it here it will be overwritten later anyway.
Stefan
Re: [Qemu-devel] [PATCH v3 2/3] virtio: add vhost-user-fs base device
In reply to Dr. David Alan Gilbert (git)Quoted 10 lines · On Tue, 17 Sep 2019 17:00:56 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
The virtio-fs virtio device provides shared file system access using the FUSE protocol carried over virtio.
The actual file server is implemented in an external vhost-user-fs device backend process.Signed-off-by Stefan Hajnoczi <[email protected]>Signed-off-by Sebastien Boeuf <[email protected]>Signed-off-by Dr. David Alan Gilbert <[email protected]>
Quoted 8 lines
--- configure | 13 ++ hw/virtio/Makefile.objs | 1 + hw/virtio/vhost-user-fs.c | 299 ++++++++++++++++++++++++++++++ include/hw/virtio/vhost-user-fs.h | 45 +++++ 4 files changed, 358 insertions(+) create mode 100644 hw/virtio/vhost-user-fs.c create mode 100644 include/hw/virtio/vhost-user-fs.h
Quoted 29 lines · On Tue, 17 Sep 2019 17:00:54 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This set of patches adds the core of the virtio-fs support to qemu;
it's marked experimental since the kernel patch isn't in yet; but it's nearly there; the spec has passed the voting stage, and the kernel changes are queued in fuse-next.A future set of patches will add the optional DAX mapping support.
The actual qemu change is pretty minimal, since it's really only
a virtio device with some queues.Some links:
Mailing list: https://www.redhat.com/mailman/listinfo/virtio-fs
Dev tree: Including filesystem daemon: https://gitlab.com/virtio-fs/qemu
kernel:
dev world:
https://gitlab.com/virtio-fs/linux
fuse next:
https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git/log/?h=for-next
virtio spec changes:https://lists.oasis-open.org/archives/virtio-dev/201908/msg00112.htmlv3
Split the kernel header update out
The contents correspond to the fuse-next world+a patch Stefan just sent to make that use the newer 'num_request_queues' name
Quoted 6 lines
Update copyright year,
Remove the assert invuf_handle_output
the virtio core code sometimes calls it during cleanup if the daemon dies first
(I've not changed the comment about guest_notifier_mask/virtio-pci
since that's copied in a bunch of virtio code going back ~5 years)
Agreed, let's change all of that at once when we figure out what a better comment would be.
Quoted 6 lines
Dr. David Alan Gilbert (3):
virtio: Addvirito_fslinux headers
virtio: add vhost-user-fs base device
virtio: add vhost-user-fs-pci device
Quoted 13 lines
configure | 13 + hw/virtio/Makefile.objs | 2 + hw/virtio/vhost-user-fs-pci.c | 85 ++++++ hw/virtio/vhost-user-fs.c | 299 ++++++++++++++++++++ include/hw/virtio/vhost-user-fs.h | 45 +++ include/standard-headers/linux/virtio_fs.h | 41 +++ include/standard-headers/linux/virtio_ids.h | 1 + 7 files changed, 486 insertions(+) create mode 100644 hw/virtio/vhost-user-fs-pci.c create mode 100644 hw/virtio/vhost-user-fs.c create mode 100644 include/hw/virtio/vhost-user-fs.h create mode 100644 include/standard-headers/linux/virtio_fs.h
Looks good to me. I still want to test virtio-fs on s390 (with a ccw device as well), but won't find time in the near future. Hopefully, at some point in time before KVM Forum, at least :)
Re: [PATCH v3 1/3] virtio: Add virito_fs linux headers
In reply to Dr. David Alan Gilbert (git)Quoted 2 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
typo in subject
Quoted 6 lines
Pull in the
virtio_fs.hlinux header and the constant for the virtiofs ID.Signed-off-by Stefan Hajnoczi <[email protected]>Signed-off-by Vivek Goyal <[email protected]>Signed-off-by Miklos Szeredi <[email protected]>
This isn't how we add this normally, we normally add the header to update-linux and then run it and add the result.
In particular if someone reruns update-linux then the ID will be gone and build will fail.
I suggest we either wait a bit until things land in Linux, or add these things in a private header for now, with an eye towards moving when header lands in Linux.
Quoted 67 lines
--- include/standard-headers/linux/virtio_fs.h | 41 +++++++++++++++++++++ include/standard-headers/linux/virtio_ids.h | 1 + 2 files changed, 42 insertions(+) create mode 100644 include/standard-headers/linux/virtio_fs.hinclude/standard-headers/linux/virtio_fs.h new file +41
-0@@ -0,0 +1,41 @@ +#ifndef _LINUX_VIRTIO_FS_H +#define _LINUX_VIRTIO_FS_H +/* This header is BSD licensed so anyone can use the definitions to implement +* compatible drivers/servers. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of IBM nor the names of its contributors +* may be used to endorse or promote products derived from this software +* without specific prior written permission. +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND +* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE +* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +* SUCH DAMAGE. */ +#include "standard-headers/linux/types.h" +#include "standard-headers/linux/virtio_ids.h" +#include "standard-headers/linux/virtio_config.h" +#include "standard-headers/linux/virtio_types.h" + +struct virtio_fs_config { +/* Filesystem name (UTF-8, not NUL-terminated, padded with NULs) */ +uint8_t tag[36 ]; + +/* Number of request queues */ +uint32_t num_request_queues; +}QEMU_PACKED ; + +#endif /* _LINUX_VIRTIO_FS_H */ include/standard-headers/linux/virtio_ids.h +1
-0@@ -43,6 +43,7 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_FS 26/* virtio filesystem */ #define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */ Signature · 1 line
2.21.0
Quoted 7 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This set of patches adds the core of the virtio-fs support to qemu;
it's marked experimental since the kernel patch isn't in yet; but it's nearly there; the spec has passed the voting stage, and the kernel changes are queued in fuse-next.
Was going to apply this but turns out headers didn't land in Linux yet. Replied on the specific patches.
Quoted 48 lines
A future set of patches will add the optional DAX mapping support.
The actual qemu change is pretty minimal, since it's really only
a virtio device with some queues.Some links:
Mailing list: https://www.redhat.com/mailman/listinfo/virtio-fs
Dev tree: Including filesystem daemon: https://gitlab.com/virtio-fs/qemu
kernel:
dev world:
https://gitlab.com/virtio-fs/linux
fuse next:
https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git/log/?h=for-next
virtio spec changes:https://lists.oasis-open.org/archives/virtio-dev/201908/msg00112.htmlv3
Split the kernel header update out
The contents correspond to the fuse-next world+a patch Stefan just sent to make that use the newer 'num_request_queues' nameUpdate copyright year,
Remove the assert invuf_handle_output
the virtio core code sometimes calls it during cleanup if the daemon dies first
(I've not changed the comment about guest_notifier_mask/virtio-pci
since that's copied in a bunch of virtio code going back ~5 years)Dr. David Alan Gilbert (3):
virtio: Addvirito_fslinux headers
virtio: add vhost-user-fs base device
virtio: add vhost-user-fs-pci deviceconfigure | 13 + hw/virtio/Makefile.objs | 2 + hw/virtio/vhost-user-fs-pci.c | 85 ++++++ hw/virtio/vhost-user-fs.c | 299 ++++++++++++++++++++ include/hw/virtio/vhost-user-fs.h | 45 +++ include/standard-headers/linux/virtio_fs.h | 41 +++ include/standard-headers/linux/virtio_ids.h | 1 + 7 files changed, 486 insertions(+) create mode 100644 hw/virtio/vhost-user-fs-pci.c create mode 100644 hw/virtio/vhost-user-fs.c create mode 100644 include/hw/virtio/vhost-user-fs.h create mode 100644 include/standard-headers/linux/virtio_fs.hSignature · 1 line
2.21.0
Re: [PATCH v3 1/3] virtio: Add virito_fs linux headers
In reply to Michael S. TsirkinQuoted 5 lines · * Michael S. Tsirkin ([email protected]) wrote:
Quoted 2 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
typo in subject
oops thanks.
Quoted 11 lines
Quoted 7 lines
Pull in the
virtio_fs.hlinux header and the constant for the virtiofs ID.Signed-off-by Stefan Hajnoczi <[email protected]>Signed-off-by Vivek Goyal <[email protected]>Signed-off-by Miklos Szeredi <[email protected]>This isn't how we add this normally, we normally add the header to update-linux and then run it and add the result.
update-linux doesn't need changing because it's got:
"$tmpdir"/include/linux/*virtio*.h \
Quoted 6 lines
In particular if someone reruns update-linux then the ID will be gone and build will fail.
I suggest we either wait a bit until things land in Linux, or add these things in a private header for now, with an eye towards moving when header lands in Linux.
I'll rerun update-linux to regenerate this patch and repost the set.
Dave
Quoted 66 lines
Quoted 66 lines
--- include/standard-headers/linux/virtio_fs.h | 41 +++++++++++++++++++++ include/standard-headers/linux/virtio_ids.h | 1 + 2 files changed, 42 insertions(+) create mode 100644 include/standard-headers/linux/virtio_fs.hinclude/standard-headers/linux/virtio_fs.h new file +41
-0@@ -0,0 +1,41 @@ +#ifndef _LINUX_VIRTIO_FS_H +#define _LINUX_VIRTIO_FS_H +/* This header is BSD licensed so anyone can use the definitions to implement +* compatible drivers/servers. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* 1. Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* 2. Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* 3. Neither the name of IBM nor the names of its contributors +* may be used to endorse or promote products derived from this software +* without specific prior written permission. +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND +* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE +* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +* SUCH DAMAGE. */ +#include "standard-headers/linux/types.h" +#include "standard-headers/linux/virtio_ids.h" +#include "standard-headers/linux/virtio_config.h" +#include "standard-headers/linux/virtio_types.h" + +struct virtio_fs_config { +/* Filesystem name (UTF-8, not NUL-terminated, padded with NULs) */ +uint8_t tag[36 ]; + +/* Number of request queues */ +uint32_t num_request_queues; +}QEMU_PACKED ; + +#endif /* _LINUX_VIRTIO_FS_H */ include/standard-headers/linux/virtio_ids.h +1
-0@@ -43,6 +43,7 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_FS 26/* virtio filesystem */ #define VIRTIO_ID_PMEM 27/* virtio pmem */
Quoted 3 lines
Quoted 3 lines
include/standard-headers/linux/virtio_ids.h +0
-0#endif /* _LINUX_VIRTIO_IDS_H */ Signature · 1 line
2.21.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK