Commit b5445f95 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds

Allow nodes to exist that only contain ZONE_MOVABLE

With the introduction of kernelcore=, a configurable zone is created on
request.  In some cases, this value will be small enough that some nodes
contain only ZONE_MOVABLE.  On some NUMA configurations when this occurs,
arch-independent zone-sizing will get the size of the memory holes within
the node incorrect.  The value of present_pages goes negative and the boot
fails.

This patch fixes the bug in the calculation of the size of the hole.  The
test case is to boot test a NUMA machine with a low value of kernelcore=
before and after the patch is applied.  While this bug exists in early
kernel it cannot be triggered in practice.

This patch has been boot-tested on a variety machines with and without
kernelcore= set.
Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee2077d9
...@@ -2775,11 +2775,11 @@ unsigned long __meminit __absent_pages_in_range(int nid, ...@@ -2775,11 +2775,11 @@ unsigned long __meminit __absent_pages_in_range(int nid,
if (i == -1) if (i == -1)
return 0; return 0;
prev_end_pfn = min(early_node_map[i].start_pfn, range_end_pfn);
/* Account for ranges before physical memory on this node */ /* Account for ranges before physical memory on this node */
if (early_node_map[i].start_pfn > range_start_pfn) if (early_node_map[i].start_pfn > range_start_pfn)
hole_pages = early_node_map[i].start_pfn - range_start_pfn; hole_pages = prev_end_pfn - range_start_pfn;
prev_end_pfn = early_node_map[i].start_pfn;
/* Find all holes for the zone within the node */ /* Find all holes for the zone within the node */
for (; i != -1; i = next_active_region_index_in_nid(i, nid)) { for (; i != -1; i = next_active_region_index_in_nid(i, nid)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment