zone_movable_pfn is initialiesd as 0. This patch set its elements to the
first pfn of ZONE_MOVABLE of the corresponding node. The map info is from
movablecore_map boot option. zone_movable_pfn[nid] == 0 means the node has
no ZONE_MOVABLE.
Signed-off-by: Tang Chen <tangc...@cn.fujitsu.com>
Reviewed-by: Wen Congyang <we...@cn.fujitsu.com>
Tested-by: Lin Feng <linf...@cn.fujitsu.com>
---
mm/page_alloc.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 198106f..ae29970 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4323,6 +4323,59 @@ static unsigned long __meminit
zone_absent_pages_in_node(int nid,
return __absent_pages_in_range(nid, zone_start_pfn, zone_end_pfn);
}
+/**
+ * sanitize_zone_movable_pfn - Sanitize the zone_movable_pfn array.
+ *
+ * zone_movable_pfn is initialized as 0. This function will try to get the
+ * first ZONE_MOVABLE pfn of each node from movablecore_map, and assigne
+ * them to zone_movable_pfn.
+ * zone_movable_pfn[nid] == 0 means the node has no ZONE_MOVABLE.
+ *
+ * Note: Each range is represented as [start_pfn, end_pfn)
+ */
+static void __meminit sanitize_zone_movable_pfn(void)
+{
+ int i = 0, j = 0, nid;
+ unsigned long start_pfn, end_pfn, movable_start, tmp_start;
+
+ if (!movablecore_map.nr_map)
+ return;
+
+ for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid) {
+ /* Assume there is no ZONE_MOVABLE on the node at first */
+ movable_start = ULONG_MAX;
+
+ while (j < movablecore_map.nr_map) {
+ if (movablecore_map.map[j].start >= end_pfn)
+ break;
+ if (movablecore_map.map[j].end <= start_pfn) {
+ j++;
+ continue;
+ }
+
+ movable_start = max(start_pfn,
movablecore_map.map[j].start);
+ if (!zone_movable_pfn[nid])
+ zone_movable_pfn[nid] = ULONG_MAX;
+
+ /*
+ * Sections covering tow or more nodes
+ * should not be skipped.
+ */
+ if (movablecore_map.map[j].end < end_pfn)
+ j++;
+
+ break;
+ }
+
+ /*
+ * The start_pfn of ZONE_MOVABLE is either the minimum pfn
+ * specified by movablecore_map, or the end of the node,
+ * which means the node has no ZONE_MOVABLE.
+ */
+ zone_movable_pfn[nid] = min(movable_start,
zone_movable_pfn[nid]);
+ }
+}
+
#else /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
static inline unsigned long __meminit zone_spanned_pages_in_node(int nid,
unsigned long zone_type,
@@ -4341,6 +4394,10 @@ static inline unsigned long __meminit
zone_absent_pages_in_node(int nid,
return zholes_size[zone_type];
}
+static void __meminit sanitize_zone_movable_pfn()
+{
+}
+
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
static void __meminit calculate_node_totalpages(struct pglist_data *pgdat,
@@ -4906,6 +4963,7 @@ void __init free_area_init_nodes(unsigned long
*max_zone_pfn)
/* Find the PFNs that ZONE_MOVABLE begins at in each node */
memset(zone_movable_pfn, 0, sizeof(zone_movable_pfn));
+ sanitize_zone_movable_pfn();
find_zone_movable_pfns_for_nodes();
/* Print out the zone ranges */
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
