From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFJHI-00039N-Ra for qemu-devel@nongnu.org; Wed, 15 Jul 2015 05:47:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFJHD-0007Z0-Bq for qemu-devel@nongnu.org; Wed, 15 Jul 2015 05:47:00 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:54309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFJH5-0007Nm-MI for qemu-devel@nongnu.org; Wed, 15 Jul 2015 05:46:55 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 Jul 2015 19:46:32 +1000 From: Alexey Kardashevskiy Date: Wed, 15 Jul 2015 19:45:06 +1000 Message-Id: <1436953507-16391-11-git-send-email-aik@ozlabs.ru> In-Reply-To: <1436953507-16391-1-git-send-email-aik@ozlabs.ru> References: <1436953507-16391-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH qemu v11 10/11] spapr_pci_vfio: Enable multiple groups per container List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Thomas Huth , Michael Roth , Alexey Kardashevskiy , Alexander Graf , Gavin Shan , Alex Williamson , qemu-ppc@nongnu.org, David Gibson This enables multiple IOMMU groups in one VFIO container which means that multiple devices from different groups can share the same IOMMU table (or tables if DDW). This removes a group id from vfio_container_ioctl(). The kernel support is required for this; if the host kernel does not have the support, it will allow only one group per container. The PHB's "iommuid" property is ignored. The ioctl is called for every container attached to the address space. At the moment there is just one container anyway. If there is no container attached to the address space, vfio_container_do_ioctl() returns -1. This removes casts to sPAPRPHBVFIOState as none of sPAPRPHBVFIOState members is accessed here. Signed-off-by: Alexey Kardashevskiy Reviewed-by: David Gibson Reviewed-by: Thomas Huth --- hw/ppc/spapr_pci_vfio.c | 17 ++++++----------- hw/vfio/common.c | 21 ++++++--------------- include/hw/vfio/vfio.h | 3 +-- 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 999ac3a..b744c65 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -35,7 +35,7 @@ int spapr_phb_vfio_dma_capabilities_update(sPAPRPHBState *sphb) struct vfio_iommu_spapr_tce_info info = { .argsz = sizeof(info) }; int ret; - ret = vfio_container_ioctl(&sphb->iommu_as, sphb->iommugroupid, + ret = vfio_container_ioctl(&sphb->iommu_as, VFIO_IOMMU_SPAPR_TCE_GET_INFO, &info); if (ret) { return ret; @@ -61,8 +61,7 @@ void spapr_phb_vfio_eeh_reenable(sPAPRPHBState *sphb) * ensures that the contained PCI devices will work properly * after reboot. */ - vfio_container_ioctl(&sphb->iommu_as, - sphb->iommugroupid, VFIO_EEH_PE_OP, &op); + vfio_container_ioctl(&sphb->iommu_as, VFIO_EEH_PE_OP, &op); } int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, @@ -88,8 +87,7 @@ int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, return RTAS_OUT_PARAM_ERROR; } - ret = vfio_container_ioctl(&sphb->iommu_as, sphb->iommugroupid, - VFIO_EEH_PE_OP, &op); + ret = vfio_container_ioctl(&sphb->iommu_as, VFIO_EEH_PE_OP, &op); if (ret < 0) { return RTAS_OUT_HW_ERROR; } @@ -103,8 +101,7 @@ int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state) int ret; op.op = VFIO_EEH_PE_GET_STATE; - ret = vfio_container_ioctl(&sphb->iommu_as, sphb->iommugroupid, - VFIO_EEH_PE_OP, &op); + ret = vfio_container_ioctl(&sphb->iommu_as, VFIO_EEH_PE_OP, &op); if (ret < 0) { return RTAS_OUT_PARAM_ERROR; } @@ -177,8 +174,7 @@ int spapr_phb_vfio_eeh_reset(sPAPRPHBState *sphb, int option) return RTAS_OUT_PARAM_ERROR; } - ret = vfio_container_ioctl(&sphb->iommu_as, sphb->iommugroupid, - VFIO_EEH_PE_OP, &op); + ret = vfio_container_ioctl(&sphb->iommu_as, VFIO_EEH_PE_OP, &op); if (ret < 0) { return RTAS_OUT_HW_ERROR; } @@ -192,8 +188,7 @@ int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb) int ret; op.op = VFIO_EEH_PE_CONFIGURE; - ret = vfio_container_ioctl(&sphb->iommu_as, sphb->iommugroupid, - VFIO_EEH_PE_OP, &op); + ret = vfio_container_ioctl(&sphb->iommu_as, VFIO_EEH_PE_OP, &op); if (ret < 0) { return RTAS_OUT_PARAM_ERROR; } diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 85ee9b0..64e0a54 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -926,35 +926,26 @@ void vfio_put_base_device(VFIODevice *vbasedev) close(vbasedev->fd); } -static int vfio_container_do_ioctl(AddressSpace *as, int32_t groupid, +static int vfio_container_do_ioctl(AddressSpace *as, int req, void *param) { - VFIOGroup *group; VFIOContainer *container; int ret = -1; + VFIOAddressSpace *space = vfio_get_address_space(as); - group = vfio_get_group(groupid, as); - if (!group) { - error_report("vfio: group %d not registered", groupid); - return ret; - } - - container = group->container; - if (group->container) { + QLIST_FOREACH(container, &space->containers, next) { ret = ioctl(container->fd, req, param); if (ret < 0) { error_report("vfio: failed to ioctl %d to container: ret=%d, %s", _IOC_NR(req) - VFIO_BASE, ret, strerror(errno)); + return -errno; } } - vfio_put_group(group); - return ret; } -int vfio_container_ioctl(AddressSpace *as, int32_t groupid, - int req, void *param) +int vfio_container_ioctl(AddressSpace *as, int req, void *param) { /* We allow only certain ioctls to the container */ switch (req) { @@ -968,5 +959,5 @@ int vfio_container_ioctl(AddressSpace *as, int32_t groupid, return -1; } - return vfio_container_do_ioctl(as, groupid, req, param); + return vfio_container_do_ioctl(as, req, param); } diff --git a/include/hw/vfio/vfio.h b/include/hw/vfio/vfio.h index 0b26cd8..e076c14 100644 --- a/include/hw/vfio/vfio.h +++ b/include/hw/vfio/vfio.h @@ -3,7 +3,6 @@ #include "qemu/typedefs.h" -extern int vfio_container_ioctl(AddressSpace *as, int32_t groupid, - int req, void *param); +extern int vfio_container_ioctl(AddressSpace *as, int req, void *param); #endif -- 2.4.0.rc3.8.gfb3e7d5