From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932109AbbDAM7l (ORCPT ); Wed, 1 Apr 2015 08:59:41 -0400 Received: from 8bytes.org ([81.169.241.247]:42495 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753370AbbDAM7I (ORCPT ); Wed, 1 Apr 2015 08:59:08 -0400 From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: Suravee.Suthikulpanit@amd.com, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 7/9] iommu/amd: Optimize alloc_new_range for new fetch_pte interface Date: Wed, 1 Apr 2015 14:58:50 +0200 Message-Id: <1427893132-18310-8-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427893132-18310-1-git-send-email-joro@8bytes.org> References: <1427893132-18310-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel Now that fetch_pte returns the page-size of the pte, the call in this function can also be optimized a little bit. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index c9ee444..f97441b 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1591,7 +1591,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, { int index = dma_dom->aperture_size >> APERTURE_RANGE_SHIFT; struct amd_iommu *iommu; - unsigned long i, old_size; + unsigned long i, old_size, pte_pgsize; #ifdef CONFIG_IOMMU_STRESS populate = false; @@ -1664,13 +1664,13 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, */ for (i = dma_dom->aperture[index]->offset; i < dma_dom->aperture_size; - i += PAGE_SIZE) { - unsigned long pte_pgsize; + i += pte_pgsize) { u64 *pte = fetch_pte(&dma_dom->domain, i, &pte_pgsize); if (!pte || !IOMMU_PTE_PRESENT(*pte)) continue; - dma_ops_reserve_addresses(dma_dom, i >> PAGE_SHIFT, 1); + dma_ops_reserve_addresses(dma_dom, i >> PAGE_SHIFT, + pte_pgsize >> 12); } update_domain(&dma_dom->domain); -- 1.9.1