[2.5][3/15] smp_call_function/_on_cpu - i386
The voyager pieces of this don't provide the smp_call_function_on_cpu(), since voyager doesn't compile kernel/smp.c, so voyager will break the first time someone uses the new function.
As a general comment, wouldn't it be better simply to make smp_call_function an alias for smp_call_function_on_cpu with the mask being the cpu_online_map? That way we'd reduce the amount of duplicated code.
James
Quoted 3 lines · James Bottomley
The voyager pieces of this don't provide the
smp_call_function_on_cpu(), since voyager doesn't compilekernel/smp.c, so voyager will break the first time someone uses the new function.
Oops, thanks, new i386 patch appended.
Quoted 4 lines
As a general comment, wouldn't it be better simply to make
smp_call_functionan alias forsmp_call_function_on_cpuwith the mask being thecpu_online_map? That way we'd reduce the amount of duplicated code.
Some SMP architectures can specify special destinations so that ALL_BUT_SELF can be sent in one IPI instead of sending it individually. I think it's good to seperate them in that case, although perhaps other architectures could have these functions collapsed.
Index: linux-2.5.59-bk/arch/i386/kernel/cpuid.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/cpuid.c,v retrieving revision 1.1.1.1
arch/i386/kernel/cpuid.c +1 -1
@@ -71,7 +71,7 @@ cmd.reg = reg; cmd.data = data; - smp_call_function(cpuid_smp_cpuid, &cmd, 1, 1); + smp_call_function(cpuid_smp_cpuid, &cmd, 1); } }#else /* ! CONFIG_SMP */
Index: linux-2.5.59-bk/arch/i386/kernel/io_apic.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/io_apic.c,v retrieving revision 1.1.1.1
arch/i386/kernel/io_apic.c +2 -2
@@ -1049,7 +1049,7 @@void print_all_local_APICs (void ) { -smp_call_function (print_local_APIC,NULL ,1 ,1 ); +smp_call_function (print_local_APIC,NULL ,1 );print_local_APIC (NULL ); }
@@ -1524,7 +1524,7 @@*/ printk (KERN_INFO "activating NMI Watchdog ..." ); -smp_call_function (enable_NMI_through_LVT0,NULL ,1 ,1 ); +smp_call_function (enable_NMI_through_LVT0,NULL ,1 );enable_NMI_through_LVT0 (NULL );printk (" done.\n" );
Index: linux-2.5.59-bk/arch/i386/kernel/ldt.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/ldt.c,v retrieving revision 1.1.1.1
arch/i386/kernel/ldt.c +1 -1
@@ -59,7 +59,7 @@#ifdef CONFIG_SMP preempt_disable ();if (current->mm->cpu_vm_mask != (1 <<smp_processor_id ())) -smp_call_function (flush_ldt,0 ,1 ,1 ); +smp_call_function (flush_ldt,0 ,1 );preempt_enable ();#endif }
Index: linux-2.5.59-bk/arch/i386/kernel/microcode.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/microcode.c,v retrieving revision 1.1.1.1
arch/i386/kernel/microcode.c +1 -1
@@ -183,7 +183,7 @@int i, error =0 , err;struct microcode *m; -if (smp_call_function (do_update_one,NULL ,1 ,1 ) !=0 ) { +if (smp_call_function (do_update_one,NULL ,1 ) !=0 ) {printk (KERN_ERR "microcode: IPI timeout, giving up\n" );return -EIO ; }
Index: linux-2.5.59-bk/arch/i386/kernel/msr.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/msr.c,v retrieving revision 1.1.1.1
arch/i386/kernel/msr.c +2 -2
@@ -124,7 +124,7 @@ cmd.data[0 ] = eax; cmd.data[1 ] = edx; -smp_call_function (msr_smp_wrmsr, &cmd,1 ,1 ); +smp_call_function (msr_smp_wrmsr, &cmd,1 );return cmd.err; } }
@@ -139,7 +139,7 @@ cmd.cpu = cpu; cmd.reg = reg; -smp_call_function (msr_smp_rdmsr, &cmd,1 ,1 ); +smp_call_function (msr_smp_rdmsr, &cmd,1 ); *eax = cmd.data[0 ]; *edx = cmd.data[1 ];
Index: linux-2.5.59-bk/arch/i386/kernel/reboot.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/reboot.c,v retrieving revision 1.1.1.1
arch/i386/kernel/reboot.c +1 -1
@@ -243,7 +243,7 @@cleared reboot_smp, and do the reboot if it is the correct CPU, otherwise it halts. */ if (reboot_cpu != cpuid) -smp_call_function ((void *)machine_restart ,NULL ,1 ,0 ); +smp_call_function ((void *)machine_restart ,NULL ,0 ); }/* if reboot_cpu is still -1, then we want a tradional reboot,
Index: linux-2.5.59-bk/arch/i386/kernel/smp.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/smp.c,v retrieving revision 1.1.1.1
arch/i386/kernel/smp.c +59 -5
92 lines not on this page · raw message
Index: linux-2.5.59-bk/arch/i386/kernel/sysenter.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/sysenter.c,v retrieving revision 1.1.1.1
arch/i386/kernel/sysenter.c +1 -1
@@ -96,7 +96,7 @@memcpy ((void *) page, sysent,sizeof (sysent));enable_sep_cpu (NULL ); -smp_call_function (enable_sep_cpu,NULL ,1 ,1 ); +smp_call_function (enable_sep_cpu,NULL ,1 );return 0 ; }
Index: linux-2.5.59-bk/arch/i386/kernel/cpu/mcheck/non-fatal.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/cpu/mcheck/non-fatal.c,v retrieving revision 1.1.1.1
arch/i386/kernel/cpu/mcheck/non-fatal.c +1 -1
@@ -49,7 +49,7 @@static void do_mce_timer (void *data) { -smp_call_function (mce_checkregs,NULL ,1 ,1 ); +smp_call_function (mce_checkregs,NULL ,1 ); } static DECLARE_WORK(mce_work, do_mce_timer, NULL);
Index: linux-2.5.59-bk/arch/i386/kernel/cpu/mtrr/main.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/kernel/cpu/mtrr/main.c,v retrieving revision 1.1.1.1
arch/i386/kernel/cpu/mtrr/main.c +1 -1
@@ -224,7 +224,7 @@atomic_set (&data.gate,0 );/* Start the ball rolling on other CPUs */ -if (smp_call_function (ipi_handler, &data,1 ,0 ) !=0 ) +if (smp_call_function (ipi_handler, &data,0 ) !=0 )panic ("mtrr: timed out waiting for other CPUs\n" );local_irq_save (flags);
Index: linux-2.5.59-bk/arch/i386/mach-voyager/voyager_smp.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/mach-voyager/voyager_smp.c,v retrieving revision 1.1.1.1
arch/i386/mach-voyager/voyager_smp.c +33 -13
87 lines not on this page · raw message
Index: linux-2.5.59-bk/arch/i386/mm/pageattr.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/mm/pageattr.c,v retrieving revision 1.1.1.1
arch/i386/mm/pageattr.c +1 -1
@@ -132,7 +132,7 @@static inline void flush_map (void ) {#ifdef CONFIG_SMP -smp_call_function (flush_kernel_map,NULL ,1 ,1 ); +smp_call_function (flush_kernel_map,NULL ,1 );#endif flush_kernel_map (NULL ); }
Index: linux-2.5.59-bk/arch/i386/oprofile/nmi_int.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.59-bk/arch/i386/oprofile/nmi_int.c,v retrieving revision 1.1.1.1
arch/i386/oprofile/nmi_int.c +4 -4
@@ -95,7 +95,7 @@* without actually triggering any NMIs as this will * break the core code horrifically. */ -smp_call_function (nmi_cpu_setup,NULL ,0 ,1 ); +smp_call_function (nmi_cpu_setup,NULL ,1 );nmi_cpu_setup (0 );set_nmi_callback (nmi_callback); oprofile_pmdev =set_nmi_pm_callback (oprofile_pm_callback);
@@ -148,7 +148,7 @@ {unset_nmi_pm_callback (oprofile_pmdev);unset_nmi_callback (); -smp_call_function (nmi_cpu_shutdown,NULL ,0 ,1 ); +smp_call_function (nmi_cpu_shutdown,NULL ,1 );nmi_cpu_shutdown (0 ); }
@@ -162,7 +162,7 @@static int nmi_start (void ) { -smp_call_function (nmi_cpu_start,NULL ,0 ,1 ); +smp_call_function (nmi_cpu_start,NULL ,1 );nmi_cpu_start (0 );return 0 ; }
@@ -177,7 +177,7 @@static void nmi_stop (void ) { -smp_call_function (nmi_cpu_stop,NULL ,0 ,1 ); +smp_call_function (nmi_cpu_stop,NULL ,1 );nmi_cpu_stop (0 ); }