|
@@ -6215,6 +6215,44 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
|
|
|
free_area_init_core(pgdat);
|
|
|
}
|
|
|
|
|
|
+#ifdef CONFIG_HAVE_MEMBLOCK
|
|
|
+/*
|
|
|
+ * Only struct pages that are backed by physical memory are zeroed and
|
|
|
+ * initialized by going through __init_single_page(). But, there are some
|
|
|
+ * struct pages which are reserved in memblock allocator and their fields
|
|
|
+ * may be accessed (for example page_to_pfn() on some configuration accesses
|
|
|
+ * flags). We must explicitly zero those struct pages.
|
|
|
+ */
|
|
|
+void __paginginit zero_resv_unavail(void)
|
|
|
+{
|
|
|
+ phys_addr_t start, end;
|
|
|
+ unsigned long pfn;
|
|
|
+ u64 i, pgcnt;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Loop through ranges that are reserved, but do not have reported
|
|
|
+ * physical memory backing.
|
|
|
+ */
|
|
|
+ pgcnt = 0;
|
|
|
+ for_each_resv_unavail_range(i, &start, &end) {
|
|
|
+ for (pfn = PFN_DOWN(start); pfn < PFN_UP(end); pfn++) {
|
|
|
+ mm_zero_struct_page(pfn_to_page(pfn));
|
|
|
+ pgcnt++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Struct pages that do not have backing memory. This could be because
|
|
|
+ * firmware is using some of this memory, or for some other reasons.
|
|
|
+ * Once memblock is changed so such behaviour is not allowed: i.e.
|
|
|
+ * list of "reserved" memory must be a subset of list of "memory", then
|
|
|
+ * this code can be removed.
|
|
|
+ */
|
|
|
+ if (pgcnt)
|
|
|
+ pr_info("Reserved but unavailable: %lld pages", pgcnt);
|
|
|
+}
|
|
|
+#endif /* CONFIG_HAVE_MEMBLOCK */
|
|
|
+
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
|
|
|
|
#if MAX_NUMNODES > 1
|
|
@@ -6638,6 +6676,7 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn)
|
|
|
node_set_state(nid, N_MEMORY);
|
|
|
check_for_memory(pgdat, nid);
|
|
|
}
|
|
|
+ zero_resv_unavail();
|
|
|
}
|
|
|
|
|
|
static int __init cmdline_parse_core(char *p, unsigned long *core)
|
|
@@ -6801,6 +6840,7 @@ void __init free_area_init(unsigned long *zones_size)
|
|
|
{
|
|
|
free_area_init_node(0, zones_size,
|
|
|
__pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL);
|
|
|
+ zero_resv_unavail();
|
|
|
}
|
|
|
|
|
|
static int page_alloc_cpu_dead(unsigned int cpu)
|