[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [RFC PATCH qemu v2 3/5] vfio: Store IOMMU type in container
From: |
Alexey Kardashevskiy |
Subject: |
[Qemu-ppc] [RFC PATCH qemu v2 3/5] vfio: Store IOMMU type in container |
Date: |
Tue, 14 Jul 2015 00:56:19 +1000 |
So far we were managing not to have an IOMMU type stored anywhere but
since we are going to implement different behavior for different IOMMU
types in the same memory listener, we need to know IOMMU type after
initialization.
This adds an IOMMU type into VFIOContainer and initializes it. This
adds SPAPR IOMMU data into the iommu_data union; for now it only includes
the existing Type1 data struct. Since zero is not used for any type,
no additional initialization is necessary for VFIOContainer::type.
This should cause no behavioral change.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
Changes:
v2:
* added VFIOContainer::iommu_data::spapr
---
hw/vfio/common.c | 11 ++++++-----
include/hw/vfio/vfio-common.h | 6 ++++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 225cdc7..510ab64 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -683,8 +683,8 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
goto free_container_exit;
}
- ret = ioctl(fd, VFIO_SET_IOMMU,
- v2 ? VFIO_TYPE1v2_IOMMU : VFIO_TYPE1_IOMMU);
+ container->iommu_data.type = v2 ? VFIO_TYPE1v2_IOMMU :
VFIO_TYPE1_IOMMU;
+ ret = ioctl(fd, VFIO_SET_IOMMU, container->iommu_data.type);
if (ret) {
error_report("vfio: failed to set iommu for container: %m");
ret = -errno;
@@ -712,7 +712,8 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
ret = -errno;
goto free_container_exit;
}
- ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_SPAPR_TCE_IOMMU);
+ container->iommu_data.type = VFIO_SPAPR_TCE_IOMMU;
+ ret = ioctl(fd, VFIO_SET_IOMMU, container->iommu_data.type);
if (ret) {
error_report("vfio: failed to set iommu for container: %m");
ret = -errno;
@@ -731,10 +732,10 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
goto free_container_exit;
}
- container->iommu_data.type1.listener = vfio_memory_listener;
+ container->iommu_data.spapr.common.listener = vfio_memory_listener;
container->iommu_data.release = vfio_listener_release;
- memory_listener_register(&container->iommu_data.type1.listener,
+ memory_listener_register(&container->iommu_data.spapr.common.listener,
container->space->as);
} else {
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 59a321d..135ea64 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -70,13 +70,19 @@ typedef struct VFIOType1 {
bool initialized;
} VFIOType1;
+typedef struct VFIOSPAPR {
+ VFIOType1 common;
+} VFIOSPAPR;
+
typedef struct VFIOContainer {
VFIOAddressSpace *space;
int fd; /* /dev/vfio/vfio, empowered by the attached groups */
struct {
/* enable abstraction to support various iommu backends */
+ unsigned type;
union {
VFIOType1 type1;
+ VFIOSPAPR spapr;
};
void (*release)(struct VFIOContainer *);
} iommu_data;
--
2.4.0.rc3.8.gfb3e7d5
- [Qemu-ppc] [RFC PATCH qemu v2 0/5] vfio: SPAPR IOMMU v2 (memory preregistration support), Alexey Kardashevskiy, 2015/07/13
- [Qemu-ppc] [RFC PATCH qemu v2 1/5] vfio: Switch from TARGET_PAGE_MASK to qemu_real_host_page_mask, Alexey Kardashevskiy, 2015/07/13
- [Qemu-ppc] [RFC PATCH qemu v2 5/5] vfio: spapr: Add SPAPR IOMMU v2 support (DMA memory preregistering), Alexey Kardashevskiy, 2015/07/13
- [Qemu-ppc] [RFC PATCH qemu v2 4/5] vfio: Refactor memory listener to accommodate more IOMMU types, Alexey Kardashevskiy, 2015/07/13
- [Qemu-ppc] [RFC PATCH qemu v2 2/5] vfio: Skip PCI BARs in memory listener, Alexey Kardashevskiy, 2015/07/13
- [Qemu-ppc] [RFC PATCH qemu v2 3/5] vfio: Store IOMMU type in container,
Alexey Kardashevskiy <=
- Re: [Qemu-ppc] [RFC PATCH qemu v2 0/5] vfio: SPAPR IOMMU v2 (memory preregistration support), Alex Williamson, 2015/07/13