From patchwork Thu Sep 17 16:25:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 518942 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45D61141438 for ; Fri, 18 Sep 2015 02:28:23 +1000 (AEST) Received: from localhost ([::1]:59840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcc2m-0003kP-6U for incoming@patchwork.ozlabs.org; Thu, 17 Sep 2015 12:28:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcbzd-0006Wm-72 for qemu-devel@nongnu.org; Thu, 17 Sep 2015 12:25:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zcbzb-0007Zo-OU for qemu-devel@nongnu.org; Thu, 17 Sep 2015 12:25:05 -0400 Received: from mail.ispras.ru ([83.149.199.45]:56208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcbzb-0007Z5-DV for qemu-devel@nongnu.org; Thu, 17 Sep 2015 12:25:03 -0400 Received: from PASHA-ISP.def.inno (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id A27C35401CB; Thu, 17 Sep 2015 19:25:02 +0300 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Thu, 17 Sep 2015 19:25:07 +0300 Message-ID: <20150917162507.8676.90232.stgit@PASHA-ISP.def.inno> In-Reply-To: <20150917162322.8676.29314.stgit@PASHA-ISP.def.inno> References: <20150917162322.8676.29314.stgit@PASHA-ISP.def.inno> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, igor.rubinov@gmail.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, hines@cert.org, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v18 18/21] replay: initialization and deinitialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch introduces the functions for enabling the record/replay and for freeing the resources when simulator closes. Reviewed-by: Paolo Bonzini Signed-off-by: Pavel Dovgalyuk --- exec.c | 2 + replay/replay-internal.h | 2 + replay/replay-user.c | 4 + replay/replay.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++ replay/replay.h | 10 ++++ stubs/replay.c | 5 ++ vl.c | 4 + 7 files changed, 156 insertions(+), 0 deletions(-) diff --git a/exec.c b/exec.c index b61126c..d31a9bb 100644 --- a/exec.c +++ b/exec.c @@ -51,6 +51,7 @@ #include "qemu/main-loop.h" #include "exec/cputlb.h" #include "translate-all.h" +#include "replay/replay.h" #include "exec/memory-internal.h" #include "exec/ram_addr.h" @@ -841,6 +842,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) } va_end(ap2); va_end(ap); + replay_finish(); #if defined(CONFIG_USER_ONLY) { struct sigaction act; diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 89c1dc7..820134f 100755 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -33,6 +33,8 @@ enum ReplayEvents { /* some of greater codes are reserved for checkpoints */ EVENT_CHECKPOINT, EVENT_CHECKPOINT_LAST = EVENT_CHECKPOINT + CHECKPOINT_COUNT - 1, + /* end of log event */ + EVENT_END, EVENT_COUNT }; diff --git a/replay/replay-user.c b/replay/replay-user.c index 62765e2..6a49eda 100755 --- a/replay/replay-user.c +++ b/replay/replay-user.c @@ -30,3 +30,7 @@ bool replay_has_interrupt(void) { return true; } + +void replay_finish(void) +{ +} diff --git a/replay/replay.c b/replay/replay.c index ca9996e..e22e595 100755 --- a/replay/replay.c +++ b/replay/replay.c @@ -16,8 +16,16 @@ #include "qemu/main-loop.h" #include "sysemu/sysemu.h" +/* Current version of the replay mechanism. + Increase it when file format changes. */ +#define REPLAY_VERSION 0xe02002 +/* Size of replay log header */ +#define HEADER_SIZE (sizeof(uint32_t) + sizeof(uint64_t)) + ReplayMode replay_mode = REPLAY_MODE_NONE; +/* Name of replay file */ +static char *replay_filename; ReplayState replay_state; bool replay_next_event_is(int event) @@ -194,3 +202,124 @@ out: replay_mutex_unlock(); return res; } + +static void replay_enable(const char *fname, int mode) +{ + const char *fmode = NULL; + assert(!replay_file); + + switch (mode) { + case REPLAY_MODE_RECORD: + fmode = "wb"; + break; + case REPLAY_MODE_PLAY: + fmode = "rb"; + break; + default: + fprintf(stderr, "Replay: internal error: invalid replay mode\n"); + exit(1); + } + + atexit(replay_finish); + + replay_mutex_init(); + + replay_file = fopen(fname, fmode); + if (replay_file == NULL) { + fprintf(stderr, "Replay: open %s: %s\n", fname, strerror(errno)); + exit(1); + } + + replay_filename = g_strdup(fname); + + replay_mode = mode; + replay_data_kind = -1; + replay_state.instructions_count = 0; + replay_state.current_step = 0; + + /* skip file header for RECORD and check it for PLAY */ + if (replay_mode == REPLAY_MODE_RECORD) { + fseek(replay_file, HEADER_SIZE, SEEK_SET); + } else if (replay_mode == REPLAY_MODE_PLAY) { + unsigned int version = replay_get_dword(); + if (version != REPLAY_VERSION) { + fprintf(stderr, "Replay: invalid input log file version\n"); + exit(1); + } + /* go to the beginning */ + fseek(replay_file, HEADER_SIZE, SEEK_SET); + replay_fetch_data_kind(); + } + + replay_init_events(); +} + +void replay_configure(QemuOpts *opts) +{ + const char *fname; + const char *rr; + ReplayMode mode = REPLAY_MODE_NONE; + + rr = qemu_opt_get(opts, "rr"); + if (!rr) { + /* Just enabling icount */ + return; + } else if (!strcmp(rr, "record")) { + mode = REPLAY_MODE_RECORD; + } else if (!strcmp(rr, "replay")) { + mode = REPLAY_MODE_PLAY; + } else { + error_report("Invalid icount rr option: %s", rr); + exit(1); + } + + fname = qemu_opt_get(opts, "rrfile"); + if (!fname) { + error_report("File name not specified for replay"); + exit(1); + } + + replay_enable(fname, mode); +} + +void replay_start(void) +{ + if (replay_mode == REPLAY_MODE_NONE) { + return; + } + + /* Timer for snapshotting will be set up here. */ + + replay_enable_events(); +} + +void replay_finish(void) +{ + if (replay_mode == REPLAY_MODE_NONE) { + return; + } + + replay_save_instructions(); + + /* finalize the file */ + if (replay_file) { + if (replay_mode == REPLAY_MODE_RECORD) { + /* write end event */ + replay_put_event(EVENT_END); + + /* write header */ + fseek(replay_file, 0, SEEK_SET); + replay_put_dword(REPLAY_VERSION); + } + + fclose(replay_file); + replay_file = NULL; + } + if (replay_filename) { + g_free(replay_filename); + replay_filename = NULL; + } + + replay_finish_events(); + replay_mutex_destroy(); +} diff --git a/replay/replay.h b/replay/replay.h index c7de964..736555d 100755 --- a/replay/replay.h +++ b/replay/replay.h @@ -15,6 +15,7 @@ #include #include #include "qapi-types.h" +#include "qemu/typedefs.h" /* replay clock kinds */ enum ReplayClockKind { @@ -42,6 +43,15 @@ typedef enum ReplayCheckpoint ReplayCheckpoint; extern ReplayMode replay_mode; +/* Replay process control functions */ + +/*! Enables recording or saving event log with specified parameters */ +void replay_configure(struct QemuOpts *opts); +/*! Initializes timers used for snapshotting and enables events recording */ +void replay_start(void); +/*! Closes replay log file and frees other resources. */ +void replay_finish(void); + /* Processing the instructions */ /*! Returns number of executed instructions. */ diff --git a/stubs/replay.c b/stubs/replay.c index e737dad..5cf587b 100755 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -25,3 +25,8 @@ int runstate_is_running(void) { return 0; } + +bool replay_events_enabled(void) +{ + return false; +} diff --git a/vl.c b/vl.c index 72ab97c..88cca5d 100644 --- a/vl.c +++ b/vl.c @@ -4640,6 +4640,8 @@ int main(int argc, char **argv, char **envp) exit(1); } + replay_start(); + /* This checkpoint is required by replay to separate prior clock reading from the other reads, because timer polling functions query clock values from the log. */ @@ -4681,6 +4683,8 @@ int main(int argc, char **argv, char **envp) } main_loop(); + replay_disable_events(); + bdrv_close_all(); pause_all_vcpus(); res_free();