diff options
Diffstat (limited to 'arch/x86/mm/numa.c')
| -rw-r--r-- | arch/x86/mm/numa.c | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index fbeaaf416610..496f494593bf 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c | |||
| @@ -192,8 +192,6 @@ int __init numa_add_memblk(int nid, u64 start, u64 end) | |||
| 192 | /* Initialize NODE_DATA for a node on the local memory */ | 192 | /* Initialize NODE_DATA for a node on the local memory */ |
| 193 | static void __init setup_node_data(int nid, u64 start, u64 end) | 193 | static void __init setup_node_data(int nid, u64 start, u64 end) |
| 194 | { | 194 | { |
| 195 | const u64 nd_low = PFN_PHYS(MAX_DMA_PFN); | ||
| 196 | const u64 nd_high = PFN_PHYS(max_pfn_mapped); | ||
| 197 | const size_t nd_size = roundup(sizeof(pg_data_t), PAGE_SIZE); | 195 | const size_t nd_size = roundup(sizeof(pg_data_t), PAGE_SIZE); |
| 198 | bool remapped = false; | 196 | bool remapped = false; |
| 199 | u64 nd_pa; | 197 | u64 nd_pa; |
| @@ -224,17 +222,12 @@ static void __init setup_node_data(int nid, u64 start, u64 end) | |||
| 224 | nd_pa = __pa(nd); | 222 | nd_pa = __pa(nd); |
| 225 | remapped = true; | 223 | remapped = true; |
| 226 | } else { | 224 | } else { |
| 227 | nd_pa = memblock_x86_find_in_range_node(nid, nd_low, nd_high, | 225 | nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid); |
| 228 | nd_size, SMP_CACHE_BYTES); | 226 | if (!nd_pa) { |
| 229 | if (nd_pa == MEMBLOCK_ERROR) | ||
| 230 | nd_pa = memblock_find_in_range(nd_low, nd_high, | ||
| 231 | nd_size, SMP_CACHE_BYTES); | ||
| 232 | if (nd_pa == MEMBLOCK_ERROR) { | ||
| 233 | pr_err("Cannot find %zu bytes in node %d\n", | 227 | pr_err("Cannot find %zu bytes in node %d\n", |
| 234 | nd_size, nid); | 228 | nd_size, nid); |
| 235 | return; | 229 | return; |
| 236 | } | 230 | } |
| 237 | memblock_x86_reserve_range(nd_pa, nd_pa + nd_size, "NODE_DATA"); | ||
| 238 | nd = __va(nd_pa); | 231 | nd = __va(nd_pa); |
| 239 | } | 232 | } |
| 240 | 233 | ||
| @@ -371,8 +364,7 @@ void __init numa_reset_distance(void) | |||
| 371 | 364 | ||
| 372 | /* numa_distance could be 1LU marking allocation failure, test cnt */ | 365 | /* numa_distance could be 1LU marking allocation failure, test cnt */ |
| 373 | if (numa_distance_cnt) | 366 | if (numa_distance_cnt) |
| 374 | memblock_x86_free_range(__pa(numa_distance), | 367 | memblock_free(__pa(numa_distance), size); |
| 375 | __pa(numa_distance) + size); | ||
| 376 | numa_distance_cnt = 0; | 368 | numa_distance_cnt = 0; |
| 377 | numa_distance = NULL; /* enable table creation */ | 369 | numa_distance = NULL; /* enable table creation */ |
| 378 | } | 370 | } |
| @@ -395,13 +387,13 @@ static int __init numa_alloc_distance(void) | |||
| 395 | 387 | ||
| 396 | phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped), | 388 | phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped), |
| 397 | size, PAGE_SIZE); | 389 | size, PAGE_SIZE); |
| 398 | if (phys == MEMBLOCK_ERROR) { | 390 | if (!phys) { |
| 399 | pr_warning("NUMA: Warning: can't allocate distance table!\n"); | 391 | pr_warning("NUMA: Warning: can't allocate distance table!\n"); |
| 400 | /* don't retry until explicitly reset */ | 392 | /* don't retry until explicitly reset */ |
| 401 | numa_distance = (void *)1LU; | 393 | numa_distance = (void *)1LU; |
| 402 | return -ENOMEM; | 394 | return -ENOMEM; |
| 403 | } | 395 | } |
| 404 | memblock_x86_reserve_range(phys, phys + size, "NUMA DIST"); | 396 | memblock_reserve(phys, size); |
| 405 | 397 | ||
| 406 | numa_distance = __va(phys); | 398 | numa_distance = __va(phys); |
| 407 | numa_distance_cnt = cnt; | 399 | numa_distance_cnt = cnt; |
| @@ -482,8 +474,8 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi) | |||
| 482 | numaram = 0; | 474 | numaram = 0; |
| 483 | } | 475 | } |
| 484 | 476 | ||
| 485 | e820ram = max_pfn - (memblock_x86_hole_size(0, | 477 | e820ram = max_pfn - absent_pages_in_range(0, max_pfn); |
| 486 | PFN_PHYS(max_pfn)) >> PAGE_SHIFT); | 478 | |
| 487 | /* We seem to lose 3 pages somewhere. Allow 1M of slack. */ | 479 | /* We seem to lose 3 pages somewhere. Allow 1M of slack. */ |
| 488 | if ((s64)(e820ram - numaram) >= (1 << (20 - PAGE_SHIFT))) { | 480 | if ((s64)(e820ram - numaram) >= (1 << (20 - PAGE_SHIFT))) { |
| 489 | printk(KERN_ERR "NUMA: nodes only cover %LuMB of your %LuMB e820 RAM. Not used.\n", | 481 | printk(KERN_ERR "NUMA: nodes only cover %LuMB of your %LuMB e820 RAM. Not used.\n", |
| @@ -505,13 +497,10 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) | |||
| 505 | if (WARN_ON(nodes_empty(node_possible_map))) | 497 | if (WARN_ON(nodes_empty(node_possible_map))) |
| 506 | return -EINVAL; | 498 | return -EINVAL; |
| 507 | 499 | ||
| 508 | for (i = 0; i < mi->nr_blks; i++) | 500 | for (i = 0; i < mi->nr_blks; i++) { |
| 509 | memblock_x86_register_active_regions(mi->blk[i].nid, | 501 | struct numa_memblk *mb = &mi->blk[i]; |
| 510 | mi->blk[i].start >> PAGE_SHIFT, | 502 | memblock_set_node(mb->start, mb->end - mb->start, mb->nid); |
| 511 | mi->blk[i].end >> PAGE_SHIFT); | 503 | } |
| 512 | |||
| 513 | /* for out of order entries */ | ||
| 514 | sort_node_map(); | ||
| 515 | 504 | ||
| 516 | /* | 505 | /* |
| 517 | * If sections array is gonna be used for pfn -> nid mapping, check | 506 | * If sections array is gonna be used for pfn -> nid mapping, check |
| @@ -545,6 +534,8 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) | |||
| 545 | setup_node_data(nid, start, end); | 534 | setup_node_data(nid, start, end); |
| 546 | } | 535 | } |
| 547 | 536 | ||
| 537 | /* Dump memblock with node info and return. */ | ||
| 538 | memblock_dump_all(); | ||
| 548 | return 0; | 539 | return 0; |
| 549 | } | 540 | } |
| 550 | 541 | ||
| @@ -582,7 +573,7 @@ static int __init numa_init(int (*init_func)(void)) | |||
| 582 | nodes_clear(node_possible_map); | 573 | nodes_clear(node_possible_map); |
| 583 | nodes_clear(node_online_map); | 574 | nodes_clear(node_online_map); |
| 584 | memset(&numa_meminfo, 0, sizeof(numa_meminfo)); | 575 | memset(&numa_meminfo, 0, sizeof(numa_meminfo)); |
| 585 | remove_all_active_ranges(); | 576 | WARN_ON(memblock_set_node(0, ULLONG_MAX, MAX_NUMNODES)); |
| 586 | numa_reset_distance(); | 577 | numa_reset_distance(); |
| 587 | 578 | ||
| 588 | ret = init_func(); | 579 | ret = init_func(); |