diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2023-08-29 11:06:58 +1000 |
---|---|---|
committer | Richard Henderson <richard.henderson@linaro.org> | 2023-09-15 05:26:50 -0700 |
commit | 0e5903436de712844b0e6cdd862b499c767e09e9 (patch) | |
tree | 95d48706aa37e2dab0324c636a6ddd8348af1bf5 /accel | |
parent | 005ad32358f12fe9313a4a01918a55e60d4f39e5 (diff) | |
download | qemu-0e5903436de712844b0e6cdd862b499c767e09e9.zip qemu-0e5903436de712844b0e6cdd862b499c767e09e9.tar.gz qemu-0e5903436de712844b0e6cdd862b499c767e09e9.tar.bz2 |
accel/tcg: mttcg remove false-negative halted assertion
mttcg asserts that an execution ending with EXCP_HALTED must have
cpu->halted. However between the event or instruction that sets
cpu->halted and requests exit and the assertion here, an
asynchronous event could clear cpu->halted.
This leads to crashes running AIX on ppc/pseries because it uses
H_CEDE/H_PROD hcalls, where H_CEDE sets self->halted = 1 and
H_PROD sets other cpu->halted = 0 and kicks it.
H_PROD could be turned into an interrupt to wake, but several other
places in ppc, sparc, and semihosting follow what looks like a similar
pattern setting halted = 0 directly. So remove this assertion.
Reported-by: Ivan Warren <ivan@vmfacility.fr>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20230829010658.8252-1-npiggin@gmail.com>
[rth: Keep the case label and adjust the comment.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'accel')
-rw-r--r-- | accel/tcg/tcg-accel-ops-mttcg.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c index b276262..4b0dfb4 100644 --- a/accel/tcg/tcg-accel-ops-mttcg.c +++ b/accel/tcg/tcg-accel-ops-mttcg.c @@ -100,14 +100,9 @@ static void *mttcg_cpu_thread_fn(void *arg) break; case EXCP_HALTED: /* - * during start-up the vCPU is reset and the thread is - * kicked several times. If we don't ensure we go back - * to sleep in the halted state we won't cleanly - * start-up when the vCPU is enabled. - * - * cpu->halted should ensure we sleep in wait_io_event + * Usually cpu->halted is set, but may have already been + * reset by another thread by the time we arrive here. */ - g_assert(cpu->halted); break; case EXCP_ATOMIC: qemu_mutex_unlock_iothread(); |