From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFLkY-0005Dj-Ly for qemu-devel@nongnu.org; Fri, 30 Aug 2013 06:16:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFLkL-0003Xb-Rw for qemu-devel@nongnu.org; Fri, 30 Aug 2013 06:16:18 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:43839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFLkL-0003WQ-7e for qemu-devel@nongnu.org; Fri, 30 Aug 2013 06:16:05 -0400 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 30 Aug 2013 20:07:25 +1000 From: Alexey Kardashevskiy Date: Fri, 30 Aug 2013 20:15:37 +1000 Message-Id: <1377857738-14789-12-git-send-email-aik@ozlabs.ru> In-Reply-To: <1377857738-14789-1-git-send-email-aik@ozlabs.ru> References: <1377857738-14789-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v4 11/12] spapr vfio: enable for spapr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Alexander Graf , Alex Williamson , qemu-ppc@nongnu.org, David Gibson This turns the sPAPR support on and enables VFIO container use in the kernel. Signed-off-by: Alexey Kardashevskiy --- Changes: v4: * fixed format string to use %m which is a glibc extension: "Print output of strerror(errno). No argument is required." --- hw/misc/vfio.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 4210471..882da70 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2815,6 +2815,36 @@ static int vfio_connect_container(VFIOGroup *group, VFIOAddressSpace *space) memory_listener_register(&container->iommu_data.listener, container->space->as); + } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) { + ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd); + if (ret) { + error_report("vfio: failed to set group container: %m"); + g_free(container); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_SPAPR_TCE_IOMMU); + if (ret) { + error_report("vfio: failed to set iommu for container: %m"); + g_free(container); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_IOMMU_ENABLE); + if (ret) { + error_report("vfio: failed to enable container: %m"); + g_free(container); + close(fd); + return -errno; + } + + container->iommu_data.listener = vfio_memory_listener; + container->iommu_data.release = vfio_listener_release; + + memory_listener_register(&container->iommu_data.listener, + container->space->as); } else { error_report("vfio: No available IOMMU models"); g_free(container); -- 1.8.4.rc4