浏览代码

RISC-V: Disable preemption before enabling interrupts

Currently, irq is enabled before preemption disabling happens.
If the scheduler fired right here and cpu is scheduled then it
may blow up.

Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
[Atish: Commit text and code comment formatting update]
Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Atish Patra 6 年之前
父节点
当前提交
6db170ff4c
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      arch/riscv/kernel/smpboot.c

+ 5 - 1
arch/riscv/kernel/smpboot.c

@@ -111,7 +111,11 @@ asmlinkage void __init smp_callin(void)
 	 * a local TLB flush right now just in case.
 	 * a local TLB flush right now just in case.
 	 */
 	 */
 	local_flush_tlb_all();
 	local_flush_tlb_all();
-	local_irq_enable();
+	/*
+	 * Disable preemption before enabling interrupts, so we don't try to
+	 * schedule a CPU that hasn't actually started yet.
+	 */
 	preempt_disable();
 	preempt_disable();
+	local_irq_enable();
 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
 }
 }