redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

intel-iommu: Performance improvement for domain_pfn_mapping()

Browse source 
As with dma_pte_clear_range(), don't keep flushing a single PTE at a
time. And also micro-optimise the setting of PTE values rather than
using the helper functions to do all the masking.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2009-06-28 20:38:49 +01:00
parent 310a5ab93c
commit 6f6a00e40a
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/pci/intel-iommu.c
View file

@ -1639,7 +1639,7 @@ static int domain_pfn_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
unsigned long phys_pfn, unsigned long nr_pages, unsigned long phys_pfn, unsigned long nr_pages,
int prot) int prot)
{ {
struct dma_pte *pte; struct dma_pte *first_pte = NULL, *pte = NULL;
int addr_width = agaw_to_width(domain->agaw) - VTD_PAGE_SHIFT; int addr_width = agaw_to_width(domain->agaw) - VTD_PAGE_SHIFT;
BUG_ON(addr_width < BITS_PER_LONG && (iov_pfn + nr_pages - 1) >> addr_width); BUG_ON(addr_width < BITS_PER_LONG && (iov_pfn + nr_pages - 1) >> addr_width);
@ -1647,19 +1647,27 @@ static int domain_pfn_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
if ((prot & (DMA_PTE_READ|DMA_PTE_WRITE)) == 0) if ((prot & (DMA_PTE_READ|DMA_PTE_WRITE)) == 0)
return -EINVAL; return -EINVAL;
prot &= DMA_PTE_READ | DMA_PTE_WRITE | DMA_PTE_SNP;
while (nr_pages--) { while (nr_pages--) {
pte = pfn_to_dma_pte(domain, iov_pfn); if (!pte) {
if (!pte) first_pte = pte = pfn_to_dma_pte(domain, iov_pfn);
return -ENOMEM; if (!pte)
return -ENOMEM;
}
/* We don't need lock here, nobody else /* We don't need lock here, nobody else
* touches the iova range * touches the iova range
*/ */
BUG_ON(dma_pte_addr(pte)); BUG_ON(dma_pte_addr(pte));
dma_set_pte_pfn(pte, phys_pfn); pte->val = (phys_pfn << VTD_PAGE_SHIFT) | prot;
dma_set_pte_prot(pte, prot); pte++;
if (prot & DMA_PTE_SNP) if (!nr_pages ||
dma_set_pte_snp(pte); (unsigned long)pte >> VTD_PAGE_SHIFT !=
domain_flush_cache(domain, pte, sizeof(*pte)); (unsigned long)first_pte >> VTD_PAGE_SHIFT) {
domain_flush_cache(domain, first_pte,
(void *)pte - (void *)first_pte);
pte = NULL;
}
iov_pfn++; iov_pfn++;
phys_pfn++; phys_pfn++;
} }