[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/38] multifd: Use proper maximum compression values
From: |
Juan Quintela |
Subject: |
[PULL 07/38] multifd: Use proper maximum compression values |
Date: |
Thu, 27 Jan 2022 16:05:17 +0100 |
It happens that there are functions to calculate the worst possible
compression size for a packet. Use them.
Suggested-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/multifd-zlib.c | 4 ++--
migration/multifd-zstd.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
index 9f6ebf1076..a2fec4d01d 100644
--- a/migration/multifd-zlib.c
+++ b/migration/multifd-zlib.c
@@ -54,8 +54,8 @@ static int zlib_send_setup(MultiFDSendParams *p, Error **errp)
error_setg(errp, "multifd %u: deflate init failed", p->id);
return -1;
}
- /* To be safe, we reserve twice the size of the packet */
- z->zbuff_len = MULTIFD_PACKET_SIZE * 2;
+ /* This is the maxium size of the compressed buffer */
+ z->zbuff_len = compressBound(MULTIFD_PACKET_SIZE);
z->zbuff = g_try_malloc(z->zbuff_len);
if (!z->zbuff) {
deflateEnd(&z->zs);
diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
index cc4e991724..97c08367d0 100644
--- a/migration/multifd-zstd.c
+++ b/migration/multifd-zstd.c
@@ -67,8 +67,8 @@ static int zstd_send_setup(MultiFDSendParams *p, Error **errp)
p->id, ZSTD_getErrorName(res));
return -1;
}
- /* To be safe, we reserve twice the size of the packet */
- z->zbuff_len = MULTIFD_PACKET_SIZE * 2;
+ /* This is the maxium size of the compressed buffer */
+ z->zbuff_len = ZSTD_compressBound(MULTIFD_PACKET_SIZE);
z->zbuff = g_try_malloc(z->zbuff_len);
if (!z->zbuff) {
ZSTD_freeCStream(z->zcs);
--
2.34.1
- [PULL 00/38] Migration 20220127 patches, Juan Quintela, 2022/01/27
- [PULL 02/38] migration: We only need last_stage in two places, Juan Quintela, 2022/01/27
- [PULL 01/38] migration: All this fields are unsigned, Juan Quintela, 2022/01/27
- [PULL 03/38] migration: ram_release_pages() always receive 1 page as argument, Juan Quintela, 2022/01/27
- [PULL 04/38] migration: Remove masking for compression, Juan Quintela, 2022/01/27
- [PULL 05/38] migration: simplify do_compress_ram_page, Juan Quintela, 2022/01/27
- [PULL 06/38] migration: Move ram_release_pages() call to save_zero_page_to_file(), Juan Quintela, 2022/01/27
- [PULL 07/38] multifd: Use proper maximum compression values,
Juan Quintela <=
- [PULL 08/38] multifd: Move iov from pages to params, Juan Quintela, 2022/01/27
- [PULL 09/38] multifd: Make zlib use iov's, Juan Quintela, 2022/01/27
- [PULL 11/38] multifd: Remove send_write() method, Juan Quintela, 2022/01/27
- [PULL 10/38] multifd: Make zstd use iov's, Juan Quintela, 2022/01/27
- [PULL 12/38] multifd: Use a single writev on the send side, Juan Quintela, 2022/01/27
- [PULL 13/38] multifd: Unfold "used" variable by its value, Juan Quintela, 2022/01/27
- [PULL 14/38] multifd: Use normal pages array on the send side, Juan Quintela, 2022/01/27
- [PULL 16/38] multifd: recv side only needs the RAMBlock host address, Juan Quintela, 2022/01/27
- [PULL 15/38] multifd: Use normal pages array on the recv side, Juan Quintela, 2022/01/27
- [PULL 17/38] multifd: Rename pages_used to normal_pages, Juan Quintela, 2022/01/27