提交 daa8e53b 编写于 作者: W Will Deacon 提交者: Yang Yingliang

arm64: smp: Increase secondary CPU boot timeout value

mainline inclusion
from mainline-v5.4-rc1
commit 0e164555
category: feature
feature: Improve robustness of SMP boot

-------------------------------------------------

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: NMark Rutland <mark.rutland@arm.com>
Signed-off-by: NWill Deacon <will@kernel.org>
Signed-off-by: NZenghui Yu <yuzenghui@huawei.com>
Reviewed-by: NXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 a2252278
...@@ -138,7 +138,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) ...@@ -138,7 +138,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)
* time out. * time out.
*/ */
wait_for_completion_timeout(&cpu_running, wait_for_completion_timeout(&cpu_running,
msecs_to_jiffies(1000)); msecs_to_jiffies(5000));
if (!cpu_online(cpu)) { if (!cpu_online(cpu)) {
pr_crit("CPU%u: failed to come online\n", cpu); pr_crit("CPU%u: failed to come online\n", cpu);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册