[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v4 16/23] replay: make locking visible outside r
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v4 16/23] replay: make locking visible outside replay code |
Date: |
Fri, 19 Jan 2018 11:44:37 +0300 |
User-agent: |
StGit/0.17.1-dirty |
From: Alex Bennée <address@hidden>
The replay_mutex_lock/unlock/locked functions are now going to be used
for ensuring lock-step behaviour between the two threads. Make them
public API functions and also provide stubs for non-QEMU builds on
common paths.
Signed-off-by: Alex Bennée <address@hidden>
Tested-by: Pavel Dovgalyuk <address@hidden>
---
include/sysemu/replay.h | 14 ++++++++++++++
replay/replay-internal.c | 9 ++++-----
replay/replay-internal.h | 5 ++---
stubs/replay.c | 15 +++++++++++++++
4 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index b86d6bb..9973849 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -47,6 +47,20 @@ extern ReplayMode replay_mode;
/* Name of the initial VM snapshot */
extern char *replay_snapshot;
+/* Replay locking
+ *
+ * The locks are needed to protect the shared structures and log file
+ * when doing record/replay. They also are the main sync-point between
+ * the main-loop thread and the vCPU thread. This was a role
+ * previously filled by the BQL which has been busy trying to reduce
+ * its impact across the code. This ensures blocks of events stay
+ * sequential and reproducible.
+ */
+
+void replay_mutex_lock(void);
+void replay_mutex_unlock(void);
+bool replay_mutex_locked(void);
+
/* Replay process control functions */
/*! Enables recording or saving event log with specified parameters */
diff --git a/replay/replay-internal.c b/replay/replay-internal.c
index 157c863..a9a6a64 100644
--- a/replay/replay-internal.c
+++ b/replay/replay-internal.c
@@ -169,6 +169,8 @@ void replay_finish_event(void)
replay_fetch_data_kind();
}
+static __thread bool replay_locked;
+
void replay_mutex_init(void)
{
qemu_mutex_init(&lock);
@@ -179,9 +181,7 @@ void replay_mutex_destroy(void)
qemu_mutex_destroy(&lock);
}
-static __thread bool replay_locked;
-
-static bool replay_mutex_locked(void)
+bool replay_mutex_locked(void)
{
return replay_locked;
}
@@ -204,7 +204,7 @@ void replay_mutex_unlock(void)
void replay_save_instructions(void)
{
if (replay_file && replay_mode == REPLAY_MODE_RECORD) {
- replay_mutex_lock();
+ g_assert(replay_mutex_locked());
int diff = (int)(replay_get_current_step() -
replay_state.current_step);
/* Time can only go forward */
@@ -215,6 +215,5 @@ void replay_save_instructions(void)
replay_put_dword(diff);
replay_state.current_step += diff;
}
- replay_mutex_unlock();
}
}
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index 8e4c701..f5f8e96 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -100,12 +100,11 @@ int64_t replay_get_qword(void);
void replay_get_array(uint8_t *buf, size_t *size);
void replay_get_array_alloc(uint8_t **buf, size_t *size);
-/* Mutex functions for protecting replay log file */
+/* Mutex functions for protecting replay log file and ensuring
+ * synchronisation between vCPU and main-loop threads. */
void replay_mutex_init(void);
void replay_mutex_destroy(void);
-void replay_mutex_lock(void);
-void replay_mutex_unlock(void);
/*! Checks error status of the file. */
void replay_check_error(void);
diff --git a/stubs/replay.c b/stubs/replay.c
index 9991ee5..cb050ef 100644
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -73,3 +73,18 @@ uint64_t blkreplay_next_id(void)
{
return 0;
}
+
+void replay_mutex_lock(void)
+{
+ abort();
+}
+
+void replay_mutex_unlock(void)
+{
+ abort();
+}
+
+bool replay_mutex_locked(void)
+{
+ return false;
+}
- [Qemu-devel] [RFC PATCH v4 08/23] replay: added replay log format description, (continued)
- [Qemu-devel] [RFC PATCH v4 08/23] replay: added replay log format description, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 09/23] replay: make safe vmstop at record/replay, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 10/23] replay: save prior value of the host clock, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 11/23] target/arm/arm-powertctl: drop BQL assertions, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 12/23] cpus: push BQL lock to qemu_*_wait_io_event, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 14/23] replay/replay.c: bump REPLAY_VERSION again, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 13/23] cpus: only take BQL for sleeping threads, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 15/23] replay/replay-internal.c: track holding of replay_lock, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 16/23] replay: make locking visible outside replay code,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH v4 17/23] replay: push replay_mutex_lock up the call tree, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 18/23] replay: don't destroy mutex at exit, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 20/23] replay: avoid recursive call of checkpoints, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 19/23] replay: check return values of fwrite, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 21/23] scripts/replay-dump.py: replay log dumper, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 22/23] replay: don't process async events when warping the clock, Pavel Dovgalyuk, 2018/01/19
- [Qemu-devel] [RFC PATCH v4 23/23] replay: save vmstate of the asynchronous events, Pavel Dovgalyuk, 2018/01/19
- Re: [Qemu-devel] [RFC PATCH v4 00/23] replay additions, no-reply, 2018/01/19