This patch set enhances the DMA Contiguous Memory Allocator on x86. Currently the DMA CMA is only supported with pci-nommu dma_map_ops and furthermore it can't be enabled on x86_64. But I would like to allocate big contiguous memory with dma_alloc_coherent() and tell it to the device that requires it, regardless of which dma mapping implementation is actually used in the system.
So this makes it work with swiotlb and intel-iommu dma_map_ops, too. And this also extends "cma=" kernel parameter to specify placement constraint by the physical address range of memory allocations. For example, CMA allocates memory below 4GB by "cma=64M@0-4G", it is required for the devices only supporting 32-bit addressing on 64-bit systems without iommu. * Changes from v2 - Rebased on current Linus tree - Add Acked-by line - Fix gfp flags check for __GFP_ATOMIC, reported by Marek Szyprowski - Avoid CMA area on highmem with cma= option, reported by Marek Szyprowski * Changes from v1 - fix dma_alloc_coherent() with __GFP_ZERO - add placement specifier for "cma=" kernel parameter Akinobu Mita (5): x86: make dma_alloc_coherent() return zeroed memory if CMA is enabled x86: enable DMA CMA with swiotlb intel-iommu: integrate DMA CMA memblock: introduce memblock_alloc_range() cma: add placement specifier for "cma=" kernel parameter Documentation/kernel-parameters.txt | 7 +++++-- arch/x86/Kconfig | 2 +- arch/x86/include/asm/swiotlb.h | 7 +++++++ arch/x86/kernel/amd_gart_64.c | 2 +- arch/x86/kernel/pci-dma.c | 3 +-- arch/x86/kernel/pci-swiotlb.c | 9 +++++--- arch/x86/kernel/setup.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 6 ++---- drivers/base/dma-contiguous.c | 42 ++++++++++++++++++++++++++++--------- drivers/iommu/intel-iommu.c | 32 +++++++++++++++++++++------- include/linux/dma-contiguous.h | 9 +++++--- include/linux/memblock.h | 2 ++ include/linux/swiotlb.h | 2 ++ lib/swiotlb.c | 2 +- mm/memblock.c | 21 +++++++++++++++---- 15 files changed, 108 insertions(+), 40 deletions(-) Cc: Marek Szyprowski <m.szyprow...@samsung.com> Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: David Woodhouse <dw...@infradead.org> Cc: Don Dutile <ddut...@redhat.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Ingo Molnar <mi...@redhat.com> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: Andi Kleen <a...@firstfloor.org> Cc: x...@kernel.org Cc: iommu@lists.linux-foundation.org -- 1.8.3.2 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
