| Message ID | 20190827151815.2160-2-will@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 0e1645557d19fc6d88d3c40431f63a3c3a4c417b |
| Headers | show |
| Series | Try to make SMP booting slightly less fragile | expand |
On Tue, Aug 27, 2019 at 04:18:13PM +0100, Will Deacon wrote: > When many debug options are enabled simultaneously (e.g. PROVE_LOCKING, > KMEMLEAK, DEBUG_PAGE_ALLOC, KASAN etc), it is possible for us to timeout > when attempting to boot a secondary CPU and give up. Unfortunately, the > CPU will /eventually/ appear, and sit in the background happily stuck > in a recursive exception due to a NULL stack pointer. > > Increase the timeout to 5s, which will of course be enough for anybody. > > Signed-off-by: Will Deacon <will@kernel.org> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Thanks, Mark. > --- > arch/arm64/kernel/smp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c > index 018a33e01b0e..63c7a7682e93 100644 > --- a/arch/arm64/kernel/smp.c > +++ b/arch/arm64/kernel/smp.c > @@ -123,7 +123,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) > * time out. > */ > wait_for_completion_timeout(&cpu_running, > - msecs_to_jiffies(1000)); > + msecs_to_jiffies(5000)); > > if (!cpu_online(cpu)) { > pr_crit("CPU%u: failed to come online\n", cpu); > -- > 2.11.0 >
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 018a33e01b0e..63c7a7682e93 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -123,7 +123,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) * time out. */ wait_for_completion_timeout(&cpu_running, - msecs_to_jiffies(1000)); + msecs_to_jiffies(5000)); if (!cpu_online(cpu)) { pr_crit("CPU%u: failed to come online\n", cpu);
When many debug options are enabled simultaneously (e.g. PROVE_LOCKING, KMEMLEAK, DEBUG_PAGE_ALLOC, KASAN etc), it is possible for us to timeout when attempting to boot a secondary CPU and give up. Unfortunately, the CPU will /eventually/ appear, and sit in the background happily stuck in a recursive exception due to a NULL stack pointer. Increase the timeout to 5s, which will of course be enough for anybody. Signed-off-by: Will Deacon <will@kernel.org> --- arch/arm64/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)