Merge tag 'fixes-2024-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...

Pull memblock fix from Mike Rapoport:
 "Fix crash when reserved memory is not added to memory.

  When CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled, the initialization
  of reserved pages may cause access of NODE_DATA() with invalid nid and
  crash.

  Add a fall back to early_pfn_to_nid() in memmap_init_reserved_pages()
  to ensure a valid node id is always passed to init_reserved_page()"

* tag 'fixes-2024-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: fix crash when reserved memory is not added to memory

diff --combined mm/memblock.c
index abd92869874d75f62cd303475ba2b44c67db38ac,4823ad979b72f5b9df9a93a2a58b4f807b873a61..4dcb2ee35eca856a43694f4402dea0c1c9bf6d8a
--- 1/mm/memblock.c
--- 2/mm/memblock.c
+++ b/mm/memblock.c
@@@ -734,40 -734,6 +734,40 @@@ int __init_memblock memblock_add(phys_a
        return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0);
  }
  
 +/**
 + * memblock_validate_numa_coverage - check if amount of memory with
 + * no node ID assigned is less than a threshold
 + * @threshold_bytes: maximal number of pages that can have unassigned node
 + * ID (in bytes).
 + *
 + * A buggy firmware may report memory that does not belong to any node.
 + * Check if amount of such memory is below @threshold_bytes.
 + *
 + * Return: true on success, false on failure.
 + */
 +bool __init_memblock memblock_validate_numa_coverage(unsigned long threshold_bytes)
 +{
 +      unsigned long nr_pages = 0;
 +      unsigned long start_pfn, end_pfn, mem_size_mb;
 +      int nid, i;
 +
 +      /* calculate lose page */
 +      for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid) {
 +              if (nid == NUMA_NO_NODE)
 +                      nr_pages += end_pfn - start_pfn;
 +      }
 +
 +      if ((nr_pages << PAGE_SHIFT) >= threshold_bytes) {
 +              mem_size_mb = memblock_phys_mem_size() >> 20;
 +              pr_err("NUMA: no nodes coverage for %luMB of %luMB RAM\n",
 +                     (nr_pages << PAGE_SHIFT) >> 20, mem_size_mb);
 +              return false;
 +      }
 +
 +      return true;
 +}
 +
 +
  /**
   * memblock_isolate_range - isolate given range into disjoint memblocks
   * @type: memblock type to isolate range for
@@@ -1885,7 -1851,7 +1885,7 @@@ int __init_memblock memblock_search_pfn
        int mid = memblock_search(type, PFN_PHYS(pfn));
  
        if (mid == -1)
 -              return -1;
 +              return NUMA_NO_NODE;
  
        *start_pfn = PFN_DOWN(type->regions[mid].base);
        *end_pfn = PFN_DOWN(type->regions[mid].base + type->regions[mid].size);
@@@ -2113,13 -2079,12 +2113,13 @@@ static void __init __free_pages_memory(
                 * Free the pages in the largest chunks alignment allows.
                 *
                 * __ffs() behaviour is undefined for 0. start == 0 is
 -               * MAX_ORDER-aligned, set order to MAX_ORDER for the case.
 +               * MAX_PAGE_ORDER-aligned, set order to MAX_PAGE_ORDER for
 +               * the case.
                 */
                if (start)
 -                      order = min_t(int, MAX_ORDER, __ffs(start));
 +                      order = min_t(int, MAX_PAGE_ORDER, __ffs(start));
                else
 -                      order = MAX_ORDER;
 +                      order = MAX_PAGE_ORDER;
  
                while (start + (1UL << order) > end)
                        order--;
@@@ -2176,6 -2141,9 +2176,9 @@@ static void __init memmap_init_reserved
                        start = region->base;
                        end = start + region->size;
  
+                       if (nid == NUMA_NO_NODE || nid >= MAX_NUMNODES)
+                               nid = early_pfn_to_nid(PFN_DOWN(start));
+ 
                        reserve_bootmem_region(start, end, nid);
                }
        }