提交 9c7cd687 编写于 作者: M Mel Gorman 提交者: Linus Torvalds

[PATCH] Account for holes that are outside the range of physical memory

absent_pages_in_range() made the assumption that users of the API would not
care about holes beyound the end of physical memory.  This was not the
case.  This patch will account for ranges outside of physical memory as
holes correctly.

Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Keith Mannthey" <kmannth@gmail.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 0e0b864e
...@@ -227,7 +227,9 @@ static int reserve_hotadd(int node, unsigned long start, unsigned long end) ...@@ -227,7 +227,9 @@ static int reserve_hotadd(int node, unsigned long start, unsigned long end)
/* This check might be a bit too strict, but I'm keeping it for now. */ /* This check might be a bit too strict, but I'm keeping it for now. */
if (absent_pages_in_range(s_pfn, e_pfn) != e_pfn - s_pfn) { if (absent_pages_in_range(s_pfn, e_pfn) != e_pfn - s_pfn) {
printk(KERN_ERR "SRAT: Hotplug area has existing memory\n"); printk(KERN_ERR
"SRAT: Hotplug area %lu -> %lu has existing memory\n",
s_pfn, e_pfn);
return -1; return -1;
} }
......
...@@ -2168,6 +2168,10 @@ unsigned long __init __absent_pages_in_range(int nid, ...@@ -2168,6 +2168,10 @@ unsigned long __init __absent_pages_in_range(int nid,
if (i == -1) if (i == -1)
return 0; return 0;
/* Account for ranges before physical memory on this node */
if (early_node_map[i].start_pfn > range_start_pfn)
hole_pages = early_node_map[i].start_pfn - range_start_pfn;
prev_end_pfn = early_node_map[i].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 */
...@@ -2189,6 +2193,11 @@ unsigned long __init __absent_pages_in_range(int nid, ...@@ -2189,6 +2193,11 @@ unsigned long __init __absent_pages_in_range(int nid,
prev_end_pfn = early_node_map[i].end_pfn; prev_end_pfn = early_node_map[i].end_pfn;
} }
/* Account for ranges past physical memory on this node */
if (range_end_pfn > prev_end_pfn)
hole_pages = range_end_pfn -
max(range_start_pfn, prev_end_pfn);
return hole_pages; return hole_pages;
} }
...@@ -2210,9 +2219,16 @@ unsigned long __init zone_absent_pages_in_node(int nid, ...@@ -2210,9 +2219,16 @@ unsigned long __init zone_absent_pages_in_node(int nid,
unsigned long zone_type, unsigned long zone_type,
unsigned long *ignored) unsigned long *ignored)
{ {
return __absent_pages_in_range(nid, unsigned long node_start_pfn, node_end_pfn;
arch_zone_lowest_possible_pfn[zone_type], unsigned long zone_start_pfn, zone_end_pfn;
arch_zone_highest_possible_pfn[zone_type]);
get_pfn_range_for_nid(nid, &node_start_pfn, &node_end_pfn);
zone_start_pfn = max(arch_zone_lowest_possible_pfn[zone_type],
node_start_pfn);
zone_end_pfn = min(arch_zone_highest_possible_pfn[zone_type],
node_end_pfn);
return __absent_pages_in_range(nid, zone_start_pfn, zone_end_pfn);
} }
/* Return the zone index a PFN is in */ /* Return the zone index a PFN is in */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册