Commit 69d81fcd authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Speed up numa_node_id by putting it directly into the PDA 



Not go from the CPU number to an mapping array.
Mode number is often used now in fast paths.

This also adds a generic numa_node_id to all the topology includes

Suggested by Eric Dumazet

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 50895c5d

arch/x86_64/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c) 
 		if (!node_online(node))

 			node = nearby_node(apicid);

 	}

  	cpu_to_node[cpu] = node;

	numa_set_node(cpu, node);



  	printk(KERN_INFO "CPU %d(%d) -> Node %d -> Core %d\n",

  			cpu, c->x86_num_cores, node, cpu_core_id[cpu]);
@@ -975,7 +975,7 @@ static void srat_detect_node(void) 
	node = apicid_to_node[hard_smp_processor_id()];

	if (node == NUMA_NO_NODE)

		node = 0;

	cpu_to_node[cpu] = node;

	numa_set_node(cpu, node);



	if (acpi_numa > 0)

		printk(KERN_INFO "CPU %d -> Node %d\n", cpu, node);

arch/x86_64/mm/numa.c

+8 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void __init numa_init_array(void) 
	for (i = 0; i < NR_CPUS; i++) {

		if (cpu_to_node[i] != NUMA_NO_NODE)

			continue;

		cpu_to_node[i] = rr;

 		numa_set_node(i, rr);

		rr = next_node(rr, node_online_map);

		if (rr == MAX_NUMNODES)

			rr = first_node(node_online_map);
@@ -242,7 +242,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) 
	nodes_clear(node_online_map);

	node_set_online(0);

	for (i = 0; i < NR_CPUS; i++)

		cpu_to_node[i] = 0;

		numa_set_node(i, 0);

	node_to_cpumask[0] = cpumask_of_cpu(0);

	setup_node_bootmem(0, start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT);

}
@@ -252,6 +252,12 @@ __cpuinit void numa_add_cpu(int cpu) 
	set_bit(cpu, &node_to_cpumask[cpu_to_node(cpu)]);

} 



void __cpuinit numa_set_node(int cpu, int node)

{

	cpu_pda[cpu].nodenumber = node;

	cpu_to_node[cpu] = node;

}



unsigned long __init numa_free_all_bootmem(void) 

{ 

	int i;

arch/x86_64/mm/srat.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) 
		if (cpu_to_node[i] == NUMA_NO_NODE)

			continue;

		if (!node_isset(cpu_to_node[i], nodes_parsed))

			cpu_to_node[i] = NUMA_NO_NODE; 

			numa_set_node(i, NUMA_NO_NODE);

	}

	numa_init_array();

	return 0;

include/asm-x86_64/numa.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ extern void numa_add_cpu(int cpu); 
extern void numa_init_array(void);

extern int numa_off;



extern void numa_set_node(int cpu, int node);



extern unsigned char apicid_to_node[256];



#define NUMA_NO_NODE 0xff

include/asm-x86_64/pda.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct x8664_pda { 
        int irqcount;		    /* Irq nesting counter. Starts with -1 */  	

	int cpunumber;		    /* Logical CPU number */

	char *irqstackptr;	/* top of irqstack */

	int nodenumber;		    /* number of current node */

	unsigned int __softirq_pending;

	unsigned int __nmi_count;	/* number of NMI on this CPUs */

	struct mm_struct *active_mm;