Skip to contentSkip to conversation

mm-cma-accept-memory-of-cma-areas-reserved-at-a-fixed-address.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Nov 3 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/cma: accept memory of CMA areas reserved at a fixed address
has been removed from the -mm tree. Its filename was
mm-cma-accept-memory-of-cma-areas-reserved-at-a-fixed-address.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: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: mm/cma: accept memory of CMA areas reserved at a fixed address
Date: Thu, 29 Oct 2026 12:18:38 +0200

CMA areas allocated from memblock have their memory accepted by memblock_alloc_range_nid(), but areas reserved at a fixed address with memblock_reserve() are not.

If a fixed CMA area is requested by the cma=<size>@<base> command line parameter, it may be in regular RAM and on TDX and SEV-SNP guests it must be accepted.

Accept the memory of fixed CMA areas as well, so that all CMA areas are accepted regardless of how they were reserved.

Fixes 75d090fd167a ("x86/tdx: Add unaccepted memory support")
Cc David Hildenbrand <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Vlastimil Babka <[email protected]>

---

 mm/cma.c |    2 ++
 1 file changed, 2 insertions(+)
mm/cma.c renamed from mm/cma.c~mm-cma-accept-memory-of-cma-areas-reserved-at-a-fixed-address +2 -0
@@ -381,6 +381,8 @@ static int __init cma_fixed_reserve(phys
 		return -EBUSY;
 	}
 
+	accept_memory(base, size);
+
 	return 0;
 }
 

_

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

userfaultfd-clear-uffd-state-in-child-ptes-if-uffd-is-released-during-fork.patch mm-vma-undo-userfaultfd-unmap-preparation-when-unmapping-fails.patch hibernation-make-swsusp_page-helpers-static.patch hibernation-ensure-secretmem-pages-dont-reach-a-snapshot.patch hibernate-handle-potential-errors-in-hibernate_mapunmap_page.patch hibernation-kfence-explicitly-map-unmap-kfence-pages.patch hibernation-make-hibernation-unavailable-when-debug_pagealloc-is-on.patch