Skip to contentSkip to conversation

ARM: DMA: Fix kzalloc flags in __iommu_alloc_buffer()

PATCH RESEND New Alexandre Courbot 1 participant 1 message Feb 13, 2015 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH RESEND v2 1/1 ARM: DMA: Fix kzalloc flags in __iommu_alloc_buffer()

From: Alexandre Courbot <[email protected]>

There doesn't seem to be any valid reason to allocate the pages array with the same flags as the buffer itself. Doing so can eventually lead to the following safeguard in mm/slab.c's cache_grow() to be hit:

        if (unlikely(flags & GFP_SLAB_BUG_MASK)) {
		pr_emerg("gfp: %u\n", flags & GFP_SLAB_BUG_MASK);
		BUG();
	}

This happens when buffers are allocated with __GFP_DMA32 or __GFP_HIGHMEM.

Fix this by allocating the pages array with GFP_KERNEL to follow what is done elsewhere in this file. Using GFP_KERNEL in __iommu_alloc_buffer() is safe because atomic allocations are handled by __iommu_alloc_atomic().

---
Changes since v1:
- Updated commit message to better point the assert that fails
- Added Will's ack

 arch/arm/mm/dma-mapping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mm/dma-mapping.c +1 -1
index 903dba064a03..170a116d1b29 100644
@@ -1106,7 +1106,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size,
 	int i = 0;
 
 	if (array_size <= PAGE_SIZE)
-		pages = kzalloc(array_size, gfp);
+		pages = kzalloc(array_size, GFP_KERNEL);
 	else
 		pages = vzalloc(array_size);
 	if (!pages)
Signature · 1 line
2.3.0