mirror of
https://github.com/qemu/qemu.git
synced 2024-11-28 06:13:46 +08:00
e692f9c6a6
* Prefer fast cpu_env() over slower CPU QOM cast macro -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmXwPhYRHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbWHvBAAgKx5LHFjz3xREVA+LkDTQ49mz0lK3s32 SGvNlIHjiaDGVttVYhVC4sinBWUruG4Lyv/2QN72OJBzn6WUsEUQE3KPH1d7Y3/s wS9X7mj70n4kugWJqeIJP5AXSRasHmWoQ4QJLVQRJd6+Eb9jqwep0x7bYkI1de6D bL1Q7bIfkFeNQBXaiPWAm2i+hqmT4C1r8HEAGZIjAsMFrjy/hzBEjNV+pnh6ZSq9 Vp8BsPWRfLU2XHm4WX0o8d89WUMAfUGbVkddEl/XjIHDrUD+Zbd1HAhLyfhsmrnE jXIwSzm+ML1KX4MoF5ilGtg8Oo0gQDEBy9/xck6G0HCm9lIoLKlgTxK9glr2vdT8 yxZmrM9Hder7F9hKKxmb127xgU6AmL7rYmVqsoQMNAq22D6Xr4UDpgFRXNk2/wO6 zZZBkfZ4H4MpZXbd/KJpXvYH5mQA4IpkOy8LJdE+dbcHX7Szy9ksZdPA+Z10hqqf zqS13qTs3abxymy2Q/tO3hPKSJCk1+vCGUkN60Wm+9VoLWGoU43qMc7gnY/pCS7m 0rFKtvfwFHhokX1orK0lP/ppVzPv/5oFIeK8YDY9if+N+dU2LCwVZHIuf2/VJPRq wmgH2vAn3JDoRKPxTGX9ly6AMxuZaeP92qBTOPap0gDhihYzIpaCq9ecEBoTakI7 tdFhV0iRr08= =NiP4 -----END PGP SIGNATURE----- Merge tag 'pull-request-2024-03-12' of https://gitlab.com/thuth/qemu into staging * Add missing ERRP_GUARD() statements in functions that need it * Prefer fast cpu_env() over slower CPU QOM cast macro # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmXwPhYRHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbWHvBAAgKx5LHFjz3xREVA+LkDTQ49mz0lK3s32 # SGvNlIHjiaDGVttVYhVC4sinBWUruG4Lyv/2QN72OJBzn6WUsEUQE3KPH1d7Y3/s # wS9X7mj70n4kugWJqeIJP5AXSRasHmWoQ4QJLVQRJd6+Eb9jqwep0x7bYkI1de6D # bL1Q7bIfkFeNQBXaiPWAm2i+hqmT4C1r8HEAGZIjAsMFrjy/hzBEjNV+pnh6ZSq9 # Vp8BsPWRfLU2XHm4WX0o8d89WUMAfUGbVkddEl/XjIHDrUD+Zbd1HAhLyfhsmrnE # jXIwSzm+ML1KX4MoF5ilGtg8Oo0gQDEBy9/xck6G0HCm9lIoLKlgTxK9glr2vdT8 # yxZmrM9Hder7F9hKKxmb127xgU6AmL7rYmVqsoQMNAq22D6Xr4UDpgFRXNk2/wO6 # zZZBkfZ4H4MpZXbd/KJpXvYH5mQA4IpkOy8LJdE+dbcHX7Szy9ksZdPA+Z10hqqf # zqS13qTs3abxymy2Q/tO3hPKSJCk1+vCGUkN60Wm+9VoLWGoU43qMc7gnY/pCS7m # 0rFKtvfwFHhokX1orK0lP/ppVzPv/5oFIeK8YDY9if+N+dU2LCwVZHIuf2/VJPRq # wmgH2vAn3JDoRKPxTGX9ly6AMxuZaeP92qBTOPap0gDhihYzIpaCq9ecEBoTakI7 # tdFhV0iRr08= # =NiP4 # -----END PGP SIGNATURE----- # gpg: Signature made Tue 12 Mar 2024 11:35:50 GMT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2024-03-12' of https://gitlab.com/thuth/qemu: (55 commits) user: Prefer fast cpu_env() over slower CPU QOM cast macro target/xtensa: Prefer fast cpu_env() over slower CPU QOM cast macro target/tricore: Prefer fast cpu_env() over slower CPU QOM cast macro target/sparc: Prefer fast cpu_env() over slower CPU QOM cast macro target/sh4: Prefer fast cpu_env() over slower CPU QOM cast macro target/rx: Prefer fast cpu_env() over slower CPU QOM cast macro target/ppc: Prefer fast cpu_env() over slower CPU QOM cast macro target/openrisc: Prefer fast cpu_env() over slower CPU QOM cast macro target/nios2: Prefer fast cpu_env() over slower CPU QOM cast macro target/mips: Prefer fast cpu_env() over slower CPU QOM cast macro target/microblaze: Prefer fast cpu_env() over slower CPU QOM cast macro target/m68k: Prefer fast cpu_env() over slower CPU QOM cast macro target/loongarch: Prefer fast cpu_env() over slower CPU QOM cast macro target/i386/hvf: Use CPUState typedef target/hexagon: Prefer fast cpu_env() over slower CPU QOM cast macro target/cris: Prefer fast cpu_env() over slower CPU QOM cast macro target/avr: Prefer fast cpu_env() over slower CPU QOM cast macro target/alpha: Prefer fast cpu_env() over slower CPU QOM cast macro target: Replace CPU_GET_CLASS(cpu -> obj) in cpu_reset_hold() handler bulk: Call in place single use cpu_env() ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
342 lines
8.8 KiB
C
342 lines
8.8 KiB
C
/*
|
|
* Multifd zlib compression implementation
|
|
*
|
|
* Copyright (c) 2020 Red Hat Inc
|
|
*
|
|
* Authors:
|
|
* Juan Quintela <quintela@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include <zlib.h>
|
|
#include "qemu/rcu.h"
|
|
#include "exec/ramblock.h"
|
|
#include "exec/target_page.h"
|
|
#include "qapi/error.h"
|
|
#include "migration.h"
|
|
#include "trace.h"
|
|
#include "options.h"
|
|
#include "multifd.h"
|
|
|
|
struct zlib_data {
|
|
/* stream for compression */
|
|
z_stream zs;
|
|
/* compressed buffer */
|
|
uint8_t *zbuff;
|
|
/* size of compressed buffer */
|
|
uint32_t zbuff_len;
|
|
/* uncompressed buffer of size qemu_target_page_size() */
|
|
uint8_t *buf;
|
|
};
|
|
|
|
/* Multifd zlib compression */
|
|
|
|
/**
|
|
* zlib_send_setup: setup send side
|
|
*
|
|
* Setup each channel with zlib compression.
|
|
*
|
|
* Returns 0 for success or -1 for error
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
* @errp: pointer to an error
|
|
*/
|
|
static int zlib_send_setup(MultiFDSendParams *p, Error **errp)
|
|
{
|
|
struct zlib_data *z = g_new0(struct zlib_data, 1);
|
|
z_stream *zs = &z->zs;
|
|
const char *err_msg;
|
|
|
|
zs->zalloc = Z_NULL;
|
|
zs->zfree = Z_NULL;
|
|
zs->opaque = Z_NULL;
|
|
if (deflateInit(zs, migrate_multifd_zlib_level()) != Z_OK) {
|
|
err_msg = "deflate init failed";
|
|
goto err_free_z;
|
|
}
|
|
/* This is the maximum size of the compressed buffer */
|
|
z->zbuff_len = compressBound(MULTIFD_PACKET_SIZE);
|
|
z->zbuff = g_try_malloc(z->zbuff_len);
|
|
if (!z->zbuff) {
|
|
err_msg = "out of memory for zbuff";
|
|
goto err_deflate_end;
|
|
}
|
|
z->buf = g_try_malloc(qemu_target_page_size());
|
|
if (!z->buf) {
|
|
err_msg = "out of memory for buf";
|
|
goto err_free_zbuff;
|
|
}
|
|
p->compress_data = z;
|
|
return 0;
|
|
|
|
err_free_zbuff:
|
|
g_free(z->zbuff);
|
|
err_deflate_end:
|
|
deflateEnd(zs);
|
|
err_free_z:
|
|
g_free(z);
|
|
error_setg(errp, "multifd %u: %s", p->id, err_msg);
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* zlib_send_cleanup: cleanup send side
|
|
*
|
|
* Close the channel and return memory.
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
* @errp: pointer to an error
|
|
*/
|
|
static void zlib_send_cleanup(MultiFDSendParams *p, Error **errp)
|
|
{
|
|
struct zlib_data *z = p->compress_data;
|
|
|
|
deflateEnd(&z->zs);
|
|
g_free(z->zbuff);
|
|
z->zbuff = NULL;
|
|
g_free(z->buf);
|
|
z->buf = NULL;
|
|
g_free(p->compress_data);
|
|
p->compress_data = NULL;
|
|
}
|
|
|
|
/**
|
|
* zlib_send_prepare: prepare date to be able to send
|
|
*
|
|
* Create a compressed buffer with all the pages that we are going to
|
|
* send.
|
|
*
|
|
* Returns 0 for success or -1 for error
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
* @errp: pointer to an error
|
|
*/
|
|
static int zlib_send_prepare(MultiFDSendParams *p, Error **errp)
|
|
{
|
|
MultiFDPages_t *pages = p->pages;
|
|
struct zlib_data *z = p->compress_data;
|
|
z_stream *zs = &z->zs;
|
|
uint32_t out_size = 0;
|
|
int ret;
|
|
uint32_t i;
|
|
|
|
if (!multifd_send_prepare_common(p)) {
|
|
goto out;
|
|
}
|
|
|
|
for (i = 0; i < pages->normal_num; i++) {
|
|
uint32_t available = z->zbuff_len - out_size;
|
|
int flush = Z_NO_FLUSH;
|
|
|
|
if (i == pages->normal_num - 1) {
|
|
flush = Z_SYNC_FLUSH;
|
|
}
|
|
|
|
/*
|
|
* Since the VM might be running, the page may be changing concurrently
|
|
* with compression. zlib does not guarantee that this is safe,
|
|
* therefore copy the page before calling deflate().
|
|
*/
|
|
memcpy(z->buf, p->pages->block->host + pages->offset[i], p->page_size);
|
|
zs->avail_in = p->page_size;
|
|
zs->next_in = z->buf;
|
|
|
|
zs->avail_out = available;
|
|
zs->next_out = z->zbuff + out_size;
|
|
|
|
/*
|
|
* Welcome to deflate semantics
|
|
*
|
|
* We need to loop while:
|
|
* - return is Z_OK
|
|
* - there are stuff to be compressed
|
|
* - there are output space free
|
|
*/
|
|
do {
|
|
ret = deflate(zs, flush);
|
|
} while (ret == Z_OK && zs->avail_in && zs->avail_out);
|
|
if (ret == Z_OK && zs->avail_in) {
|
|
error_setg(errp, "multifd %u: deflate failed to compress all input",
|
|
p->id);
|
|
return -1;
|
|
}
|
|
if (ret != Z_OK) {
|
|
error_setg(errp, "multifd %u: deflate returned %d instead of Z_OK",
|
|
p->id, ret);
|
|
return -1;
|
|
}
|
|
out_size += available - zs->avail_out;
|
|
}
|
|
p->iov[p->iovs_num].iov_base = z->zbuff;
|
|
p->iov[p->iovs_num].iov_len = out_size;
|
|
p->iovs_num++;
|
|
p->next_packet_size = out_size;
|
|
|
|
out:
|
|
p->flags |= MULTIFD_FLAG_ZLIB;
|
|
multifd_send_fill_packet(p);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* zlib_recv_setup: setup receive side
|
|
*
|
|
* Create the compressed channel and buffer.
|
|
*
|
|
* Returns 0 for success or -1 for error
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
* @errp: pointer to an error
|
|
*/
|
|
static int zlib_recv_setup(MultiFDRecvParams *p, Error **errp)
|
|
{
|
|
struct zlib_data *z = g_new0(struct zlib_data, 1);
|
|
z_stream *zs = &z->zs;
|
|
|
|
p->compress_data = z;
|
|
zs->zalloc = Z_NULL;
|
|
zs->zfree = Z_NULL;
|
|
zs->opaque = Z_NULL;
|
|
zs->avail_in = 0;
|
|
zs->next_in = Z_NULL;
|
|
if (inflateInit(zs) != Z_OK) {
|
|
error_setg(errp, "multifd %u: inflate init failed", p->id);
|
|
return -1;
|
|
}
|
|
/* To be safe, we reserve twice the size of the packet */
|
|
z->zbuff_len = MULTIFD_PACKET_SIZE * 2;
|
|
z->zbuff = g_try_malloc(z->zbuff_len);
|
|
if (!z->zbuff) {
|
|
inflateEnd(zs);
|
|
error_setg(errp, "multifd %u: out of memory for zbuff", p->id);
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* zlib_recv_cleanup: setup receive side
|
|
*
|
|
* For no compression this function does nothing.
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
*/
|
|
static void zlib_recv_cleanup(MultiFDRecvParams *p)
|
|
{
|
|
struct zlib_data *z = p->compress_data;
|
|
|
|
inflateEnd(&z->zs);
|
|
g_free(z->zbuff);
|
|
z->zbuff = NULL;
|
|
g_free(p->compress_data);
|
|
p->compress_data = NULL;
|
|
}
|
|
|
|
/**
|
|
* zlib_recv: read the data from the channel into actual pages
|
|
*
|
|
* Read the compressed buffer, and uncompress it into the actual
|
|
* pages.
|
|
*
|
|
* Returns 0 for success or -1 for error
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
* @errp: pointer to an error
|
|
*/
|
|
static int zlib_recv(MultiFDRecvParams *p, Error **errp)
|
|
{
|
|
struct zlib_data *z = p->compress_data;
|
|
z_stream *zs = &z->zs;
|
|
uint32_t in_size = p->next_packet_size;
|
|
/* we measure the change of total_out */
|
|
uint32_t out_size = zs->total_out;
|
|
uint32_t expected_size = p->normal_num * p->page_size;
|
|
uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK;
|
|
int ret;
|
|
int i;
|
|
|
|
if (flags != MULTIFD_FLAG_ZLIB) {
|
|
error_setg(errp, "multifd %u: flags received %x flags expected %x",
|
|
p->id, flags, MULTIFD_FLAG_ZLIB);
|
|
return -1;
|
|
}
|
|
|
|
multifd_recv_zero_page_process(p);
|
|
|
|
if (!p->normal_num) {
|
|
assert(in_size == 0);
|
|
return 0;
|
|
}
|
|
|
|
ret = qio_channel_read_all(p->c, (void *)z->zbuff, in_size, errp);
|
|
|
|
if (ret != 0) {
|
|
return ret;
|
|
}
|
|
|
|
zs->avail_in = in_size;
|
|
zs->next_in = z->zbuff;
|
|
|
|
for (i = 0; i < p->normal_num; i++) {
|
|
int flush = Z_NO_FLUSH;
|
|
unsigned long start = zs->total_out;
|
|
|
|
if (i == p->normal_num - 1) {
|
|
flush = Z_SYNC_FLUSH;
|
|
}
|
|
|
|
zs->avail_out = p->page_size;
|
|
zs->next_out = p->host + p->normal[i];
|
|
|
|
/*
|
|
* Welcome to inflate semantics
|
|
*
|
|
* We need to loop while:
|
|
* - return is Z_OK
|
|
* - there are input available
|
|
* - we haven't completed a full page
|
|
*/
|
|
do {
|
|
ret = inflate(zs, flush);
|
|
} while (ret == Z_OK && zs->avail_in
|
|
&& (zs->total_out - start) < p->page_size);
|
|
if (ret == Z_OK && (zs->total_out - start) < p->page_size) {
|
|
error_setg(errp, "multifd %u: inflate generated too few output",
|
|
p->id);
|
|
return -1;
|
|
}
|
|
if (ret != Z_OK) {
|
|
error_setg(errp, "multifd %u: inflate returned %d instead of Z_OK",
|
|
p->id, ret);
|
|
return -1;
|
|
}
|
|
}
|
|
out_size = zs->total_out - out_size;
|
|
if (out_size != expected_size) {
|
|
error_setg(errp, "multifd %u: packet size received %u size expected %u",
|
|
p->id, out_size, expected_size);
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static MultiFDMethods multifd_zlib_ops = {
|
|
.send_setup = zlib_send_setup,
|
|
.send_cleanup = zlib_send_cleanup,
|
|
.send_prepare = zlib_send_prepare,
|
|
.recv_setup = zlib_recv_setup,
|
|
.recv_cleanup = zlib_recv_cleanup,
|
|
.recv = zlib_recv
|
|
};
|
|
|
|
static void multifd_zlib_register(void)
|
|
{
|
|
multifd_register_ops(MULTIFD_COMPRESSION_ZLIB, &multifd_zlib_ops);
|
|
}
|
|
|
|
migration_init(multifd_zlib_register);
|