Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751781AbdHaWKq (ORCPT ); Thu, 31 Aug 2017 18:10:46 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:7136 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751110AbdHaWKp (ORCPT ); Thu, 31 Aug 2017 18:10:45 -0400 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Thu, 31 Aug 2017 15:10:34 -0700 From: Krishna Reddy To: , , , Subject: [PATCH] iommu/dma: limit the IOVA allocated to dma-ranges region Date: Thu, 31 Aug 2017 15:08:21 -0700 Message-ID: <1504217301-17216-1-git-send-email-vdumpa@nvidia.com> X-Mailer: git-send-email 2.1.4 X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1277 Lines: 34 Limit the IOVA allocated to dma-ranges specified for the device. This is necessary to ensure that IOVA allocated is addressable by device. Signed-off-by: Krishna Reddy --- drivers/iommu/dma-iommu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 9d1cebe7f6cb..e8a8320b571b 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -364,6 +364,7 @@ static dma_addr_t iommu_dma_alloc_iova(struct iommu_domain *domain, struct iommu_dma_cookie *cookie = domain->iova_cookie; struct iova_domain *iovad = &cookie->iovad; unsigned long shift, iova_len, iova = 0; + dma_addr_t dma_end_addr; if (cookie->type == IOMMU_DMA_MSI_COOKIE) { cookie->msi_iova += size; @@ -381,6 +382,10 @@ static dma_addr_t iommu_dma_alloc_iova(struct iommu_domain *domain, if (iova_len < (1 << (IOVA_RANGE_CACHE_MAX_SIZE - 1))) iova_len = roundup_pow_of_two(iova_len); + /* Limit IOVA allocated to device addressable dma-ranges region. */ + dma_end_addr = (dma_addr_t)iovad->dma_32bit_pfn << shift; + dma_limit = dma_limit > dma_end_addr ? dma_end_addr : dma_limit; + if (domain->geometry.force_aperture) dma_limit = min(dma_limit, domain->geometry.aperture_end); -- 2.1.4