x86/boot tree changes for v3.18
Subsystems (2)
Linus,
Please pull the latest x86-boot-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-for-linus
# HEAD: eeeda4cd06e828b331b15741a204ff9f5874d28d x86/relocs: Make per_cpu_load_addr static
The changes in this cycle were:
- Fix rare SMP-boot hang (mostly in virtual environments)
- Fix build warning with certain (rare) toolchains
Thanks,
Ingo
------------------>
Ben Hutchings (1):
x86/relocs: Make per_cpu_load_addr static
Igor Mammedov (1):
x86/smpboot: Initialize secondary CPU only if master CPU will wait for it
arch/x86/kernel/cpu/common.c | 29 ++++++++----- arch/x86/kernel/smpboot.c | 98 ++++++++++++++------------------------------ arch/x86/tools/relocs.c | 2 +- arch/x86/xen/smp.c | 2 + 4 files changed, 51 insertions(+), 80 deletions(-)
arch/x86/kernel/cpu/common.c +18 -11
@@ -1266,6 +1266,19 @@ static void dbg_restore_debug_regs(void)#define dbg_restore_debug_regs ()#endif /* ! CONFIG_KGDB */ +static void wait_for_master_cpu (int cpu) +{ +#ifdef CONFIG_SMP +/* +* wait for ACK from master CPU before continuing +* with AP initialization +*/ +WARN_ON (cpumask_test_and_set_cpu (cpu, cpu_initialized_mask)); +while (!cpumask_test_cpu (cpu, cpu_callout_mask)) +cpu_relax (); +#endif +} +/* * cpu_init() initializes state that is per-CPU. Some data is already * initialized (naturally) in the bootstrap process, such as the GDT
@@ -1281,16 +1294,17 @@ void cpu_init(void)struct task_struct *me;struct tss_struct *t;unsigned long v; -int cpu; +int cpu =stack_smp_processor_id ();int i; +wait_for_master_cpu (cpu); +/* * Load microcode on this cpu if a valid microcode is available. * This is early microcode loading procedure. */ load_ucode_ap (); - cpu =stack_smp_processor_id (); t = &per_cpu (init_tss, cpu); oist = &per_cpu (orig_ist, cpu);
@@ -1302,9 +1316,6 @@ void cpu_init(void) me = current; -if (cpumask_test_and_set_cpu (cpu, cpu_initialized_mask)) -panic ("CPU#%d already initialized!\n" , cpu); -pr_debug ("Initializing CPU#%d\n" , cpu);clear_in_cr4 (X86_CR4_VME |X86_CR4_PVI |X86_CR4_TSD |X86_CR4_DE );
@@ -1381,13 +1392,9 @@ void cpu_init(void)struct tss_struct *t = &per_cpu (init_tss, cpu);struct thread_struct *thread = &curr->thread; -show_ucode_info_early (); +wait_for_master_cpu (cpu); -if (cpumask_test_and_set_cpu (cpu, cpu_initialized_mask)) { -printk (KERN_WARNING "CPU#%d already initialized!\n" , cpu); -for (;;) -local_irq_enable (); - } +show_ucode_info_early ();printk (KERN_INFO "Initializing CPU#%d\n" , cpu);
arch/x86/kernel/smpboot.c +30 -68
141 lines not on this page · raw message
arch/x86/tools/relocs.c +1 -1
@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,* */ static int per_cpu_shndx =-1 ; -Elf_Addr per_cpu_load_addr; +static Elf_Addr per_cpu_load_addr;static void percpu_init (void ) {
arch/x86/xen/smp.c +2 -0
@@ -360,6 +360,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)struct desc_struct *gdt;unsigned long gdt_mfn; +/* used to tell cpu_init() that it can proceed with initialization */ +cpumask_set_cpu (cpu, cpu_callout_mask);if (cpumask_test_and_set_cpu (cpu, xen_cpu_initialized_map))return 0 ;