From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
libvir-list@redhat.com, Stefan Hajnoczi <stefanha@redhat.com>,
Fam Zheng <fam@euphon.net>, Hanna Reitz <hreitz@redhat.com>,
Li Zhijian <lizhijian@fujitsu.com>, Peter Xu <peterx@redhat.com>,
Leonardo Bras <leobras@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Eric Blake <eblake@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Hailiang Zhang <zhanghailiang@xfusion.com>,
qemu-block@nongnu.org, Fabiano Rosas <farosas@suse.de>
Subject: [PULL 05/38] migration: Receiving a zero page non zero is an error
Date: Tue, 31 Oct 2023 10:01:09 +0100 [thread overview]
Message-ID: <20231031090142.13122-6-quintela@redhat.com> (raw)
In-Reply-To: <20231031090142.13122-1-quintela@redhat.com>
We don't allow non zero compressed pages since:
commit 3edcd7e6ebae3ef0ac178eed5f4225803159562d
Author: Peter Lieven <pl@kamp.de>
Date: Tue Mar 26 10:58:35 2013 +0100
migration: search for zero instead of dup pages
RDMA case is a bit more complicated, but they don't handle it since:
commit a1febc4950f2c6232c002f401d7cd409f6fa6a88
Author: Richard Henderson <rth@twiddle.net>
Date: Mon Aug 29 11:46:14 2016 -0700
cutils: Export only buffer_is_zero
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231019085259.13307-2-quintela@redhat.com>
---
migration/ram.c | 15 +++++++++++----
migration/rdma.c | 6 +++++-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 92769902bb..4bfb20c94a 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3715,16 +3715,18 @@ int ram_load_postcopy(QEMUFile *f, int channel)
switch (flags & ~RAM_SAVE_FLAG_CONTINUE) {
case RAM_SAVE_FLAG_ZERO:
ch = qemu_get_byte(f);
+ if (ch != 0) {
+ error_report("Found a zero page with value %d", ch);
+ ret = -EINVAL;
+ break;
+ }
/*
* Can skip to set page_buffer when
* this is a zero page and (block->page_size == TARGET_PAGE_SIZE).
*/
- if (ch || !matches_target_page_size) {
+ if (!matches_target_page_size) {
memset(page_buffer, ch, TARGET_PAGE_SIZE);
}
- if (ch) {
- tmp_page->all_zero = false;
- }
break;
case RAM_SAVE_FLAG_PAGE:
@@ -4030,6 +4032,11 @@ static int ram_load_precopy(QEMUFile *f)
case RAM_SAVE_FLAG_ZERO:
ch = qemu_get_byte(f);
+ if (ch != 0) {
+ error_report("Found a zero page with value %d", ch);
+ ret = -EINVAL;
+ break;
+ }
ram_handle_compressed(host, ch, TARGET_PAGE_SIZE);
break;
diff --git a/migration/rdma.c b/migration/rdma.c
index 2a1852ec7f..2d963fd147 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -3592,7 +3592,11 @@ int rdma_registration_handle(QEMUFile *f)
host_addr = block->local_host_addr +
(comp->offset - block->offset);
-
+ if (comp->value) {
+ error_report("rdma: Zero page with non-zero (%d) value",
+ comp->value);
+ goto err;
+ }
ram_handle_compressed(host_addr, comp->value, comp->length);
break;
--
2.41.0
next prev parent reply other threads:[~2023-10-31 9:03 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-31 9:01 [PULL 00/38] Migration 20231031 patches Juan Quintela
2023-10-31 9:01 ` [PULL 01/38] migration/doc: Add contents Juan Quintela
2023-10-31 9:01 ` [PULL 02/38] migration/doc: Add documentation for backwards compatiblity Juan Quintela
2023-10-31 9:01 ` [PULL 03/38] migration/doc: How to migrate when hosts have different features Juan Quintela
2023-10-31 9:01 ` [PULL 04/38] migration/doc: We broke backwards compatibility Juan Quintela
2023-10-31 9:01 ` Juan Quintela [this message]
2023-10-31 9:01 ` [PULL 06/38] migration: Rename ram_handle_compressed() to ram_handle_zero() Juan Quintela
2023-10-31 9:01 ` [PULL 07/38] migration: Give one error if trying to set MULTIFD and XBZRLE Juan Quintela
2023-10-31 9:01 ` [PULL 08/38] migration: Give one error if trying to set COMPRESSION " Juan Quintela
2023-10-31 9:01 ` [PULL 09/38] migration: Remove save_page_use_compression() Juan Quintela
2023-10-31 9:01 ` [PULL 10/38] migration: Make compress_data_with_multithreads return bool Juan Quintela
2023-10-31 9:01 ` [PULL 11/38] migration: Simplify compress_page_with_multithread() Juan Quintela
2023-10-31 9:01 ` [PULL 12/38] migration: Move busy++ to migrate_with_multithread Juan Quintela
2023-10-31 9:01 ` [PULL 13/38] migration: Create compress_update_rates() Juan Quintela
2023-10-31 9:01 ` [PULL 14/38] migration: Export send_queued_data() Juan Quintela
2023-10-31 9:01 ` [PULL 15/38] migration: Move ram_flush_compressed_data() to ram-compress.c Juan Quintela
2023-10-31 9:01 ` [PULL 16/38] migration: Merge flush_compressed_data() and compress_flush_data() Juan Quintela
2023-10-31 9:01 ` [PULL 17/38] migration: Rename ram_compressed_pages() to compress_ram_pages() Juan Quintela
2023-10-31 9:01 ` [PULL 18/38] migration/ram: Fix compilation with -Wshadow=local Juan Quintela
2023-10-31 9:01 ` [PULL 19/38] migration: rename vmstate_save_needed->vmstate_section_needed Juan Quintela
2023-10-31 9:01 ` [PULL 20/38] migration: set file error on subsection loading Juan Quintela
2023-10-31 9:01 ` [PULL 21/38] qemu-iotests: Filter warnings about block migration being deprecated Juan Quintela
2023-10-31 9:01 ` [PULL 22/38] migration: migrate 'inc' command option is deprecated Juan Quintela
2023-10-31 9:01 ` [PULL 23/38] migration: migrate 'blk' " Juan Quintela
2023-10-31 9:01 ` [PULL 24/38] migration: Deprecate block migration Juan Quintela
2023-10-31 9:01 ` [PULL 25/38] migration: Deprecate old compression method Juan Quintela
2023-10-31 9:01 ` [PULL 26/38] migration: Stop migration immediately in RDMA error paths Juan Quintela
2023-10-31 9:01 ` [PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer Juan Quintela
2023-10-31 9:01 ` [PULL 28/38] qemu_file: Use a stat64 for qemu_file_transferred Juan Quintela
2023-10-31 9:01 ` [PULL 29/38] qemu_file: total_transferred is not used anymore Juan Quintela
2023-10-31 9:01 ` [PULL 30/38] migration: Use the number of transferred bytes directly Juan Quintela
2023-10-31 9:01 ` [PULL 31/38] qemu_file: Remove unused qemu_file_transferred() Juan Quintela
2023-10-31 9:01 ` [PULL 32/38] qemu-file: Remove _noflush from qemu_file_transferred_noflush() Juan Quintela
2023-10-31 9:01 ` [PULL 33/38] migration: migration_transferred_bytes() don't need the QEMUFile Juan Quintela
2023-10-31 9:01 ` [PULL 34/38] migration: migration_rate_limit_reset() " Juan Quintela
2023-10-31 9:01 ` [PULL 35/38] qemu-file: Simplify qemu_file_get_error() Juan Quintela
2023-10-31 9:01 ` [PULL 36/38] migration: Use migration_transferred_bytes() Juan Quintela
2023-10-31 9:01 ` [PULL 37/38] migration: Remove transferred atomic counter Juan Quintela
2023-10-31 9:01 ` [PULL 38/38] qemu-file: Make qemu_fflush() return errors Juan Quintela
2023-10-31 23:31 ` [PULL 00/38] Migration 20231031 patches Stefan Hajnoczi
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=20231031090142.13122-6-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=farosas@suse.de \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=leobras@redhat.com \
--cc=libvir-list@redhat.com \
--cc=lizhijian@fujitsu.com \
--cc=peterx@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=zhanghailiang@xfusion.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).