Skip to content

Commit

Permalink
AMD IOMMU: add branch hints to completion wait checks
Browse files Browse the repository at this point in the history
This patch adds branch hints to the cecks if a completion_wait is
necessary. The completion_waits in the mapping paths are unlikly because
they will only happen on software implementations of AMD IOMMU which
don't exists today or with lazy IO/TLB flushing when the allocator wraps
around the address space. With lazy IO/TLB flushing the completion_wait
in the unmapping path is unlikely too.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Joerg Roedel authored and Ingo Molnar committed Sep 19, 2008
1 parent 1c65577 commit 5507eef
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/x86/kernel/amd_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ static dma_addr_t map_single(struct device *dev, phys_addr_t paddr,
if (addr == bad_dma_address)
goto out;

if (iommu->need_sync)
if (unlikely(iommu->need_sync))
iommu_completion_wait(iommu);

out:
Expand Down Expand Up @@ -905,7 +905,7 @@ static void unmap_single(struct device *dev, dma_addr_t dma_addr,

__unmap_single(iommu, domain->priv, dma_addr, size, dir);

if (iommu->need_sync)
if (unlikely(iommu->need_sync))
iommu_completion_wait(iommu);

spin_unlock_irqrestore(&domain->lock, flags);
Expand Down Expand Up @@ -968,7 +968,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
goto unmap;
}

if (iommu->need_sync)
if (unlikely(iommu->need_sync))
iommu_completion_wait(iommu);

out:
Expand Down Expand Up @@ -1014,7 +1014,7 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,
s->dma_address = s->dma_length = 0;
}

if (iommu->need_sync)
if (unlikely(iommu->need_sync))
iommu_completion_wait(iommu);

spin_unlock_irqrestore(&domain->lock, flags);
Expand Down Expand Up @@ -1061,7 +1061,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
goto out;
}

if (iommu->need_sync)
if (unlikely(iommu->need_sync))
iommu_completion_wait(iommu);

out:
Expand Down Expand Up @@ -1093,7 +1093,7 @@ static void free_coherent(struct device *dev, size_t size,

__unmap_single(iommu, domain->priv, dma_addr, size, DMA_BIDIRECTIONAL);

if (iommu->need_sync)
if (unlikely(iommu->need_sync))
iommu_completion_wait(iommu);

spin_unlock_irqrestore(&domain->lock, flags);
Expand Down

0 comments on commit 5507eef

Please sign in to comment.