Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
---
hw/vfio/common.c | 207 +++++++++++++++++++++++++++++++++++++++++-
hw/vfio/pci.c | 18 +++-
hw/vfio/user.c | 3 +
hw/vfio/user.h | 1 +
include/hw/vfio/vfio-common.h | 6 ++
5 files changed, 231 insertions(+), 4 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index b540195..e73a772 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -19,6 +19,7 @@
*/
#include "qemu/osdep.h"
+#include CONFIG_DEVICES
#include <sys/ioctl.h>
#ifdef CONFIG_KVM
#include <linux/kvm.h>
@@ -2267,6 +2268,208 @@ put_space_exit:
return ret;
}
+
+#ifdef CONFIG_VFIO_USER
+
+static int vfio_connect_proxy(VFIOProxy *proxy, VFIOGroup *group,
+ AddressSpace *as, Error **errp)
+{
+ VFIOAddressSpace *space;
+ VFIOContainer *container;
+ int ret;
+
+ /*
+ * try to mirror vfio_connect_container()
+ * as much as possible
+ */
+
+ space = vfio_get_address_space(as);
+
+ container = g_malloc0(sizeof(*container));
+ container->space = space;
+ container->fd = -1;
+ container->error = NULL;
+ container->io_ops = &vfio_cont_io_sock;
+ QLIST_INIT(&container->giommu_list);
+ QLIST_INIT(&container->hostwin_list);
+ QLIST_INIT(&container->vrdl_list);
+ container->proxy = proxy;
+
+ /*
+ * The proxy uses a SW IOMMU in lieu of the HW one
+ * used in the ioctl() version. Mascarade as TYPE1
+ * for maximum capatibility
+ */
+ container->iommu_type = VFIO_TYPE1_IOMMU;
+
+ /*
+ * VFIO user allows the device server to map guest
+ * memory so it has the same issue with discards as
+ * a local IOMMU has.
+ */
+ ret = vfio_ram_block_discard_disable(container, true);
+ if (ret) {
+ error_setg_errno(errp, -ret, "Cannot set discarding of RAM broken");
+ goto free_container_exit;
+ }
+
+ vfio_host_win_add(container, 0, (hwaddr)-1, proxy->dma_pgsizes);
+ container->pgsizes = proxy->dma_pgsizes;
+ container->dma_max_mappings = proxy->max_dma;
+
+ /* setup bitmask now, but migration support won't be ready until v2 */
+ container->dirty_pages_supported = true;
+ container->max_dirty_bitmap_size = proxy->max_bitmap;
+ container->dirty_pgsizes = proxy->migr_pgsize;
+
+ QLIST_INIT(&container->group_list);
+ QLIST_INSERT_HEAD(&space->containers, container, next);
+
+ group->container = container;
+ QLIST_INSERT_HEAD(&container->group_list, group, container_next);
+
+ container->listener = vfio_memory_listener;
+ memory_listener_register(&container->listener, container->space->as);
+
+ if (container->error) {
+ ret = -1;
+ error_propagate_prepend(errp, container->error,
+ "memory listener initialization failed: ");
+ goto listener_release_exit;
+ }
+
+ container->initialized = true;
+
+ return 0;
+
+listener_release_exit:
+ QLIST_REMOVE(group, container_next);
+ QLIST_REMOVE(container, next);
+ vfio_listener_release(container);
+ vfio_ram_block_discard_disable(container, false);
+
+free_container_exit:
+ g_free(container);
+
+ vfio_put_address_space(space);
+
+ return ret;
+}
+
+static void vfio_disconnect_proxy(VFIOGroup *group)
+{
+ VFIOContainer *container = group->container;
+ VFIOAddressSpace *space = container->space;
+ VFIOGuestIOMMU *giommu, *tmp;
+ VFIOHostDMAWindow *hostwin, *next;
+
+ /*
+ * try to mirror vfio_disconnect_container()
+ * as much as possible, knowing each device
+ * is in one group and one container
+ */
+
+ QLIST_REMOVE(group, container_next);
+ group->container = NULL;
+
+ /*
+ * Explicitly release the listener first before unset container,
+ * since unset may destroy the backend container if it's the last
+ * group.
+ */
+ memory_listener_unregister(&container->listener);
+
+ QLIST_REMOVE(container, next);
+
+ QLIST_FOREACH_SAFE(giommu, &container->giommu_list, giommu_next, tmp) {
+ memory_region_unregister_iommu_notifier(
+ MEMORY_REGION(giommu->iommu_mr), &giommu->n);
+ QLIST_REMOVE(giommu, giommu_next);
+ g_free(giommu);
+ }
+
+ QLIST_FOREACH_SAFE(hostwin, &container->hostwin_list, hostwin_next,
+ next) {
+ QLIST_REMOVE(hostwin, hostwin_next);
+ g_free(hostwin);
+ }
+
+ g_free(container);
+ vfio_put_address_space(space);
+}
+
+int vfio_user_get_device(VFIOGroup *group, VFIODevice *vbasedev, Error **errp)
+{
+ struct vfio_device_info info = { .argsz = sizeof(info) };
+ int ret;
+
+ ret = VDEV_GET_INFO(vbasedev, &info);
+ if (ret) {
+ error_setg_errno(errp, -ret, "get info failure");
+ return ret;
+ }
+
+ vbasedev->fd = -1;
+ vbasedev->group = group;
+ QLIST_INSERT_HEAD(&group->device_list, vbasedev, next);
+
+ vbasedev->num_irqs = info.num_irqs;
+ vbasedev->num_regions = info.num_regions;
+ vbasedev->flags = info.flags;
+
+ vfio_get_all_regions(vbasedev);
+ vbasedev->reset_works = !!(info.flags & VFIO_DEVICE_FLAGS_RESET);
+ return 0;
+}
+
+VFIOGroup *vfio_user_get_group(VFIOProxy *proxy, AddressSpace *as, Error **errp)
+{
+ VFIOGroup *group;
+
+ /*
+ * Mirror vfio_get_group(), except that each
+ * device gets its own group and container,
+ * unrelated to any host IOMMU groupings
+ */
+ group = g_malloc0(sizeof(*group));
+ group->fd = -1;
+ group->groupid = -1;
+ QLIST_INIT(&group->device_list);
+
+ if (vfio_connect_proxy(proxy, group, as, errp)) {
+ error_prepend(errp, "failed to connect proxy");
+ g_free(group);
+ group = NULL;
+ }
+
+ if (QLIST_EMPTY(&vfio_group_list)) {
+ qemu_register_reset(vfio_reset_handler, NULL);
+ }
+
+ QLIST_INSERT_HEAD(&vfio_group_list, group, next);
+
+ return group;
+}
+
+void vfio_user_put_group(VFIOGroup *group)
+{
+ if (!group || !QLIST_EMPTY(&group->device_list)) {
+ return;
+ }
+
+ vfio_ram_block_discard_disable(group->container, false);
+ vfio_disconnect_proxy(group);
+ QLIST_REMOVE(group, next);
+ g_free(group);
+
+ if (QLIST_EMPTY(&vfio_group_list)) {
+ qemu_unregister_reset(vfio_reset_handler, NULL);
+ }
+}
+
+#endif /* CONFIG_VFIO_USER */
+
+
static void vfio_disconnect_container(VFIOGroup *group)
{
VFIOContainer *container = group->container;
@@ -2499,7 +2702,9 @@ void vfio_put_base_device(VFIODevice *vbasedev)
QLIST_REMOVE(vbasedev, next);
vbasedev->group = NULL;
trace_vfio_put_base_device(vbasedev->fd);
- close(vbasedev->fd);
+ if (vbasedev->fd != -1) {
+ close(vbasedev->fd);
+ }
}
int vfio_get_region_info(VFIODevice *vbasedev, int index,
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index a1ae3fb..53e3bb8 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3584,7 +3584,7 @@ static void vfio_user_pci_realize(PCIDevice *pdev, Error **errp)
VFIODevice *vbasedev = &vdev->vbasedev;
SocketAddress addr;
VFIOProxy *proxy;
- struct vfio_device_info info;
+ VFIOGroup *group = NULL;
int ret;
Error *err = NULL;
@@ -3630,9 +3630,15 @@ static void vfio_user_pci_realize(PCIDevice *pdev, Error **errp)
vbasedev->io_ops = &vfio_dev_io_sock;
vdev->vbasedev.irq_mask_works = true;
- ret = VDEV_GET_INFO(vbasedev, &info);
+ group = vfio_user_get_group(proxy, pci_device_iommu_address_space(pdev),
+ errp);
+ if (!group) {
+ goto error;
+ }
+
+ ret = vfio_user_get_device(group, vbasedev, errp);
if (ret) {
- error_setg_errno(errp, -ret, "get info failure");
+ vfio_user_put_group(group);
goto error;
}
@@ -3692,12 +3698,18 @@ static void vfio_user_instance_finalize(Object *obj)
{
VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj);
VFIODevice *vbasedev = &vdev->vbasedev;
+ VFIOGroup *group = vbasedev->group;
+
+ vfio_bars_finalize(vdev);
+ g_free(vdev->emulated_config_bits);
+ g_free(vdev->rom);
if (vdev->msix != NULL) {
vfio_user_msix_teardown(vdev);
}
vfio_put_device(vdev);
+ vfio_user_put_group(group);
if (vbasedev->proxy != NULL) {
vfio_user_disconnect(vbasedev->proxy);
diff --git a/hw/vfio/user.c b/hw/vfio/user.c
index 815385b..2d35f83 100644
--- a/hw/vfio/user.c
+++ b/hw/vfio/user.c
@@ -1433,3 +1433,6 @@ VFIODevIO vfio_dev_io_sock = {
.region_write = vfio_user_io_region_write,
};
+
+VFIOContIO vfio_cont_io_sock = {
+};
diff --git a/hw/vfio/user.h b/hw/vfio/user.h
index 359a029..19b8a29 100644
--- a/hw/vfio/user.h
+++ b/hw/vfio/user.h
@@ -94,5 +94,6 @@ void vfio_user_set_handler(VFIODevice *vbasedev,
int vfio_user_validate_version(VFIOProxy *proxy, Error **errp);
extern VFIODevIO vfio_dev_io_sock;
+extern VFIOContIO vfio_cont_io_sock;
#endif /* VFIO_USER_H */
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 793ca94..312ef9c 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -94,6 +94,7 @@ typedef struct VFIOContainer {
uint64_t max_dirty_bitmap_size;
unsigned long pgsizes;
unsigned int dma_max_mappings;
+ VFIOProxy *proxy;
QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
QLIST_HEAD(, VFIOGroup) group_list;
@@ -282,6 +283,11 @@ void vfio_put_group(VFIOGroup *group);
int vfio_get_device(VFIOGroup *group, const char *name,
VFIODevice *vbasedev, Error **errp);
+int vfio_user_get_device(VFIOGroup *group, VFIODevice *vbasedev, Error **errp);
+VFIOGroup *vfio_user_get_group(VFIOProxy *proxy, AddressSpace *as,
+ Error **errp);
+void vfio_user_put_group(VFIOGroup *group);
+
extern const MemoryRegionOps vfio_region_ops;
typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;
extern VFIOGroupList vfio_group_list;
--
1.8.3.1On 11/9/22 00:13, John Johnson wrote:
> Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
> Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
> Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
> ---
> hw/vfio/common.c | 207 +++++++++++++++++++++++++++++++++++++++++-
> hw/vfio/pci.c | 18 +++-
> hw/vfio/user.c | 3 +
> hw/vfio/user.h | 1 +
> include/hw/vfio/vfio-common.h | 6 ++
> 5 files changed, 231 insertions(+), 4 deletions(-)
>
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index b540195..e73a772 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -19,6 +19,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include CONFIG_DEVICES
> #include <sys/ioctl.h>
> #ifdef CONFIG_KVM
> #include <linux/kvm.h>
> @@ -2267,6 +2268,208 @@ put_space_exit:
> return ret;
> }
>
> +
> +#ifdef CONFIG_VFIO_USER
this code belongs to hw/vfio/user.c. You will need to export the required
vfio subroutines for it.
> +
> +static int vfio_connect_proxy(VFIOProxy *proxy, VFIOGroup *group,
> + AddressSpace *as, Error **errp)
> +{
> + VFIOAddressSpace *space;
> + VFIOContainer *container;
> + int ret;
> +
> + /*
> + * try to mirror vfio_connect_container()
> + * as much as possible
> + */
Yes. This is very much like the VFIO_TYPE1_IOMMU case.
Could we wrap the vfio_get_iommu_info() routine in some way to bring it
even close ? to avoid all this code duplication.
> +
> + space = vfio_get_address_space(as);
> +
> + container = g_malloc0(sizeof(*container));
> + container->space = space;
> + container->fd = -1;
> + container->error = NULL;
> + container->io_ops = &vfio_cont_io_sock;
> + QLIST_INIT(&container->giommu_list);
> + QLIST_INIT(&container->hostwin_list);
> + QLIST_INIT(&container->vrdl_list);
> + container->proxy = proxy;
> +
> + /*
> + * The proxy uses a SW IOMMU in lieu of the HW one
> + * used in the ioctl() version. Mascarade as TYPE1
> + * for maximum capatibility
> + */
> + container->iommu_type = VFIO_TYPE1_IOMMU;
> +
> + /*
> + * VFIO user allows the device server to map guest
> + * memory so it has the same issue with discards as
> + * a local IOMMU has.
> + */
> + ret = vfio_ram_block_discard_disable(container, true);
> + if (ret) {
> + error_setg_errno(errp, -ret, "Cannot set discarding of RAM broken");
> + goto free_container_exit;
> + }
> +
> + vfio_host_win_add(container, 0, (hwaddr)-1, proxy->dma_pgsizes);
> + container->pgsizes = proxy->dma_pgsizes;
> + container->dma_max_mappings = proxy->max_dma;
> +
> + /* setup bitmask now, but migration support won't be ready until v2 */
> + container->dirty_pages_supported = true;
> + container->max_dirty_bitmap_size = proxy->max_bitmap;
> + container->dirty_pgsizes = proxy->migr_pgsize;
> +
> + QLIST_INIT(&container->group_list);
> + QLIST_INSERT_HEAD(&space->containers, container, next);
> +
> + group->container = container;
> + QLIST_INSERT_HEAD(&container->group_list, group, container_next);
> +
> + container->listener = vfio_memory_listener;
> + memory_listener_register(&container->listener, container->space->as);
> +
> + if (container->error) {
> + ret = -1;
> + error_propagate_prepend(errp, container->error,
> + "memory listener initialization failed: ");
> + goto listener_release_exit;
> + }
> +
> + container->initialized = true;
> +
> + return 0;
> +
> +listener_release_exit:
> + QLIST_REMOVE(group, container_next);
> + QLIST_REMOVE(container, next);
> + vfio_listener_release(container);
> + vfio_ram_block_discard_disable(container, false);
> +
> +free_container_exit:
> + g_free(container);
> +
> + vfio_put_address_space(space);
> +
> + return ret;
> +}
> +
> +static void vfio_disconnect_proxy(VFIOGroup *group)
> +{
> + VFIOContainer *container = group->container;
> + VFIOAddressSpace *space = container->space;
> + VFIOGuestIOMMU *giommu, *tmp;
> + VFIOHostDMAWindow *hostwin, *next;
> +
> + /*
> + * try to mirror vfio_disconnect_container()
same comment.
Given the code that follows, I wonder if we shouldn't introduce new
VFIOGroup models: Base, PCI, User, to isolate the differences and
reduce duplication.
Thanks,
C.
> + * as much as possible, knowing each device
> + * is in one group and one container
> + */
> +
> + QLIST_REMOVE(group, container_next);
> + group->container = NULL;
> +
> + /*
> + * Explicitly release the listener first before unset container,
> + * since unset may destroy the backend container if it's the last
> + * group.
> + */
> + memory_listener_unregister(&container->listener);
> +
> + QLIST_REMOVE(container, next);
> +
> + QLIST_FOREACH_SAFE(giommu, &container->giommu_list, giommu_next, tmp) {
> + memory_region_unregister_iommu_notifier(
> + MEMORY_REGION(giommu->iommu_mr), &giommu->n);
> + QLIST_REMOVE(giommu, giommu_next);
> + g_free(giommu);
> + }
> +
> + QLIST_FOREACH_SAFE(hostwin, &container->hostwin_list, hostwin_next,
> + next) {
> + QLIST_REMOVE(hostwin, hostwin_next);
> + g_free(hostwin);
> + }
> +
> + g_free(container);
> + vfio_put_address_space(space);
> +}
> +
> +int vfio_user_get_device(VFIOGroup *group, VFIODevice *vbasedev, Error **errp)
> +{
> + struct vfio_device_info info = { .argsz = sizeof(info) };
> + int ret;
> +
> + ret = VDEV_GET_INFO(vbasedev, &info);
> + if (ret) {
> + error_setg_errno(errp, -ret, "get info failure");
> + return ret;
> + }
> +
> + vbasedev->fd = -1;
> + vbasedev->group = group;
> + QLIST_INSERT_HEAD(&group->device_list, vbasedev, next);
> +
> + vbasedev->num_irqs = info.num_irqs;
> + vbasedev->num_regions = info.num_regions;
> + vbasedev->flags = info.flags;
> +
> + vfio_get_all_regions(vbasedev);
> + vbasedev->reset_works = !!(info.flags & VFIO_DEVICE_FLAGS_RESET);
> + return 0;
> +}
> +
> +VFIOGroup *vfio_user_get_group(VFIOProxy *proxy, AddressSpace *as, Error **errp)
> +{
> + VFIOGroup *group;
> +
> + /*
> + * Mirror vfio_get_group(), except that each
> + * device gets its own group and container,
> + * unrelated to any host IOMMU groupings
> + */
> + group = g_malloc0(sizeof(*group));
> + group->fd = -1;
> + group->groupid = -1;
> + QLIST_INIT(&group->device_list);
> +
> + if (vfio_connect_proxy(proxy, group, as, errp)) {
> + error_prepend(errp, "failed to connect proxy");
> + g_free(group);
> + group = NULL;
> + }
> +
> + if (QLIST_EMPTY(&vfio_group_list)) {
> + qemu_register_reset(vfio_reset_handler, NULL);
> + }
> +
> + QLIST_INSERT_HEAD(&vfio_group_list, group, next);
> +
> + return group;
> +}
> +
> +void vfio_user_put_group(VFIOGroup *group)
> +{
> + if (!group || !QLIST_EMPTY(&group->device_list)) {
> + return;
> + }
> +
> + vfio_ram_block_discard_disable(group->container, false);
> + vfio_disconnect_proxy(group);
> + QLIST_REMOVE(group, next);
> + g_free(group);
> +
> + if (QLIST_EMPTY(&vfio_group_list)) {
> + qemu_unregister_reset(vfio_reset_handler, NULL);
> + }
> +}
> +
> +#endif /* CONFIG_VFIO_USER */
> +
> +
> static void vfio_disconnect_container(VFIOGroup *group)
> {
> VFIOContainer *container = group->container;
> @@ -2499,7 +2702,9 @@ void vfio_put_base_device(VFIODevice *vbasedev)
> QLIST_REMOVE(vbasedev, next);
> vbasedev->group = NULL;
> trace_vfio_put_base_device(vbasedev->fd);
> - close(vbasedev->fd);
> + if (vbasedev->fd != -1) {
> + close(vbasedev->fd);
> + }
> }
>
> int vfio_get_region_info(VFIODevice *vbasedev, int index,
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index a1ae3fb..53e3bb8 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -3584,7 +3584,7 @@ static void vfio_user_pci_realize(PCIDevice *pdev, Error **errp)
> VFIODevice *vbasedev = &vdev->vbasedev;
> SocketAddress addr;
> VFIOProxy *proxy;
> - struct vfio_device_info info;
> + VFIOGroup *group = NULL;
> int ret;
> Error *err = NULL;
>
> @@ -3630,9 +3630,15 @@ static void vfio_user_pci_realize(PCIDevice *pdev, Error **errp)
> vbasedev->io_ops = &vfio_dev_io_sock;
> vdev->vbasedev.irq_mask_works = true;
>
> - ret = VDEV_GET_INFO(vbasedev, &info);
> + group = vfio_user_get_group(proxy, pci_device_iommu_address_space(pdev),
> + errp);
> + if (!group) {
> + goto error;
> + }
> +
> + ret = vfio_user_get_device(group, vbasedev, errp);
> if (ret) {
> - error_setg_errno(errp, -ret, "get info failure");
> + vfio_user_put_group(group);
> goto error;
> }
>
> @@ -3692,12 +3698,18 @@ static void vfio_user_instance_finalize(Object *obj)
> {
> VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj);
> VFIODevice *vbasedev = &vdev->vbasedev;
> + VFIOGroup *group = vbasedev->group;
> +
> + vfio_bars_finalize(vdev);
> + g_free(vdev->emulated_config_bits);
> + g_free(vdev->rom);
>
> if (vdev->msix != NULL) {
> vfio_user_msix_teardown(vdev);
> }
>
> vfio_put_device(vdev);
> + vfio_user_put_group(group);
>
> if (vbasedev->proxy != NULL) {
> vfio_user_disconnect(vbasedev->proxy);
> diff --git a/hw/vfio/user.c b/hw/vfio/user.c
> index 815385b..2d35f83 100644
> --- a/hw/vfio/user.c
> +++ b/hw/vfio/user.c
> @@ -1433,3 +1433,6 @@ VFIODevIO vfio_dev_io_sock = {
> .region_write = vfio_user_io_region_write,
> };
>
> +
> +VFIOContIO vfio_cont_io_sock = {
> +};
> diff --git a/hw/vfio/user.h b/hw/vfio/user.h
> index 359a029..19b8a29 100644
> --- a/hw/vfio/user.h
> +++ b/hw/vfio/user.h
> @@ -94,5 +94,6 @@ void vfio_user_set_handler(VFIODevice *vbasedev,
> int vfio_user_validate_version(VFIOProxy *proxy, Error **errp);
>
> extern VFIODevIO vfio_dev_io_sock;
> +extern VFIOContIO vfio_cont_io_sock;
>
> #endif /* VFIO_USER_H */
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index 793ca94..312ef9c 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -94,6 +94,7 @@ typedef struct VFIOContainer {
> uint64_t max_dirty_bitmap_size;
> unsigned long pgsizes;
> unsigned int dma_max_mappings;
> + VFIOProxy *proxy;
> QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
> QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
> QLIST_HEAD(, VFIOGroup) group_list;
> @@ -282,6 +283,11 @@ void vfio_put_group(VFIOGroup *group);
> int vfio_get_device(VFIOGroup *group, const char *name,
> VFIODevice *vbasedev, Error **errp);
>
> +int vfio_user_get_device(VFIOGroup *group, VFIODevice *vbasedev, Error **errp);
> +VFIOGroup *vfio_user_get_group(VFIOProxy *proxy, AddressSpace *as,
> + Error **errp);
> +void vfio_user_put_group(VFIOGroup *group);
> +
> extern const MemoryRegionOps vfio_region_ops;
> typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;
> extern VFIOGroupList vfio_group_list;
On Tue, Nov 08, 2022 at 03:13:38PM -0800, John Johnson wrote:
> + /*
> + * The proxy uses a SW IOMMU in lieu of the HW one
> + * used in the ioctl() version. Mascarade as TYPE1
> + * for maximum capatibility
> + */
capability
> @@ -3692,12 +3698,18 @@ static void vfio_user_instance_finalize(Object *obj)
> {
> VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj);
> VFIODevice *vbasedev = &vdev->vbasedev;
> + VFIOGroup *group = vbasedev->group;
> +
> + vfio_bars_finalize(vdev);
> + g_free(vdev->emulated_config_bits);
> + g_free(vdev->rom);
These changes seem unrelated to this particular patch?
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index 793ca94..312ef9c 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -94,6 +94,7 @@ typedef struct VFIOContainer {
> uint64_t max_dirty_bitmap_size;
> unsigned long pgsizes;
> unsigned int dma_max_mappings;
> + VFIOProxy *proxy;
> QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
> QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
> QLIST_HEAD(, VFIOGroup) group_list;
> @@ -282,6 +283,11 @@ void vfio_put_group(VFIOGroup *group);
> int vfio_get_device(VFIOGroup *group, const char *name,
> VFIODevice *vbasedev, Error **errp);
>
> +int vfio_user_get_device(VFIOGroup *group, VFIODevice *vbasedev, Error **errp);
> +VFIOGroup *vfio_user_get_group(VFIOProxy *proxy, AddressSpace *as,
> + Error **errp);
> +void vfio_user_put_group(VFIOGroup *group);
> +
Why aren't these in user.h?
regards
john
© 2016 - 2026 Red Hat, Inc.