UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/amd: Do not flush Device Table in iommu_map_page() 

The flush of the Device Table Entries for the domain has already
happened in increase_address_space(), if necessary. Do no flush them
again in iommu_map_page().

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Tested-by: Qian Cai <cai@lca.pw>
Link: https://lore.kernel.org/r/20200504125413.16798-6-joro@8bytes.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2020-05-04 14:54:13 +02:00
parent 19c6978fba
commit 119b2b2c3e
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/iommu/amd_iommu.c
View File

@ -1446,15 +1446,18 @@ static bool increase_address_space(struct protection_domain *domain,
{
struct domain_pgtable pgtable;
unsigned long flags;
bool ret = false;
bool ret = true;
u64 *pte, root;
spin_lock_irqsave(&domain->lock, flags);
amd_iommu_domain_get_pgtable(domain, &pgtable);
if (address <= PM_LEVEL_SIZE(pgtable.mode) ||
WARN_ON_ONCE(pgtable.mode == PAGE_MODE_6_LEVEL))
if (address <= PM_LEVEL_SIZE(pgtable.mode))
goto out;
ret = false;
if (WARN_ON_ONCE(pgtable.mode == PAGE_MODE_6_LEVEL))
goto out;
pte = (void *)get_zeroed_page(gfp);
@ -1499,19 +1502,15 @@ static u64 *alloc_pte(struct protection_domain *domain,
amd_iommu_domain_get_pgtable(domain, &pgtable);
while (address > PM_LEVEL_SIZE(pgtable.mode)) {
bool upd = increase_address_space(domain, address, gfp);
/* Read new values to check if update was successful */
amd_iommu_domain_get_pgtable(domain, &pgtable);
/*
* Return an error if there is no memory to update the
* page-table.
*/
if (!upd && (address > PM_LEVEL_SIZE(pgtable.mode)))
if (!increase_address_space(domain, address, gfp))
return NULL;
*updated = *updated || upd;
/* Read new values to check if update was successful */
amd_iommu_domain_get_pgtable(domain, &pgtable);
}
@ -1719,7 +1718,13 @@ out:
unsigned long flags;
spin_lock_irqsave(&dom->lock, flags);
update_domain(dom);
/*
* Flush domain TLB(s) and wait for completion. Any Device-Table
* Updates and flushing already happened in
* increase_address_space().
*/
domain_flush_tlb_pde(dom);
domain_flush_complete(dom);
spin_unlock_irqrestore(&dom->lock, flags);
}