* Cornelia Huck (coh...@redhat.com) wrote:
> On Sun, 18 Aug 2019 07:08:31 -0400
> "Michael S. Tsirkin" <m...@redhat.com> wrote:
>
> > On Fri, Aug 16, 2019 at 03:33:20PM +0100, Dr. David Alan Gilbert (git)
> > wrote:
> > > From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
> > >
> > > The virtio-fs virtio device provides shared file system access using
> > > the FUSE protocol carried ovew virtio.
> > > The actual file server is implemented in an external vhost-user-fs device
> > > backend process.
> > >
> > > Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
> > > Signed-off-by: Sebastien Boeuf <sebastien.bo...@intel.com>
> > > Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> > > ---
> > > configure | 13 +
> > > hw/virtio/Makefile.objs | 1 +
> > > hw/virtio/vhost-user-fs.c | 297 ++++++++++++++++++++
> > > include/hw/virtio/vhost-user-fs.h | 45 +++
> > > include/standard-headers/linux/virtio_fs.h | 41 +++
> > > include/standard-headers/linux/virtio_ids.h | 1 +
> > > 6 files changed, 398 insertions(+)
> > > 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
>
> > > diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c
> > > new file mode 100644
> > > index 0000000000..2753c2c07a
> > > --- /dev/null
> > > +++ b/hw/virtio/vhost-user-fs.c
> > > @@ -0,0 +1,297 @@
> > > +/*
> > > + * Vhost-user filesystem virtio device
> > > + *
> > > + * Copyright 2018 Red Hat, Inc.
> > > + *
> > > + * Authors:
> > > + * Stefan Hajnoczi <stefa...@redhat.com>
> > > + *
> > > + * 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/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"
>
> JFYI, this needs to include hw/qdev-properties.h as well on the latest
> code level. (As does the pci part.)
Thanks! Updated my local version.
Dave
> > > +
> > > +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_queues, fs->conf.num_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.
>
> Referring to 'virtio-pci' seems a bit suspicious :) Should that be 'the
> transport'? (And 'the right thing' is not really self-explanatory...)
>
> (I have wired it up for virtio-ccw, but have not actually tried it out.
> Will send it out once I did.)
>
> > > + */
> > > + 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_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_queues == 0) {
> > > + error_setg(errp, "num-queues property must be larger than 0");
> > > + return;
> > > + }
> >
> > The strange thing is that actual # of queues is this number + 2.
> > And this affects an optimal number of vectors (see patch 2).
> > Not sure what a good solution is - include the
> > mandatory queues in the number?
> > Needs to be documented in some way.
>
> I think the spec states that num_queues in the config space is the
> number of request queues only. Can we rename to num_request_queues? The
> hiprio queue is not really configurable, anyway.
>
> >
> > > +
> > > + if (!is_power_of_2(fs->conf.queue_size)) {
> > > + error_setg(errp, "queue-size property must be a power of 2");
> > > + return;
> > > + }
> >
> > Hmm packed ring allows non power of 2 ...
> > We need to look into a generic helper to support VQ
> > size checks.
>
> Huh, I didn't notice before that there are several devices which
> already allow to configure the queue size... looking, there seem to be
> the following cases:
>
> - bound checks and checks for power of 2 (blk, net)
> - no checks (scsi) -- isn't that dangerous, as virtio_add_queue() will
> abort() for a too large value?
>
> Anyway, if we have a non power of 2 size and the driver does not
> negotiate packed, we can just fail setting FEATURES_OK, so dropping the
> power of 2 check should be fine, at least when we add packed support.
>
> >
> > > +
> > > + 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));
> > > +
> > > + /* Notifications queue */
> > > + virtio_add_queue(vdev, fs->conf.queue_size, vuf_handle_output);
> > > +
> > > + /* Hiprio queue */
> > > + virtio_add_queue(vdev, fs->conf.queue_size, vuf_handle_output);
> > >
> >
> > Weird, spec patch v6 says:
> >
> > +\item[0] hiprio
> > +\item[1\ldots n] request queues
> >
> > where's the Notifications queue coming from?
>
> Maybe an old name of the hiprio queue?
>
> >
> > > + /* Request queues */
> > > + for (i = 0; i < fs->conf.num_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_queues;
>
> Anyway, the notifications queue needs to go, or this is wrong :)
>
> > > + 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) {
> > > + 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);
> > > + return;
> > > +}
>
> (...)
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
