mask ADT: x86_64 changes from Matthew's nodemask_t Patch 5/7 [14/22]
PATCH 1/1 mask ADT: x86_64 changes from Matthew's nodemask_t Patch 5/7 [14/22]
Patch_14_of_22 - Matthew Dobson's [PATCH]_nodemask_t_x86_64_changes_[5_7]
Changes to x86_64 specific code.
Untested. Code review & testing requested.
Note Patch 22 of 22 below - needed to fix complement in this patch.
diffstat Patch_14_of_22:
arch/x86_64/kernel/setup64.c | 6 +++--- arch/x86_64/mm/k8topology.c | 30 +++++++++++++++--------------- arch/x86_64/mm/numa.c | 16 ++++++---------- include/asm-x86_64/mmzone.h | 1 - include/asm-x86_64/numa.h | 6 ------ 5 files changed, 24 insertions(+), 35 deletions(-)
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1720 -> 1.1721
# include/asm-x86_64/numa.h 1.2 -> 1.3
# arch/x86_64/kernel/setup64.c 1.19 -> 1.20
# arch/x86_64/mm/numa.c 1.7 -> 1.8
# include/asm-x86_64/mmzone.h 1.6 -> 1.7
# arch/x86_64/mm/k8topology.c 1.9 -> 1.10
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/28 [email protected] 1.1721
# Matthew Dobson's [PATCH]_nodemask_t_x86_64_changes_[5_7] of 18 Mar 2004:
# Changes to x86_64 specific code.
# Untested. Code review & testing requested.
# --------------------------------------------
#
arch/x86_64/kernel/setup64.c +3 -3
@@ -135,11 +135,11 @@unsigned char *ptr;/* If possible allocate on the node of the CPU. In case it doesn't exist round-robin nodes. */ -if (!NODE_DATA (i % numnodes)) { -printk ("cpu with no node %d, numnodes %d\n" , i, numnodes); +if (!NODE_DATA (i %num_online_nodes ())) { +printk ("cpu with no node %d, num_online_nodes() %d\n" , i,num_online_nodes ()); ptr =alloc_bootmem (size); }else { - ptr =alloc_bootmem_node (NODE_DATA (i % numnodes), size); + ptr =alloc_bootmem_node (NODE_DATA (i %num_online_nodes ()), size); }if (!ptr)panic ("Cannot allocate cpu data for CPU %d\n" , i);
arch/x86_64/mm/k8topology.c +15 -15
@@ -44,7 +44,7 @@int __init k8_scan_nodes (unsigned long start,unsigned long end) {unsigned long prevbase; -struct node nodes[MAXNODE ]; +struct node nodes[MAX_NUMNODES ];int nodeid, i, nb;int found =0 ;u32 reg;
@@ -57,9 +57,10 @@printk (KERN_INFO "Scanning NUMA topology in Northbridge %d\n" , nb); reg =read_pci_config (0 , nb,0 ,0x60 ); - numnodes = ((reg >>4 ) &7 ) +1 ; +for (i =0 ; i <= ((reg >>4 ) &7 ); i++) +node_set_online (i); -printk (KERN_INFO "Number of nodes %d (%x)\n" , numnodes, reg); +printk (KERN_INFO "Number of nodes %d (%x)\n" ,num_online_nodes (), reg);memset (&nodes,0 ,sizeof (nodes)); prevbase =0 ;
@@ -71,11 +72,11 @@ nodeid = limit &7 ;if ((base &3 ) ==0 ) { -if (i < numnodes) +if (i <num_online_nodes ())printk ("Skipping disabled node %d\n" , i);continue ; } -if (nodeid >= numnodes) { +if (nodeid >=num_online_nodes ()) {printk ("Ignoring excess node %d (%lx:%lx)\n" , nodeid, base, limit);continue ;
@@ -91,7 +92,7 @@ nodeid, (base>>8)&3, (limit>>8) & 3);return -1 ; } -if ((1UL << nodeid) & nodes_present) { +if (node_online (nodeid)) {printk (KERN_INFO "Node %d already present. Skipping\n" , nodeid);continue ;
@@ -151,7 +152,7 @@ }printk (KERN_INFO "Using node hash shift of %d\n" , memnode_shift); -for (i =0 ; i <MAXNODE ; i++) { +for_each_node (i) {if (nodes[i].start != nodes[i].end)setup_node_bootmem (i, nodes[i].start, nodes[i].end); }
@@ -161,15 +162,14 @@mapping. To avoid this fill in the mapping for all possible CPUs, as the number of CPUs is not known yet. We round robin the existing nodes. */ - rr =0 ; -for (i =0 ; i <MAXNODE ; i++) { -if (nodes_present & (1UL <<i)) -continue ; -if ((nodes_present >> rr) ==0 ) - rr =0 ; - rr =ffz (~nodes_present >> rr); + rr =first_node (node_online_map); +nodemask_t node_offline_map =nodes_complement (node_online_map); +for_each_node_mask (i, node_offline_map) { node_data[i] = node_data[rr]; - rr++; + + rr =next_node (rr, node_online_map); +if (rr >=MAX_NUMNODES ) + rr =first_node (node_online_map); }if (found ==1 )
arch/x86_64/mm/numa.c +6 -10
@@ -16,7 +16,7 @@ #define Dprintk(x...) -struct pglist_data *node_data[MAXNODE ]; +struct pglist_data *node_data[MAX_NUMNODES ];bootmem_data_t plat_node_bdata[MAX_NUMNODES ];int memnode_shift;
@@ -24,8 +24,6 @@static int numa_off__initdata ; -unsigned long nodes_present; -int __init compute_hash_shift (struct node *nodes) {int i;
@@ -35,7 +33,7 @@/* When in doubt use brute force. */ while (shift <48 ) {memset (memnodemap,0xff ,sizeof (*memnodemap) *NODEMAPSIZE ); -for (i =0 ; i < numnodes; i++) { +for_each_online_node (i) {if (nodes[i].start == nodes[i].end)continue ; for (addr = nodes[i].start;
@@ -101,9 +99,6 @@reserve_bootmem_node (NODE_DATA (nodeid), nodedata_phys, pgdat_size);reserve_bootmem_node (NODE_DATA (nodeid), bootmap_start, bootmap_pages<<PAGE_SHIFT ); -if (nodeid +1 > numnodes) - numnodes = nodeid +1 ; - nodes_present |= (1UL << nodeid);node_set_online (nodeid); }
@@ -152,7 +147,8 @@ fake_node =1 ; memnode_shift =63 ; memnodemap[0 ] =0 ; - numnodes =1 ; +nodes_clear (node_online_map); +node_set_online (0 );setup_node_bootmem (0 , start_pfn<<PAGE_SHIFT , end_pfn<<PAGE_SHIFT );return -1 ; }
@@ -161,7 +157,7 @@ {int i;unsigned long pages =0 ; -for_all_nodes (i) { +for_each_online_node (i) { pages +=free_all_bootmem_node (NODE_DATA (i)); }return pages;
@@ -170,7 +166,7 @@void __init paging_init (void ) {int i; -for_all_nodes (i) { +for_each_online_node (i) {setup_node_zones (i); } }
include/asm-x86_64/mmzone.h +0 -1
@@ -12,7 +12,6 @@#include <asm/smp.h> -#define MAXNODE 8#define NODEMAPSIZE 0xff/* Simple perfect hash to map physical addresses to node numbers */
include/asm-x86_64/numa.h +0 -6
@@ -1,19 +1,13 @@#ifndef _ASM_X8664_NUMA_H#define _ASM_X8664_NUMA_H 1 -#define MAXNODE 8#define NODEMASK 0xffstruct node {u64 start,end; }; -#define for_all_nodes (x) for ((x) = 0; (x) < numnodes; (x)++) \ - if ((1UL << (x)) & nodes_present) - -extern int compute_hash_shift (struct node *nodes); -extern unsigned long nodes_present;#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
Signature · 3 lines
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <[email protected]> 1.650.933.1373Quoted 4 lines · Paul Jackson
Patch_14_of_22- Matthew Dobson's [PATCH]_nodemask_t_x86_64_changes_[5_7]
Changes tox86_64specific code.
Untested. Code review & testing requested.
Note Patch 22 of 22 below - needed to fix complement in this patch.
This one has been updated as well. I chose a slightly different fix for the nodes_complement() bug I introduced. I just inserted:
for_each_node(i) {
if (node_online(i))
continue;
...
}rather than doing any nodes_complement() at all. Either solution will work, and I don't have a strong preference for either solution. Your fix (correctly using nodes_complement to get a nodes_offline_map) is more efficient, especially for systems with lots of nodes. That said, though, k8_scan_nodes() is an __init function, so performance is far from critical. Going with my updated patch means you can shrink your patchset from 22 to 21 patches... ;)
-Matt
arch/x86_64/kernel/setup64.c +3 -3
@@ -135,11 +135,11 @@ void __init setup_per_cpu_areas(void)unsigned char *ptr;/* If possible allocate on the node of the CPU. In case it doesn't exist round-robin nodes. */ -if (!NODE_DATA (i % numnodes)) { -printk ("cpu with no node %d, numnodes %d\n" , i, numnodes); +if (!NODE_DATA (i %num_online_nodes ())) { +printk ("cpu with no node %d, num_online_nodes() %d\n" , i,num_online_nodes ()); ptr =alloc_bootmem (size); }else { - ptr =alloc_bootmem_node (NODE_DATA (i % numnodes), size); + ptr =alloc_bootmem_node (NODE_DATA (i %num_online_nodes ()), size); }if (!ptr)panic ("Cannot allocate cpu data for CPU %d\n" , i);
arch/x86_64/mm/k8topology.c +17 -15
@@ -44,7 +44,7 @@ static __init int find_northbridge(void)int __init k8_scan_nodes (unsigned long start,unsigned long end) {unsigned long prevbase; -struct node nodes[MAXNODE ]; +struct node nodes[MAX_NUMNODES ];int nodeid, i, nb;int found =0 ;u32 reg;
@@ -57,9 +57,10 @@ int __init k8_scan_nodes(unsigned long sprintk (KERN_INFO "Scanning NUMA topology in Northbridge %d\n" , nb); reg =read_pci_config (0 , nb,0 ,0x60 ); - numnodes = ((reg >>4 ) &7 ) +1 ; +for (i =0 ; i <= ((reg >>4 ) &7 ); i++) +node_set_online (i); -printk (KERN_INFO "Number of nodes %d (%x)\n" , numnodes, reg); +printk (KERN_INFO "Number of nodes %d (%x)\n" ,num_online_nodes (), reg);memset (&nodes,0 ,sizeof (nodes)); prevbase =0 ;
@@ -71,11 +72,11 @@ int __init k8_scan_nodes(unsigned long s nodeid = limit &7 ;if ((base &3 ) ==0 ) { -if (i < numnodes) +if (i <num_online_nodes ())printk ("Skipping disabled node %d\n" , i);continue ; } -if (nodeid >= numnodes) { +if (nodeid >=num_online_nodes ()) {printk ("Ignoring excess node %d (%lx:%lx)\n" , nodeid, base, limit);continue ;
@@ -91,7 +92,7 @@ int __init k8_scan_nodes(unsigned long s nodeid, (base>>8)&3, (limit>>8) & 3);return -1 ; } -if ((1UL << nodeid) & nodes_present) { +if (node_online (nodeid)) {printk (KERN_INFO "Node %d already present. Skipping\n" , nodeid);continue ;
@@ -151,7 +152,7 @@ int __init k8_scan_nodes(unsigned long s }printk (KERN_INFO "Using node hash shift of %d\n" , memnode_shift); -for (i =0 ; i <MAXNODE ; i++) { +for_each_node (i) {if (nodes[i].start != nodes[i].end)setup_node_bootmem (i, nodes[i].start, nodes[i].end); }
@@ -161,15 +162,16 @@ int __init k8_scan_nodes(unsigned long smapping. To avoid this fill in the mapping for all possible CPUs, as the number of CPUs is not known yet. We round robin the existing nodes. */ - rr =0 ; -for (i =0 ; i <MAXNODE ; i++) { -if (nodes_present & (1UL <<i)) -continue ; -if ((nodes_present >> rr) ==0 ) - rr =0 ; - rr =ffz (~nodes_present >> rr); + rr =first_node (node_online_map); +for_each_node (i) { +if (node_online (i)) +continue ; + node_data[i] = node_data[rr]; - rr++; + + rr =next_node (rr, node_online_map); +if (rr >=MAX_NUMNODES ) + rr =first_node (node_online_map); }if (found ==1 )
arch/x86_64/mm/numa.c +6 -10
@@ -16,7 +16,7 @@ #define Dprintk(x...) -struct pglist_data *node_data[MAXNODE ]; +struct pglist_data *node_data[MAX_NUMNODES ];bootmem_data_t plat_node_bdata[MAX_NUMNODES ];int memnode_shift;
@@ -24,8 +24,6 @@ u8 memnodemap[NODEMAPSIZE];static int numa_off__initdata ; -unsigned long nodes_present; -int __init compute_hash_shift (struct node *nodes) {int i;
@@ -35,7 +33,7 @@ int __init compute_hash_shift(struct nod/* When in doubt use brute force. */ while (shift <48 ) {memset (memnodemap,0xff ,sizeof (*memnodemap) *NODEMAPSIZE ); -for (i =0 ; i < numnodes; i++) { +for_each_online_node (i) {if (nodes[i].start == nodes[i].end)continue ; for (addr = nodes[i].start;
@@ -101,9 +99,6 @@ void __init setup_node_bootmem(int nodeireserve_bootmem_node (NODE_DATA (nodeid), nodedata_phys, pgdat_size);reserve_bootmem_node (NODE_DATA (nodeid), bootmap_start, bootmap_pages<<PAGE_SHIFT ); -if (nodeid +1 > numnodes) - numnodes = nodeid +1 ; - nodes_present |= (1UL << nodeid);node_set_online (nodeid); }
@@ -152,7 +147,8 @@ int __init numa_initmem_init(unsigned lo fake_node =1 ; memnode_shift =63 ; memnodemap[0 ] =0 ; - numnodes =1 ; +nodes_clear (node_online_map); +node_set_online (0 );setup_node_bootmem (0 , start_pfn<<PAGE_SHIFT , end_pfn<<PAGE_SHIFT );return -1 ; }
@@ -161,7 +157,7 @@ unsigned long __init numa_free_all_bootm {int i;unsigned long pages =0 ; -for_all_nodes (i) { +for_each_online_node (i) { pages +=free_all_bootmem_node (NODE_DATA (i)); }return pages;
@@ -170,7 +166,7 @@ unsigned long __init numa_free_all_bootmvoid __init paging_init (void ) {int i; -for_all_nodes (i) { +for_each_online_node (i) {setup_node_zones (i); } }
include/asm-x86_64/mmzone.h +0 -1
@@ -12,7 +12,6 @@#include <asm/smp.h> -#define MAXNODE 8#define NODEMAPSIZE 0xff/* Simple perfect hash to map physical addresses to node numbers */
include/asm-x86_64/numa.h +0 -6
@@ -1,19 +1,13 @@#ifndef _ASM_X8664_NUMA_H#define _ASM_X8664_NUMA_H 1 -#define MAXNODE 8#define NODEMASK 0xffstruct node {u64 start,end; }; -#define for_all_nodes (x) for ((x) = 0; (x) < numnodes; (x)++) \ - if ((1UL << (x)) & nodes_present) - -extern int compute_hash_shift (struct node *nodes); -extern unsigned long nodes_present;#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))