arm_cpu_has_work() runs without the BQL held. Use atomic reads for halt_reason and event_register to safely inspect state updated by other CPU contexts.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/arm/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 5cfd3bcfc8e..ccc6630026c 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -144,20 +144,21 @@ int arm_cpu_mmu_index(CPUState *cs, bool ifetch) static bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); + ARMHaltReason halt_reason = qatomic_read(&cpu->env.halt_reason); /* * Only another PSCI call can wake the CPU up in which case the * power_state would be set by arm_set_cpu_on_and_reset_async_work() */ if (qatomic_read(&cpu->power_state) == PSCI_OFF) { - g_assert(cpu->env.halt_reason == HALT_PSCI); + g_assert(halt_reason == HALT_PSCI); return false; } /* * A wake-up event should only wake us if we are halted on a WFE */ - if (cpu->env.halt_reason == HALT_WFE && cpu->env.event_register) { + if (halt_reason == HALT_WFE && qatomic_read(&cpu->env.event_register)) { return true; } -- 2.53.0
