[RFC 12/18] vfio/container-obj: Introduce [attach/detach]_device container callbacks

Yi Liu
2022-04-14T10:47:40Z

From: Eric Auger <eric.auger@redhat.com>

Let's turn attach/detach_device as container callbacks. That way,
their implementation can be easily customized for a given backend.

For the time being, only the legacy container is supported.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
hw/vfio/as.c | 36 ++++++++++++++++++++++++++++
hw/vfio/container.c | 11 +++++----
hw/vfio/pci.c | 2 +-
include/hw/vfio/vfio-common.h | 7 ++++++
include/hw/vfio/vfio-container-obj.h | 6 +++++
5 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/hw/vfio/as.c b/hw/vfio/as.c
index 37423d2c89..30e86f6833 100644
--- a/hw/vfio/as.c
+++ b/hw/vfio/as.c
@@ -874,3 +874,39 @@ void vfio_put_address_space(VFIOAddressSpace *space)
g_free(space);
}
}
+
+static VFIOContainerClass *
+vfio_get_container_class(VFIOIOMMUBackendType be)
+{
+ ObjectClass *klass;
+
+ switch (be) {
+ case VFIO_IOMMU_BACKEND_TYPE_LEGACY:
+ klass = object_class_by_name(TYPE_VFIO_LEGACY_CONTAINER);
+ return VFIO_CONTAINER_OBJ_CLASS(klass);
+ default:
+ return NULL;
+ }
+}
+
+int vfio_attach_device(VFIODevice *vbasedev, AddressSpace *as, Error **errp)
+{
+ VFIOContainerClass *vccs;
+
+ vccs = vfio_get_container_class(VFIO_IOMMU_BACKEND_TYPE_LEGACY);
+ if (!vccs) {
+ return -ENOENT;
+ }
+ return vccs->attach_device(vbasedev, as, errp);
+}
+
+void vfio_detach_device(VFIODevice *vbasedev)
+{
+ VFIOContainerClass *vccs;
+
+ if (!vbasedev->container) {
+ return;
+ }
+ vccs = VFIO_CONTAINER_OBJ_GET_CLASS(vbasedev->container);
+ vccs->detach_device(vbasedev);
+}
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 5d73f8285e..74febc1567 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -50,8 +50,6 @@
static int vfio_kvm_device_fd = -1;
#endif

-#define TYPE_VFIO_LEGACY_CONTAINER "qemu:vfio-legacy-container"
-
VFIOGroupList vfio_group_list =
QLIST_HEAD_INITIALIZER(vfio_group_list);

@@ -1240,7 +1238,8 @@ static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp)
return groupid;
}

-int vfio_attach_device(VFIODevice *vbasedev, AddressSpace *as, Error **errp)
+static int
+legacy_attach_device(VFIODevice *vbasedev, AddressSpace *as, Error **errp)
{
int groupid = vfio_device_groupid(vbasedev, errp);
VFIODevice *vbasedev_iter;
@@ -1269,14 +1268,16 @@ int vfio_attach_device(VFIODevice *vbasedev, AddressSpace *as, Error **errp)
vfio_put_group(group);
return -1;
}
+ vbasedev->container = &group->container->obj;

return 0;
}

-void vfio_detach_device(VFIODevice *vbasedev)
+static void legacy_detach_device(VFIODevice *vbasedev)
{
vfio_put_base_device(vbasedev);
vfio_put_group(vbasedev->group);
+ vbasedev->container = NULL;
}

static void vfio_legacy_container_class_init(ObjectClass *klass,
@@ -1292,6 +1293,8 @@ static void vfio_legacy_container_class_init(ObjectClass *klass,
vccs->add_window = vfio_legacy_container_add_section_window;
vccs->del_window = vfio_legacy_container_del_section_window;
vccs->check_extension = vfio_legacy_container_check_extension;
+ vccs->attach_device = legacy_attach_device;
+ vccs->detach_device = legacy_detach_device;
}

static const TypeInfo vfio_legacy_container_info = {
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 0363f81017..e1ab6d339d 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3063,7 +3063,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
}

if (!pdev->failover_pair_id &&
- vfio_container_check_extension(&vbasedev->group->container->obj,
+ vfio_container_check_extension(vbasedev->container,
VFIO_FEAT_LIVE_MIGRATION)) {
ret = vfio_migration_probe(vbasedev, errp);
if (ret) {
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 7d7898717e..2040c27cda 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -83,9 +83,15 @@ typedef struct VFIOLegacyContainer {

typedef struct VFIODeviceOps VFIODeviceOps;

+typedef enum VFIOIOMMUBackendType {
+ VFIO_IOMMU_BACKEND_TYPE_LEGACY = 0,
+ VFIO_IOMMU_BACKEND_TYPE_IOMMUFD = 1,
+} VFIOIOMMUBackendType;
+
typedef struct VFIODevice {
QLIST_ENTRY(VFIODevice) next;
struct VFIOGroup *group;
+ VFIOContainer *container;
char *sysfsdev;
char *name;
DeviceState *dev;
@@ -97,6 +103,7 @@ typedef struct VFIODevice {
bool ram_block_discard_allowed;
bool enable_migration;
VFIODeviceOps *ops;
+ VFIOIOMMUBackendType be;
unsigned int num_irqs;
unsigned int num_regions;
unsigned int flags;
diff --git a/include/hw/vfio/vfio-container-obj.h b/include/hw/vfio/vfio-container-obj.h
index 7ffbbb299f..ebc1340530 100644
--- a/include/hw/vfio/vfio-container-obj.h
+++ b/include/hw/vfio/vfio-container-obj.h
@@ -42,6 +42,8 @@
OBJECT_GET_CLASS(VFIOContainerClass, (obj), \
TYPE_VFIO_CONTAINER_OBJ)

+#define TYPE_VFIO_LEGACY_CONTAINER "qemu:vfio-legacy-container"
+
typedef enum VFIOContainerFeature {
VFIO_FEAT_LIVE_MIGRATION,
} VFIOContainerFeature;
@@ -101,6 +103,8 @@ struct VFIOContainer {
QLIST_ENTRY(VFIOContainer) next;
};

+typedef struct VFIODevice VFIODevice;
+
typedef struct VFIOContainerClass {
/* private */
ObjectClass parent_class;
@@ -126,6 +130,8 @@ typedef struct VFIOContainerClass {
Error **errp);
void (*del_window)(VFIOContainer *container,
MemoryRegionSection *section);
+ int (*attach_device)(VFIODevice *vbasedev, AddressSpace *as, Error **errp);
+ void (*detach_device)(VFIODevice *vbasedev);
} VFIOContainerClass;

bool vfio_container_check_extension(VFIOContainer *container,
--
2.27.0