mm-hugetlb-copy-the-cma-flag-when-demoting.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: copy the CMA flag when demoting
has been removed from the -mm tree. Its filename was
mm-hugetlb-copy-the-cma-flag-when-demoting.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Frank van der Linden <[email protected]>
Subject: mm/hugetlb: copy the CMA flag when demoting
Date: Thu, 1 May 2025 04:43:24 +0000
Since commit d2d786714080 ("mm/hugetlb: enable bootmem allocation from CMA areas"), a flag is used to mark hugetlb folios as allocated from CMA. This flag is also used to decide if it should be freed to CMA.
However, the flag isn't copied to the smaller folios when a hugetlb folio is broken up for demotion, which would cause it to be freed incorrectly.
Fix this by copying the flag to the smaller order hugetlb pages created from the original one.
---
mm/hugetlb.c | 6 ++++++ 1 file changed, 6 insertions(+)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-copy-the-cma-flag-when-demoting +6 -0
@@ -4034,10 +4034,13 @@ static long demote_free_hugetlb_folios(slist_for_each_entry_safe (folio, next, src_list, lru) {int i; +bool cma;if (folio_test_hugetlb_vmemmap_optimized (folio))continue ; + cma =folio_test_hugetlb_cma (folio); +list_del (&folio->lru);split_page_owner (&folio->page,huge_page_order (src),huge_page_order (dst));
@@ -4053,6 +4056,9 @@ static long demote_free_hugetlb_folios(s new_folio->mapping =NULL ;init_new_hugetlb_folio (dst, new_folio); +/* Copy the CMA flag so that it is freed correctly */ +if (cma) +folio_set_hugetlb_cma (new_folio);list_add (&new_folio->lru, &dst_list); } }
_
Patches currently in -mm which might be from [email protected] are
mm-hugetlb-use-separate-nodemask-for-bootmem-allocations.patch