| Message ID | 20220514041107.1980-5-longpeng2@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | add generic vDPA device support | expand |
On Sat, May 14, 2022 at 12:11:07PM +0800, Longpeng(Mike) wrote: > From: Longpeng <longpeng2@huawei.com> > > Supports vdpa-dev-pci, we can use the device as follow: > > -device vhost-vdpa-device-pci,vhostdev=/dev/vhost-vdpa-X > > Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> > Signed-off-by: Longpeng <longpeng2@huawei.com> Build fails: FAILED: libqemu-aarch64-softmmu.fa.p/hw_virtio_vdpa-dev-pci.c.o cc -m64 -mcx16 -Ilibqemu-aarch64-softmmu.fa.p -I. -I.. -Itarget/arm -I../target/arm -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/PCSC -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /scm/qemu/linux-headers -isystem linux-headers -iquote . -iquote /scm/qemu -iquote /scm/qemu/include -iquote /scm/qemu/disas/libvixl -iquote /scm/qemu/tcg/i386 -pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H '-DCONFIG_TARGET="aarch64-softmmu-config-target.h"' '-DCONFIG_DEVICES="aarch64-softmmu-config-devices.h"' -MD -MQ libqemu-aarch64-softmmu.fa.p/hw_virtio_vdpa-dev-pci.c.o -MF libqemu-aarch64-softmmu.fa.p/hw_virtio_vdpa-dev-pci.c.o.d -o libqemu-aarch64-softmmu.fa.p/hw_virtio_vdpa-dev-pci.c.o -c ../hw/virtio/vdpa-dev-pci.c ../hw/virtio/vdpa-dev-pci.c:26:10: fatal error: virtio-pci.h: No such file or directory 26 | #include "virtio-pci.h" | ^~~~~~~~~~~~~~ compilation terminated. > --- > hw/virtio/meson.build | 1 + > hw/virtio/vdpa-dev-pci.c | 102 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 103 insertions(+) > create mode 100644 hw/virtio/vdpa-dev-pci.c > > diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build > index 8f6f86db71..c2da69616f 100644 > --- a/hw/virtio/meson.build > +++ b/hw/virtio/meson.build > @@ -50,6 +50,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-serial-pc > virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem-pci.c')) > virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu-pci.c')) > virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pci.c')) > +virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-pci.c')) > > virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) > > diff --git a/hw/virtio/vdpa-dev-pci.c b/hw/virtio/vdpa-dev-pci.c > new file mode 100644 > index 0000000000..fde35dfc92 > --- /dev/null > +++ b/hw/virtio/vdpa-dev-pci.c > @@ -0,0 +1,102 @@ > +/* > + * Vhost Vdpa Device PCI Bindings > + * > + * Copyright (c) Huawei Technologies Co., Ltd. 2022. All Rights Reserved. > + * > + * Authors: > + * Longpeng <longpeng2@huawei.com> > + * > + * Largely based on the "vhost-user-blk-pci.c" and "vhost-user-blk.c" > + * implemented by: > + * Changpeng Liu <changpeng.liu@intel.com> > + * > + * This work is licensed under the terms of the GNU LGPL, version 2 or later. > + * See the COPYING.LIB file in the top-level directory. > + */ > +#include "qemu/osdep.h" > +#include <sys/ioctl.h> > +#include <linux/vhost.h> > +#include "hw/virtio/virtio.h" > +#include "hw/virtio/vdpa-dev.h" > +#include "hw/pci/pci.h" > +#include "hw/qdev-properties.h" > +#include "qapi/error.h" > +#include "qemu/error-report.h" > +#include "qemu/module.h" > +#include "virtio-pci.h" > +#include "qom/object.h" > + > + > +typedef struct VhostVdpaDevicePCI VhostVdpaDevicePCI; > + > +#define TYPE_VHOST_VDPA_DEVICE_PCI "vhost-vdpa-device-pci-base" > +DECLARE_INSTANCE_CHECKER(VhostVdpaDevicePCI, VHOST_VDPA_DEVICE_PCI, > + TYPE_VHOST_VDPA_DEVICE_PCI) > + > +struct VhostVdpaDevicePCI { > + VirtIOPCIProxy parent_obj; > + VhostVdpaDevice vdev; > +}; > + > +static void vhost_vdpa_device_pci_instance_init(Object *obj) > +{ > + VhostVdpaDevicePCI *dev = VHOST_VDPA_DEVICE_PCI(obj); > + > + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), > + TYPE_VHOST_VDPA_DEVICE); > + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev), > + "bootindex"); > +} > + > +static Property vhost_vdpa_device_pci_properties[] = { > + DEFINE_PROP_END_OF_LIST(), > +}; > + > +static int vhost_vdpa_device_pci_post_init(VhostVdpaDevice *v, Error **errp) > +{ > + VhostVdpaDevicePCI *dev = container_of(v, VhostVdpaDevicePCI, vdev); > + VirtIOPCIProxy *vpci_dev = &dev->parent_obj; > + > + vpci_dev->class_code = virtio_pci_get_class_id(v->vdev_id); > + vpci_dev->trans_devid = virtio_pci_get_trans_devid(v->vdev_id); > + /* one for config vector */ > + vpci_dev->nvectors = v->num_queues + 1; > + > + return 0; > +} > + > +static void > +vhost_vdpa_device_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) > +{ > + VhostVdpaDevicePCI *dev = VHOST_VDPA_DEVICE_PCI(vpci_dev); > + > + dev->vdev.post_init = vhost_vdpa_device_pci_post_init; > + qdev_realize(DEVICE(&dev->vdev), BUS(&vpci_dev->bus), errp); > +} > + > +static void vhost_vdpa_device_pci_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass); > + > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > + device_class_set_props(dc, vhost_vdpa_device_pci_properties); > + k->realize = vhost_vdpa_device_pci_realize; > +} > + > +static const VirtioPCIDeviceTypeInfo vhost_vdpa_device_pci_info = { > + .base_name = TYPE_VHOST_VDPA_DEVICE_PCI, > + .generic_name = "vhost-vdpa-device-pci", > + .transitional_name = "vhost-vdpa-device-pci-transitional", > + .non_transitional_name = "vhost-vdpa-device-pci-non-transitional", > + .instance_size = sizeof(VhostVdpaDevicePCI), > + .instance_init = vhost_vdpa_device_pci_instance_init, > + .class_init = vhost_vdpa_device_pci_class_init, > +}; > + > +static void vhost_vdpa_device_pci_register(void) > +{ > + virtio_pci_types_register(&vhost_vdpa_device_pci_info); > +} > + > +type_init(vhost_vdpa_device_pci_register); > -- > 2.23.0
在 2022/6/9 7:10, Michael S. Tsirkin 写道: > On Sat, May 14, 2022 at 12:11:07PM +0800, Longpeng(Mike) wrote: >> From: Longpeng <longpeng2@huawei.com> >> >> Supports vdpa-dev-pci, we can use the device as follow: >> >> -device vhost-vdpa-device-pci,vhostdev=/dev/vhost-vdpa-X >> >> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> >> Signed-off-by: Longpeng <longpeng2@huawei.com> > > > Build fails: > > FAILED: libqemu-aarch64-softmmu.fa.p/hw_virtio_vdpa-dev-pci.c.o > cc -m64 -mcx16 -Ilibqemu-aarch64-softmmu.fa.p -I. -I.. -Itarget/arm -I../target/arm -Iqapi -Itrace -Iui -Iui/shader -I/usr/include/pixman-1 -I/usr/include/capstone -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/nss3 -I/usr/include/nspr4 -I/usr/include/PCSC -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -isystem /scm/qemu/linux-headers -isystem linux-headers -iquote . -iquote /scm/qemu -iquote /scm/qemu/include -iquote /scm/qemu/disas/libvixl -iquote /scm/qemu/tcg/i386 -pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE -isystem../linux-headers -isystemlinux-headers -DNEED_CPU_H '-DCONFIG_TARGET="aarch64-softmmu-config-target.h"' '-DCONFIG_DEVICES="aarch64-softmmu-config-devices.h"' -MD -MQ libqemu-aarch64-softmmu.fa.p/hw_virtio_vdpa-dev-pci.c.o -MF libqemu-aarch64-softmmu.fa.p/hw_virtio_vdpa-dev-pci.c.o.d -o libqemu-aarch64-softmmu.fa.p/hw_virtio_vdpa-dev-pci.c.o -c ../hw/virtio/vdpa-dev-pci.c > ../hw/virtio/vdpa-dev-pci.c:26:10: fatal error: virtio-pci.h: No such file or directory > 26 | #include "virtio-pci.h" > | ^~~~~~~~~~~~~~ > compilation terminated. > The following patch moved the virtio-pci.h to the include/ directory: e1b1f53 2022-05-16 04:38:40 -0400 hw/virtio: move virtio-pci.h into shared include space I'll rebase this series recently. Thanks. > >> --- >> hw/virtio/meson.build | 1 + >> hw/virtio/vdpa-dev-pci.c | 102 +++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 103 insertions(+) >> create mode 100644 hw/virtio/vdpa-dev-pci.c >> >> diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build >> index 8f6f86db71..c2da69616f 100644 >> --- a/hw/virtio/meson.build >> +++ b/hw/virtio/meson.build >> @@ -50,6 +50,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-serial-pc >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem-pci.c')) >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu-pci.c')) >> virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pci.c')) >> +virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-pci.c')) >> >> virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) >> >> diff --git a/hw/virtio/vdpa-dev-pci.c b/hw/virtio/vdpa-dev-pci.c >> new file mode 100644 >> index 0000000000..fde35dfc92 >> --- /dev/null >> +++ b/hw/virtio/vdpa-dev-pci.c >> @@ -0,0 +1,102 @@ >> +/* >> + * Vhost Vdpa Device PCI Bindings >> + * >> + * Copyright (c) Huawei Technologies Co., Ltd. 2022. All Rights Reserved. >> + * >> + * Authors: >> + * Longpeng <longpeng2@huawei.com> >> + * >> + * Largely based on the "vhost-user-blk-pci.c" and "vhost-user-blk.c" >> + * implemented by: >> + * Changpeng Liu <changpeng.liu@intel.com> >> + * >> + * This work is licensed under the terms of the GNU LGPL, version 2 or later. >> + * See the COPYING.LIB file in the top-level directory. >> + */ >> +#include "qemu/osdep.h" >> +#include <sys/ioctl.h> >> +#include <linux/vhost.h> >> +#include "hw/virtio/virtio.h" >> +#include "hw/virtio/vdpa-dev.h" >> +#include "hw/pci/pci.h" >> +#include "hw/qdev-properties.h" >> +#include "qapi/error.h" >> +#include "qemu/error-report.h" >> +#include "qemu/module.h" >> +#include "virtio-pci.h" >> +#include "qom/object.h" >> + >> + >> +typedef struct VhostVdpaDevicePCI VhostVdpaDevicePCI; >> + >> +#define TYPE_VHOST_VDPA_DEVICE_PCI "vhost-vdpa-device-pci-base" >> +DECLARE_INSTANCE_CHECKER(VhostVdpaDevicePCI, VHOST_VDPA_DEVICE_PCI, >> + TYPE_VHOST_VDPA_DEVICE_PCI) >> + >> +struct VhostVdpaDevicePCI { >> + VirtIOPCIProxy parent_obj; >> + VhostVdpaDevice vdev; >> +}; >> + >> +static void vhost_vdpa_device_pci_instance_init(Object *obj) >> +{ >> + VhostVdpaDevicePCI *dev = VHOST_VDPA_DEVICE_PCI(obj); >> + >> + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), >> + TYPE_VHOST_VDPA_DEVICE); >> + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev), >> + "bootindex"); >> +} >> + >> +static Property vhost_vdpa_device_pci_properties[] = { >> + DEFINE_PROP_END_OF_LIST(), >> +}; >> + >> +static int vhost_vdpa_device_pci_post_init(VhostVdpaDevice *v, Error **errp) >> +{ >> + VhostVdpaDevicePCI *dev = container_of(v, VhostVdpaDevicePCI, vdev); >> + VirtIOPCIProxy *vpci_dev = &dev->parent_obj; >> + >> + vpci_dev->class_code = virtio_pci_get_class_id(v->vdev_id); >> + vpci_dev->trans_devid = virtio_pci_get_trans_devid(v->vdev_id); >> + /* one for config vector */ >> + vpci_dev->nvectors = v->num_queues + 1; >> + >> + return 0; >> +} >> + >> +static void >> +vhost_vdpa_device_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) >> +{ >> + VhostVdpaDevicePCI *dev = VHOST_VDPA_DEVICE_PCI(vpci_dev); >> + >> + dev->vdev.post_init = vhost_vdpa_device_pci_post_init; >> + qdev_realize(DEVICE(&dev->vdev), BUS(&vpci_dev->bus), errp); >> +} >> + >> +static void vhost_vdpa_device_pci_class_init(ObjectClass *klass, void *data) >> +{ >> + DeviceClass *dc = DEVICE_CLASS(klass); >> + VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass); >> + >> + set_bit(DEVICE_CATEGORY_MISC, dc->categories); >> + device_class_set_props(dc, vhost_vdpa_device_pci_properties); >> + k->realize = vhost_vdpa_device_pci_realize; >> +} >> + >> +static const VirtioPCIDeviceTypeInfo vhost_vdpa_device_pci_info = { >> + .base_name = TYPE_VHOST_VDPA_DEVICE_PCI, >> + .generic_name = "vhost-vdpa-device-pci", >> + .transitional_name = "vhost-vdpa-device-pci-transitional", >> + .non_transitional_name = "vhost-vdpa-device-pci-non-transitional", >> + .instance_size = sizeof(VhostVdpaDevicePCI), >> + .instance_init = vhost_vdpa_device_pci_instance_init, >> + .class_init = vhost_vdpa_device_pci_class_init, >> +}; >> + >> +static void vhost_vdpa_device_pci_register(void) >> +{ >> + virtio_pci_types_register(&vhost_vdpa_device_pci_info); >> +} >> + >> +type_init(vhost_vdpa_device_pci_register); >> -- >> 2.23.0 > > > .
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 8f6f86db71..c2da69616f 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -50,6 +50,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-serial-pc virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pci.c')) +virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-pci.c')) virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) diff --git a/hw/virtio/vdpa-dev-pci.c b/hw/virtio/vdpa-dev-pci.c new file mode 100644 index 0000000000..fde35dfc92 --- /dev/null +++ b/hw/virtio/vdpa-dev-pci.c @@ -0,0 +1,102 @@ +/* + * Vhost Vdpa Device PCI Bindings + * + * Copyright (c) Huawei Technologies Co., Ltd. 2022. All Rights Reserved. + * + * Authors: + * Longpeng <longpeng2@huawei.com> + * + * Largely based on the "vhost-user-blk-pci.c" and "vhost-user-blk.c" + * implemented by: + * Changpeng Liu <changpeng.liu@intel.com> + * + * This work is licensed under the terms of the GNU LGPL, version 2 or later. + * See the COPYING.LIB file in the top-level directory. + */ +#include "qemu/osdep.h" +#include <sys/ioctl.h> +#include <linux/vhost.h> +#include "hw/virtio/virtio.h" +#include "hw/virtio/vdpa-dev.h" +#include "hw/pci/pci.h" +#include "hw/qdev-properties.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/module.h" +#include "virtio-pci.h" +#include "qom/object.h" + + +typedef struct VhostVdpaDevicePCI VhostVdpaDevicePCI; + +#define TYPE_VHOST_VDPA_DEVICE_PCI "vhost-vdpa-device-pci-base" +DECLARE_INSTANCE_CHECKER(VhostVdpaDevicePCI, VHOST_VDPA_DEVICE_PCI, + TYPE_VHOST_VDPA_DEVICE_PCI) + +struct VhostVdpaDevicePCI { + VirtIOPCIProxy parent_obj; + VhostVdpaDevice vdev; +}; + +static void vhost_vdpa_device_pci_instance_init(Object *obj) +{ + VhostVdpaDevicePCI *dev = VHOST_VDPA_DEVICE_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VHOST_VDPA_DEVICE); + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev), + "bootindex"); +} + +static Property vhost_vdpa_device_pci_properties[] = { + DEFINE_PROP_END_OF_LIST(), +}; + +static int vhost_vdpa_device_pci_post_init(VhostVdpaDevice *v, Error **errp) +{ + VhostVdpaDevicePCI *dev = container_of(v, VhostVdpaDevicePCI, vdev); + VirtIOPCIProxy *vpci_dev = &dev->parent_obj; + + vpci_dev->class_code = virtio_pci_get_class_id(v->vdev_id); + vpci_dev->trans_devid = virtio_pci_get_trans_devid(v->vdev_id); + /* one for config vector */ + vpci_dev->nvectors = v->num_queues + 1; + + return 0; +} + +static void +vhost_vdpa_device_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) +{ + VhostVdpaDevicePCI *dev = VHOST_VDPA_DEVICE_PCI(vpci_dev); + + dev->vdev.post_init = vhost_vdpa_device_pci_post_init; + qdev_realize(DEVICE(&dev->vdev), BUS(&vpci_dev->bus), errp); +} + +static void vhost_vdpa_device_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass); + + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + device_class_set_props(dc, vhost_vdpa_device_pci_properties); + k->realize = vhost_vdpa_device_pci_realize; +} + +static const VirtioPCIDeviceTypeInfo vhost_vdpa_device_pci_info = { + .base_name = TYPE_VHOST_VDPA_DEVICE_PCI, + .generic_name = "vhost-vdpa-device-pci", + .transitional_name = "vhost-vdpa-device-pci-transitional", + .non_transitional_name = "vhost-vdpa-device-pci-non-transitional", + .instance_size = sizeof(VhostVdpaDevicePCI), + .instance_init = vhost_vdpa_device_pci_instance_init, + .class_init = vhost_vdpa_device_pci_class_init, +}; + +static void vhost_vdpa_device_pci_register(void) +{ + virtio_pci_types_register(&vhost_vdpa_device_pci_info); +} + +type_init(vhost_vdpa_device_pci_register);