cpu/hotplug, x86: Reworked parallel CPU bringup
Status from this message: The following commit has been merged into the smp/core branch of tip:
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest37 patches 15 repliesApplied
- v2 posting 2/210 of 38 patches 5 repliesSuperseded
- v326 of 36 patches 27 repliesApplied
Earlier versions · 2
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v2 posting 1/2 | 38 patches | 5 replies | Superseded | |
| v1 | 37 patches | 41 replies | Superseded |
Patches in v4 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/37 | x86/smpboot: Cleanup topology_phys_to_logical_pkg()/die()arch/ arch/ | +6 | 0 replies | |
| 2/37 | cpu/hotplug: Mark arch_disable_smp_support() and bringup_nonboot_cpus() __initarch/ kernel/ kernel/ | +4 | 0 replies | |
| 3/37 | x86/smpboot: Avoid pointless delay calibration if TSC is synchronizedarch/ arch/ | +41 | 0 replies | |
| 4/37 | x86/smpboot: Rename start_cpu0() to soft_restart_cpu()arch/ arch/ arch/ +2 more | +13 | 1 reply | |
| 5/37 | x86/topology: Remove CPU0 hotplug optionDocumentation/ Documentation/ arch/ +3 more | +6 | 0 replies | |
| 6/37 | x86/smpboot: Remove the CPU0 hotplug kludgearch/ arch/ arch/ +1 more | +14 | 0 replies | |
| 7/37 | x86/smpboot: Restrict soft_restart_cpu() to SEVarch/ arch/ arch/ | +2 | 1 reply | |
| 8/37 | x86/smpboot: Remove unnecessary barrier()arch/ | +0 | 0 replies | |
| 9/37 | x86/smpboot: Split up native_cpu_up() into separate phases and document themarch/ | +119 | 0 replies | |
| 10/37 | x86/smpboot: Get rid of cpu_init_secondary()arch/ arch/ arch/ | +19 | 1 reply | |
| 11/37 | x86/cpu/cacheinfo: Remove cpu_callout_mask dependencyarch/ | +17 | 0 replies | |
| 12/37 | x86/smpboot: Move synchronization masks to SMP boot codearch/ arch/ arch/ +1 more | +16 | 0 replies | |
| 13/37 | x86/smpboot: Make TSC synchronization function call basedarch/ arch/ arch/ | +14 | 0 replies | |
| 14/37 | x86/smpboot: Remove cpu_callin_maskarch/ | +15 | 0 replies | |
| 15/37 | cpu/hotplug: Rework sparse_irq locking in bringup_cpu()kernel/ | +24 | 0 replies | |
| 16/37 | x86/smpboot: Remove wait for cpu_online()arch/ | +2 | 0 replies | |
| 17/37 | x86/xen/smp_pv: Remove wait for CPU onlinearch/ | +5 | 0 replies | |
| 18/37 | x86/xen/hvm: Get rid of DEAD_FROZEN handlingarch/ | +5 | 0 replies | |
| 19/37 | cpu/hotplug: Add CPU state tracking and synchronizationarch/ include/ kernel/ +1 more | +221 | 0 replies | |
| 20/37 | x86/smpboot: Switch to hotplug core state synchronizationarch/ arch/ arch/ +3 more | +75 | 0 replies | |
| 21/37 | cpu/hotplug: Remove cpu_report_state() and related unused cruftinclude/ kernel/ | +0 | 0 replies | |
| 22/37 | ARM: smp: Switch to hotplug core state synchronizationarch/ arch/ arch/ | +9 | 0 replies | |
| 23/37 | arm64: smp: Switch to hotplug core state synchronizationarch/ arch/ arch/ | +7 | 0 replies | |
| 24/37 | csky/smp: Switch to hotplug core state synchronizationarch/ arch/ arch/ | +4 | 0 replies | |
| 25/37 | MIPS: SMP_CPS: Switch to hotplug core state synchronizationarch/ arch/ arch/ +4 more | +18 | 0 replies | |
| 26/37 | parisc: Switch to hotplug core state synchronizationarch/ arch/ arch/ | +6 | 0 replies | |
| 27/37 | riscv: Switch to hotplug core state synchronizationarch/ arch/ arch/ | +9 | 0 replies | |
| 28/37 | cpu/hotplug: Remove unused state functionsinclude/ kernel/ | +0 | 0 replies | |
| 29/37 | cpu/hotplug: Reset task stack state in _cpu_up()kernel/ | +6 | 0 replies | |
| 30/37 | cpu/hotplug: Provide a split up CPUHP_BRINGUP mechanismarch/ include/ kernel/ | +76 | 0 replies | |
| 31/37 | x86/smpboot: Enable split CPU startuparch/ arch/ arch/ +2 more | +10 | 0 replies | |
| 32/37 | x86/apic: Provide cpu_primary_thread maskarch/ arch/ arch/ +1 more | +27 | 0 replies | |
| 33/37 | cpu/hotplug: Allow "parallel" bringup up to CPUHP_BP_KICK_AP_STATEDocumentation/ arch/ include/ +1 more | +109 | 5 replies | |
| 34/37 | x86/apic: Save the APIC virtual base addressarch/ arch/ | +5 | 0 replies | |
| 35/37 | x86/smpboot: Implement a bit spinlock to protect the realmode stackarch/ arch/ arch/ +1 more | +36 | 0 replies | |
| 36/37 | x86/smpboot: Support parallel startup of secondary CPUsarch/ arch/ arch/ +4 more | +83 | 3 replies | |
| 37/37 | x86/smpboot/64: Implement arch_cpuhp_init_parallel_bringup() and enable itarch/ arch/ arch/ | +75 | 1 reply |
Reviews trailers per patch
5 of 37 patches have a Reviewed-by or Acked-by.
| Patch | Michael Kelley | Palmer Dabbelt | Mark Rutland | David Woodhouse | Oleksandr Natalenko | Helge Deller | Guilherme G. Piccoli | Jeffrey Hugo | Mark Brown | Philippe Mathieu-Daudé |
|---|---|---|---|---|---|---|---|---|---|---|
| Series | T-b | T-b | T-b | T-b | ||||||
| 1/37 | T-b | |||||||||
| 2/37 | T-b | |||||||||
| 3/37 | T-b | |||||||||
| 4/37 | T-b | R-b | ||||||||
| 5/37 | T-b | |||||||||
| 6/37 | T-b | |||||||||
| 7/37 | T-b | R-b | ||||||||
| 8/37 | ||||||||||
| 9/37 | T-b | |||||||||
| 10/37 | T-b | R-b | ||||||||
| 11/37 | T-b | |||||||||
| 12/37 | T-b | |||||||||
| 13/37 | T-b | |||||||||
| 14/37 | T-b | |||||||||
| 15/37 | T-b | |||||||||
| 16/37 | T-b | |||||||||
| 17/37 | T-b | |||||||||
| 18/37 | T-b | |||||||||
| 19/37 | T-b | |||||||||
| 20/37 | T-b | |||||||||
| 21/37 | T-b | |||||||||
| 22/37 | T-b | |||||||||
| 23/37 | T-b | T-b | ||||||||
| 24/37 | T-b | |||||||||
| 25/37 | T-b | |||||||||
| 26/37 | T-b | |||||||||
| 27/37 | T-b | A-b | ||||||||
| 28/37 | T-b | |||||||||
| 29/37 | T-b | T-b R-b | ||||||||
| 30/37 | T-b | |||||||||
| 31/37 | T-b | |||||||||
| 32/37 | T-b | |||||||||
| 33/37 | T-b | T-b | ||||||||
| 34/37 | T-b | |||||||||
| 35/37 | T-b | |||||||||
| 36/37 | T-b | T-b | ||||||||
| 37/37 | T-b | Originally-by |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 10 reviewers.
Cover letter [patch V4 00/37] cpu/hotplug, x86: Reworked parallel CPU bringup
Hi!
This is version 4 of the reworked parallel bringup series. Version 3 can be found here:
https://lore.kernel.org/lkml/[email protected]
This is just a reiteration to address the following details:
1) Address review feedback (Peter Zijlstra)
2) Fix a MIPS related build problem (0day)
Other than that there are no changes and the other details are all the same as in V3 and V2.
It's also available from git:
git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git hotplug
Diff to V3 below.
Thanks,
tglx
---
arch/mips/kernel/smp.c +1 -1
@@ -690,7 +690,7 @@ void flush_tlb_one(unsigned long vaddr)EXPORT_SYMBOL (flush_tlb_page);EXPORT_SYMBOL (flush_tlb_one); -#ifdef CONFIG_HOTPLUG_CPU +#ifdef CONFIG_HOTPLUG_CORE_SYNC_DEAD void arch_cpuhp_cleanup_dead_cpu (unsigned int cpu) {if (mp_ops->cleanup_dead_cpu)
arch/x86/kernel/head_64.S +2 -4
@@ -290,8 +290,7 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL) /* APIC ID not found in the table. Drop the trampoline lock and bail. */ movq trampoline_lock(%rip), %rax - lock - btrl $0, (%rax) + movl $0, (%rax) 1: cli hlt
@@ -320,8 +319,7 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL) movq trampoline_lock(%rip), %rax testq %rax, %rax jz .Lsetup_gdt - lock - btrl $0, (%rax) + movl $0, (%rax) .Lsetup_gdt: /*
arch/x86/kernel/smpboot.c +10 -16
@@ -161,31 +161,28 @@ static inline void smpboot_restore_warm_reset_vector(void) } -/* -* Report back to the Boot Processor during boot time or to the caller processor -* during CPU online. -*/ -static void smp_callin (void ) +/* Run the next set of setup steps for the upcoming CPU */ +static void ap_starting (void ) {int cpuid =smp_processor_id ();/* -* If waken up by an INIT in an 82489DX configuration the alive -* synchronization guarantees we don't get here before an -* INIT_deassert IPI reaches our local APIC, so it is now safe to -* touch our local APIC. +* If woken up by an INIT in an 82489DX configuration the alive +* synchronization guarantees that the CPU does not reach this +* point before an INIT_deassert IPI reaches the local APIC, so it +* is now safe to touch the local APIC. * * Set up this CPU, first the APIC, which is probably redundant on * most boards. */ apic_ap_setup (); -/* Save our processor parameters. */ +/* Save the processor parameters. */ smp_store_cpu_info (cpuid);/* * The topology information must be up to date before -* calibrate_delay() and notify_cpu_starting(). +* notify_cpu_starting(). */ set_cpu_sibling_map (cpuid);
@@ -197,7 +194,7 @@ static void smp_callin(void)/* * This runs the AP through all the cpuhp states to its target -* state (CPUHP_ONLINE in the case of serial bringup). +* state CPUHP_ONLINE. */ notify_cpu_starting (cpuid); }
@@ -274,10 +271,7 @@ static void notrace start_secondary(void *unused)rcu_cpu_starting (raw_smp_processor_id ()); x86_cpuinit.early_percpu_clock_init (); -smp_callin (); - -/* Otherwise gcc will move up smp_processor_id() before cpu_init() */ -barrier (); +ap_starting ();/* Check TSC synchronization with the control CPU. */ check_tsc_sync_target ();
arch/x86/realmode/rm/trampoline_64.S +5 -9
@@ -40,17 +40,13 @@ .macro LOAD_REALMODE_ESP /* * Make sure only one CPU fiddles with the realmode stack - */ + */ .Llock_rm\@: - btl $0, tr_lock - jnc 2f - pause - jmp .Llock_rm\@ + lock btsl $0, tr_lock + jnc 2f + pause + jmp .Llock_rm\@ 2: - lock - btsl $0, tr_lock - jc .Llock_rm\@ - # Setup stack movl $rm_stack_end, %esp .endm
kernel/cpu.c +8 -4
@@ -294,14 +294,14 @@ enum cpuhp_sync_state {* cpuhp_ap_update_sync_state - Update synchronization state during bringup/teardown * @state: The synchronization state to set * -* No synchronization point. Just update of the synchronization state. +* No synchronization point. Just update of the synchronization state, but implies +* a full barrier so that the AP changes are visible before the control CPU proceeds. */ static inline void cpuhp_ap_update_sync_state (enum cpuhp_sync_state state) {atomic_t *st =this_cpu_ptr (&cpuhp_state.ap_sync_state); -int sync =atomic_read (st); -while (!atomic_try_cmpxchg (st, &sync, state)); + (void )atomic_xchg (st, state); }void __weak arch_cpuhp_sync_state_poll (void ) {cpu_relax (); }
@@ -829,7 +829,11 @@ static int bringup_cpu(unsigned int cpu)/* * Some architectures have to walk the irq descriptors to * setup the vector space for the cpu which comes online. -* Prevent irq alloc/free across the bringup. +* +* Prevent irq alloc/free across the bringup by acquiring the +* sparse irq lock. Hold it until the upcoming CPU completes the +* startup in cpuhp_online_idle() which allows to avoid +* intermediate synchronization points in the architecture code. */ irq_lock_sparse ();