[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/13] ram.c: Reset result after sending queued data
From: |
Lukas Straub |
Subject: |
[PATCH v2 04/13] ram.c: Reset result after sending queued data |
Date: |
Thu, 20 Apr 2023 11:48:03 +0200 |
And take the param->mutex lock for the whole section to ensure
thread-safety.
Now, it is explicitly clear if there is no queued data to send.
Before, this was handled by param->file stream being empty and thus
qemu_put_qemu_file() not sending anything.
This will be used in the next commits to move save_page_header()
out of compress code.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
migration/ram.c | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 820b4ebaeb..5ca0f115cf 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1519,6 +1519,13 @@ update_compress_thread_counts(const CompressParam
*param, int bytes_xmit)
static bool save_page_use_compression(RAMState *rs);
+static inline void compress_reset_result(CompressParam *param)
+{
+ param->result = RES_NONE;
+ param->block = NULL;
+ param->offset = 0;
+}
+
static void flush_compressed_data(RAMState *rs)
{
MigrationState *ms = migrate_get_current();
@@ -1540,13 +1547,16 @@ static void flush_compressed_data(RAMState *rs)
for (idx = 0; idx < thread_count; idx++) {
qemu_mutex_lock(&comp_param[idx].mutex);
if (!comp_param[idx].quit) {
- len = qemu_put_qemu_file(ms->to_dst_file, comp_param[idx].file);
+ CompressParam *param = &comp_param[idx];
+ len = qemu_put_qemu_file(ms->to_dst_file, param->file);
+ compress_reset_result(param);
+
/*
* it's safe to fetch zero_page without holding comp_done_lock
* as there is no further request submitted to the thread,
* i.e, the thread should be waiting for a request at this point.
*/
- update_compress_thread_counts(&comp_param[idx], len);
+ update_compress_thread_counts(param, len);
}
qemu_mutex_unlock(&comp_param[idx].mutex);
}
@@ -1571,15 +1581,17 @@ static int compress_page_with_multi_thread(RAMBlock
*block, ram_addr_t offset)
retry:
for (idx = 0; idx < thread_count; idx++) {
if (comp_param[idx].done) {
- comp_param[idx].done = false;
- bytes_xmit = qemu_put_qemu_file(ms->to_dst_file,
- comp_param[idx].file);
- qemu_mutex_lock(&comp_param[idx].mutex);
- set_compress_params(&comp_param[idx], block, offset);
- qemu_cond_signal(&comp_param[idx].cond);
- qemu_mutex_unlock(&comp_param[idx].mutex);
+ CompressParam *param = &comp_param[idx];
+ qemu_mutex_lock(¶m->mutex);
+ param->done = false;
+ bytes_xmit = qemu_put_qemu_file(ms->to_dst_file, param->file);
+ compress_reset_result(param);
+ set_compress_params(param, block, offset);
+
+ update_compress_thread_counts(param, bytes_xmit);
+ qemu_cond_signal(¶m->cond);
+ qemu_mutex_unlock(¶m->mutex);
pages = 1;
- update_compress_thread_counts(&comp_param[idx], bytes_xmit);
break;
}
}
--
2.40.0
pgpCtL8_Gs8LC.pgp
Description: OpenPGP digital signature
- [PATCH v2 01/13] qtest/migration-test.c: Add postcopy tests with compress enabled, (continued)
- [PATCH v2 05/13] ram.c: Do not call save_page_header() from compress threads, Lukas Straub, 2023/04/20
- [PATCH v2 02/13] ram.c: Let the compress threads return a CompressResult enum, Lukas Straub, 2023/04/20
- [PATCH v2 06/13] ram.c: Call update_compress_thread_counts from compress_send_queued_data, Lukas Straub, 2023/04/20
- [PATCH v2 04/13] ram.c: Reset result after sending queued data,
Lukas Straub <=
- [PATCH v2 08/13] ram.c: Introduce whitespace (squash with next patch), Lukas Straub, 2023/04/20
- [PATCH v2 07/13] ram.c: Remove last ram.c dependency from the core compress code, Lukas Straub, 2023/04/20
- [PATCH v2 09/13] ram.c: Move core compression code into its own file, Lukas Straub, 2023/04/20
- [PATCH v2 10/13] ram.c: Remove whitespace (squash with previous patch), Lukas Straub, 2023/04/20
- [PATCH v2 12/13] ram compress: Assert that the file buffer matches the result, Lukas Straub, 2023/04/20