From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752401AbcBKOfb (ORCPT ); Thu, 11 Feb 2016 09:35:31 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:33389 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752370AbcBKOf0 (ORCPT ); Thu, 11 Feb 2016 09:35:26 -0500 From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: suravee.suthikulpanit@amd.com, patches@linaro.org, linux-kernel@vger.kernel.org, Manish.Jaggi@caviumnetworks.com, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, sherry.hurwitz@amd.com, brijesh.singh@amd.com, leo.duran@amd.com, Thomas.Lendacky@amd.com Subject: [RFC v2 08/15] iommu/arm-smmu: implement iommu_get/put_single_reserved Date: Thu, 11 Feb 2016 14:34:15 +0000 Message-Id: <1455201262-5259-9-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455201262-5259-1-git-send-email-eric.auger@linaro.org> References: <1455201262-5259-1-git-send-email-eric.auger@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement the iommu_get/put_single_reserved API in arm-smmu. In order to track which physical address is already mapped we use the RB tree indexed by PA. Signed-off-by: Eric Auger --- v1 -> v2: - previously in vfio_iommu_type1.c --- drivers/iommu/arm-smmu.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 729a4c6..9961bfd 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1563,6 +1563,118 @@ static void arm_smmu_free_reserved_iova_domain(struct iommu_domain *domain) mutex_unlock(&smmu_domain->reserved_mutex); } +static int arm_smmu_get_single_reserved(struct iommu_domain *domain, + phys_addr_t addr, int prot, + dma_addr_t *iova) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + unsigned long order = __ffs(domain->ops->pgsize_bitmap); + size_t page_size = 1 << order; + phys_addr_t mask = page_size - 1; + phys_addr_t aligned_addr = addr & ~mask; + phys_addr_t offset = addr - aligned_addr; + struct arm_smmu_reserved_binding *b; + struct iova *p_iova; + struct iova_domain *iovad = smmu_domain->reserved_iova_domain; + int ret; + + if (!iovad) + return -EINVAL; + + mutex_lock(&smmu_domain->reserved_mutex); + + b = find_reserved_binding(smmu_domain, aligned_addr, page_size); + if (b) { + *iova = b->iova + offset; + kref_get(&b->kref); + ret = 0; + goto unlock; + } + + /* there is no existing reserved iova for this pa */ + p_iova = alloc_iova(iovad, 1, iovad->dma_32bit_pfn, true); + if (!p_iova) { + ret = -ENOMEM; + goto unlock; + } + *iova = p_iova->pfn_lo << order; + + b = kzalloc(sizeof(*b), GFP_KERNEL); + if (!b) { + ret = -ENOMEM; + goto free_iova_unlock; + } + + ret = arm_smmu_map(domain, *iova, aligned_addr, page_size, prot); + if (ret) + goto free_binding_iova_unlock; + + kref_init(&b->kref); + kref_get(&b->kref); + b->domain = smmu_domain; + b->addr = aligned_addr; + b->iova = *iova; + b->size = page_size; + + link_reserved_binding(smmu_domain, b); + + *iova += offset; + goto unlock; + +free_binding_iova_unlock: + kfree(b); +free_iova_unlock: + free_iova(smmu_domain->reserved_iova_domain, *iova >> order); +unlock: + mutex_unlock(&smmu_domain->reserved_mutex); + return ret; +} + +/* called with reserved_mutex locked */ +static void reserved_binding_release(struct kref *kref) +{ + struct arm_smmu_reserved_binding *b = + container_of(kref, struct arm_smmu_reserved_binding, kref); + struct arm_smmu_domain *smmu_domain = b->domain; + struct iommu_domain *d = &smmu_domain->domain; + unsigned long order = __ffs(b->size); + + + arm_smmu_unmap(d, b->iova, b->size); + free_iova(smmu_domain->reserved_iova_domain, b->iova >> order); + unlink_reserved_binding(smmu_domain, b); + kfree(b); +} + +static void arm_smmu_put_single_reserved(struct iommu_domain *domain, + dma_addr_t iova) +{ + unsigned long order; + phys_addr_t aligned_addr; + dma_addr_t aligned_iova, page_size, mask, offset; + struct arm_smmu_reserved_binding *b; + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + + order = __ffs(domain->ops->pgsize_bitmap); + page_size = (uint64_t)1 << order; + mask = page_size - 1; + + aligned_iova = iova & ~mask; + offset = iova - aligned_iova; + + aligned_addr = iommu_iova_to_phys(domain, aligned_iova); + + mutex_lock(&smmu_domain->reserved_mutex); + + b = find_reserved_binding(smmu_domain, aligned_addr, page_size); + if (!b) + goto unlock; + kref_put(&b->kref, reserved_binding_release); + +unlock: + mutex_unlock(&smmu_domain->reserved_mutex); +} + static struct iommu_ops arm_smmu_ops = { .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc, @@ -1580,6 +1692,8 @@ static struct iommu_ops arm_smmu_ops = { .domain_set_attr = arm_smmu_domain_set_attr, .alloc_reserved_iova_domain = arm_smmu_alloc_reserved_iova_domain, .free_reserved_iova_domain = arm_smmu_free_reserved_iova_domain, + .get_single_reserved = arm_smmu_get_single_reserved, + .put_single_reserved = arm_smmu_put_single_reserved, /* Page size bitmap, restricted during device attach */ .pgsize_bitmap = -1UL, }; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Auger Subject: [RFC v2 08/15] iommu/arm-smmu: implement iommu_get/put_single_reserved Date: Thu, 11 Feb 2016 14:34:15 +0000 Message-ID: <1455201262-5259-9-git-send-email-eric.auger@linaro.org> References: <1455201262-5259-1-git-send-email-eric.auger@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Thomas.Lendacky-5C7GfCeVMHo@public.gmane.org, brijesh.singh-5C7GfCeVMHo@public.gmane.org, patches-QSEj5FYQhm4dnm+yROfE0A@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, sherry.hurwitz-5C7GfCeVMHo@public.gmane.org To: eric.auger-qxv4g6HH51o@public.gmane.org, eric.auger-QSEj5FYQhm4dnm+yROfE0A@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, marc.zyngier-5wv7dgnIgG8@public.gmane.org, christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, kvmarm-FPEHb7Xf0XXUo1n7N8X6UoWGPAHP3yOg@public.gmane.org, kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <1455201262-5259-1-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@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 List-Id: kvm.vger.kernel.org Implement the iommu_get/put_single_reserved API in arm-smmu. In order to track which physical address is already mapped we use the RB tree indexed by PA. Signed-off-by: Eric Auger --- v1 -> v2: - previously in vfio_iommu_type1.c --- drivers/iommu/arm-smmu.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 729a4c6..9961bfd 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1563,6 +1563,118 @@ static void arm_smmu_free_reserved_iova_domain(struct iommu_domain *domain) mutex_unlock(&smmu_domain->reserved_mutex); } +static int arm_smmu_get_single_reserved(struct iommu_domain *domain, + phys_addr_t addr, int prot, + dma_addr_t *iova) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + unsigned long order = __ffs(domain->ops->pgsize_bitmap); + size_t page_size = 1 << order; + phys_addr_t mask = page_size - 1; + phys_addr_t aligned_addr = addr & ~mask; + phys_addr_t offset = addr - aligned_addr; + struct arm_smmu_reserved_binding *b; + struct iova *p_iova; + struct iova_domain *iovad = smmu_domain->reserved_iova_domain; + int ret; + + if (!iovad) + return -EINVAL; + + mutex_lock(&smmu_domain->reserved_mutex); + + b = find_reserved_binding(smmu_domain, aligned_addr, page_size); + if (b) { + *iova = b->iova + offset; + kref_get(&b->kref); + ret = 0; + goto unlock; + } + + /* there is no existing reserved iova for this pa */ + p_iova = alloc_iova(iovad, 1, iovad->dma_32bit_pfn, true); + if (!p_iova) { + ret = -ENOMEM; + goto unlock; + } + *iova = p_iova->pfn_lo << order; + + b = kzalloc(sizeof(*b), GFP_KERNEL); + if (!b) { + ret = -ENOMEM; + goto free_iova_unlock; + } + + ret = arm_smmu_map(domain, *iova, aligned_addr, page_size, prot); + if (ret) + goto free_binding_iova_unlock; + + kref_init(&b->kref); + kref_get(&b->kref); + b->domain = smmu_domain; + b->addr = aligned_addr; + b->iova = *iova; + b->size = page_size; + + link_reserved_binding(smmu_domain, b); + + *iova += offset; + goto unlock; + +free_binding_iova_unlock: + kfree(b); +free_iova_unlock: + free_iova(smmu_domain->reserved_iova_domain, *iova >> order); +unlock: + mutex_unlock(&smmu_domain->reserved_mutex); + return ret; +} + +/* called with reserved_mutex locked */ +static void reserved_binding_release(struct kref *kref) +{ + struct arm_smmu_reserved_binding *b = + container_of(kref, struct arm_smmu_reserved_binding, kref); + struct arm_smmu_domain *smmu_domain = b->domain; + struct iommu_domain *d = &smmu_domain->domain; + unsigned long order = __ffs(b->size); + + + arm_smmu_unmap(d, b->iova, b->size); + free_iova(smmu_domain->reserved_iova_domain, b->iova >> order); + unlink_reserved_binding(smmu_domain, b); + kfree(b); +} + +static void arm_smmu_put_single_reserved(struct iommu_domain *domain, + dma_addr_t iova) +{ + unsigned long order; + phys_addr_t aligned_addr; + dma_addr_t aligned_iova, page_size, mask, offset; + struct arm_smmu_reserved_binding *b; + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + + order = __ffs(domain->ops->pgsize_bitmap); + page_size = (uint64_t)1 << order; + mask = page_size - 1; + + aligned_iova = iova & ~mask; + offset = iova - aligned_iova; + + aligned_addr = iommu_iova_to_phys(domain, aligned_iova); + + mutex_lock(&smmu_domain->reserved_mutex); + + b = find_reserved_binding(smmu_domain, aligned_addr, page_size); + if (!b) + goto unlock; + kref_put(&b->kref, reserved_binding_release); + +unlock: + mutex_unlock(&smmu_domain->reserved_mutex); +} + static struct iommu_ops arm_smmu_ops = { .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc, @@ -1580,6 +1692,8 @@ static struct iommu_ops arm_smmu_ops = { .domain_set_attr = arm_smmu_domain_set_attr, .alloc_reserved_iova_domain = arm_smmu_alloc_reserved_iova_domain, .free_reserved_iova_domain = arm_smmu_free_reserved_iova_domain, + .get_single_reserved = arm_smmu_get_single_reserved, + .put_single_reserved = arm_smmu_put_single_reserved, /* Page size bitmap, restricted during device attach */ .pgsize_bitmap = -1UL, }; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: eric.auger@linaro.org (Eric Auger) Date: Thu, 11 Feb 2016 14:34:15 +0000 Subject: [RFC v2 08/15] iommu/arm-smmu: implement iommu_get/put_single_reserved In-Reply-To: <1455201262-5259-1-git-send-email-eric.auger@linaro.org> References: <1455201262-5259-1-git-send-email-eric.auger@linaro.org> Message-ID: <1455201262-5259-9-git-send-email-eric.auger@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Implement the iommu_get/put_single_reserved API in arm-smmu. In order to track which physical address is already mapped we use the RB tree indexed by PA. Signed-off-by: Eric Auger --- v1 -> v2: - previously in vfio_iommu_type1.c --- drivers/iommu/arm-smmu.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 729a4c6..9961bfd 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1563,6 +1563,118 @@ static void arm_smmu_free_reserved_iova_domain(struct iommu_domain *domain) mutex_unlock(&smmu_domain->reserved_mutex); } +static int arm_smmu_get_single_reserved(struct iommu_domain *domain, + phys_addr_t addr, int prot, + dma_addr_t *iova) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + unsigned long order = __ffs(domain->ops->pgsize_bitmap); + size_t page_size = 1 << order; + phys_addr_t mask = page_size - 1; + phys_addr_t aligned_addr = addr & ~mask; + phys_addr_t offset = addr - aligned_addr; + struct arm_smmu_reserved_binding *b; + struct iova *p_iova; + struct iova_domain *iovad = smmu_domain->reserved_iova_domain; + int ret; + + if (!iovad) + return -EINVAL; + + mutex_lock(&smmu_domain->reserved_mutex); + + b = find_reserved_binding(smmu_domain, aligned_addr, page_size); + if (b) { + *iova = b->iova + offset; + kref_get(&b->kref); + ret = 0; + goto unlock; + } + + /* there is no existing reserved iova for this pa */ + p_iova = alloc_iova(iovad, 1, iovad->dma_32bit_pfn, true); + if (!p_iova) { + ret = -ENOMEM; + goto unlock; + } + *iova = p_iova->pfn_lo << order; + + b = kzalloc(sizeof(*b), GFP_KERNEL); + if (!b) { + ret = -ENOMEM; + goto free_iova_unlock; + } + + ret = arm_smmu_map(domain, *iova, aligned_addr, page_size, prot); + if (ret) + goto free_binding_iova_unlock; + + kref_init(&b->kref); + kref_get(&b->kref); + b->domain = smmu_domain; + b->addr = aligned_addr; + b->iova = *iova; + b->size = page_size; + + link_reserved_binding(smmu_domain, b); + + *iova += offset; + goto unlock; + +free_binding_iova_unlock: + kfree(b); +free_iova_unlock: + free_iova(smmu_domain->reserved_iova_domain, *iova >> order); +unlock: + mutex_unlock(&smmu_domain->reserved_mutex); + return ret; +} + +/* called with reserved_mutex locked */ +static void reserved_binding_release(struct kref *kref) +{ + struct arm_smmu_reserved_binding *b = + container_of(kref, struct arm_smmu_reserved_binding, kref); + struct arm_smmu_domain *smmu_domain = b->domain; + struct iommu_domain *d = &smmu_domain->domain; + unsigned long order = __ffs(b->size); + + + arm_smmu_unmap(d, b->iova, b->size); + free_iova(smmu_domain->reserved_iova_domain, b->iova >> order); + unlink_reserved_binding(smmu_domain, b); + kfree(b); +} + +static void arm_smmu_put_single_reserved(struct iommu_domain *domain, + dma_addr_t iova) +{ + unsigned long order; + phys_addr_t aligned_addr; + dma_addr_t aligned_iova, page_size, mask, offset; + struct arm_smmu_reserved_binding *b; + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + + order = __ffs(domain->ops->pgsize_bitmap); + page_size = (uint64_t)1 << order; + mask = page_size - 1; + + aligned_iova = iova & ~mask; + offset = iova - aligned_iova; + + aligned_addr = iommu_iova_to_phys(domain, aligned_iova); + + mutex_lock(&smmu_domain->reserved_mutex); + + b = find_reserved_binding(smmu_domain, aligned_addr, page_size); + if (!b) + goto unlock; + kref_put(&b->kref, reserved_binding_release); + +unlock: + mutex_unlock(&smmu_domain->reserved_mutex); +} + static struct iommu_ops arm_smmu_ops = { .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc, @@ -1580,6 +1692,8 @@ static struct iommu_ops arm_smmu_ops = { .domain_set_attr = arm_smmu_domain_set_attr, .alloc_reserved_iova_domain = arm_smmu_alloc_reserved_iova_domain, .free_reserved_iova_domain = arm_smmu_free_reserved_iova_domain, + .get_single_reserved = arm_smmu_get_single_reserved, + .put_single_reserved = arm_smmu_put_single_reserved, /* Page size bitmap, restricted during device attach */ .pgsize_bitmap = -1UL, }; -- 1.9.1