From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEfKp-000260-31 for qemu-devel@nongnu.org; Mon, 13 Jul 2015 11:08:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEfKj-0002CG-5b for qemu-devel@nongnu.org; Mon, 13 Jul 2015 11:07:58 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:45804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEfKi-00029e-HU for qemu-devel@nongnu.org; Mon, 13 Jul 2015 11:07:53 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 14 Jul 2015 00:57:28 +1000 From: Alexey Kardashevskiy Date: Tue, 14 Jul 2015 00:56:19 +1000 Message-Id: <1436799381-16150-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1436799381-16150-1-git-send-email-aik@ozlabs.ru> References: <1436799381-16150-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [RFC PATCH qemu v2 3/5] vfio: Store IOMMU type in container List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Alex Williamson , qemu-ppc@nongnu.org, Michael Roth , David Gibson 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 --- 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