| Message ID | 20200506094948.76388-12-david@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio-mem: Paravirtualized memory hot(un)plug | expand |
> Let's add a proxy for virtio-mem, make it a memory device, and > pass-through the properties. > > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> > Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > Cc: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > hw/virtio/Makefile.objs | 1 + > hw/virtio/virtio-mem-pci.c | 131 +++++++++++++++++++++++++++++++++++++ > hw/virtio/virtio-mem-pci.h | 33 ++++++++++ > include/hw/pci/pci.h | 1 + > 4 files changed, 166 insertions(+) > create mode 100644 hw/virtio/virtio-mem-pci.c > create mode 100644 hw/virtio/virtio-mem-pci.h > > diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs > index 7df70e977e..b9661f9c01 100644 > --- a/hw/virtio/Makefile.objs > +++ b/hw/virtio/Makefile.objs > @@ -19,6 +19,7 @@ obj-$(call land,$(CONFIG_VHOST_USER_FS),$(CONFIG_VIRTIO_PCI)) += vhost-user-fs-p > obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o > obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o > obj-$(CONFIG_VIRTIO_MEM) += virtio-mem.o > +common-obj-$(call land,$(CONFIG_VIRTIO_MEM),$(CONFIG_VIRTIO_PCI)) += virtio-mem-pci.o > > ifeq ($(CONFIG_VIRTIO_PCI),y) > obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o > diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c > new file mode 100644 > index 0000000000..a47d21c81f > --- /dev/null > +++ b/hw/virtio/virtio-mem-pci.c > @@ -0,0 +1,131 @@ > +/* > + * Virtio MEM PCI device > + * > + * Copyright (C) 2020 Red Hat, Inc. > + * > + * Authors: > + * David Hildenbrand <david@redhat.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > + Don't think we need the blank line here. > +#include "virtio-mem-pci.h" > +#include "hw/mem/memory-device.h" > +#include "qapi/error.h" > + > +static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) > +{ > + VirtIOMEMPCI *mem_pci = VIRTIO_MEM_PCI(vpci_dev); > + DeviceState *vdev = DEVICE(&mem_pci->vdev); > + > + qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); > + object_property_set_bool(OBJECT(vdev), true, "realized", errp); > +} > + > +static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr, > + Error **errp) > +{ > + object_property_set_uint(OBJECT(md), addr, VIRTIO_MEM_ADDR_PROP, errp); > +} > + > +static uint64_t virtio_mem_pci_get_addr(const MemoryDeviceState *md) > +{ > + return object_property_get_uint(OBJECT(md), VIRTIO_MEM_ADDR_PROP, > + &error_abort); > +} > + > +static MemoryRegion *virtio_mem_pci_get_memory_region(MemoryDeviceState *md, > + Error **errp) > +{ > + VirtIOMEMPCI *pci_mem = VIRTIO_MEM_PCI(md); > + VirtIOMEM *vmem = VIRTIO_MEM(&pci_mem->vdev); > + VirtIOMEMClass *vmc = VIRTIO_MEM_GET_CLASS(vmem); > + > + return vmc->get_memory_region(vmem, errp); > +} > + > +static uint64_t virtio_mem_pci_get_plugged_size(const MemoryDeviceState *md, > + Error **errp) > +{ > + return object_property_get_uint(OBJECT(md), VIRTIO_MEM_SIZE_PROP, > + errp); > +} > + > +static void virtio_mem_pci_fill_device_info(const MemoryDeviceState *md, > + MemoryDeviceInfo *info) > +{ > + VirtioMEMDeviceInfo *vi = g_new0(VirtioMEMDeviceInfo, 1); > + VirtIOMEMPCI *pci_mem = VIRTIO_MEM_PCI(md); > + VirtIOMEM *vmem = VIRTIO_MEM(&pci_mem->vdev); > + VirtIOMEMClass *vpc = VIRTIO_MEM_GET_CLASS(vmem); > + DeviceState *dev = DEVICE(md); > + > + if (dev->id) { > + vi->has_id = true; > + vi->id = g_strdup(dev->id); > + } > + > + /* let the real device handle everything else */ > + vpc->fill_device_info(vmem, vi); > + > + info->u.virtio_mem.data = vi; > + info->type = MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM; > +} > + > +static void virtio_mem_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); > + MemoryDeviceClass *mdc = MEMORY_DEVICE_CLASS(klass); > + > + k->realize = virtio_mem_pci_realize; > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; > + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_MEM; > + pcidev_k->revision = VIRTIO_PCI_ABI_VERSION; > + pcidev_k->class_id = PCI_CLASS_OTHERS; > + > + mdc->get_addr = virtio_mem_pci_get_addr; > + mdc->set_addr = virtio_mem_pci_set_addr; > + mdc->get_plugged_size = virtio_mem_pci_get_plugged_size; > + mdc->get_memory_region = virtio_mem_pci_get_memory_region; > + mdc->fill_device_info = virtio_mem_pci_fill_device_info; > +} > + > +static void virtio_mem_pci_instance_init(Object *obj) > +{ > + VirtIOMEMPCI *dev = VIRTIO_MEM_PCI(obj); > + > + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), > + TYPE_VIRTIO_MEM); > + object_property_add_alias(obj, VIRTIO_MEM_BLOCK_SIZE_PROP, > + OBJECT(&dev->vdev), > + VIRTIO_MEM_BLOCK_SIZE_PROP, &error_abort); > + object_property_add_alias(obj, VIRTIO_MEM_SIZE_PROP, OBJECT(&dev->vdev), > + VIRTIO_MEM_SIZE_PROP, &error_abort); > + object_property_add_alias(obj, VIRTIO_MEM_REQUESTED_SIZE_PROP, > + OBJECT(&dev->vdev), > + VIRTIO_MEM_REQUESTED_SIZE_PROP, &error_abort); > +} > + > +static const VirtioPCIDeviceTypeInfo virtio_mem_pci_info = { > + .base_name = TYPE_VIRTIO_MEM_PCI, > + .generic_name = "virtio-mem-pci", > + .instance_size = sizeof(VirtIOMEMPCI), > + .instance_init = virtio_mem_pci_instance_init, > + .class_init = virtio_mem_pci_class_init, > + .interfaces = (InterfaceInfo[]) { > + { TYPE_MEMORY_DEVICE }, > + { } > + }, > +}; > + > +static void virtio_mem_pci_register_types(void) > +{ > + virtio_pci_types_register(&virtio_mem_pci_info); > +} > +type_init(virtio_mem_pci_register_types) > diff --git a/hw/virtio/virtio-mem-pci.h b/hw/virtio/virtio-mem-pci.h > new file mode 100644 > index 0000000000..8820cd6628 > --- /dev/null > +++ b/hw/virtio/virtio-mem-pci.h > @@ -0,0 +1,33 @@ > +/* > + * Virtio MEM PCI device > + * > + * Copyright (C) 2020 Red Hat, Inc. > + * > + * Authors: > + * David Hildenbrand <david@redhat.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2. > + * See the COPYING file in the top-level directory. > + */ > + > +#ifndef QEMU_VIRTIO_MEM_PCI_H > +#define QEMU_VIRTIO_MEM_PCI_H > + > +#include "hw/virtio/virtio-pci.h" > +#include "hw/virtio/virtio-mem.h" > + > +typedef struct VirtIOMEMPCI VirtIOMEMPCI; > + > +/* > + * virtio-mem-pci: This extends VirtioPCIProxy. > + */ > +#define TYPE_VIRTIO_MEM_PCI "virtio-mem-pci-base" > +#define VIRTIO_MEM_PCI(obj) \ > + OBJECT_CHECK(VirtIOMEMPCI, (obj), TYPE_VIRTIO_MEM_PCI) > + > +struct VirtIOMEMPCI { > + VirtIOPCIProxy parent_obj; > + VirtIOMEM vdev; > +}; > + > +#endif /* QEMU_VIRTIO_MEM_PCI_H */ > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index cfedf5a995..fec72d5a31 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -87,6 +87,7 @@ extern bool pci_available; > #define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012 > #define PCI_DEVICE_ID_VIRTIO_PMEM 0x1013 > #define PCI_DEVICE_ID_VIRTIO_IOMMU 0x1014 > +#define PCI_DEVICE_ID_VIRTIO_MEM 0x1015 > > #define PCI_VENDOR_ID_REDHAT 0x1b36 > #define PCI_DEVICE_ID_REDHAT_BRIDGE 0x0001 > -- > 2.25.3 Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
On 06.05.20 20:57, Pankaj Gupta wrote: >> Let's add a proxy for virtio-mem, make it a memory device, and >> pass-through the properties. >> >> Cc: "Michael S. Tsirkin" <mst@redhat.com> >> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> >> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> >> Cc: Igor Mammedov <imammedo@redhat.com> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> hw/virtio/Makefile.objs | 1 + >> hw/virtio/virtio-mem-pci.c | 131 +++++++++++++++++++++++++++++++++++++ >> hw/virtio/virtio-mem-pci.h | 33 ++++++++++ >> include/hw/pci/pci.h | 1 + >> 4 files changed, 166 insertions(+) >> create mode 100644 hw/virtio/virtio-mem-pci.c >> create mode 100644 hw/virtio/virtio-mem-pci.h >> >> diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs >> index 7df70e977e..b9661f9c01 100644 >> --- a/hw/virtio/Makefile.objs >> +++ b/hw/virtio/Makefile.objs >> @@ -19,6 +19,7 @@ obj-$(call land,$(CONFIG_VHOST_USER_FS),$(CONFIG_VIRTIO_PCI)) += vhost-user-fs-p >> obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o >> obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o >> obj-$(CONFIG_VIRTIO_MEM) += virtio-mem.o >> +common-obj-$(call land,$(CONFIG_VIRTIO_MEM),$(CONFIG_VIRTIO_PCI)) += virtio-mem-pci.o >> >> ifeq ($(CONFIG_VIRTIO_PCI),y) >> obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o >> diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c >> new file mode 100644 >> index 0000000000..a47d21c81f >> --- /dev/null >> +++ b/hw/virtio/virtio-mem-pci.c >> @@ -0,0 +1,131 @@ >> +/* >> + * Virtio MEM PCI device >> + * >> + * Copyright (C) 2020 Red Hat, Inc. >> + * >> + * Authors: >> + * David Hildenbrand <david@redhat.com> >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2. >> + * See the COPYING file in the top-level directory. >> + */ >> + >> +#include "qemu/osdep.h" >> + > Don't think we need the blank line here. > Right, thanks! [...] >> -- >> 2.25.3 > Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com> > Thanks!
diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index 7df70e977e..b9661f9c01 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -19,6 +19,7 @@ obj-$(call land,$(CONFIG_VHOST_USER_FS),$(CONFIG_VIRTIO_PCI)) += vhost-user-fs-p obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o obj-$(CONFIG_VIRTIO_MEM) += virtio-mem.o +common-obj-$(call land,$(CONFIG_VIRTIO_MEM),$(CONFIG_VIRTIO_PCI)) += virtio-mem-pci.o ifeq ($(CONFIG_VIRTIO_PCI),y) obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c new file mode 100644 index 0000000000..a47d21c81f --- /dev/null +++ b/hw/virtio/virtio-mem-pci.c @@ -0,0 +1,131 @@ +/* + * Virtio MEM PCI device + * + * Copyright (C) 2020 Red Hat, Inc. + * + * Authors: + * David Hildenbrand <david@redhat.com> + * + * This work is licensed under the terms of the GNU GPL, version 2. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" + +#include "virtio-mem-pci.h" +#include "hw/mem/memory-device.h" +#include "qapi/error.h" + +static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) +{ + VirtIOMEMPCI *mem_pci = VIRTIO_MEM_PCI(vpci_dev); + DeviceState *vdev = DEVICE(&mem_pci->vdev); + + qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); + object_property_set_bool(OBJECT(vdev), true, "realized", errp); +} + +static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr, + Error **errp) +{ + object_property_set_uint(OBJECT(md), addr, VIRTIO_MEM_ADDR_PROP, errp); +} + +static uint64_t virtio_mem_pci_get_addr(const MemoryDeviceState *md) +{ + return object_property_get_uint(OBJECT(md), VIRTIO_MEM_ADDR_PROP, + &error_abort); +} + +static MemoryRegion *virtio_mem_pci_get_memory_region(MemoryDeviceState *md, + Error **errp) +{ + VirtIOMEMPCI *pci_mem = VIRTIO_MEM_PCI(md); + VirtIOMEM *vmem = VIRTIO_MEM(&pci_mem->vdev); + VirtIOMEMClass *vmc = VIRTIO_MEM_GET_CLASS(vmem); + + return vmc->get_memory_region(vmem, errp); +} + +static uint64_t virtio_mem_pci_get_plugged_size(const MemoryDeviceState *md, + Error **errp) +{ + return object_property_get_uint(OBJECT(md), VIRTIO_MEM_SIZE_PROP, + errp); +} + +static void virtio_mem_pci_fill_device_info(const MemoryDeviceState *md, + MemoryDeviceInfo *info) +{ + VirtioMEMDeviceInfo *vi = g_new0(VirtioMEMDeviceInfo, 1); + VirtIOMEMPCI *pci_mem = VIRTIO_MEM_PCI(md); + VirtIOMEM *vmem = VIRTIO_MEM(&pci_mem->vdev); + VirtIOMEMClass *vpc = VIRTIO_MEM_GET_CLASS(vmem); + DeviceState *dev = DEVICE(md); + + if (dev->id) { + vi->has_id = true; + vi->id = g_strdup(dev->id); + } + + /* let the real device handle everything else */ + vpc->fill_device_info(vmem, vi); + + info->u.virtio_mem.data = vi; + info->type = MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM; +} + +static void virtio_mem_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); + MemoryDeviceClass *mdc = MEMORY_DEVICE_CLASS(klass); + + k->realize = virtio_mem_pci_realize; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_MEM; + pcidev_k->revision = VIRTIO_PCI_ABI_VERSION; + pcidev_k->class_id = PCI_CLASS_OTHERS; + + mdc->get_addr = virtio_mem_pci_get_addr; + mdc->set_addr = virtio_mem_pci_set_addr; + mdc->get_plugged_size = virtio_mem_pci_get_plugged_size; + mdc->get_memory_region = virtio_mem_pci_get_memory_region; + mdc->fill_device_info = virtio_mem_pci_fill_device_info; +} + +static void virtio_mem_pci_instance_init(Object *obj) +{ + VirtIOMEMPCI *dev = VIRTIO_MEM_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VIRTIO_MEM); + object_property_add_alias(obj, VIRTIO_MEM_BLOCK_SIZE_PROP, + OBJECT(&dev->vdev), + VIRTIO_MEM_BLOCK_SIZE_PROP, &error_abort); + object_property_add_alias(obj, VIRTIO_MEM_SIZE_PROP, OBJECT(&dev->vdev), + VIRTIO_MEM_SIZE_PROP, &error_abort); + object_property_add_alias(obj, VIRTIO_MEM_REQUESTED_SIZE_PROP, + OBJECT(&dev->vdev), + VIRTIO_MEM_REQUESTED_SIZE_PROP, &error_abort); +} + +static const VirtioPCIDeviceTypeInfo virtio_mem_pci_info = { + .base_name = TYPE_VIRTIO_MEM_PCI, + .generic_name = "virtio-mem-pci", + .instance_size = sizeof(VirtIOMEMPCI), + .instance_init = virtio_mem_pci_instance_init, + .class_init = virtio_mem_pci_class_init, + .interfaces = (InterfaceInfo[]) { + { TYPE_MEMORY_DEVICE }, + { } + }, +}; + +static void virtio_mem_pci_register_types(void) +{ + virtio_pci_types_register(&virtio_mem_pci_info); +} +type_init(virtio_mem_pci_register_types) diff --git a/hw/virtio/virtio-mem-pci.h b/hw/virtio/virtio-mem-pci.h new file mode 100644 index 0000000000..8820cd6628 --- /dev/null +++ b/hw/virtio/virtio-mem-pci.h @@ -0,0 +1,33 @@ +/* + * Virtio MEM PCI device + * + * Copyright (C) 2020 Red Hat, Inc. + * + * Authors: + * David Hildenbrand <david@redhat.com> + * + * This work is licensed under the terms of the GNU GPL, version 2. + * See the COPYING file in the top-level directory. + */ + +#ifndef QEMU_VIRTIO_MEM_PCI_H +#define QEMU_VIRTIO_MEM_PCI_H + +#include "hw/virtio/virtio-pci.h" +#include "hw/virtio/virtio-mem.h" + +typedef struct VirtIOMEMPCI VirtIOMEMPCI; + +/* + * virtio-mem-pci: This extends VirtioPCIProxy. + */ +#define TYPE_VIRTIO_MEM_PCI "virtio-mem-pci-base" +#define VIRTIO_MEM_PCI(obj) \ + OBJECT_CHECK(VirtIOMEMPCI, (obj), TYPE_VIRTIO_MEM_PCI) + +struct VirtIOMEMPCI { + VirtIOPCIProxy parent_obj; + VirtIOMEM vdev; +}; + +#endif /* QEMU_VIRTIO_MEM_PCI_H */ diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index cfedf5a995..fec72d5a31 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -87,6 +87,7 @@ extern bool pci_available; #define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012 #define PCI_DEVICE_ID_VIRTIO_PMEM 0x1013 #define PCI_DEVICE_ID_VIRTIO_IOMMU 0x1014 +#define PCI_DEVICE_ID_VIRTIO_MEM 0x1015 #define PCI_VENDOR_ID_REDHAT 0x1b36 #define PCI_DEVICE_ID_REDHAT_BRIDGE 0x0001
Let's add a proxy for virtio-mem, make it a memory device, and pass-through the properties. Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Cc: Igor Mammedov <imammedo@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/virtio/Makefile.objs | 1 + hw/virtio/virtio-mem-pci.c | 131 +++++++++++++++++++++++++++++++++++++ hw/virtio/virtio-mem-pci.h | 33 ++++++++++ include/hw/pci/pci.h | 1 + 4 files changed, 166 insertions(+) create mode 100644 hw/virtio/virtio-mem-pci.c create mode 100644 hw/virtio/virtio-mem-pci.h