From 6dfb14f255ce0ec07c7eda0e8ed2eda9b690084d Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Tue, 26 Nov 2019 22:12:45 -0500 Subject: [PATCH] iommu/amd: Check PM_LEVEL_SIZE() condition in locked section commit 46ac18c347b00be29b265c28209b0f3c38a1f142 upstream. The increase_address_space() function has to check the PM_LEVEL_SIZE() condition again under the domain->lock to avoid a false trigger of the WARN_ON_ONCE() and to avoid that the address space is increase more often than necessary. Reported-by: Qian Cai Fixes: 754265bcab78 ("iommu/amd: Fix race in increase_address_space()") Reviewed-by: Jerry Snitselaar Signed-off-by: Joerg Roedel Signed-off-by: WANG Siyuan Acked-by: Caspar Zhang --- drivers/iommu/amd_iommu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 0a7546b4824a..2caa2918a5d4 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1341,6 +1341,7 @@ static void domain_flush_devices(struct protection_domain *domain) * to 64 bits. */ static void increase_address_space(struct protection_domain *domain, + unsigned long address, gfp_t gfp) { unsigned long flags; @@ -1348,8 +1349,8 @@ static void increase_address_space(struct protection_domain *domain, spin_lock_irqsave(&domain->lock, flags); - if (WARN_ON_ONCE(domain->mode == PAGE_MODE_6_LEVEL)) - /* address space already 64 bit large */ + if (address <= PM_LEVEL_SIZE(domain->mode) || + WARN_ON_ONCE(domain->mode == PAGE_MODE_6_LEVEL)) goto out; pte = (void *)get_zeroed_page(gfp); @@ -1380,7 +1381,7 @@ static u64 *alloc_pte(struct protection_domain *domain, BUG_ON(!is_power_of_2(page_size)); while (address > PM_LEVEL_SIZE(domain->mode)) - increase_address_space(domain, gfp); + increase_address_space(domain, address, gfp); level = domain->mode - 1; pte = &domain->pt_root[PM_LEVEL_INDEX(level, address)]; -- GitLab