Skip to content

Commit

Permalink
xen/swiotlb: With more than 4GB on 64-bit, disable the native SWIOTLB.
Browse files Browse the repository at this point in the history
If a PV guest is booted the native SWIOTLB should not be
turned on. It does not help us (we don't have any PCI devices)
and it eats 64MB of good memory. In the case of PV guests
with PCI devices we need the Xen-SWIOTLB one.

[v1: Rewrite comment per Stefano's suggestion]
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Konrad Rzeszutek Wilk committed Aug 21, 2012
1 parent 988f0e2 commit fc2341d
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions arch/x86/xen/pci-swiotlb-xen.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
#include <xen/xen.h>
#include <asm/iommu_table.h>

#ifdef CONFIG_X86_64
#include <asm/iommu.h>
#include <asm/dma.h>
#endif

int xen_swiotlb __read_mostly;

static struct dma_map_ops xen_swiotlb_dma_ops = {
Expand Down Expand Up @@ -49,6 +54,15 @@ int __init pci_xen_swiotlb_detect(void)
* the 'swiotlb' flag is the only one turning it on. */
swiotlb = 0;

#ifdef CONFIG_X86_64
/* pci_swiotlb_detect_4gb turns on native SWIOTLB if no_iommu == 0
* (so no iommu=X command line over-writes).
* Considering that PV guests do not want the *native SWIOTLB* but
* only Xen SWIOTLB it is not useful to us so set no_iommu=1 here.
*/
if (max_pfn > MAX_DMA32_PFN)
no_iommu = 1;
#endif
return xen_swiotlb;
}

Expand Down

0 comments on commit fc2341d

Please sign in to comment.