Commit 75f9d4cc authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

mm: move numa_distance and related code from x86 to numa_memblks 

Move code dealing with numa_distance array from arch/x86 to
mm/numa_memblks.c

This code will be later reused by arch_numa.

No functional changes.

Link: https://lkml.kernel.org/r/20240807064110.1003856-19-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Tested-by: Zi Yan <ziy@nvidia.com> # for x86_64 and arm64
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> [arm64 + CXL via QEMU]
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Rob Herring (Arm) <robh@kernel.org>
Cc: Samuel Holland <samuel.holland@sifive.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 87482708

arch/x86/include/asm/numa.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ extern int numa_off; 
extern s16 __apicid_to_node[MAX_LOCAL_APIC];

extern nodemask_t numa_nodes_parsed __initdata;



extern void __init numa_set_distance(int from, int to, int distance);



static inline void set_apicid_to_node(int apicid, s16 node)

{

	__apicid_to_node[apicid] = node;

arch/x86/mm/numa.c

+0 −104
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 


int numa_off;



static int numa_distance_cnt;

static u8 *numa_distance;



static __init int numa_setup(char *opt)

{

	if (!opt)
@@ -118,107 +115,6 @@ void __init setup_node_to_cpumask_map(void) 
	pr_debug("Node to cpumask map for %u nodes\n", nr_node_ids);

}



/**

 * numa_reset_distance - Reset NUMA distance table

 *

 * The current table is freed.  The next numa_set_distance() call will

 * create a new one.

 */

void __init numa_reset_distance(void)

{

	size_t size = numa_distance_cnt * numa_distance_cnt * sizeof(numa_distance[0]);



	/* numa_distance could be 1LU marking allocation failure, test cnt */

	if (numa_distance_cnt)

		memblock_free(numa_distance, size);

	numa_distance_cnt = 0;

	numa_distance = NULL;	/* enable table creation */

}



static int __init numa_alloc_distance(void)

{

	nodemask_t nodes_parsed;

	size_t size;

	int i, j, cnt = 0;



	/* size the new table and allocate it */

	nodes_parsed = numa_nodes_parsed;

	numa_nodemask_from_meminfo(&nodes_parsed, &numa_meminfo);



	for_each_node_mask(i, nodes_parsed)

		cnt = i;

	cnt++;

	size = cnt * cnt * sizeof(numa_distance[0]);



	numa_distance = memblock_alloc(size, PAGE_SIZE);

	if (!numa_distance) {

		pr_warn("Warning: can't allocate distance table!\n");

		/* don't retry until explicitly reset */

		numa_distance = (void *)1LU;

		return -ENOMEM;

	}



	numa_distance_cnt = cnt;



	/* fill with the default distances */

	for (i = 0; i < cnt; i++)

		for (j = 0; j < cnt; j++)

			numa_distance[i * cnt + j] = i == j ?

				LOCAL_DISTANCE : REMOTE_DISTANCE;

	printk(KERN_DEBUG "NUMA: Initialized distance table, cnt=%d\n", cnt);



	return 0;

}



/**

 * numa_set_distance - Set NUMA distance from one NUMA to another

 * @from: the 'from' node to set distance

 * @to: the 'to'  node to set distance

 * @distance: NUMA distance

 *

 * Set the distance from node @from to @to to @distance.  If distance table

 * doesn't exist, one which is large enough to accommodate all the currently

 * known nodes will be created.

 *

 * If such table cannot be allocated, a warning is printed and further

 * calls are ignored until the distance table is reset with

 * numa_reset_distance().

 *

 * If @from or @to is higher than the highest known node or lower than zero

 * at the time of table creation or @distance doesn't make sense, the call

 * is ignored.

 * This is to allow simplification of specific NUMA config implementations.

 */

void __init numa_set_distance(int from, int to, int distance)

{

	if (!numa_distance && numa_alloc_distance() < 0)

		return;



	if (from >= numa_distance_cnt || to >= numa_distance_cnt ||

			from < 0 || to < 0) {

		pr_warn_once("Warning: node ids are out of bound, from=%d to=%d distance=%d\n",

			     from, to, distance);

		return;

	}



	if ((u8)distance != distance ||

	    (from == to && distance != LOCAL_DISTANCE)) {

		pr_warn_once("Warning: invalid distance parameter, from=%d to=%d distance=%d\n",

			     from, to, distance);

		return;

	}



	numa_distance[from * numa_distance_cnt + to] = distance;

}



int __node_distance(int from, int to)

{

	if (from >= numa_distance_cnt || to >= numa_distance_cnt)

		return from == to ? LOCAL_DISTANCE : REMOTE_DISTANCE;

	return numa_distance[from * numa_distance_cnt + to];

}

EXPORT_SYMBOL(__node_distance);



static int __init numa_register_memblks(struct numa_meminfo *mi)

{

	int nid, err;

arch/x86/mm/numa_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#include <linux/types.h>

#include <asm/numa.h>



void __init numa_reset_distance(void);



void __init x86_numa_init(void);



struct numa_meminfo;

include/linux/numa_memblks.h

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ 


#define NR_NODE_MEMBLKS		(MAX_NUMNODES * 2)



extern int numa_distance_cnt;

void __init numa_set_distance(int from, int to, int distance);

void __init numa_reset_distance(void);



struct numa_memblk {

	u64			start;

	u64			end;

mm/numa_memblks.c

+104 −0
Original line number Diff line number Diff line
@@ -7,11 +7,115 @@ 
#include <linux/numa.h>

#include <linux/numa_memblks.h>



int numa_distance_cnt;

static u8 *numa_distance;



nodemask_t numa_nodes_parsed __initdata;



struct numa_meminfo numa_meminfo __initdata_or_meminfo;

struct numa_meminfo numa_reserved_meminfo __initdata_or_meminfo;



/**

 * numa_reset_distance - Reset NUMA distance table

 *

 * The current table is freed.  The next numa_set_distance() call will

 * create a new one.

 */

void __init numa_reset_distance(void)

{

	size_t size = numa_distance_cnt * numa_distance_cnt * sizeof(numa_distance[0]);



	/* numa_distance could be 1LU marking allocation failure, test cnt */

	if (numa_distance_cnt)

		memblock_free(numa_distance, size);

	numa_distance_cnt = 0;

	numa_distance = NULL;	/* enable table creation */

}



static int __init numa_alloc_distance(void)

{

	nodemask_t nodes_parsed;

	size_t size;

	int i, j, cnt = 0;



	/* size the new table and allocate it */

	nodes_parsed = numa_nodes_parsed;

	numa_nodemask_from_meminfo(&nodes_parsed, &numa_meminfo);



	for_each_node_mask(i, nodes_parsed)

		cnt = i;

	cnt++;

	size = cnt * cnt * sizeof(numa_distance[0]);



	numa_distance = memblock_alloc(size, PAGE_SIZE);

	if (!numa_distance) {

		pr_warn("Warning: can't allocate distance table!\n");

		/* don't retry until explicitly reset */

		numa_distance = (void *)1LU;

		return -ENOMEM;

	}



	numa_distance_cnt = cnt;



	/* fill with the default distances */

	for (i = 0; i < cnt; i++)

		for (j = 0; j < cnt; j++)

			numa_distance[i * cnt + j] = i == j ?

				LOCAL_DISTANCE : REMOTE_DISTANCE;

	printk(KERN_DEBUG "NUMA: Initialized distance table, cnt=%d\n", cnt);



	return 0;

}



/**

 * numa_set_distance - Set NUMA distance from one NUMA to another

 * @from: the 'from' node to set distance

 * @to: the 'to'  node to set distance

 * @distance: NUMA distance

 *

 * Set the distance from node @from to @to to @distance.  If distance table

 * doesn't exist, one which is large enough to accommodate all the currently

 * known nodes will be created.

 *

 * If such table cannot be allocated, a warning is printed and further

 * calls are ignored until the distance table is reset with

 * numa_reset_distance().

 *

 * If @from or @to is higher than the highest known node or lower than zero

 * at the time of table creation or @distance doesn't make sense, the call

 * is ignored.

 * This is to allow simplification of specific NUMA config implementations.

 */

void __init numa_set_distance(int from, int to, int distance)

{

	if (!numa_distance && numa_alloc_distance() < 0)

		return;



	if (from >= numa_distance_cnt || to >= numa_distance_cnt ||

			from < 0 || to < 0) {

		pr_warn_once("Warning: node ids are out of bound, from=%d to=%d distance=%d\n",

			     from, to, distance);

		return;

	}



	if ((u8)distance != distance ||

	    (from == to && distance != LOCAL_DISTANCE)) {

		pr_warn_once("Warning: invalid distance parameter, from=%d to=%d distance=%d\n",

			     from, to, distance);

		return;

	}



	numa_distance[from * numa_distance_cnt + to] = distance;

}



int __node_distance(int from, int to)

{

	if (from >= numa_distance_cnt || to >= numa_distance_cnt)

		return from == to ? LOCAL_DISTANCE : REMOTE_DISTANCE;

	return numa_distance[from * numa_distance_cnt + to];

}

EXPORT_SYMBOL(__node_distance);



static int __init numa_add_memblk_to(int nid, u64 start, u64 end,

				     struct numa_meminfo *mi)

{