Skip to content

Commit

Permalink
amd-iommu: handle page table allocation failures in dma_ops code
Browse files Browse the repository at this point in the history
The code will be required when the aperture size increases dynamically
in the extended address allocator.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
  • Loading branch information
Joerg Roedel committed May 28, 2009
1 parent 8bda309 commit 53812c1
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions arch/x86/kernel/amd_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,8 @@ static dma_addr_t dma_ops_domain_map(struct amd_iommu *iommu,
paddr &= PAGE_MASK;

pte = dma_ops_get_pte(dom, address);
if (!pte)
return bad_dma_address;

__pte = paddr | IOMMU_PTE_P | IOMMU_PTE_FC;

Expand Down Expand Up @@ -1248,7 +1250,7 @@ static dma_addr_t __map_single(struct device *dev,
u64 dma_mask)
{
dma_addr_t offset = paddr & ~PAGE_MASK;
dma_addr_t address, start;
dma_addr_t address, start, ret;
unsigned int pages;
unsigned long align_mask = 0;
int i;
Expand All @@ -1271,7 +1273,10 @@ static dma_addr_t __map_single(struct device *dev,

start = address;
for (i = 0; i < pages; ++i) {
dma_ops_domain_map(iommu, dma_dom, start, paddr, dir);
ret = dma_ops_domain_map(iommu, dma_dom, start, paddr, dir);
if (ret == bad_dma_address)
goto out_unmap;

paddr += PAGE_SIZE;
start += PAGE_SIZE;
}
Expand All @@ -1287,6 +1292,17 @@ static dma_addr_t __map_single(struct device *dev,

out:
return address;

out_unmap:

for (--i; i >= 0; --i) {
start -= PAGE_SIZE;
dma_ops_domain_unmap(iommu, dma_dom, start);
}

dma_ops_free_addresses(dma_dom, address, pages);

return bad_dma_address;
}

/*
Expand Down

0 comments on commit 53812c1

Please sign in to comment.