Commit 3572597c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-2024-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock 

Pull memblock fixes from Mike Rapoport:
 "Fix validation of NUMA coverage.

  memblock_validate_numa_coverage() was checking for a unset node ID
  using NUMA_NO_NODE, but x86 used MAX_NUMNODES when no node ID was
  specified by buggy firmware.

  Update memblock to substitute MAX_NUMNODES with NUMA_NO_NODE in
  memblock_set_node() and use NUMA_NO_NODE in x86::numa_init()"

* tag 'fixes-2024-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node()
  memblock: make memblock_set_node() also warn about use of MAX_NUMNODES
parents 2ccbdf43 3ac36aa7

arch/x86/mm/numa.c

+3 −3
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static void __init numa_clear_kernel_node_hotplug(void) 
	for_each_reserved_mem_region(mb_region) {

		int nid = memblock_get_region_node(mb_region);



		if (nid != MAX_NUMNODES)

		if (nid != NUMA_NO_NODE)

			node_set(nid, reserved_nodemask);

	}
@@ -614,9 +614,9 @@ static int __init numa_init(int (*init_func)(void)) 
	nodes_clear(node_online_map);

	memset(&numa_meminfo, 0, sizeof(numa_meminfo));

	WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,

				  MAX_NUMNODES));

				  NUMA_NO_NODE));

	WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.reserved,

				  MAX_NUMNODES));

				  NUMA_NO_NODE));

	/* In case that parsing SRAT failed. */

	WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX));

	numa_reset_distance();

mm/memblock.c

+4 −0
Original line number Diff line number Diff line
@@ -1339,6 +1339,10 @@ int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size, 
	int start_rgn, end_rgn;

	int i, ret;



	if (WARN_ONCE(nid == MAX_NUMNODES,

		      "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))

		nid = NUMA_NO_NODE;



	ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);

	if (ret)

		return ret;