On x86, we have numa_info specifically to track the numa layout, which
is precisely the data memlayout needs, so use it to create an initial
memlayout.
Signed-off-by: Cody P Schafer <c...@linux.vnet.ibm.com>
---
arch/x86/mm/numa.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index a71c4e2..75819ef 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -11,6 +11,7 @@
#include <linux/nodemask.h>
#include <linux/sched.h>
#include <linux/topology.h>
+#include <linux/dnuma.h>
#include <asm/e820.h>
#include <asm/proto.h>
@@ -32,6 +33,33 @@ __initdata
#endif
;
+#ifdef CONFIG_DYNAMIC_NUMA
+void __init memlayout_global_init(void)
+{
+ struct numa_meminfo *mi = &numa_meminfo;
+ int i;
+ struct numa_memblk *blk;
+ struct memlayout *ml = memlayout_create(ML_INITIAL);
+ if (WARN_ON(!ml))
+ return;
+
+ pr_devel("x86/memlayout: adding ranges from numa_meminfo\n");
+ for (i = 0; i < mi->nr_blks; i++) {
+ blk = mi->blk + i;
+ pr_devel(" adding range {%LX[%LX]-%LX[%LX]}:%d\n",
+ PFN_DOWN(blk->start), blk->start,
+ PFN_DOWN(blk->end - PAGE_SIZE / 2 - 1),
+ blk->end - 1, blk->nid);
+ memlayout_new_range(ml, PFN_DOWN(blk->start),
+ PFN_DOWN(blk->end - PAGE_SIZE / 2 - 1),
+ blk->nid);
+ }
+ pr_devel(" done adding ranges from numa_meminfo\n");
+
+ memlayout_commit(ml);
+}
+#endif
+
static int numa_distance_cnt;
static u8 *numa_distance;
--
1.8.2.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/
