[merged mm-hotfixes-stable] mm-cma-accept-memory-of-cma-areas-reserved-at-a-fixed-address.patch removed from -mm tree

[merged mm-hotfixes-stable] mm-cma-accept-memory-of-cma-areas-reserved-at-a-fixed-address.patch removed from -mm tree

[Andrew Morton]

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)" <rppt@kernel.org>
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.

Link: https://lore.kernel.org/20261029-cma-multi-v1-2-2cbced8b5cb7@kernel.org
Fixes: 75d090fd167a ("x86/tdx: Add unaccepted memory support")
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Kiryl Shutsemau (Meta) <kas@kernel.org>
Reviewed-by: Pankaj Gupta <pankaj.gupta@amd.com>
Tested-by: Pankaj Gupta <pankaj.gupta@amd.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: Liam R. Howlett <liam@infradead.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Cc: <stable@vger.kernel.org>
---

 mm/cma.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/mm/cma.c~mm-cma-accept-memory-of-cma-areas-reserved-at-a-fixed-address
+++ a/mm/cma.c
@@ -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 rppt@kernel.org 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