iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: loongson64: alloc pglist_data at run time

Browse Source 
Loongson64 allocates arrays of pglist_data statically and is located
at Node 0, and cpu from Nodes other than 0 need remote access to
pglist_data and zone info.

Delay pglist_data allocation till run time, and make it NUMA-aware

Signed-off-by: Huang Pei <huangpei@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Huang Pei 2021-03-09 16:02:10 +08:00 committed by Thomas Bogendoerfer
parent 76e0c88dbd
commit dd647b1255
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/mips/loongson64/numa.c
View File

@ -27,7 +27,6 @@
#include <boot_param.h> #include <boot_param.h>
#include <loongson.h> #include <loongson.h>
static struct pglist_data prealloc__node_data[MAX_NUMNODES];
unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES]; unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES];
EXPORT_SYMBOL(__node_distances); EXPORT_SYMBOL(__node_distances);
struct pglist_data *__node_data[MAX_NUMNODES]; struct pglist_data *__node_data[MAX_NUMNODES];
@ -84,8 +83,12 @@ static void __init init_topology_matrix(void)
static void __init node_mem_init(unsigned int node) static void __init node_mem_init(unsigned int node)
{ {
struct pglist_data *nd;
unsigned long node_addrspace_offset; unsigned long node_addrspace_offset;
unsigned long start_pfn, end_pfn; unsigned long start_pfn, end_pfn;
unsigned long nd_pa;
int tnid;
const size_t nd_size = roundup(sizeof(pg_data_t), SMP_CACHE_BYTES);
node_addrspace_offset = nid_to_addrbase(node); node_addrspace_offset = nid_to_addrbase(node);
pr_info("Node%d's addrspace_offset is 0x%lx\n", pr_info("Node%d's addrspace_offset is 0x%lx\n",
@ -95,8 +98,16 @@ static void __init node_mem_init(unsigned int node)
pr_info("Node%d: start_pfn=0x%lx, end_pfn=0x%lx\n", pr_info("Node%d: start_pfn=0x%lx, end_pfn=0x%lx\n",
node, start_pfn, end_pfn); node, start_pfn, end_pfn);
__node_data[node] = prealloc__node_data + node; nd_pa = memblock_phys_alloc_try_nid(nd_size, SMP_CACHE_BYTES, node);
if (!nd_pa)
panic("Cannot allocate %zu bytes for node %d data\n",
nd_size, node);
nd = __va(nd_pa);
memset(nd, 0, sizeof(struct pglist_data));
tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
if (tnid != node)
pr_info("NODE_DATA(%d) on node %d\n", node, tnid);
__node_data[node] = nd;
NODE_DATA(node)->node_start_pfn = start_pfn; NODE_DATA(node)->node_start_pfn = start_pfn;
NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn; NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn;