diff options
| author |   Will Deacon <will@kernel.org> | 2019-08-27 14:25:44 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-08-27 17:36:50 +0100 |
| commit | 0e1645557d19fc6d88d3c40431f63a3c3a4c417b (patch) | |
| tree | 377440b11bd729dc2b0f1ad90b0ff2a7d1975bdc /arch/arm64/kernel/smp.c | |
| parent | Linux 5.3-rc3 (diff) | |
| download | linux-dev-0e1645557d19fc6d88d3c40431f63a3c3a4c417b.tar.xz linux-dev-0e1645557d19fc6d88d3c40431f63a3c3a4c417b.zip | |
arm64: smp: Increase secondary CPU boot timeout value
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.
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |