[PATCH] x86_64: Node local pda take 2 -- cpu_pda preparation

Helper patch to change cpu_pda users to use macros to access cpu_pda instead of the cpu_pda[] array. Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org> Signed-off-by: Shai Fultheim <shai@scalex86.org> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] x86_64: Node local pda take 2 -- cpu_pda preparation
Helper patch to change cpu_pda users to use macros to access cpu_pda instead of the cpu_pda[] array. Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org> Signed-off-by: Shai Fultheim <shai@scalex86.org> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ravikiran G Thirumalai · Linus Torvalds
1 parent 05b3cbd8bb
Showing 9 changed files with 21 additions and 20 deletions Side-by-side Diff
arch/x86_64/kernel/irq.c
arch/x86_64/kernel/nmi.c
arch/x86_64/kernel/setup64.c
arch/x86_64/kernel/smpboot.c
arch/x86_64/kernel/traps.c
arch/x86_64/kernel/x8664_ksyms.c
arch/x86_64/mm/numa.c
include/asm-x86_64/pda.h
include/asm-x86_64/percpu.h
@@ -70,13 +70,13 @@
 		seq_printf(p, "NMI: ");
 		for (j = 0; j < NR_CPUS; j++)
 			if (cpu_online(j))
-				seq_printf(p, "%10u ", cpu_pda[j].__nmi_count);
+				seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count);
 		seq_putc(p, '\n');
 #ifdef CONFIG_X86_LOCAL_APIC
 		seq_printf(p, "LOC: ");
 		for (j = 0; j < NR_CPUS; j++)
 			if (cpu_online(j))
-				seq_printf(p, "%10u ", cpu_pda[j].apic_timer_irqs);
+				seq_printf(p, "%10u ", cpu_pda(j)->apic_timer_irqs);
 		seq_putc(p, '\n');
 #endif
 		seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
@@ -155,19 +155,19 @@
 		smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
  
 	for (cpu = 0; cpu < NR_CPUS; cpu++)
-		counts[cpu] = cpu_pda[cpu].__nmi_count; 
+		counts[cpu] = cpu_pda(cpu)->__nmi_count;
 	local_irq_enable();
 	mdelay((10*1000)/nmi_hz); // wait 10 ticks
  
 	for (cpu = 0; cpu < NR_CPUS; cpu++) {
 		if (!cpu_online(cpu))
 			continue;
-		if (cpu_pda[cpu].__nmi_count - counts[cpu] <= 5) {
+		if (cpu_pda(cpu)->__nmi_count - counts[cpu] <= 5) {
 			endflag = 1;
 			printk("CPU#%d: NMI appears to be stuck (%d->%d)!\n",
 			       cpu,
 			       counts[cpu],
-			       cpu_pda[cpu].__nmi_count);
+			       cpu_pda(cpu)->__nmi_count);
 			nmi_active = 0;
 			lapic_nmi_owner &= ~LAPIC_NMI_WATCHDOG;
 			nmi_perfctr_msr = 0;
@@ -30,7 +30,7 @@
  
 cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
  
-struct x8664_pda cpu_pda[NR_CPUS] __cacheline_aligned; 
+struct x8664_pda _cpu_pda[NR_CPUS] __cacheline_aligned;
  
 struct desc_ptr idt_descr = { 256 * 16, (unsigned long) idt_table }; 
  
  
  
@@ -110,18 +110,18 @@
 		}
 		if (!ptr)
 			panic("Cannot allocate cpu data for CPU %d\n", i);
-		cpu_pda[i].data_offset = ptr - __per_cpu_start;
+		cpu_pda(i)->data_offset = ptr - __per_cpu_start;
 		memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
 	}
 } 
  
 void pda_init(int cpu)
 { 
-	struct x8664_pda *pda = &cpu_pda[cpu];
+	struct x8664_pda *pda = cpu_pda(cpu);
  
 	/* Setup up data that may be needed in __get_free_pages early */
 	asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0)); 
-	wrmsrl(MSR_GS_BASE, cpu_pda + cpu);
+	wrmsrl(MSR_GS_BASE, pda);
  
 	pda->cpunumber = cpu; 
 	pda->irqcount = -1;
@@ -792,7 +792,7 @@
  
 do_rest:
  
-	cpu_pda[cpu].pcurrent = c_idle.idle;
+	cpu_pda(cpu)->pcurrent = c_idle.idle;
  
 	start_rip = setup_trampoline();
  
@@ -70,7 +70,6 @@
 asmlinkage void alignment_check(void);
 asmlinkage void machine_check(void);
 asmlinkage void spurious_interrupt_bug(void);
-asmlinkage void call_debug(void);
  
 struct notifier_block *die_chain;
 static DEFINE_SPINLOCK(die_notifier_lock);
@@ -139,7 +138,7 @@
 		switch (k + 1) {
 #if DEBUG_STKSZ > EXCEPTION_STKSZ
 		case DEBUG_STACK:
-			end = cpu_pda[cpu].debugstack + DEBUG_STKSZ;
+			end = cpu_pda(cpu)->debugstack + DEBUG_STKSZ;
 			break;
 #endif
 		default:
@@ -186,7 +185,7 @@
 {
 	unsigned long addr;
 	const unsigned cpu = safe_smp_processor_id();
-	unsigned long *irqstack_end = (unsigned long *)cpu_pda[cpu].irqstackptr;
+	unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)->irqstackptr;
 	int i;
 	unsigned used = 0;
  
@@ -254,8 +253,8 @@
 	unsigned long *stack;
 	int i;
 	const int cpu = safe_smp_processor_id();
-	unsigned long *irqstack_end = (unsigned long *) (cpu_pda[cpu].irqstackptr);
-	unsigned long *irqstack = (unsigned long *) (cpu_pda[cpu].irqstackptr - IRQSTACKSIZE);    
+	unsigned long *irqstack_end = (unsigned long *) (cpu_pda(cpu)->irqstackptr);
+	unsigned long *irqstack = (unsigned long *) (cpu_pda(cpu)->irqstackptr - IRQSTACKSIZE);
  
 	// debugging aid: "show_stack(NULL, NULL);" prints the
 	// back trace for this cpu.
@@ -303,7 +302,7 @@
 	int in_kernel = !user_mode(regs);
 	unsigned long rsp;
 	const int cpu = safe_smp_processor_id(); 
-	struct task_struct *cur = cpu_pda[cpu].pcurrent; 
+	struct task_struct *cur = cpu_pda(cpu)->pcurrent;
  
 		rsp = regs->rsp;
  
@@ -96,7 +96,7 @@
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(clear_page);
  
-EXPORT_SYMBOL(cpu_pda);
+EXPORT_SYMBOL(_cpu_pda);
 #ifdef CONFIG_SMP
 EXPORT_SYMBOL(cpu_data);
 EXPORT_SYMBOL(__write_lock_failed);
@@ -272,7 +272,7 @@
  
 void __cpuinit numa_set_node(int cpu, int node)
 {
-	cpu_pda[cpu].nodenumber = node;
+	cpu_pda(cpu)->nodenumber = node;
 	cpu_to_node[cpu] = node;
 }
  
@@ -27,7 +27,9 @@
 	unsigned apic_timer_irqs;
 } ____cacheline_aligned_in_smp;
  
-extern struct x8664_pda cpu_pda[];
+extern struct x8664_pda _cpu_pda[];
+
+#define cpu_pda(i) (&_cpu_pda[i])
  
 /* 
  * There is no fast way to get the base address of the PDA, all the accesses
@@ -11,7 +11,7 @@
  
 #include <asm/pda.h>
  
-#define __per_cpu_offset(cpu) (cpu_pda[cpu].data_offset)
+#define __per_cpu_offset(cpu) (cpu_pda(cpu)->data_offset)
 #define __my_cpu_offset() read_pda(data_offset)
  
 /* Separate out the type, so (int[3], foo) works. */
...	...	@@ -70,13 +70,13 @@
70	70	seq_printf(p, "NMI: ");
71	71	for (j = 0; j < NR_CPUS; j++)
72	72	if (cpu_online(j))
73		- seq_printf(p, "%10u ", cpu_pda[j].__nmi_count);
	73	+ seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count);
74	74	seq_putc(p, '\n');
75	75	#ifdef CONFIG_X86_LOCAL_APIC
76	76	seq_printf(p, "LOC: ");
77	77	for (j = 0; j < NR_CPUS; j++)
78	78	if (cpu_online(j))
79		- seq_printf(p, "%10u ", cpu_pda[j].apic_timer_irqs);
	79	+ seq_printf(p, "%10u ", cpu_pda(j)->apic_timer_irqs);
80	80	seq_putc(p, '\n');
81	81	#endif
82	82	seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
...	...	@@ -155,19 +155,19 @@
155	155	smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
156	156
157	157	for (cpu = 0; cpu < NR_CPUS; cpu++)
158		- counts[cpu] = cpu_pda[cpu].__nmi_count;
	158	+ counts[cpu] = cpu_pda(cpu)->__nmi_count;
159	159	local_irq_enable();
160	160	mdelay((10*1000)/nmi_hz); // wait 10 ticks
161	161
162	162	for (cpu = 0; cpu < NR_CPUS; cpu++) {
163	163	if (!cpu_online(cpu))
164	164	continue;
165		- if (cpu_pda[cpu].__nmi_count - counts[cpu] <= 5) {
	165	+ if (cpu_pda(cpu)->__nmi_count - counts[cpu] <= 5) {
166	166	endflag = 1;
167	167	printk("CPU#%d: NMI appears to be stuck (%d->%d)!\n",
168	168	cpu,
169	169	counts[cpu],
170		- cpu_pda[cpu].__nmi_count);
	170	+ cpu_pda(cpu)->__nmi_count);
171	171	nmi_active = 0;
172	172	lapic_nmi_owner &= ~LAPIC_NMI_WATCHDOG;
173	173	nmi_perfctr_msr = 0;
...	...	@@ -30,7 +30,7 @@
30	30
31	31	cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
32	32
33		-struct x8664_pda cpu_pda[NR_CPUS] __cacheline_aligned;
	33	+struct x8664_pda _cpu_pda[NR_CPUS] __cacheline_aligned;
34	34
35	35	struct desc_ptr idt_descr = { 256 * 16, (unsigned long) idt_table };
36	36
37	37
38	38
...	...	@@ -110,18 +110,18 @@
110	110	}
111	111	if (!ptr)
112	112	panic("Cannot allocate cpu data for CPU %d\n", i);
113		- cpu_pda[i].data_offset = ptr - __per_cpu_start;
	113	+ cpu_pda(i)->data_offset = ptr - __per_cpu_start;
114	114	memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
115	115	}
116	116	}
117	117
118	118	void pda_init(int cpu)
119	119	{
120		- struct x8664_pda *pda = &cpu_pda[cpu];
	120	+ struct x8664_pda *pda = cpu_pda(cpu);
121	121
122	122	/* Setup up data that may be needed in __get_free_pages early */
123	123	asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0));
124		- wrmsrl(MSR_GS_BASE, cpu_pda + cpu);
	124	+ wrmsrl(MSR_GS_BASE, pda);
125	125
126	126	pda->cpunumber = cpu;
127	127	pda->irqcount = -1;
...	...	@@ -792,7 +792,7 @@
792	792
793	793	do_rest:
794	794
795		- cpu_pda[cpu].pcurrent = c_idle.idle;
	795	+ cpu_pda(cpu)->pcurrent = c_idle.idle;
796	796
797	797	start_rip = setup_trampoline();
798	798
...	...	@@ -70,7 +70,6 @@
70	70	asmlinkage void alignment_check(void);
71	71	asmlinkage void machine_check(void);
72	72	asmlinkage void spurious_interrupt_bug(void);
73		-asmlinkage void call_debug(void);
74	73
75	74	struct notifier_block *die_chain;
76	75	static DEFINE_SPINLOCK(die_notifier_lock);
...	...	@@ -139,7 +138,7 @@
139	138	switch (k + 1) {
140	139	#if DEBUG_STKSZ > EXCEPTION_STKSZ
141	140	case DEBUG_STACK:
142		- end = cpu_pda[cpu].debugstack + DEBUG_STKSZ;
	141	+ end = cpu_pda(cpu)->debugstack + DEBUG_STKSZ;
143	142	break;
144	143	#endif
145	144	default:
...	...	@@ -186,7 +185,7 @@
186	185	{
187	186	unsigned long addr;
188	187	const unsigned cpu = safe_smp_processor_id();
189		- unsigned long irqstack_end = (unsigned long )cpu_pda[cpu].irqstackptr;
	188	+ unsigned long irqstack_end = (unsigned long )cpu_pda(cpu)->irqstackptr;
190	189	int i;
191	190	unsigned used = 0;
192	191
...	...	@@ -254,8 +253,8 @@
254	253	unsigned long *stack;
255	254	int i;
256	255	const int cpu = safe_smp_processor_id();
257		- unsigned long irqstack_end = (unsigned long ) (cpu_pda[cpu].irqstackptr);
258		- unsigned long irqstack = (unsigned long ) (cpu_pda[cpu].irqstackptr - IRQSTACKSIZE);
	256	+ unsigned long irqstack_end = (unsigned long ) (cpu_pda(cpu)->irqstackptr);
	257	+ unsigned long irqstack = (unsigned long ) (cpu_pda(cpu)->irqstackptr - IRQSTACKSIZE);
259	258
260	259	// debugging aid: "show_stack(NULL, NULL);" prints the
261	260	// back trace for this cpu.
...	...	@@ -303,7 +302,7 @@
303	302	int in_kernel = !user_mode(regs);
304	303	unsigned long rsp;
305	304	const int cpu = safe_smp_processor_id();
306		- struct task_struct *cur = cpu_pda[cpu].pcurrent;
	305	+ struct task_struct *cur = cpu_pda(cpu)->pcurrent;
307	306
308	307	rsp = regs->rsp;
309	308
...	...	@@ -96,7 +96,7 @@
96	96	EXPORT_SYMBOL(copy_page);
97	97	EXPORT_SYMBOL(clear_page);
98	98
99		-EXPORT_SYMBOL(cpu_pda);
	99	+EXPORT_SYMBOL(_cpu_pda);
100	100	#ifdef CONFIG_SMP
101	101	EXPORT_SYMBOL(cpu_data);
102	102	EXPORT_SYMBOL(__write_lock_failed);
...	...	@@ -272,7 +272,7 @@
272	272
273	273	void __cpuinit numa_set_node(int cpu, int node)
274	274	{
275		- cpu_pda[cpu].nodenumber = node;
	275	+ cpu_pda(cpu)->nodenumber = node;
276	276	cpu_to_node[cpu] = node;
277	277	}
278	278
...	...	@@ -27,7 +27,9 @@
27	27	unsigned apic_timer_irqs;
28	28	} ____cacheline_aligned_in_smp;
29	29
30		-extern struct x8664_pda cpu_pda[];
	30	+extern struct x8664_pda _cpu_pda[];
	31	+
	32	+#define cpu_pda(i) (&_cpu_pda[i])
31	33
32	34	/*
33	35	* There is no fast way to get the base address of the PDA, all the accesses
...	...	@@ -11,7 +11,7 @@
11	11
12	12	#include <asm/pda.h>
13	13
14		-#define __per_cpu_offset(cpu) (cpu_pda[cpu].data_offset)
	14	+#define __per_cpu_offset(cpu) (cpu_pda(cpu)->data_offset)
15	15	#define __my_cpu_offset() read_pda(data_offset)
16	16
17	17	/* Separate out the type, so (int[3], foo) works. */