Skip to contentSkip to conversation

allocate page tables on the right node

PATCH In review Jesse Barnes 2 participants 4 messages Sep 24, 2003 – Sep 29, 2003

lore
Share & tools
lore

Jesse Barnes

author
#0 lore raw

PATCH 1/1 allocate page tables on the right node

Small patch that shouldn't affect anybody right now, but will help when CONFIG_DISCONTIGMEM and CONFIG_VIRTUAL_MEM_MAP learn to play nice together. Allocates the page tables on the node they belong to, minimizing off-node references.

Thanks,
Jesse

arch/ia64/mm/init.c +6 -3
diff -Nru a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
@@ -24,6 +24,7 @@
 #include <asm/ia32.h>
 #include <asm/io.h>
 #include <asm/machvec.h>
+#include <asm/numa.h>
 #include <asm/patch.h>
 #include <asm/pgalloc.h>
 #include <asm/sal.h>

@@ -342,6 +343,7 @@
 {
 	unsigned long address, start_page, end_page;
 	struct page *map_start, *map_end;
+	int node;
 	pgd_t *pgd;
 	pmd_t *pmd;
 	pte_t *pte;

@@ -351,19 +353,20 @@
 
 	start_page = (unsigned long) map_start & PAGE_MASK;
 	end_page = PAGE_ALIGN((unsigned long) map_end);
+	node = paddr_to_nid(__pa(start));
 
 	for (address = start_page; address < end_page; address += PAGE_SIZE) {
 		pgd = pgd_offset_k(address);
 		if (pgd_none(*pgd))
-			pgd_populate(&init_mm, pgd, alloc_bootmem_pages(PAGE_SIZE));
+			pgd_populate(&init_mm, pgd, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE));
 		pmd = pmd_offset(pgd, address);
 
 		if (pmd_none(*pmd))
-			pmd_populate_kernel(&init_mm, pmd, alloc_bootmem_pages(PAGE_SIZE));
+			pmd_populate_kernel(&init_mm, pmd, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE));
 		pte = pte_offset_kernel(pmd, address);
 
 		if (pte_none(*pte))
-			set_pte(pte, pfn_pte(__pa(alloc_bootmem_pages(PAGE_SIZE)) >> PAGE_SHIFT,
+			set_pte(pte, pfn_pte(__pa(alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)) >> PAGE_SHIFT,
 					     PAGE_KERNEL));
 	}
 	return 0;
include/asm-ia64/numa.h +6 -0
diff -Nru a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
@@ -67,6 +67,12 @@
 
 #define local_nodeid (cpu_to_node_map[smp_processor_id()])
 
+#else /* !CONFIG_NUMA */
+
+#define node_distance(from,to)	10
+#define paddr_to_nid(addr)	0
+#define local_nodeid		0
+
 #endif /* CONFIG_NUMA */
 
 #endif /* _ASM_IA64_NUMA_H */
#1 lore raw
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line · On Wed, 24 Sep 2003 11:17:57 -0700, [email protected] (Jesse Barnes) said:

Jesse> +#define node_distance(from,to) 10

This looks bogus to me. node_distance() is used as an lvalue in acpi.c.

	--david
author
#2 lore raw
In reply to Jesse Barnes
Quoted 5 lines · David Mosberger
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line · On Wed, 24 Sep 2003 11:17:57 -0700, [email protected] (Jesse Barnes) said:

Jesse> +#define node_distance(from,to) 10

This looks bogus to me. node_distance() is used as an lvalue in acpi.c.

You're right. I should have omitted node_distance() and local_nodeid since they're only ever used if CONFIG_ACPI_NUMA is on. Should I send a new patch? I'll continue to clean this stuff up with subsequent patches too.

Thanks,
Jesse

author
#3 lore raw
In reply to Jesse Barnes
Quoted 6 lines · Jesse Barnes
Quoted 5 lines · David Mosberger
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line · On Wed, 24 Sep 2003 11:17:57 -0700, [email protected] (Jesse Barnes) said:

Jesse> +#define node_distance(from,to) 10

This looks bogus to me. node_distance() is used as an lvalue in acpi.c.

Here's a new one.

Thanks,
Jesse

arch/ia64/mm/init.c +6 -3
diff -Nru a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
@@ -24,6 +24,7 @@
 #include <asm/ia32.h>
 #include <asm/io.h>
 #include <asm/machvec.h>
+#include <asm/numa.h>
 #include <asm/patch.h>
 #include <asm/pgalloc.h>
 #include <asm/sal.h>

@@ -342,6 +343,7 @@
 {
 	unsigned long address, start_page, end_page;
 	struct page *map_start, *map_end;
+	int node;
 	pgd_t *pgd;
 	pmd_t *pmd;
 	pte_t *pte;

@@ -351,19 +353,20 @@
 
 	start_page = (unsigned long) map_start & PAGE_MASK;
 	end_page = PAGE_ALIGN((unsigned long) map_end);
+	node = paddr_to_nid(__pa(start));
 
 	for (address = start_page; address < end_page; address += PAGE_SIZE) {
 		pgd = pgd_offset_k(address);
 		if (pgd_none(*pgd))
-			pgd_populate(&init_mm, pgd, alloc_bootmem_pages(PAGE_SIZE));
+			pgd_populate(&init_mm, pgd, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE));
 		pmd = pmd_offset(pgd, address);
 
 		if (pmd_none(*pmd))
-			pmd_populate_kernel(&init_mm, pmd, alloc_bootmem_pages(PAGE_SIZE));
+			pmd_populate_kernel(&init_mm, pmd, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE));
 		pte = pte_offset_kernel(pmd, address);
 
 		if (pte_none(*pte))
-			set_pte(pte, pfn_pte(__pa(alloc_bootmem_pages(PAGE_SIZE)) >> PAGE_SHIFT,
+			set_pte(pte, pfn_pte(__pa(alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)) >> PAGE_SHIFT,
 					     PAGE_KERNEL));
 	}
 	return 0;
include/asm-ia64/numa.h +4 -0
diff -Nru a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
@@ -67,6 +67,10 @@
 
 #define local_nodeid (cpu_to_node_map[smp_processor_id()])
 
+#else /* !CONFIG_NUMA */
+
+#define paddr_to_nid(addr)	0
+
 #endif /* CONFIG_NUMA */
 
 #endif /* _ASM_IA64_NUMA_H */