iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/vt-d: Remove IOVA handling code from the non-dma_ops path

Browse Source 
There's no need for the non-dma_ops path to keep track of IOVAs. The
whole point of the non-dma_ops path is that it allows the IOVAs to be
handled separately. The IOVA handling code removed in this patch is
pointless.

Signed-off-by: Tom Murphy <murphyt7@tcd.ie>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20200516062101.29541-19-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Tom Murphy 2020-05-16 14:21:01 +08:00 committed by Joerg Roedel
parent 7482fd5925
commit e70b081c6f
1 changed files with 32 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
drivers/iommu/intel-iommu.c
View File

@ -1892,11 +1892,6 @@ static int dmar_init_reserved_ranges(void)
return 0; return 0;
} }
static void domain_reserve_special_ranges(struct dmar_domain *domain)
{
copy_reserved_iova(&reserved_iova_list, &domain->iovad);
}
static inline int guestwidth_to_adjustwidth(int gaw) static inline int guestwidth_to_adjustwidth(int gaw)
{ {
int agaw; int agaw;
@ -1918,7 +1913,8 @@ static void domain_exit(struct dmar_domain *domain)
domain_remove_dev_info(domain); domain_remove_dev_info(domain);
/* destroy iovas */ /* destroy iovas */
put_iova_domain(&domain->iovad); if (domain->domain.type == IOMMU_DOMAIN_DMA)
put_iova_domain(&domain->iovad);
if (domain->pgd) { if (domain->pgd) {
struct page *freelist; struct page *freelist;
@ -2627,19 +2623,9 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
} }
static int iommu_domain_identity_map(struct dmar_domain *domain, static int iommu_domain_identity_map(struct dmar_domain *domain,
unsigned long long start, unsigned long first_vpfn,
unsigned long long end) unsigned long last_vpfn)
{ {
unsigned long first_vpfn = start >> VTD_PAGE_SHIFT;
unsigned long last_vpfn = end >> VTD_PAGE_SHIFT;
if (!reserve_iova(&domain->iovad, dma_to_mm_pfn(first_vpfn),
dma_to_mm_pfn(last_vpfn))) {
pr_err("Reserving iova failed\n");
return -ENOMEM;
}
pr_debug("Mapping reserved region %llx-%llx\n", start, end);
/* /*
* RMRR range might have overlap with physical memory range, * RMRR range might have overlap with physical memory range,
* clear it first * clear it first
@ -2677,7 +2663,8 @@ static int __init si_domain_init(int hw)
for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, NULL) { for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, NULL) {
ret = iommu_domain_identity_map(si_domain, ret = iommu_domain_identity_map(si_domain,
PFN_PHYS(start_pfn), PFN_PHYS(end_pfn)); mm_to_dma_pfn(start_pfn),
mm_to_dma_pfn(end_pfn));
if (ret) if (ret)
return ret; return ret;
} }
@ -4547,58 +4534,37 @@ static int intel_iommu_memory_notifier(struct notifier_block *nb,
unsigned long val, void *v) unsigned long val, void *v)
{ {
struct memory_notify *mhp = v; struct memory_notify *mhp = v;
unsigned long long start, end; unsigned long start_vpfn = mm_to_dma_pfn(mhp->start_pfn);
unsigned long start_vpfn, last_vpfn; unsigned long last_vpfn = mm_to_dma_pfn(mhp->start_pfn +
mhp->nr_pages - 1);
switch (val) { switch (val) {
case MEM_GOING_ONLINE: case MEM_GOING_ONLINE:
start = mhp->start_pfn << PAGE_SHIFT; if (iommu_domain_identity_map(si_domain,
end = ((mhp->start_pfn + mhp->nr_pages) << PAGE_SHIFT) - 1; start_vpfn, last_vpfn)) {
if (iommu_domain_identity_map(si_domain, start, end)) { pr_warn("Failed to build identity map for [%lx-%lx]\n",
pr_warn("Failed to build identity map for [%llx-%llx]\n", start_vpfn, last_vpfn);
start, end);
return NOTIFY_BAD; return NOTIFY_BAD;
} }
break; break;
case MEM_OFFLINE: case MEM_OFFLINE:
case MEM_CANCEL_ONLINE: case MEM_CANCEL_ONLINE:
start_vpfn = mm_to_dma_pfn(mhp->start_pfn); {
last_vpfn = mm_to_dma_pfn(mhp->start_pfn + mhp->nr_pages - 1);
while (start_vpfn <= last_vpfn) {
struct iova *iova;
struct dmar_drhd_unit *drhd; struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu; struct intel_iommu *iommu;
struct page *freelist; struct page *freelist;
iova = find_iova(&si_domain->iovad, start_vpfn); freelist = domain_unmap(si_domain,
if (iova == NULL) { start_vpfn, last_vpfn);
pr_debug("Failed get IOVA for PFN %lx\n",
start_vpfn);
break;
}
iova = split_and_remove_iova(&si_domain->iovad, iova,
start_vpfn, last_vpfn);
if (iova == NULL) {
pr_warn("Failed to split IOVA PFN [%lx-%lx]\n",
start_vpfn, last_vpfn);
return NOTIFY_BAD;
}
freelist = domain_unmap(si_domain, iova->pfn_lo,
iova->pfn_hi);
rcu_read_lock(); rcu_read_lock();
for_each_active_iommu(iommu, drhd) for_each_active_iommu(iommu, drhd)
iommu_flush_iotlb_psi(iommu, si_domain, iommu_flush_iotlb_psi(iommu, si_domain,
iova->pfn_lo, iova_size(iova), start_vpfn, mhp->nr_pages,
!freelist, 0); !freelist, 0);
rcu_read_unlock(); rcu_read_unlock();
dma_free_pagelist(freelist); dma_free_pagelist(freelist);
start_vpfn = iova->pfn_hi + 1;
free_iova_mem(iova);
} }
break; break;
} }
@ -4626,8 +4592,9 @@ static void free_all_cpu_cached_iovas(unsigned int cpu)
for (did = 0; did < cap_ndoms(iommu->cap); did++) { for (did = 0; did < cap_ndoms(iommu->cap); did++) {
domain = get_iommu_domain(iommu, (u16)did); domain = get_iommu_domain(iommu, (u16)did);
if (!domain) if (!domain || domain->domain.type != IOMMU_DOMAIN_DMA)
continue; continue;
free_cpu_cached_iovas(cpu, &domain->iovad); free_cpu_cached_iovas(cpu, &domain->iovad);
} }
} }
@ -5037,9 +5004,6 @@ static int md_domain_init(struct dmar_domain *domain, int guest_width)
{ {
int adjust_width; int adjust_width;
init_iova_domain(&domain->iovad, VTD_PAGE_SIZE, IOVA_START_PFN);
domain_reserve_special_ranges(domain);
/* calculate AGAW */ /* calculate AGAW */
domain->gaw = guest_width; domain->gaw = guest_width;
adjust_width = guestwidth_to_adjustwidth(guest_width); adjust_width = guestwidth_to_adjustwidth(guest_width);
@ -5058,11 +5022,21 @@ static int md_domain_init(struct dmar_domain *domain, int guest_width)
return 0; return 0;
} }
static void intel_init_iova_domain(struct dmar_domain *dmar_domain)
{
init_iova_domain(&dmar_domain->iovad, VTD_PAGE_SIZE, IOVA_START_PFN);
copy_reserved_iova(&reserved_iova_list, &dmar_domain->iovad);
if (!intel_iommu_strict &&
init_iova_flush_queue(&dmar_domain->iovad,
iommu_flush_iova, iova_entry_free))
pr_info("iova flush queue initialization failed\n");
}
static struct iommu_domain *intel_iommu_domain_alloc(unsigned type) static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)
{ {
struct dmar_domain *dmar_domain; struct dmar_domain *dmar_domain;
struct iommu_domain *domain; struct iommu_domain *domain;
int ret;
switch (type) { switch (type) {
case IOMMU_DOMAIN_DMA: case IOMMU_DOMAIN_DMA:
@ -5079,13 +5053,8 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)
return NULL; return NULL;
} }
if (!intel_iommu_strict && type == IOMMU_DOMAIN_DMA) { if (type == IOMMU_DOMAIN_DMA)
ret = init_iova_flush_queue(&dmar_domain->iovad, intel_init_iova_domain(dmar_domain);
iommu_flush_iova,
iova_entry_free);
if (ret)
pr_info("iova flush queue initialization failed\n");
}
domain_update_iommu_cap(dmar_domain); domain_update_iommu_cap(dmar_domain);