| Message ID | 20200717092929.19453-2-mhartmay@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | Enable virtio-fs on s390x | expand |
On Fri, Jul 17, 2020 at 11:29:27AM +0200, Marc Hartmayer wrote: > From: Halil Pasic <pasic@linux.ibm.com> > > Wire up the CCW device for vhost-user-fs. > > Signed-off-by: Halil Pasic <pasic@linux.ibm.com> > --- > hw/s390x/Makefile.objs | 1 + > hw/s390x/vhost-user-fs-ccw.c | 73 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 74 insertions(+) > create mode 100644 hw/s390x/vhost-user-fs-ccw.c Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On Fri, 17 Jul 2020 11:29:27 +0200 Marc Hartmayer <mhartmay@linux.ibm.com> wrote: > From: Halil Pasic <pasic@linux.ibm.com> > > Wire up the CCW device for vhost-user-fs. > > Signed-off-by: Halil Pasic <pasic@linux.ibm.com> > --- > hw/s390x/Makefile.objs | 1 + > hw/s390x/vhost-user-fs-ccw.c | 73 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 74 insertions(+) > create mode 100644 hw/s390x/vhost-user-fs-ccw.c > (...) > diff --git a/hw/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c > new file mode 100644 > index 000000000000..88a7a11a34b4 > --- /dev/null > +++ b/hw/s390x/vhost-user-fs-ccw.c > @@ -0,0 +1,73 @@ > +/* > + * Ccw transport wiring for vhost-user-fs "virtio ccw vhost-user-fs implementation" ? > + * > + * Copyright 2020 IBM Corp. > + * > + * 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 "qapi/error.h" > +#include "hw/virtio/vhost-user-fs.h" > +#include "virtio-ccw.h" > + > +typedef struct VHostUserFSCcw { > + VirtioCcwDevice parent_obj; > + VHostUserFS vdev; > +} VHostUserFSCcw; > + > +#define TYPE_VHOST_USER_FS_CCW "vhost-user-fs-ccw" > +#define VHOST_USER_FS_CCW(obj) \ > + OBJECT_CHECK(VHostUserFSCcw, (obj), TYPE_VHOST_USER_FS_CCW) > + > + > +static Property vhost_user_fs_ccw_properties[] = { > + DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags, > + VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true), > + DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev, > + VIRTIO_CCW_MAX_REV), > + DEFINE_PROP_END_OF_LIST(), > +}; > + > +static void vhost_user_fs_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp) > +{ > + VHostUserFSCcw *dev = VHOST_USER_FS_CCW(ccw_dev); > + DeviceState *vdev = DEVICE(&dev->vdev); > + > + qdev_realize(vdev, BUS(&ccw_dev->bus), errp); > +} > + > +static void vhost_user_fs_ccw_instance_init(Object *obj) > +{ > + VHostUserFSCcw *dev = VHOST_USER_FS_CCW(obj); > + This needs ccw_dev->force_revision_1 = true; > + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), > + TYPE_VHOST_USER_FS); > +} > + > +static void vhost_user_fs_ccw_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); > + > + k->realize = vhost_user_fs_ccw_realize; > + device_class_set_props(dc,vhost_user_fs_ccw_properties); > + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); > +} > + > +static const TypeInfo vhost_user_fs_ccw = { > + .name = TYPE_VHOST_USER_FS_CCW, > + .parent = TYPE_VIRTIO_CCW_DEVICE, > + .instance_size = sizeof(VHostUserFSCcw), > + .instance_init = vhost_user_fs_ccw_instance_init, > + .class_init = vhost_user_fs_ccw_class_init, > +}; > + > +static void vhost_user_fs_ccw_register(void) > +{ > + type_register_static(&vhost_user_fs_ccw); > +} > + > +type_init(vhost_user_fs_ccw_register)
On Tue, 28 Jul 2020 12:31:51 +0200 Cornelia Huck <cohuck@redhat.com> wrote: > On Fri, 17 Jul 2020 11:29:27 +0200 > Marc Hartmayer <mhartmay@linux.ibm.com> wrote: > > > From: Halil Pasic <pasic@linux.ibm.com> > > > > Wire up the CCW device for vhost-user-fs. > > > > Signed-off-by: Halil Pasic <pasic@linux.ibm.com> > > --- > > hw/s390x/Makefile.objs | 1 + > > hw/s390x/vhost-user-fs-ccw.c | 73 ++++++++++++++++++++++++++++++++++++ > > 2 files changed, 74 insertions(+) > > create mode 100644 hw/s390x/vhost-user-fs-ccw.c > > > > (...) > > > diff --git a/hw/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c > > new file mode 100644 > > index 000000000000..88a7a11a34b4 > > --- /dev/null > > +++ b/hw/s390x/vhost-user-fs-ccw.c > > @@ -0,0 +1,73 @@ > > +/* > > + * Ccw transport wiring for vhost-user-fs > > "virtio ccw vhost-user-fs implementation" ? > Nod. > > + * > > + * Copyright 2020 IBM Corp. > > + * > > + * 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 "qapi/error.h" > > +#include "hw/virtio/vhost-user-fs.h" > > +#include "virtio-ccw.h" > > + > > +typedef struct VHostUserFSCcw { > > + VirtioCcwDevice parent_obj; > > + VHostUserFS vdev; > > +} VHostUserFSCcw; > > + > > +#define TYPE_VHOST_USER_FS_CCW "vhost-user-fs-ccw" > > +#define VHOST_USER_FS_CCW(obj) \ > > + OBJECT_CHECK(VHostUserFSCcw, (obj), TYPE_VHOST_USER_FS_CCW) > > + > > + > > +static Property vhost_user_fs_ccw_properties[] = { > > + DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags, > > + VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true), > > + DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev, > > + VIRTIO_CCW_MAX_REV), > > + DEFINE_PROP_END_OF_LIST(), > > +}; > > + > > +static void vhost_user_fs_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp) > > +{ > > + VHostUserFSCcw *dev = VHOST_USER_FS_CCW(ccw_dev); > > + DeviceState *vdev = DEVICE(&dev->vdev); > > + > > + qdev_realize(vdev, BUS(&ccw_dev->bus), errp); > > +} > > + > > +static void vhost_user_fs_ccw_instance_init(Object *obj) > > +{ > > + VHostUserFSCcw *dev = VHOST_USER_FS_CCW(obj); > > + > > This needs > > ccw_dev->force_revision_1 = true; > I'm OK with that as well. Just out of curiosity, why do we need it? Is there a virtio-ccw revision 1 feature this device inherently needs? Regards, Halil [..]
On Tue, 28 Jul 2020 13:25:57 +0200 Halil Pasic <pasic@linux.ibm.com> wrote: > On Tue, 28 Jul 2020 12:31:51 +0200 > Cornelia Huck <cohuck@redhat.com> wrote: > > > On Fri, 17 Jul 2020 11:29:27 +0200 > > Marc Hartmayer <mhartmay@linux.ibm.com> wrote: > > > > > From: Halil Pasic <pasic@linux.ibm.com> > > > > > > Wire up the CCW device for vhost-user-fs. > > > > > > Signed-off-by: Halil Pasic <pasic@linux.ibm.com> > > > --- > > > hw/s390x/Makefile.objs | 1 + > > > hw/s390x/vhost-user-fs-ccw.c | 73 ++++++++++++++++++++++++++++++++++++ > > > 2 files changed, 74 insertions(+) > > > create mode 100644 hw/s390x/vhost-user-fs-ccw.c (...) > > > +static void vhost_user_fs_ccw_instance_init(Object *obj) > > > +{ > > > + VHostUserFSCcw *dev = VHOST_USER_FS_CCW(obj); > > > + > > > > This needs > > > > ccw_dev->force_revision_1 = true; > > > > I'm OK with that as well. Just out of curiosity, why do we need it? Is > there a virtio-ccw revision 1 feature this device inherently needs? Yes, the VERSION_1 feature :) (All newer virtio devices are virtio-1 only, and the code has recently started enforcing this.)
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index a46a1c7894e0..c4086ec3171e 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -20,6 +20,7 @@ obj-$(CONFIG_VIRTIO_NET) += virtio-ccw-net.o obj-$(CONFIG_VIRTIO_BLK) += virtio-ccw-blk.o obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) += virtio-ccw-9p.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-ccw.o +obj-$(CONFIG_VHOST_USER_FS) += vhost-user-fs-ccw.o endif obj-y += css-bridge.o obj-y += ccw-device.o diff --git a/hw/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c new file mode 100644 index 000000000000..88a7a11a34b4 --- /dev/null +++ b/hw/s390x/vhost-user-fs-ccw.c @@ -0,0 +1,73 @@ +/* + * Ccw transport wiring for vhost-user-fs + * + * Copyright 2020 IBM Corp. + * + * 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 "qapi/error.h" +#include "hw/virtio/vhost-user-fs.h" +#include "virtio-ccw.h" + +typedef struct VHostUserFSCcw { + VirtioCcwDevice parent_obj; + VHostUserFS vdev; +} VHostUserFSCcw; + +#define TYPE_VHOST_USER_FS_CCW "vhost-user-fs-ccw" +#define VHOST_USER_FS_CCW(obj) \ + OBJECT_CHECK(VHostUserFSCcw, (obj), TYPE_VHOST_USER_FS_CCW) + + +static Property vhost_user_fs_ccw_properties[] = { + DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags, + VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true), + DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev, + VIRTIO_CCW_MAX_REV), + DEFINE_PROP_END_OF_LIST(), +}; + +static void vhost_user_fs_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp) +{ + VHostUserFSCcw *dev = VHOST_USER_FS_CCW(ccw_dev); + DeviceState *vdev = DEVICE(&dev->vdev); + + qdev_realize(vdev, BUS(&ccw_dev->bus), errp); +} + +static void vhost_user_fs_ccw_instance_init(Object *obj) +{ + VHostUserFSCcw *dev = VHOST_USER_FS_CCW(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VHOST_USER_FS); +} + +static void vhost_user_fs_ccw_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); + + k->realize = vhost_user_fs_ccw_realize; + device_class_set_props(dc,vhost_user_fs_ccw_properties); + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); +} + +static const TypeInfo vhost_user_fs_ccw = { + .name = TYPE_VHOST_USER_FS_CCW, + .parent = TYPE_VIRTIO_CCW_DEVICE, + .instance_size = sizeof(VHostUserFSCcw), + .instance_init = vhost_user_fs_ccw_instance_init, + .class_init = vhost_user_fs_ccw_class_init, +}; + +static void vhost_user_fs_ccw_register(void) +{ + type_register_static(&vhost_user_fs_ccw); +} + +type_init(vhost_user_fs_ccw_register)