From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO3Fd-0007y0-Ha for qemu-devel@nongnu.org; Wed, 18 Feb 2015 06:57:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO3FX-0003C5-Ao for qemu-devel@nongnu.org; Wed, 18 Feb 2015 06:57:09 -0500 Received: from mail.ispras.ru ([83.149.199.45]:38270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO3FW-0003Bs-V1 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 06:57:03 -0500 From: Pavel Dovgalyuk Date: Wed, 18 Feb 2015 14:57:04 +0300 Message-ID: <20150218115703.4176.16661.stgit@PASHA-ISP> In-Reply-To: <20150218115534.4176.12578.stgit@PASHA-ISP> References: <20150218115534.4176.12578.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC PATCH v9 14/23] replay: checkpoints List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, alex.bennee@linaro.org, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com This patch introduces checkpoints that synchronize cpu thread and iothread. When checkpoint is met in the code all asynchronous events from the queue are executed. Signed-off-by: Pavel Dovgalyuk --- block.c | 12 ++++++++++++ cpus.c | 5 +++++ main-loop.c | 6 ++++++ qemu-timer.c | 38 ++++++++++++++++++++++++++++++++++---- replay/replay-internal.h | 4 ++++ replay/replay.c | 36 ++++++++++++++++++++++++++++++++++++ replay/replay.h | 18 ++++++++++++++++++ stubs/replay.c | 11 +++++++++++ vl.c | 5 ++++- 9 files changed, 130 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 210fd5f..37b9bd8 100644 --- a/block.c +++ b/block.c @@ -36,6 +36,7 @@ #include "qmp-commands.h" #include "qemu/timer.h" #include "qapi-event.h" +#include "replay/replay.h" #ifdef CONFIG_BSD #include @@ -1994,6 +1995,11 @@ void bdrv_drain_all(void) BlockDriverState *bs; while (busy) { + if (!replay_checkpoint(CHECKPOINT_BDRV_DRAIN)) { + /* Do not wait anymore, we stopped at some place in + the middle of execution during replay */ + return; + } busy = false; QTAILQ_FOREACH(bs, &bdrv_states, device_list) { @@ -2004,6 +2010,12 @@ void bdrv_drain_all(void) aio_context_release(aio_context); } } + if (replay_mode == REPLAY_MODE_PLAY) { + /* Skip checkpoints from the log */ + while (replay_checkpoint(CHECKPOINT_BDRV_DRAIN)) { + /* Nothing */ + } + } } /* make a BlockDriverState anonymous by removing from bdrv_state and diff --git a/cpus.c b/cpus.c index b40b48c..5b2f896 100644 --- a/cpus.c +++ b/cpus.c @@ -391,6 +391,11 @@ void qemu_clock_warp(QEMUClockType type) return; } + /* warp clock deterministically in record/replay mode */ + if (!replay_checkpoint(CHECKPOINT_CLOCK_WARP)) { + return; + } + /* * If the CPUs have been sleeping, advance QEMU_CLOCK_VIRTUAL timer now. * This ensures that the deadline for the timer is computed correctly below. diff --git a/main-loop.c b/main-loop.c index 981bcb5..06aad06 100644 --- a/main-loop.c +++ b/main-loop.c @@ -29,6 +29,7 @@ #include "slirp/libslirp.h" #include "qemu/main-loop.h" #include "block/aio.h" +#include "replay/replay.h" #ifndef _WIN32 @@ -497,6 +498,11 @@ int main_loop_wait(int nonblocking) slirp_pollfds_poll(gpollfds, (ret < 0)); #endif + /* CPU thread can infinitely wait for event after + missing the warp */ + if (replay_mode == REPLAY_MODE_PLAY) { + qemu_clock_warp(QEMU_CLOCK_VIRTUAL); + } qemu_clock_run_all_timers(); return ret; diff --git a/qemu-timer.c b/qemu-timer.c index d605afd..37d9098 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -478,10 +478,33 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) void *opaque; qemu_event_reset(&timer_list->timers_done_ev); - if (!timer_list->clock->enabled) { + if (!timer_list->clock->enabled || !timer_list->active_timers) { goto out; } + switch (timer_list->clock->type) { + case QEMU_CLOCK_REALTIME: + break; + default: + case QEMU_CLOCK_VIRTUAL: + if ((replay_mode != REPLAY_MODE_NONE && !runstate_is_running()) + || !replay_checkpoint(CHECKPOINT_CLOCK_VIRTUAL)) { + goto out; + } + break; + case QEMU_CLOCK_HOST: + if ((replay_mode != REPLAY_MODE_NONE && !runstate_is_running()) + || !replay_checkpoint(CHECKPOINT_CLOCK_HOST)) { + goto out; + } + case QEMU_CLOCK_VIRTUAL_RT: + if ((replay_mode != REPLAY_MODE_NONE && !runstate_is_running()) + || !replay_checkpoint(CHECKPOINT_CLOCK_VIRTUAL_RT)) { + goto out; + } + break; + } + current_time = qemu_clock_get_ns(timer_list->clock->type); for(;;) { qemu_mutex_lock(&timer_list->active_timers_lock); @@ -545,11 +568,18 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg) { int64_t deadline = -1; QEMUClockType type; + bool play = replay_mode == REPLAY_MODE_PLAY; for (type = 0; type < QEMU_CLOCK_MAX; type++) { if (qemu_clock_use_for_deadline(tlg->tl[type]->clock->type)) { - deadline = qemu_soonest_timeout(deadline, - timerlist_deadline_ns( - tlg->tl[type])); + if (!play || tlg->tl[type]->clock->type == QEMU_CLOCK_REALTIME) { + deadline = qemu_soonest_timeout(deadline, + timerlist_deadline_ns( + tlg->tl[type])); + } else { + /* Read clock from the replay file and + do not calculate the deadline, based on virtual clock. */ + qemu_clock_get_ns(tlg->tl[type]->clock->type); + } } } return deadline; diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 27a3b0a..fb27b48 100755 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -29,6 +29,10 @@ enum ReplayEvents { /* some of grteater codes are reserved for clocks */ EVENT_CLOCK, EVENT_CLOCK_LAST = EVENT_CLOCK + REPLAY_CLOCK_COUNT - 1, + /* for checkpoint event */ + /* some of grteater codes are reserved for checkpoints */ + EVENT_CHECKPOINT, + EVENT_CHECKPOINT_LAST = EVENT_CHECKPOINT + CHECKPOINT_COUNT - 1, EVENT_COUNT }; diff --git a/replay/replay.c b/replay/replay.c index 3330432..9cc8dd0 100755 --- a/replay/replay.c +++ b/replay/replay.c @@ -161,3 +161,39 @@ void replay_shutdown_request(void) replay_put_event(EVENT_SHUTDOWN); } } + +bool replay_checkpoint(ReplayCheckpoint checkpoint) +{ + bool res = false; + replay_save_instructions(); + + if (replay_file) { + if (replay_mode == REPLAY_MODE_PLAY) { + replay_mutex_lock(); + if (!skip_async_events(EVENT_CHECKPOINT + checkpoint)) { + if (replay_data_kind == EVENT_ASYNC) { + replay_read_events(checkpoint); + replay_fetch_data_kind(); + res = replay_data_kind != EVENT_ASYNC; + replay_mutex_unlock(); + return res; + } + replay_mutex_unlock(); + return res; + } + replay_has_unread_data = 0; + replay_read_events(checkpoint); + replay_fetch_data_kind(); + res = replay_data_kind != EVENT_ASYNC; + replay_mutex_unlock(); + return res; + } else if (replay_mode == REPLAY_MODE_RECORD) { + replay_mutex_lock(); + replay_put_event(EVENT_CHECKPOINT + checkpoint); + replay_save_events(checkpoint); + replay_mutex_unlock(); + } + } + + return true; +} diff --git a/replay/replay.h b/replay/replay.h index fcc93d1..f4bdb31 100755 --- a/replay/replay.h +++ b/replay/replay.h @@ -26,6 +26,18 @@ enum ReplayClockKind { }; typedef enum ReplayClockKind ReplayClockKind; +/* IDs of the checkpoints */ +enum ReplayCheckpoint { + CHECKPOINT_BDRV_DRAIN, + CHECKPOINT_CLOCK_WARP, + CHECKPOINT_RESET_REQUESTED, + CHECKPOINT_CLOCK_VIRTUAL, + CHECKPOINT_CLOCK_HOST, + CHECKPOINT_CLOCK_VIRTUAL_RT, + CHECKPOINT_COUNT +}; +typedef enum ReplayCheckpoint ReplayCheckpoint; + extern ReplayMode replay_mode; /* Processing the instructions */ @@ -70,6 +82,12 @@ int64_t replay_read_clock(ReplayClockKind kind); /*! Called when qemu shutdown is requested. */ void replay_shutdown_request(void); +/*! Should be called at check points in the execution. + These check points are skipped, if they were not met. + Saves checkpoint in the SAVE mode and validates in the PLAY mode. + Returns 0 in PLAY mode if checkpoint was not found. + Returns 1 in all other cases. */ +bool replay_checkpoint(ReplayCheckpoint checkpoint); /* Asynchronous events queue */ diff --git a/stubs/replay.c b/stubs/replay.c index 121bca6..1be3575 100755 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -1,4 +1,5 @@ #include "replay/replay.h" +#include "sysemu/sysemu.h" ReplayMode replay_mode; @@ -10,3 +11,13 @@ int64_t replay_read_clock(unsigned int kind) { return 0; } + +bool replay_checkpoint(ReplayCheckpoint checkpoint) +{ + return 0; +} + +int runstate_is_running(void) +{ + return 0; +} diff --git a/vl.c b/vl.c index 58b9dd5..565bbb2 100644 --- a/vl.c +++ b/vl.c @@ -118,6 +118,7 @@ int main(int argc, char **argv) #include "qapi/opts-visitor.h" #include "qom/object_interfaces.h" #include "qapi-event.h" +#include "replay/replay.h" #define DEFAULT_RAM_SIZE 128 @@ -1757,7 +1758,9 @@ static bool main_loop_should_exit(void) return true; } } - if (qemu_reset_requested()) { + if (qemu_reset_requested_get() + && replay_checkpoint(CHECKPOINT_RESET_REQUESTED)) { + qemu_reset_requested(); pause_all_vcpus(); cpu_synchronize_all_states(); qemu_system_reset(VMRESET_REPORT);