Skip to contentSkip to conversation

mm-hugetlb-align-cma-on-allocation-order-not-demotion-order.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 6, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/hugetlb: align cma on allocation order, not demotion order
has been removed from the -mm tree. Its filename was
mm-hugetlb-align-cma-on-allocation-order-not-demotion-order.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/hugetlb: align cma on allocation order, not demotion order
Date: Tue, 30 Apr 2024 16:14:37 +0000

Align the CMA area for hugetlb gigantic pages to their size, not the size that they can be demoted to. Otherwise there might be misaligned sections at the start and end of the CMA area that will never be used for hugetlb page allocations.

Fixes a01f43901cfb ("hugetlb: be sure to free demoted CMA pages to CMA")
Cc Muchun Song <[email protected]>

---

 mm/hugetlb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-align-cma-on-allocation-order-not-demotion-order +1 -1
@@ -7800,7 +7800,7 @@ void __init hugetlb_cma_reserve(int orde
 		 * huge page demotion.
 		 */
 		res = cma_declare_contiguous_nid(0, size, 0,
-					PAGE_SIZE << HUGETLB_PAGE_ORDER,
+					PAGE_SIZE << order,
 					HUGETLB_PAGE_ORDER, false, name,
 					&hugetlb_cma[nid], nid);
 		if (res) {

_

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