Re: linux-next: manual merge of the liveupdate tree with the mm-unstable tree

[Mike Rapoport <rppt@kernel.org>]

On Tue, Jul 28, 2026 at 05:27:05PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the liveupdate tree got a conflict in:
> 
>   mm/hugetlb.c
>   mm/mm_init.c
> 
> between at least commit:
> 
>   7b558c2570017 ("mm/hugetlb: refactor early boot gigantic hugepage allocation")
> 
> from the mm-unstable tree and commit:
> 
>   7c967e2d549dc ("memblock: make HugeTLB bootmem allocation work with KHO")
>   f476132a8999e ("mm/mm_init: don't rely on memblock to get KHO scratch migratetype")
> 
> from the liveupdate tree.
> 
> I stared at the conflict for a bit but with my minimal familiarity with
> this code I have absolutely no confidence in my ability to do a working
> resolution for this in a timely fashion so instead I merged the version
> of liveupdate from next-20260727, I'll have another look tomorrow but
> would really appreciate it if someone could help out here.

I've got this for merging mm-unstable into liveupdate/next:

diff --cc mm/hugetlb.c
index ab4afc818e8cb,a77c3c1cb8943..0000000000000
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@@ -3027,51 -3076,23 +3076,16 @@@ out_end_reservation
  
  static __init void *alloc_bootmem(struct hstate *h, int nid, bool node_exact)
  {
- 	struct huge_bootmem_page *m;
- 	int listnode = nid;
- 
  	if (hugetlb_early_cma(h))
- 		m = hugetlb_cma_alloc_bootmem(h, &listnode, node_exact);
- 	else {
- 		m = memblock_alloc_hugetlb(huge_page_size(h), nid, node_exact);
- 		if (m) {
- 			m->flags = 0;
- 			m->cma = NULL;
+ 		return hugetlb_cma_alloc_bootmem(h, nid, node_exact);
  
- 			/*
- 			 * For pre-HVO to work correctly, pages need to be on
- 			 * the list for the node they were actually allocated
- 			 * from. That node may be different in the case of
- 			 * fallback by memblock_alloc_hugetlb_bootmem. So,
- 			 * extract the actual node first.
- 			 */
- 			if (!node_exact)
- 				listnode = early_pfn_to_nid(PHYS_PFN(__pa(m)));
- 		}
- 	}
- 
- 	if (m) {
- 		/*
- 		 * Use the beginning of the huge page to store the
- 		 * huge_bootmem_page struct (until gather_bootmem
- 		 * puts them into the mem_map).
- 		 *
- 		 * Put them into a private list first because mem_map
- 		 * is not up yet.
- 		 */
- 		INIT_LIST_HEAD(&m->list);
- 		list_add(&m->list, &huge_boot_pages[listnode]);
- 		m->hstate = h;
- 	}
 -	if (node_exact)
 -		return memblock_alloc_exact_nid_raw(huge_page_size(h),
 -				huge_page_size(h), 0,
 -				MEMBLOCK_ALLOC_ACCESSIBLE, nid);
--
- 	return m;
 -	return memblock_alloc_try_nid_raw(huge_page_size(h),
 -				huge_page_size(h), 0,
 -				MEMBLOCK_ALLOC_ACCESSIBLE, nid);
++	return memblock_alloc_hugetlb(huge_page_size(h), nid, node_exact);
  }
  
- int alloc_bootmem_huge_page(struct hstate *h, int nid)
+ void *__init arch_alloc_bootmem_huge_page(struct hstate *h, int nid)
  	__attribute__ ((weak, alias("__alloc_bootmem_huge_page")));
- int __alloc_bootmem_huge_page(struct hstate *h, int nid)
+ void *__init __alloc_bootmem_huge_page(struct hstate *h, int nid)
  {
- 	struct huge_bootmem_page *m = NULL; /* initialize for clang */
  	int nr_nodes, node = nid;
  
  	/* do node specific alloc */
diff --cc mm/mm_init.c
index dc20d6814e48b,711f821f7b3c7..0000000000000
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@@ -2683,7 -2683,8 +2682,9 @@@ void __init __weak mem_init(void
  
  void __init mm_core_init_early(void)
  {
 +	kho_memory_init_early();
+ 	free_area_init();
+ 
  	hugetlb_cma_reserve();
  	hugetlb_bootmem_alloc();



-- 
Sincerely yours,
Mike.