From: Lukas Straub <lukasstraub2@web.de>
To: qemu-devel <qemu-devel@nongnu.org>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>
Subject: [PATCH 02/14] ram.c: Dont change param->block in the compress thread
Date: Sun, 2 Apr 2023 17:56:07 +0000 [thread overview]
Message-ID: <ba18bf4e6e143a83b588c26b83136168c8657a33.1680457764.git.lukasstraub2@web.de> (raw)
In-Reply-To: <cover.1680457764.git.lukasstraub2@web.de>
[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]
Instead introduce a extra parameter to trigger the compress thread.
Now, when the compress thread is done, we know what RAMBlock and
offset it did compress.
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 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index ca561e62bd..3c9fac086d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -503,6 +503,7 @@ typedef enum CompressResult CompressResult;
struct CompressParam {
bool done;
bool quit;
+ bool trigger;
CompressResult result;
QEMUFile *file;
QemuMutex mutex;
@@ -576,10 +577,10 @@ static void *do_data_compress(void *opaque)
qemu_mutex_lock(¶m->mutex);
while (!param->quit) {
- if (param->block) {
+ if (param->trigger) {
block = param->block;
offset = param->offset;
- param->block = NULL;
+ param->trigger = false;
qemu_mutex_unlock(¶m->mutex);
result = do_compress_ram_page(param->file, ¶m->stream,
@@ -1556,6 +1557,7 @@ static inline void set_compress_params(CompressParam *param, RAMBlock *block,
{
param->block = block;
param->offset = offset;
+ param->trigger = true;
}
static int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset)
--
2.30.2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2023-04-02 17:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-02 17:55 [PATCH 00/14] migration/ram.c: Refactor compress code Lukas Straub
2023-04-02 17:56 ` [PATCH 01/14] ram.c: Let the compress threads return a CompressResult enum Lukas Straub
2023-04-03 7:25 ` Philippe Mathieu-Daudé
2023-04-03 10:59 ` Lukas Straub
2023-04-02 17:56 ` Lukas Straub [this message]
2023-04-02 17:56 ` [PATCH 03/14] ram.c: Reset result after sending queued data Lukas Straub
2023-04-02 17:56 ` [PATCH 04/14] ram.c: Do not call save_page_header() from compress threads Lukas Straub
2023-04-02 17:56 ` [PATCH 05/14] ram.c: Call update_compress_thread_counts from compress_send_queued_data Lukas Straub
2023-04-02 17:56 ` [PATCH 06/14] ram.c: Remove last ram.c dependency from the core compress code Lukas Straub
2023-04-02 17:56 ` [PATCH 07/14] ram.c: Introduce whitespace (squash with next patch) Lukas Straub
2023-04-02 17:56 ` [PATCH 08/14] ram.c: Move core compression code into its own file Lukas Straub
2023-04-02 17:56 ` [PATCH 09/14] ram.c: Remove whitespace (squash with previous patch) Lukas Straub
2023-04-02 17:56 ` [PATCH 10/14] ram.c: Move core decompression code into its own file Lukas Straub
2023-04-03 7:27 ` Philippe Mathieu-Daudé
2023-04-02 17:56 ` [PATCH 11/14] ram compress: Assert that the file buffer matches the result Lukas Straub
2023-04-02 17:56 ` [PATCH 12/14] ram.c: Remove unused include after moving out code Lukas Straub
2023-04-03 7:30 ` Philippe Mathieu-Daudé
2023-04-02 17:56 ` [PATCH 13/14] ram-compress.c: Make target independent Lukas Straub
2023-04-03 7:29 ` Philippe Mathieu-Daudé
2023-04-02 17:56 ` [PATCH 14/14] migration: Initialize and cleanup decompression in migration.c Lukas Straub
2023-04-03 2:16 ` [PATCH 00/14] migration/ram.c: Refactor compress code Zhang, Chen
2023-04-05 14:44 ` Lukas Straub
2023-04-05 14:54 ` Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ba18bf4e6e143a83b588c26b83136168c8657a33.1680457764.git.lukasstraub2@web.de \
--to=lukasstraub2@web.de \
--cc=dgilbert@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).