Subject: [folded-merged] x86-make-dma_alloc_coherent-return-zeroed-memory-if-cma-is-enabled-fix.patch removed from -mm tree To: akinobu.mita@xxxxxxxxx,andi@xxxxxxxxxxxxxx,ddutile@xxxxxxxxxx,dwmw2@xxxxxxxxxxxxx,hpa@xxxxxxxxx,konrad.wilk@xxxxxxxxxx,m.szyprowski@xxxxxxxxxxx,mingo@xxxxxxxxxx,tglx@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 04 Jun 2014 15:22:26 -0700 The patch titled Subject: arch/x86/kernel/pci-dma.c: avoid duplicated memset in dma_generic_alloc_coherent() has been removed from the -mm tree. Its filename was x86-make-dma_alloc_coherent-return-zeroed-memory-if-cma-is-enabled-fix.patch This patch was dropped because it was folded into x86-make-dma_alloc_coherent-return-zeroed-memory-if-cma-is-enabled.patch ------------------------------------------------------ From: Akinobu Mita <akinobu.mita@xxxxxxxxx> Subject: arch/x86/kernel/pci-dma.c: avoid duplicated memset in dma_generic_alloc_coherent() Fix a duplicated memset that was introduced by the patch x86-make-dma_alloc_coherent-return-zeroed-memory-if-cma-is-enabled.patch in -mm tree, and this change should be folded into it. If dma_generic_alloc_coherent() is called with __GFP_ZERO, it does a duplicated memset to the memory area allocated by alloc_pages_node() with __GFP_ZERO. This change fixes that inefficiency by clearing __GFP_ZERO bit in gfp flages before calling alloc_pages_node(). Note that dma_generic_alloc_coherent() always returns zeroed memory. Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Don Dutile <ddutile@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/pci-dma.c | 1 + 1 file changed, 1 insertion(+) diff -puN arch/x86/kernel/pci-dma.c~x86-make-dma_alloc_coherent-return-zeroed-memory-if-cma-is-enabled-fix arch/x86/kernel/pci-dma.c --- a/arch/x86/kernel/pci-dma.c~x86-make-dma_alloc_coherent-return-zeroed-memory-if-cma-is-enabled-fix +++ a/arch/x86/kernel/pci-dma.c @@ -97,6 +97,7 @@ void *dma_generic_alloc_coherent(struct dma_mask = dma_alloc_coherent_mask(dev, flag); + flag &= ~__GFP_ZERO; again: page = NULL; /* CMA can be used only in the context which permits sleeping */ _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are origin.patch x86-make-dma_alloc_coherent-return-zeroed-memory-if-cma-is-enabled.patch x86-enable-dma-cma-with-swiotlb.patch intel-iommu-integrate-dma-cma.patch intel-iommu-integrate-dma-cma-fix.patch memblock-introduce-memblock_alloc_range.patch cma-add-placement-specifier-for-cma=-kernel-parameter.patch arch-x86-kernel-pci-dmac-fix-dma_generic_alloc_coherent-when-config_dma_cma-is-enabled.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html