Skip to contentSkip to conversation

mm-cma-drop-incorrect-alignment-check-in-cma_init_reserved_mem.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Apr 26, 2024 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/cma: drop incorrect alignment check in cma_init_reserved_mem
has been removed from the -mm tree. Its filename was
mm-cma-drop-incorrect-alignment-check-in-cma_init_reserved_mem.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Frank van der Linden <[email protected]>
Subject: mm/cma: drop incorrect alignment check in cma_init_reserved_mem
Date: Thu, 4 Apr 2024 16:25:14 +0000

cma_init_reserved_mem uses IS_ALIGNED to check if the size represented by one bit in the cma allocation bitmask is aligned with CMA_MIN_ALIGNMENT_BYTES (pageblock size).

However, this is too strict, as this will fail if order_per_bit > pageblock_order, which is a valid configuration.

We could check IS_ALIGNED both ways, but since both numbers are powers of two, no check is needed at all.

Fixes de9e14eebf33 ("drivers: dma-contiguous: add initialization from device tree")
Cc Marek Szyprowski <[email protected]>
Cc Muchun Song <[email protected]>
Cc Roman Gushchin <[email protected]>

---

 mm/cma.c |    4 ----
 1 file changed, 4 deletions(-)
mm/cma.c renamed from mm/cma.c~mm-cma-drop-incorrect-alignment-check-in-cma_init_reserved_mem +0 -4
@@ -182,10 +182,6 @@ int __init cma_init_reserved_mem(phys_ad
 	if (!size || !memblock_is_region_reserved(base, size))
 		return -EINVAL;
 
-	/* alignment should be aligned with order_per_bit */
-	if (!IS_ALIGNED(CMA_MIN_ALIGNMENT_PAGES, 1 << order_per_bit))
-		return -EINVAL;
-
 	/* ensure minimal alignment required by mm core */
 	if (!IS_ALIGNED(base | size, CMA_MIN_ALIGNMENT_BYTES))
 		return -EINVAL;

_

Patches currently in -mm which might be from [email protected] are