[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v3 10/25] vfio: register DualStageIOMMUObject to vIOMMU
From: |
Liu, Yi L |
Subject: |
[RFC v3 10/25] vfio: register DualStageIOMMUObject to vIOMMU |
Date: |
Wed, 29 Jan 2020 04:16:41 -0800 |
From: Liu Yi L <address@hidden>
After confirming dual stage DMA translation support
with kernel by checking VFIO_TYPE1_NESTING_IOMMU,
VFIO could register DualStageIOMMUObject instance to
vIOMMU, thus that vIOMMU is aware of such hardware
capability. vIOMMU may make use of such capability by
leveraging the ops provided by DualStageIOMMUObject.
Cc: Kevin Tian <address@hidden>
Cc: Jacob Pan <address@hidden>
Cc: Peter Xu <address@hidden>
Cc: Eric Auger <address@hidden>
Cc: Yi Sun <address@hidden>
Cc: David Gibson <address@hidden>
Cc: Alex Williamson <address@hidden>
Signed-off-by: Liu Yi L <address@hidden>
---
hw/vfio/common.c | 30 ++++++++++++++++++++++++++++--
include/hw/vfio/vfio-common.h | 2 ++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index a5e70b1..fc1723d 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1179,6 +1179,9 @@ static int vfio_get_iommu_type(VFIOContainer *container,
return -EINVAL;
}
+static struct DualStageIOMMUOps vfio_ds_iommu_ops = {
+};
+
static int vfio_init_container(VFIOContainer *container, int group_fd,
Error **errp)
{
@@ -1210,12 +1213,29 @@ static int vfio_init_container(VFIOContainer
*container, int group_fd,
return -errno;
}
+ if (iommu_type == VFIO_TYPE1_NESTING_IOMMU) {
+ ds_iommu_object_init(&container->dsi_obj, &vfio_ds_iommu_ops);
+ if (iommu_context_register_ds_iommu(container->iommu_ctx,
+ &container->dsi_obj)) {
+ /*
+ * Here just need an info to indicate that there is no
+ * DualStageIOMMUObject instance registered to vIOMMU
+ * due to either no IOMMUContext support in vIOMMU or
+ * vIOMMU internal failure. Neither is fatal error to
+ * VFIO as it is not mandatory requirement to use such
+ * capability in vIOMMU.
+ */
+ printf("No Dual Stage IOMMU for container(0x%p)\n", container);
+ ds_iommu_object_destroy(&container->dsi_obj);
+ }
+ }
+
container->iommu_type = iommu_type;
return 0;
}
static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
- Error **errp)
+ IOMMUContext *iommu_ctx, Error **errp)
{
VFIOContainer *container;
int ret, fd;
@@ -1277,6 +1297,7 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as,
container = g_malloc0(sizeof(*container));
container->space = space;
container->fd = fd;
+ container->iommu_ctx = iommu_ctx;
container->error = NULL;
QLIST_INIT(&container->giommu_list);
QLIST_INIT(&container->hostwin_list);
@@ -1457,6 +1478,11 @@ static void vfio_disconnect_container(VFIOGroup *group)
trace_vfio_disconnect_container(container->fd);
close(container->fd);
+ if (container->iommu_ctx) {
+ iommu_context_unregister_ds_iommu(container->iommu_ctx,
+ &container->dsi_obj);
+ }
+ ds_iommu_object_destroy(&container->dsi_obj);
g_free(container);
vfio_put_address_space(space);
@@ -1508,7 +1534,7 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace *as,
group->groupid = groupid;
QLIST_INIT(&group->device_list);
- if (vfio_connect_container(group, as, errp)) {
+ if (vfio_connect_container(group, as, iommu_ctx, errp)) {
error_prepend(errp, "failed to setup container for group %d: ",
groupid);
goto close_fd_exit;
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 8ab68fa..dc68552 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -72,6 +72,8 @@ typedef struct VFIOContainer {
MemoryListener listener;
MemoryListener prereg_listener;
unsigned iommu_type;
+ IOMMUContext *iommu_ctx;
+ DualStageIOMMUObject dsi_obj;
Error *error;
bool initialized;
unsigned long pgsizes;
--
2.7.4
- [RFC v3 02/25] hw/iommu: introduce DualStageIOMMUObject, (continued)
- [RFC v3 02/25] hw/iommu: introduce DualStageIOMMUObject, Liu, Yi L, 2020/01/29
- [RFC v3 07/25] header file update VFIO/IOMMU vSVA APIs, Liu, Yi L, 2020/01/29
- [RFC v3 05/25] intel_iommu: provide get_iommu_context() callback, Liu, Yi L, 2020/01/29
- [RFC v3 03/25] hw/iommu: introduce IOMMUContext, Liu, Yi L, 2020/01/29
- [RFC v3 10/25] vfio: register DualStageIOMMUObject to vIOMMU,
Liu, Yi L <=
- [RFC v3 01/25] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps, Liu, Yi L, 2020/01/29
- [RFC v3 12/25] vfio/common: add pasid_alloc/free support, Liu, Yi L, 2020/01/29
- [RFC v3 13/25] intel_iommu: modify x-scalable-mode to be string option, Liu, Yi L, 2020/01/29
- [RFC v3 11/25] vfio: get stage-1 pasid formats from Kernel, Liu, Yi L, 2020/01/29
- [RFC v3 15/25] intel_iommu: process pasid cache invalidation, Liu, Yi L, 2020/01/29
- [RFC v3 14/25] intel_iommu: add virtual command capability support, Liu, Yi L, 2020/01/29
- [RFC v3 16/25] intel_iommu: add PASID cache management infrastructure, Liu, Yi L, 2020/01/29
- [RFC v3 17/25] vfio: add bind stage-1 page table support, Liu, Yi L, 2020/01/29
- [RFC v3 18/25] intel_iommu: bind/unbind guest page table to host, Liu, Yi L, 2020/01/29
- [RFC v3 19/25] intel_iommu: replay guest pasid bindings to host, Liu, Yi L, 2020/01/29