[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH 1/2] xen/swiotlb: If iommu=soft was not passed in on > 4GB, don't turn it on.
>>> On 26.07.12 at 22:43, Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> wrote: > If we boot a 64-bit guest with more than 4GB memory, the SWIOTLB > gets turned on: > PCI-DMA: Using software bounce buffering for IO (SWIOTLB) > software IO TLB [mem 0xfb43d000-0xff43cfff] (64MB) mapped at > [ffff8800fb43d000-ffff8800ff43cfff] > > which is OK if we had PCI devices, but not if we did not. In a PV > guest the SWIOTLB ends up asking the hypervisor for precious lowmem > memory - and 64MB of it per guest. On a 32GB machine, this limits the > amount of guests that are 4GB to start due to lowmem exhaustion. > > What we do is detect whether the user supplied e820_hole=1 > parameter, which is used to construct an E820 that is similar to > the machine - so that the PCI regions do not overlap with RAM regions. > We check for that by looking at the E820 and seeing if it diverges > from the standard - and if so (and if iommu=soft was not turned on), > we disable the check pci_swiotlb_detect_4gb code. > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> > --- > arch/x86/xen/pci-swiotlb-xen.c | 26 ++++++++++++++++++++++++++ > 1 files changed, 26 insertions(+), 0 deletions(-) > > diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c > index 967633a..56f373e 100644 > --- a/arch/x86/xen/pci-swiotlb-xen.c > +++ b/arch/x86/xen/pci-swiotlb-xen.c > @@ -8,6 +8,10 @@ > #include <xen/xen.h> > #include <asm/iommu_table.h> > > +#include <asm/e820.h> > +#include <asm/dma.h> > +#include <asm/iommu.h> > + > int xen_swiotlb __read_mostly; > > static struct dma_map_ops xen_swiotlb_dma_ops = { > @@ -24,7 +28,19 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { > .unmap_page = xen_swiotlb_unmap_page, > .dma_supported = xen_swiotlb_dma_supported, > }; > +bool __init e820_has_acpi(void) > +{ > + int i; > > + /* Check if the user supplied the e820_hole parameter > + * which would create a machine looking E820 region. */ > + for (i = 0; i < e820.nr_map; i++) { > + if ((e820.map[i].type == E820_ACPI) || > + (e820.map[i].type == E820_NVS)) > + return true; Tying this decision to the presence of ACPI regions in E820 is problematic for two reasons imo: For one, it precludes cleaning up this (bogus!) construct where it gets produced (PV DomU-s really shouldn't ever see such E820 entries, they should get converted to simple reserved entries, to wipe any notion of ACPI presence). And second it ties you to running on systems that actually have ACPI, whereas it is my rudimentary understanding that systems with e.g. SFI would not have any ACPI). Jan > + } > + return false; > +} > /* > * pci_xen_swiotlb_detect - set xen_swiotlb to 1 if necessary > * > @@ -33,7 +49,17 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { > */ > int __init pci_xen_swiotlb_detect(void) > { > +#ifdef CONFIG_X86_64 > > + /* Having more than 4GB triggers the native SWIOTLB to activate. > + * The way to turn it off is to set no_iommu. */ > + printk(KERN_INFO "swiotlb: %d\n", swiotlb); > + if (xen_pv_domain() && !swiotlb && max_pfn > MAX_DMA32_PFN) { > + /* Normal PV guests only have E820_RSV and E820_RAM regions */ > + if (!e820_has_acpi()) > + no_iommu = 1; > + } > +#endif > /* If running as PV guest, either iommu=soft, or swiotlb=force will > * activate this IOMMU. If running as PV privileged, activate it > * irregardless. > -- > 1.7.7.6 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@xxxxxxxxxxxxx > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |