Skip to content

riscv支持cpu并行启动 #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sterling-teng merged 3 commits into from
Jun 24, 2026
Merged

riscv支持cpu并行启动 #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7afb5df
cpu/hotplug: Make HOTPLUG_PARALLEL independent of HOTPLUG_SMT
FlyGoat Jul 16, 2024
ef5a9a2
cpu/hotplug: Provide weak fallback for arch_cpuhp_init_parallel_bring…
FlyGoat Jul 16, 2024
706b693
RISC-V: Enable HOTPLUG_PARALLEL for secondary CPUs
avpatel Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/riscv/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ config RISCV
select HAVE_RSEQ
select HAVE_STACKPROTECTOR
select HAVE_SYSCALL_TRACEPOINTS
select HOTPLUG_CORE_SYNC_DEAD if HOTPLUG_CPU
select HOTPLUG_PARALLEL if HOTPLUG_CPU
select IRQ_DOMAIN
select IRQ_FORCED_THREADING
select KASAN_VMALLOC if KASAN
Expand Down
15 changes: 15 additions & 0 deletions arch/riscv/kernel/smpboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@

#include "head.h"

#ifndef CONFIG_HOTPLUG_PARALLEL
static DECLARE_COMPLETION(cpu_running);
#endif

void __init smp_prepare_boot_cpu(void)
{
Expand Down Expand Up @@ -202,6 +204,12 @@ static int start_secondary_cpu(int cpu, struct task_struct *tidle)
return -EOPNOTSUPP;
}

#ifdef CONFIG_HOTPLUG_PARALLEL
int arch_cpuhp_kick_ap_alive(unsigned int cpu, struct task_struct *tidle)
{
return start_secondary_cpu(cpu, tidle);
}
#else
int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int ret = 0;
Expand All @@ -222,6 +230,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)

return ret;
}
#endif

void __init smp_cpus_done(unsigned int max_cpus)
{
Expand All @@ -239,6 +248,10 @@ asmlinkage __visible void smp_callin(void)
mmgrab(mm);
current->active_mm = mm;

#ifdef CONFIG_HOTPLUG_PARALLEL
cpuhp_ap_sync_alive();
#endif

store_cpu_topology(curr_cpuid);
notify_cpu_starting(curr_cpuid);

Expand All @@ -257,7 +270,9 @@ asmlinkage __visible void smp_callin(void)
* a local TLB flush right now just in case.
*/
local_flush_tlb_all();
#ifndef CONFIG_HOTPLUG_PARALLEL
complete(&cpu_running);
#endif
/*
* Disable preemption before enabling interrupts, so we don't try to
* schedule a CPU that hasn't actually started yet.
Expand Down
16 changes: 16 additions & 0 deletions kernel/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1846,6 +1846,7 @@ static int __init parallel_bringup_parse_param(char *arg)
}
early_param("cpuhp.parallel", parallel_bringup_parse_param);

#ifdef CONFIG_HOTPLUG_SMT
static inline bool cpuhp_smt_aware(void)
{
return cpu_smt_max_threads > 1;
Expand All @@ -1855,6 +1856,21 @@ static inline const struct cpumask *cpuhp_get_primary_thread_mask(void)
{
return cpu_primary_thread_mask;
}
#else
static inline bool cpuhp_smt_aware(void)
{
return false;
}
static inline const struct cpumask *cpuhp_get_primary_thread_mask(void)
{
return cpu_none_mask;
}
#endif

bool __weak arch_cpuhp_init_parallel_bringup(void)
{
return true;
}

/*
* On architectures which have enabled parallel bringup this invokes all BP
Expand Down
Loading