Commit 8ee2debc authored by David Rientjes's avatar David Rientjes Committed by Ingo Molnar

x86: Export k8 physical topology

To eventually interleave emulated nodes over physical nodes, we
need to know the physical topology of the machine without actually
registering it.  This does the k8 node setup in two parts:
detection and registration.  NUMA emulation can then used the
physical topology detected to setup the address ranges of emulated
nodes accordingly.  If emulation isn't used, the k8 nodes are
registered as normal.

Two formals are added to the x86 NUMA setup functions: `acpi' and
`k8'. These represent whether ACPI or K8 NUMA has been detected;
both cannot be true at the same time.  This specifies to the NUMA
emulation code whether an underlying physical NUMA topology exists
and which interface to use.

This patch deals solely with separating the k8 setup path into
Northbridge detection and registration steps and leaves the ACPI
changes for a subsequent patch.  The `acpi' formal is added here,
however, to avoid touching all the header files again in the next
patch.

This approach also ensures emulated nodes will not span physical
nodes so the true memory latency is not misrepresented.

k8_get_nodes() may now be used to export the k8 physical topology
of the machine for NUMA emulation.
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Ankita Garg <ankita@in.ibm.com>
Cc: Len Brown <len.brown@intel.com>
LKML-Reference: <alpine.DEB.1.00.0909251518400.14754@chino.kir.corp.google.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1af5ba51
...@@ -10,7 +10,9 @@ extern struct pci_dev **k8_northbridges; ...@@ -10,7 +10,9 @@ extern struct pci_dev **k8_northbridges;
extern int num_k8_northbridges; extern int num_k8_northbridges;
extern int cache_k8_northbridges(void); extern int cache_k8_northbridges(void);
extern void k8_flush_garts(void); extern void k8_flush_garts(void);
extern int k8_scan_nodes(unsigned long start, unsigned long end); extern int k8_get_nodes(struct bootnode *nodes);
extern int k8_numa_init(unsigned long start_pfn, unsigned long end_pfn);
extern int k8_scan_nodes(void);
#ifdef CONFIG_K8_NB #ifdef CONFIG_K8_NB
static inline struct pci_dev *node_to_k8_nb_misc(int node) static inline struct pci_dev *node_to_k8_nb_misc(int node)
......
...@@ -49,7 +49,8 @@ extern unsigned long max_pfn_mapped; ...@@ -49,7 +49,8 @@ extern unsigned long max_pfn_mapped;
extern unsigned long init_memory_mapping(unsigned long start, extern unsigned long init_memory_mapping(unsigned long start,
unsigned long end); unsigned long end);
extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn); extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn,
int acpi, int k8);
extern void free_initmem(void); extern void free_initmem(void);
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
......
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
#include <asm/percpu.h> #include <asm/percpu.h>
#include <asm/topology.h> #include <asm/topology.h>
#include <asm/apicdef.h> #include <asm/apicdef.h>
#include <asm/k8.h>
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
#include <asm/numa_64.h> #include <asm/numa_64.h>
#endif #endif
...@@ -691,6 +692,9 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { ...@@ -691,6 +692,9 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
void __init setup_arch(char **cmdline_p) void __init setup_arch(char **cmdline_p)
{ {
int acpi = 0;
int k8 = 0;
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data)); memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
visws_early_detect(); visws_early_detect();
...@@ -937,7 +941,11 @@ void __init setup_arch(char **cmdline_p) ...@@ -937,7 +941,11 @@ void __init setup_arch(char **cmdline_p)
acpi_numa_init(); acpi_numa_init();
#endif #endif
initmem_init(0, max_pfn); #ifdef CONFIG_K8_NUMA
k8 = !k8_numa_init(0, max_pfn);
#endif
initmem_init(0, max_pfn, acpi, k8);
#ifdef CONFIG_ACPI_SLEEP #ifdef CONFIG_ACPI_SLEEP
/* /*
......
...@@ -703,8 +703,8 @@ void __init find_low_pfn_range(void) ...@@ -703,8 +703,8 @@ void __init find_low_pfn_range(void)
} }
#ifndef CONFIG_NEED_MULTIPLE_NODES #ifndef CONFIG_NEED_MULTIPLE_NODES
void __init initmem_init(unsigned long start_pfn, void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,
unsigned long end_pfn) int acpi, int k8)
{ {
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
highstart_pfn = highend_pfn = max_pfn; highstart_pfn = highend_pfn = max_pfn;
......
...@@ -568,7 +568,8 @@ kernel_physical_mapping_init(unsigned long start, ...@@ -568,7 +568,8 @@ kernel_physical_mapping_init(unsigned long start,
} }
#ifndef CONFIG_NUMA #ifndef CONFIG_NUMA
void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn) void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,
int acpi, int k8)
{ {
unsigned long bootmap_size, bootmap; unsigned long bootmap_size, bootmap;
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/k8.h> #include <asm/k8.h>
static struct bootnode __initdata nodes[8];
static nodemask_t __initdata nodes_parsed = NODE_MASK_NONE;
static __init int find_northbridge(void) static __init int find_northbridge(void)
{ {
int num; int num;
...@@ -76,12 +79,26 @@ static __init void early_get_boot_cpu_id(void) ...@@ -76,12 +79,26 @@ static __init void early_get_boot_cpu_id(void)
early_init_lapic_mapping(); early_init_lapic_mapping();
} }
int __init k8_scan_nodes(unsigned long start, unsigned long end) int __init k8_get_nodes(struct bootnode *physnodes)
{ {
unsigned numnodes, cores, bits, apicid_base; int i;
int ret = 0;
for_each_node_mask(i, nodes_parsed) {
physnodes[ret].start = nodes[i].start;
physnodes[ret].end = nodes[i].end;
ret++;
}
return ret;
}
int __init k8_numa_init(unsigned long start_pfn, unsigned long end_pfn)
{
unsigned long start = PFN_PHYS(start_pfn);
unsigned long end = PFN_PHYS(end_pfn);
unsigned numnodes;
unsigned long prevbase; unsigned long prevbase;
struct bootnode nodes[8]; int i, nb, found = 0;
int i, j, nb, found = 0;
u32 nodeid, reg; u32 nodeid, reg;
if (!early_pci_allowed()) if (!early_pci_allowed())
...@@ -98,9 +115,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) ...@@ -98,9 +115,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
if (numnodes <= 1) if (numnodes <= 1)
return -1; return -1;
pr_info("Number of nodes %d\n", numnodes); pr_info("Number of physical nodes %d\n", numnodes);
memset(&nodes, 0, sizeof(nodes));
prevbase = 0; prevbase = 0;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
unsigned long base, limit; unsigned long base, limit;
...@@ -130,7 +146,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) ...@@ -130,7 +146,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
nodeid, (base >> 8) & 3, (limit >> 8) & 3); nodeid, (base >> 8) & 3, (limit >> 8) & 3);
return -1; return -1;
} }
if (node_isset(nodeid, node_possible_map)) { if (node_isset(nodeid, nodes_parsed)) {
pr_info("Node %d already present, skipping\n", pr_info("Node %d already present, skipping\n",
nodeid); nodeid);
continue; continue;
...@@ -141,8 +157,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) ...@@ -141,8 +157,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
limit |= (1<<24)-1; limit |= (1<<24)-1;
limit++; limit++;
if (limit > max_pfn << PAGE_SHIFT) if (limit > end)
limit = max_pfn << PAGE_SHIFT; limit = end;
if (limit <= base) if (limit <= base)
continue; continue;
...@@ -180,12 +196,23 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) ...@@ -180,12 +196,23 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
prevbase = base; prevbase = base;
node_set(nodeid, node_possible_map); node_set(nodeid, nodes_parsed);
} }
if (!found) if (!found)
return -1; return -1;
return 0;
}
int __init k8_scan_nodes(void)
{
unsigned int bits;
unsigned int cores;
unsigned int apicid_base;
int i;
BUG_ON(nodes_empty(nodes_parsed));
node_possible_map = nodes_parsed;
memnode_shift = compute_hash_shift(nodes, 8, NULL); memnode_shift = compute_hash_shift(nodes, 8, NULL);
if (memnode_shift < 0) { if (memnode_shift < 0) {
pr_err("No NUMA node hash function found. Contact maintainer\n"); pr_err("No NUMA node hash function found. Contact maintainer\n");
...@@ -204,9 +231,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) ...@@ -204,9 +231,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
apicid_base = boot_cpu_physical_apicid; apicid_base = boot_cpu_physical_apicid;
} }
for (i = 0; i < 8; i++) { for_each_node_mask(i, node_possible_map) {
if (nodes[i].start == nodes[i].end) int j;
continue;
e820_register_active_regions(i, e820_register_active_regions(i,
nodes[i].start >> PAGE_SHIFT, nodes[i].start >> PAGE_SHIFT,
......
...@@ -347,8 +347,8 @@ static void init_remap_allocator(int nid) ...@@ -347,8 +347,8 @@ static void init_remap_allocator(int nid)
(ulong) node_remap_end_vaddr[nid]); (ulong) node_remap_end_vaddr[nid]);
} }
void __init initmem_init(unsigned long start_pfn, void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,
unsigned long end_pfn) int acpi, int k8)
{ {
int nid; int nid;
long kva_target_pfn; long kva_target_pfn;
......
...@@ -524,7 +524,8 @@ static int __init numa_emulation(unsigned long start_pfn, unsigned long last_pfn ...@@ -524,7 +524,8 @@ static int __init numa_emulation(unsigned long start_pfn, unsigned long last_pfn
} }
#endif /* CONFIG_NUMA_EMU */ #endif /* CONFIG_NUMA_EMU */
void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn) void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,
int acpi, int k8)
{ {
int i; int i;
...@@ -547,8 +548,7 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn) ...@@ -547,8 +548,7 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn)
#endif #endif
#ifdef CONFIG_K8_NUMA #ifdef CONFIG_K8_NUMA
if (!numa_off && !k8_scan_nodes(start_pfn<<PAGE_SHIFT, if (!numa_off && k8 && !k8_scan_nodes())
last_pfn<<PAGE_SHIFT))
return; return;
nodes_clear(node_possible_map); nodes_clear(node_possible_map);
nodes_clear(node_online_map); nodes_clear(node_online_map);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment