From: Fan Du <[email protected]>
Mark NUMA node as DRAM or PMEM.
This could happen in boot up state (see the e820 pmem type
override patch), or on fly when bind devdax device with kmem
driver.
It depends on BIOS supplying PMEM NUMA proximity in SRAT table,
that's current production BIOS does.
Signed-off-by: Fan Du <[email protected]>
Signed-off-by: Fengguang Wu <[email protected]>
---
arch/x86/include/asm/numa.h | 2 ++
arch/x86/mm/numa.c | 2 ++
drivers/acpi/numa.c | 5 +++++
3 files changed, 9 insertions(+)
--- linux.orig/arch/x86/include/asm/numa.h 2018-12-23 19:20:39.890947888 +0800
+++ linux/arch/x86/include/asm/numa.h 2018-12-23 19:20:39.890947888 +0800
@@ -30,6 +30,8 @@ extern int numa_off;
*/
extern s16 __apicid_to_node[MAX_LOCAL_APIC];
extern nodemask_t numa_nodes_parsed __initdata;
+extern nodemask_t numa_nodes_pmem;
+extern nodemask_t numa_nodes_dram;
extern int __init numa_add_memblk(int nodeid, u64 start, u64 end);
extern void __init numa_set_distance(int from, int to, int distance);
--- linux.orig/arch/x86/mm/numa.c 2018-12-23 19:20:39.890947888 +0800
+++ linux/arch/x86/mm/numa.c 2018-12-23 19:20:39.890947888 +0800
@@ -20,6 +20,8 @@
int numa_off;
nodemask_t numa_nodes_parsed __initdata;
+nodemask_t numa_nodes_pmem;
+nodemask_t numa_nodes_dram;
struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
EXPORT_SYMBOL(node_data);
--- linux.orig/drivers/acpi/numa.c 2018-12-23 19:20:39.890947888 +0800
+++ linux/drivers/acpi/numa.c 2018-12-23 19:20:39.890947888 +0800
@@ -297,6 +297,11 @@ acpi_numa_memory_affinity_init(struct ac
node_set(node, numa_nodes_parsed);
+ if (ma->flags & ACPI_SRAT_MEM_NON_VOLATILE)
+ node_set(node, numa_nodes_pmem);
+ else
+ node_set(node, numa_nodes_dram);
+
pr_info("SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]%s%s\n",
node, pxm,
(unsigned long long) start, (unsigned long long) end - 1,