Skip to contentSkip to conversation

dma-contiguous: two bug fixes for dma_{alloc,free}_contiguous()

PATCH Applied Nicolin Chen 2 participants 4 messages Jul 26, 2019 – Jul 29, 2019 DMA mapping helpers

lore
Share & tools
lore
#0 lore raw

v2 cover dma-contiguous: two bug fixes for dma_{alloc,free}_contiguous()

There are two obvious bugs in these two functions. So having two patches to fix them.

Changlog
v1->v2:
* PATCH-1: Confine cma_align inside the if-condition.
* PATCH-1: Updated commit message to be precise for the corner case.
* PATCH-2: Added Reviewed-by from Christoph.

Nicolin Chen (2):
dma-contiguous: do not overwrite align in dma_alloc_contiguous()
dma-contiguous: page-align the size in dma_free_contiguous()

 kernel/dma/contiguous.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
Signature · 6 lines
2.17.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
#1 lore raw

PATCH v2 1/2 dma-contiguous: do not overwrite align in dma_alloc_contiguous()

The dma_alloc_contiguous() limits align at CONFIG_CMA_ALIGNMENT for cma_alloc() however it does not restore it for the fallback routine. This will result in a size mismatch between the allocation and free when running into the fallback routines after cma_alloc() fails, if the align is larger than CONFIG_CMA_ALIGNMENT.

This patch adds a cma_align to take care of cma_alloc() and prevent the align from being overwritten.

Fixes fdaeec198ada ("dma-contiguous: add dma_{alloc,free}_contiguous() helpers")
---
 kernel/dma/contiguous.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/dma/contiguous.c +3 -2
index bfc0c17f2a3d..ea8259f53eda 100644
@@ -243,8 +243,9 @@ struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp)
 
 	/* CMA can be used only in the context which permits sleeping */
 	if (cma && gfpflags_allow_blocking(gfp)) {
-		align = min_t(size_t, align, CONFIG_CMA_ALIGNMENT);
-		page = cma_alloc(cma, count, align, gfp & __GFP_NOWARN);
+		size_t cma_align = min_t(size_t, align, CONFIG_CMA_ALIGNMENT);
+
+		page = cma_alloc(cma, count, cma_align, gfp & __GFP_NOWARN);
 	}
 
 	/* Fallback allocation of normal pages */
Signature · 6 lines
2.17.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
#2 lore raw

PATCH v2 2/2 dma-contiguous: page-align the size in dma_free_contiguous()

In reply to Nicolin Chen

According to the original dma_direct_alloc_pages() code:

{
	unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;

	if (!dma_release_from_contiguous(dev, page, count))
		__free_pages(page, get_order(size));
}

The count parameter for dma_release_from_contiguous() was page aligned before the right-shifting operation, while the new API dma_free_contiguous() forgets to have PAGE_ALIGN() at the size.

So this patch simply adds it to prevent any corner case.

Fixes fdaeec198ada ("dma-contiguous: add dma_{alloc,free}_contiguous() helpers")
---
 kernel/dma/contiguous.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/dma/contiguous.c +2 -1
index ea8259f53eda..2bd410f934b3 100644
@@ -267,7 +267,8 @@ struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp)
  */
 void dma_free_contiguous(struct device *dev, struct page *page, size_t size)
 {
-	if (!cma_release(dev_get_cma_area(dev), page, size >> PAGE_SHIFT))
+	if (!cma_release(dev_get_cma_area(dev), page,
+			 PAGE_ALIGN(size) >> PAGE_SHIFT))
 		__free_pages(page, get_order(size));
 }
 
Signature · 1 line
2.17.1