From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Auger Subject: [RFC 05/11] iommu/dma: iommu_dma_(un)map_mixed Date: Tue, 27 Sep 2016 20:48:32 +0000 Message-ID: <1475009318-2617-6-git-send-email-eric.auger@redhat.com> References: <1475009318-2617-1-git-send-email-eric.auger@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1475009318-2617-1-git-send-email-eric.auger-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: eric.auger-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, eric.auger.pro-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, marc.zyngier-5wv7dgnIgG8@public.gmane.org, robin.murphy-5wv7dgnIgG8@public.gmane.org, alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org, joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org, tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org, jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: drjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Manish.Jaggi-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org, p.fedin-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, pranav.sawargaonkar-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org List-Id: iommu@lists.linux-foundation.org iommu_dma_map_mixed and iommu_dma_unmap_mixed operate on IOMMU_DOMAIN_MIXED typed domains. On top of standard iommu_map/unmap they reserve the IOVA window to prevent the iova allocator to allocate in those areas. Signed-off-by: Eric Auger --- drivers/iommu/dma-iommu.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/dma-iommu.h | 18 ++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 04bbc85..db21143 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -759,3 +759,51 @@ int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, return 0; } EXPORT_SYMBOL(iommu_get_dma_msi_region_cookie); + +int iommu_dma_map_mixed(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot) +{ + struct iova_domain *iovad; + unsigned long lo, hi; + int ret; + + if (domain->type != IOMMU_DOMAIN_MIXED) + return -EINVAL; + + if (!domain->iova_cookie) + return -EINVAL; + + iovad = cookie_iovad(domain); + + lo = iova_pfn(iovad, iova); + hi = iova_pfn(iovad, iova + size - 1); + reserve_iova(iovad, lo, hi); + ret = iommu_map(domain, iova, paddr, size, prot); + if (ret) + free_iova(iovad, lo); + return ret; +} +EXPORT_SYMBOL(iommu_dma_map_mixed); + +size_t iommu_dma_unmap_mixed(struct iommu_domain *domain, unsigned long iova, + size_t size) +{ + struct iova_domain *iovad; + unsigned long lo; + size_t ret; + + if (domain->type != IOMMU_DOMAIN_MIXED) + return -EINVAL; + + if (!domain->iova_cookie) + return -EINVAL; + + iovad = cookie_iovad(domain); + lo = iova_pfn(iovad, iova); + + ret = iommu_unmap(domain, iova, size); + if (ret == size) + free_iova(iovad, lo); + return ret; +} +EXPORT_SYMBOL(iommu_dma_unmap_mixed); diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 1c55413..f2aa855 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -70,6 +70,12 @@ void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg); int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, dma_addr_t base, u64 size); +int iommu_dma_map_mixed(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot); + +size_t iommu_dma_unmap_mixed(struct iommu_domain *domain, unsigned long iova, + size_t size); + #else struct iommu_domain; @@ -99,6 +105,18 @@ static inline int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, return -ENODEV; } +int iommu_dma_map_mixed(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot) +{ + return -ENODEV; +} + +size_t iommu_dma_unmap_mixed(struct iommu_domain *domain, unsigned long iova, + size_t size) +{ + return -ENODEV; +} + #endif /* CONFIG_IOMMU_DMA */ #endif /* __KERNEL__ */ #endif /* __DMA_IOMMU_H */ -- 1.9.1