[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-9.0 v2 01/10] vfio/spapr: Extend VFIOIOMMUOps with a release
From: |
Cédric Le Goater |
Subject: |
[PATCH for-9.0 v2 01/10] vfio/spapr: Extend VFIOIOMMUOps with a release handler |
Date: |
Tue, 19 Dec 2023 07:58:16 +0100 |
This allows to abstract a bit more the sPAPR IOMMU support in the
legacy IOMMU backend.
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
include/hw/vfio/vfio-container-base.h | 1 +
hw/vfio/container.c | 10 +++-----
hw/vfio/spapr.c | 35 +++++++++++++++------------
3 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/include/hw/vfio/vfio-container-base.h
b/include/hw/vfio/vfio-container-base.h
index
2ae297ccda93fd97986c852a8329b390fa1ab91f..5c9594b6c77681e5593236e711e7e391e5f2bdff
100644
--- a/include/hw/vfio/vfio-container-base.h
+++ b/include/hw/vfio/vfio-container-base.h
@@ -117,5 +117,6 @@ struct VFIOIOMMUOps {
Error **errp);
void (*del_window)(VFIOContainerBase *bcontainer,
MemoryRegionSection *section);
+ void (*release)(VFIOContainerBase *bcontainer);
};
#endif /* HW_VFIO_VFIO_CONTAINER_BASE_H */
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index
b22feb8ded0a0d9ed98d6e206b78c0c6e2554d5c..1e77a2929e90ed1d2ee84062549c477ae651c5a8
100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -632,9 +632,8 @@ listener_release_exit:
QLIST_REMOVE(bcontainer, next);
vfio_kvm_device_del_group(group);
memory_listener_unregister(&bcontainer->listener);
- if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU ||
- container->iommu_type == VFIO_SPAPR_TCE_IOMMU) {
- vfio_spapr_container_deinit(container);
+ if (bcontainer->ops->release) {
+ bcontainer->ops->release(bcontainer);
}
enable_discards_exit:
@@ -667,9 +666,8 @@ static void vfio_disconnect_container(VFIOGroup *group)
*/
if (QLIST_EMPTY(&container->group_list)) {
memory_listener_unregister(&bcontainer->listener);
- if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU ||
- container->iommu_type == VFIO_SPAPR_TCE_IOMMU) {
- vfio_spapr_container_deinit(container);
+ if (bcontainer->ops->release) {
+ bcontainer->ops->release(bcontainer);
}
}
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index
5c6426e6973bec606667ebcaca5b0585b184a214..44617dfc6b5f1a2a3a1c37436b76042aebda8b63
100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -440,6 +440,24 @@ vfio_spapr_container_del_section_window(VFIOContainerBase
*bcontainer,
}
}
+static void vfio_spapr_container_release(VFIOContainerBase *bcontainer)
+{
+ VFIOContainer *container = container_of(bcontainer, VFIOContainer,
+ bcontainer);
+ VFIOSpaprContainer *scontainer = container_of(container,
VFIOSpaprContainer,
+ container);
+ VFIOHostDMAWindow *hostwin, *next;
+
+ if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU) {
+ memory_listener_unregister(&scontainer->prereg_listener);
+ }
+ QLIST_FOREACH_SAFE(hostwin, &scontainer->hostwin_list, hostwin_next,
+ next) {
+ QLIST_REMOVE(hostwin, hostwin_next);
+ g_free(hostwin);
+ }
+}
+
static VFIOIOMMUOps vfio_iommu_spapr_ops;
static void setup_spapr_ops(VFIOContainerBase *bcontainer)
@@ -447,6 +465,7 @@ static void setup_spapr_ops(VFIOContainerBase *bcontainer)
vfio_iommu_spapr_ops = *bcontainer->ops;
vfio_iommu_spapr_ops.add_window = vfio_spapr_container_add_section_window;
vfio_iommu_spapr_ops.del_window = vfio_spapr_container_del_section_window;
+ vfio_iommu_spapr_ops.release = vfio_spapr_container_release;
bcontainer->ops = &vfio_iommu_spapr_ops;
}
@@ -527,19 +546,3 @@ listener_unregister_exit:
}
return ret;
}
-
-void vfio_spapr_container_deinit(VFIOContainer *container)
-{
- VFIOSpaprContainer *scontainer = container_of(container,
VFIOSpaprContainer,
- container);
- VFIOHostDMAWindow *hostwin, *next;
-
- if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU) {
- memory_listener_unregister(&scontainer->prereg_listener);
- }
- QLIST_FOREACH_SAFE(hostwin, &scontainer->hostwin_list, hostwin_next,
- next) {
- QLIST_REMOVE(hostwin, hostwin_next);
- g_free(hostwin);
- }
-}
--
2.43.0
- [PATCH for-9.0 v2 00/10] vfio: Introduce a VFIOIOMMUClass, Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 02/10] vfio/container: Introduce vfio_legacy_setup() for further cleanups, Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 01/10] vfio/spapr: Extend VFIOIOMMUOps with a release handler,
Cédric Le Goater <=
- [PATCH for-9.0 v2 03/10] vfio/container: Initialize VFIOIOMMUOps under vfio_init_container(), Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 04/10] vfio/container: Introduce a VFIOIOMMU QOM interface, Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 05/10] vfio/container: Introduce a VFIOIOMMU legacy QOM interface, Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 06/10] vfio/container: Intoduce a new VFIOIOMMUClass::setup handler, Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 07/10] vfio/spapr: Introduce a sPAPR VFIOIOMMU QOM interface, Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 08/10] vfio/iommufd: Introduce a VFIOIOMMU iommufd QOM interface, Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 09/10] vfio/spapr: Only compile sPAPR IOMMU support when needed, Cédric Le Goater, 2023/12/19
- [PATCH for-9.0 v2 10/10] vfio/iommufd: Remove CONFIG_IOMMUFD usage, Cédric Le Goater, 2023/12/19
- Re: [PATCH for-9.0 v2 00/10] vfio: Introduce a VFIOIOMMUClass, Cédric Le Goater, 2023/12/20
- Re: [PATCH for-9.0 v2 00/10] vfio: Introduce a VFIOIOMMUClass, Eric Farman, 2023/12/20