Commit 0971e82e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull memblock fix from Mike Rapoport:
 "Fix fragility in checks for unset node ID.

  Use numa_valid_node() function to verify that nid is a valid node
  ID instead of inconsistent comparisons with either NUMA_NO_NODE or
  MAX_NUMNODES"

* tag 'fixes-2024-06-23' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: use numa_valid_node() helper to check for invalid node ID
parents b67eeff7 8043832e

include/linux/numa.h

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ 
#define	NUMA_NO_NODE	(-1)

#define	NUMA_NO_MEMBLK	(-1)



static inline bool numa_valid_node(int nid)

{

	return nid >= 0 && nid < MAX_NUMNODES;

}



/* optionally keep NUMA memory info available post init */

#ifdef CONFIG_NUMA_KEEP_MEMINFO

#define __initdata_or_meminfo

mm/memblock.c

+7 −21
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ bool __init_memblock memblock_validate_numa_coverage(unsigned long threshold_byt 


	/* calculate lose page */

	for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid) {

		if (nid == NUMA_NO_NODE)

		if (!numa_valid_node(nid))

			nr_pages += end_pfn - start_pfn;

	}
@@ -1061,7 +1061,7 @@ static bool should_skip_region(struct memblock_type *type, 
		return false;



	/* only memory regions are associated with nodes, check it */

	if (nid != NUMA_NO_NODE && nid != m_nid)

	if (numa_valid_node(nid) && nid != m_nid)

		return true;



	/* skip hotpluggable memory regions if needed */
@@ -1118,10 +1118,6 @@ void __next_mem_range(u64 *idx, int nid, enum memblock_flags flags, 
	int idx_a = *idx & 0xffffffff;

	int idx_b = *idx >> 32;



	if (WARN_ONCE(nid == MAX_NUMNODES,

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

		nid = NUMA_NO_NODE;



	for (; idx_a < type_a->cnt; idx_a++) {

		struct memblock_region *m = &type_a->regions[idx_a];
@@ -1215,9 +1211,6 @@ void __init_memblock __next_mem_range_rev(u64 *idx, int nid, 
	int idx_a = *idx & 0xffffffff;

	int idx_b = *idx >> 32;



	if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))

		nid = NUMA_NO_NODE;



	if (*idx == (u64)ULLONG_MAX) {

		idx_a = type_a->cnt - 1;

		if (type_b != NULL)
@@ -1303,7 +1296,7 @@ void __init_memblock __next_mem_pfn_range(int *idx, int nid, 


		if (PFN_UP(r->base) >= PFN_DOWN(r->base + r->size))

			continue;

		if (nid == MAX_NUMNODES || nid == r_nid)

		if (!numa_valid_node(nid) || nid == r_nid)

			break;

	}

	if (*idx >= type->cnt) {
@@ -1339,10 +1332,6 @@ 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;
@@ -1452,9 +1441,6 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, 
	enum memblock_flags flags = choose_memblock_flags();

	phys_addr_t found;



	if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))

		nid = NUMA_NO_NODE;



	if (!align) {

		/* Can't use WARNs this early in boot on powerpc */

		dump_stack();
@@ -1467,7 +1453,7 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, 
	if (found && !memblock_reserve(found, size))

		goto done;



	if (nid != NUMA_NO_NODE && !exact_nid) {

	if (numa_valid_node(nid) && !exact_nid) {

		found = memblock_find_in_range_node(size, align, start,

						    end, NUMA_NO_NODE,

						    flags);
@@ -1987,7 +1973,7 @@ static void __init_memblock memblock_dump(struct memblock_type *type) 
		end = base + size - 1;

		flags = rgn->flags;

#ifdef CONFIG_NUMA

		if (memblock_get_region_node(rgn) != MAX_NUMNODES)

		if (numa_valid_node(memblock_get_region_node(rgn)))

			snprintf(nid_buf, sizeof(nid_buf), " on node %d",

				 memblock_get_region_node(rgn));

#endif
@@ -2181,7 +2167,7 @@ static void __init memmap_init_reserved_pages(void) 
			start = region->base;

			end = start + region->size;



			if (nid == NUMA_NO_NODE || nid >= MAX_NUMNODES)

			if (!numa_valid_node(nid))

				nid = early_pfn_to_nid(PFN_DOWN(start));



			reserve_bootmem_region(start, end, nid);
@@ -2272,7 +2258,7 @@ static int memblock_debug_show(struct seq_file *m, void *private) 


		seq_printf(m, "%4d: ", i);

		seq_printf(m, "%pa..%pa ", &reg->base, &end);

		if (nid != MAX_NUMNODES)

		if (numa_valid_node(nid))

			seq_printf(m, "%4d ", nid);

		else

			seq_printf(m, "%4c ", 'x');