From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsdOR-0006eX-IZ for qemu-devel@nongnu.org; Thu, 05 Jun 2014 15:32:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsdOM-0006AG-Fc for qemu-devel@nongnu.org; Thu, 05 Jun 2014 15:32:07 -0400 Message-ID: <1401996718.9207.215.camel@ul30vt.home> From: Alex Williamson Date: Thu, 05 Jun 2014 13:31:58 -0600 In-Reply-To: <1401947401-21329-5-git-send-email-aik@ozlabs.ru> References: <1401947401-21329-1-git-send-email-aik@ozlabs.ru> <1401947401-21329-5-git-send-email-aik@ozlabs.ru> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v7 4/4] vfio: Enable for spapr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Gavin Shan , Alexander Graf On Thu, 2014-06-05 at 15:50 +1000, Alexey Kardashevskiy wrote: > This turns the sPAPR support on and enables VFIO container use > in the kernel. > > This extends vfio_connect_container to support VFIO_SPAPR_TCE_IOMMU type > in the host kernel. > > This registers a memory listener which sPAPR IOMMU will notify when > executing H_PUT_TCE/etc DMA calls. The listener then will notify the host > kernel about DMA map/unmap operation via VFIO_IOMMU_MAP_DMA/ > VFIO_IOMMU_UNMAP_DMA ioctls. > > This executes VFIO_IOMMU_ENABLE ioctl to make sure that the IOMMU is free > of mappings and can be exclusively given to the user. At the moment SPAPR > is the only platform requiring this call to be implemented. > > Signed-off-by: Alexey Kardashevskiy > --- > Changes: > v7: > * added more details in commit log > > v5: > * multiple returns converted to gotos > > 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 | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c > index 99141f3..c8e3aff 100644 > --- a/hw/misc/vfio.c > +++ b/hw/misc/vfio.c > @@ -3650,6 +3650,34 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) > > container->iommu_data.type1.initialized = true; > > + } 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"); > + ret = -errno; > + goto free_container_exit; > + } > + > + ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_SPAPR_TCE_IOMMU); > + if (ret) { > + error_report("vfio: failed to set iommu for container: %m"); > + ret = -errno; > + goto free_container_exit; > + } > + > + ret = ioctl(fd, VFIO_IOMMU_ENABLE); Where's the matching DISABLE? Do we need a different release wrapper that includes a disable? Thanks, Alex > + if (ret) { > + error_report("vfio: failed to enable container: %m"); > + ret = -errno; > + goto free_container_exit; > + } > + > + container->iommu_data.type1.listener = vfio_memory_listener; > + container->iommu_data.release = vfio_listener_release; > + > + memory_listener_register(&container->iommu_data.type1.listener, > + container->space->as); > + > } else { > error_report("vfio: No available IOMMU models"); > ret = -EINVAL;