OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

replay: stop us hanging in rr_wait_io_event

Browse Source 
A lot of the hang I see are when we end up spinning in
rr_wait_io_event for an event that will never come in playback. As a
new check functions which can see if we are in PLAY mode and kick us
us the wait function so the event can be processed.

This fixes most of the failures in replay_kernel.py

Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2013
Cc: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231211091346.14616-12-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2023-12-11 09:13:40 +00:00
parent fd84325f71
commit 1f881ea4a4
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/tcg/tcg-accel-ops-rr.c
View File

@ -109,7 +109,7 @@ static void rr_wait_io_event(void)
{
CPUState *cpu;
while (all_cpu_threads_idle()) {
while (all_cpu_threads_idle() && replay_can_wait()) {
rr_stop_kick_timer();
qemu_cond_wait_iothread(first_cpu->halt_cond);
}

5
include/sysemu/replay.h
View File

@ -70,6 +70,11 @@ int replay_get_instructions(void);
/*! Updates instructions counter in replay mode. */
void replay_account_executed_instructions(void);
/**
* replay_can_wait: check if we should pause for wait-io
*/
bool replay_can_wait(void);
/* Processing clocks and other time sources */
/*! Save the specified clock */

21
replay/replay.c
View File

@ -449,6 +449,27 @@ void replay_start(void)
replay_enable_events();
}
/*
* For none/record the answer is yes.
*/
bool replay_can_wait(void)
{
if (replay_mode == REPLAY_MODE_PLAY) {
/*
* For playback we shouldn't ever be at a point we wait. If
* the instruction count has reached zero and we have an
* unconsumed event we should go around again and consume it.
*/
if (replay_state.instruction_count == 0 && replay_state.has_unread_data) {
return false;
} else {
replay_sync_error("Playback shouldn't have to iowait");
}
}
return true;
}
void replay_finish(void)
{
if (replay_mode == REPLAY_MODE_NONE) {