Skip to contentSkip to conversation

x86, UV: Fix for nodes with memory and no cpus

PATCH In review Jack Steiner 2 participants 4 messages Mar 30, 2009 – Apr 3, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86, UV: Fix for nodes with memory and no cpus

Fix initialization of UV blade information for systems that have nodes with memory but no cpus.

---
 arch/x86/kernel/apic/x2apic_uv_x.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +14 -2
Index: linux/arch/x86/kernel/apic/x2apic_uv_x.c
===================================================================
@@ -555,7 +555,8 @@ void __init uv_system_init(void)
 	unsigned long gnode_upper, lowmem_redir_base, lowmem_redir_size;
 	int bytes, nid, cpu, lcpu, pnode, blade, i, j, m_val, n_val;
 	int max_pnode = 0;
-	unsigned long mmr_base, present;
+	unsigned long mmr_base, present, paddr;
+	unsigned short pnode_mask;
 
 	map_low_mmrs();
 
@@ -598,6 +599,7 @@ void __init uv_system_init(void)
 		}
 	}
 
+	pnode_mask = (1 << n_val) - 1;
 	node_id.v = uv_read_local_mmr(UVH_NODE_ID);
 	gnode_upper = (((unsigned long)node_id.s.node_id) &
 		       ~((1 << n_val) - 1)) << m_val;
@@ -621,7 +623,7 @@ void __init uv_system_init(void)
 		uv_cpu_hub_info(cpu)->numa_blade_id = blade;
 		uv_cpu_hub_info(cpu)->blade_processor_id = lcpu;
 		uv_cpu_hub_info(cpu)->pnode = pnode;
-		uv_cpu_hub_info(cpu)->pnode_mask = (1 << n_val) - 1;
+		uv_cpu_hub_info(cpu)->pnode_mask =pnode_mask;
 		uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;
 		uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;
 		uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base;
@@ -637,6 +639,16 @@ void __init uv_system_init(void)
 			lcpu, blade);
 	}
 
+	/* Add blade/pnode info for nodes without cpus */
+	for_each_online_node(nid) {
+		if (uv_node_to_blade[nid] >= 0)
+			continue;
+		paddr = node_start_pfn(nid) << PAGE_SHIFT;
+		pnode = (paddr >> m_val) & pnode_mask;
+		blade = boot_pnode_to_blade(pnode);
+		uv_node_to_blade[nid] = blade;
+	}
+
 	map_gru_high(max_pnode);
 	map_mmr_high(max_pnode);
 	map_config_high(max_pnode);
#1 lore raw
Commit-ID:  6a891a24e4d0056c365a90ff2d71c38fd366b0d0
Gitweb:     http://git.kernel.org/tip/6a891a24e4d0056c365a90ff2d71c38fd366b0d0
Author:     Jack Steiner <[email protected]>
AuthorDate: Mon, 30 Mar 2009 09:01:11 -0500
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 3 Apr 2009 19:49:58 +0200

x86, UV: Fix for nodes with memory and no cpus

Fix initialization of UV blade information for systems that have nodes with memory but no cpus.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/apic/x2apic_uv_x.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +14 -2
index 1248318..de1a50a 100644
@@ -549,7 +549,8 @@ void __init uv_system_init(void)
 	unsigned long gnode_upper, lowmem_redir_base, lowmem_redir_size;
 	int bytes, nid, cpu, lcpu, pnode, blade, i, j, m_val, n_val;
 	int max_pnode = 0;
-	unsigned long mmr_base, present;
+	unsigned long mmr_base, present, paddr;
+	unsigned short pnode_mask;
 
 	map_low_mmrs();
 
@@ -592,6 +593,7 @@ void __init uv_system_init(void)
 		}
 	}
 
+	pnode_mask = (1 << n_val) - 1;
 	node_id.v = uv_read_local_mmr(UVH_NODE_ID);
 	gnode_upper = (((unsigned long)node_id.s.node_id) &
 		       ~((1 << n_val) - 1)) << m_val;
@@ -615,7 +617,7 @@ void __init uv_system_init(void)
 		uv_cpu_hub_info(cpu)->numa_blade_id = blade;
 		uv_cpu_hub_info(cpu)->blade_processor_id = lcpu;
 		uv_cpu_hub_info(cpu)->pnode = pnode;
-		uv_cpu_hub_info(cpu)->pnode_mask = (1 << n_val) - 1;
+		uv_cpu_hub_info(cpu)->pnode_mask = pnode_mask;
 		uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;
 		uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;
 		uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base;
@@ -631,6 +633,16 @@ void __init uv_system_init(void)
 			lcpu, blade);
 	}
 
+	/* Add blade/pnode info for nodes without cpus */
+	for_each_online_node(nid) {
+		if (uv_node_to_blade[nid] >= 0)
+			continue;
+		paddr = node_start_pfn(nid) << PAGE_SHIFT;
+		pnode = (paddr >> m_val) & pnode_mask;
+		blade = boot_pnode_to_blade(pnode);
+		uv_node_to_blade[nid] = blade;
+	}
+
 	map_gru_high(max_pnode);
 	map_mmr_high(max_pnode);
 	map_config_high(max_pnode);
#2 lore raw
Quoted 8 lines · Jack Steiner
Commit-ID:  6a891a24e4d0056c365a90ff2d71c38fd366b0d0
Gitweb:     http://git.kernel.org/tip/6a891a24e4d0056c365a90ff2d71c38fd366b0d0
Author:     Jack Steiner <[email protected]>
AuthorDate: Mon, 30 Mar 2009 09:01:11 -0500
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 3 Apr 2009 19:49:58 +0200

x86, UV: Fix for nodes with memory and no cpus

Hm, there's a build failure regression here:

arch/x86/kernel/apic/x2apic_uv_x.c: In function ‘uv_system_init’:
arch/x86/kernel/apic/x2apic_uv_x.c:641: error: implicit declaration of function ‘node_start_pfn’

Ingo

#3 lore raw
Quoted 10 lines · Ingo Molnar
Quoted 7 lines · Jack Steiner
Commit-ID:  6a891a24e4d0056c365a90ff2d71c38fd366b0d0
Gitweb:     http://git.kernel.org/tip/6a891a24e4d0056c365a90ff2d71c38fd366b0d0
Author:     Jack Steiner <[email protected]>
AuthorDate: Mon, 30 Mar 2009 09:01:11 -0500
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 3 Apr 2009 19:49:58 +0200
Quoted 6 lines
Quoted 1 line

x86, UV: Fix for nodes with memory and no cpus

Hm, there's a build failure regression here:

arch/x86/kernel/apic/x2apic_uv_x.c: In function ???uv_system_init???:
arch/x86/kernel/apic/x2apic_uv_x.c:641: error: implicit declaration of function ???node_start_pfn???

What was the config? Looks like node_start_pfn() is not defined for non-NUMA? If your config was non-NUMA, I'll make UV depend on NUMA.

--- jack