All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com,
	berrange@redhat.com, gaojinhao@huawei.com, armbru@redhat.com,
	mst@redhat.com, philmd@redhat.com, wainersm@redhat.com,
	s.reiter@proxmox.com
Subject: [PULL 27/27] migration: only check page size match if RAM postcopy is enabled
Date: Mon,  8 Feb 2021 11:29:18 +0000	[thread overview]
Message-ID: <20210208112918.185058-28-dgilbert@redhat.com> (raw)
In-Reply-To: <20210208112918.185058-1-dgilbert@redhat.com>

From: Stefan Reiter <s.reiter@proxmox.com>

Postcopy may also be advised for dirty-bitmap migration only, in which
case the remote page size will not be available and we'll instead read
bogus data, blocking migration with a mismatch error if the VM uses
hugepages.

Fixes: 58110f0acb ("migration: split common postcopy out of ram postcopy")
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Message-Id: <20210204163522.13291-1-s.reiter@proxmox.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/ram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/ram.c b/migration/ram.c
index 46e9d4d145..72143da0ac 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3808,7 +3808,7 @@ static int ram_load_precopy(QEMUFile *f)
                         }
                     }
                     /* For postcopy we need to check hugepage sizes match */
-                    if (postcopy_advised &&
+                    if (postcopy_advised && migrate_postcopy_ram() &&
                         block->page_size != qemu_host_page_size) {
                         uint64_t remote_page_size = qemu_get_be64(f);
                         if (remote_page_size != block->page_size) {
-- 
2.29.2



  parent reply	other threads:[~2021-02-08 18:23 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-08 11:28 [PULL 00/27] migration queue Dr. David Alan Gilbert (git)
2021-02-08 11:28 ` [PULL 01/27] spapr_pci: Fix memory leak of vmstate_spapr_pci Dr. David Alan Gilbert (git)
2021-02-08 11:28 ` [PULL 02/27] savevm: Fix memory leak of vmstate_configuration Dr. David Alan Gilbert (git)
2021-02-08 11:28 ` [PULL 03/27] migration/qemu-file: Fix maybe uninitialized on qemu_get_buffer_in_place() Dr. David Alan Gilbert (git)
2021-02-08 11:28 ` [PULL 04/27] migration: introduce 'background-snapshot' migration capability Dr. David Alan Gilbert (git)
2021-02-08 11:28 ` [PULL 05/27] migration: introduce UFFD-WP low-level interface helpers Dr. David Alan Gilbert (git)
2021-02-08 11:28 ` [PULL 06/27] migration: support UFFD write fault processing in ram_save_iterate() Dr. David Alan Gilbert (git)
2021-02-08 11:28 ` [PULL 07/27] migration: implementation of background snapshot thread Dr. David Alan Gilbert (git)
2021-02-08 11:28 ` [PULL 08/27] migration: introduce 'userfaultfd-wrlat.py' script Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 09/27] migration: Fix migrate-set-parameters argument validation Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 10/27] migration: Clean up signed vs. unsigned XBZRLE cache-size Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 11/27] migration: Fix cache_init()'s "Failed to allocate" error messages Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 12/27] migration: Fix a few absurdly defective " Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 13/27] migration: Add blocker information Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 14/27] migration: Display the migration blockers Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 15/27] block: push error reporting into bdrv_all_*_snapshot functions Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 16/27] migration: Make save_snapshot() return bool, not 0/-1 Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 17/27] migration: stop returning errno from load_snapshot() Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 18/27] block: add ability to specify list of blockdevs during snapshot Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 19/27] block: allow specifying name of block device for vmstate storage Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 20/27] block: rename and alter bdrv_all_find_snapshot semantics Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 21/27] migration: control whether snapshots are ovewritten Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 22/27] migration: wire up support for snapshot device selection Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 23/27] migration: introduce a delete_snapshot wrapper Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 24/27] iotests: add support for capturing and matching QMP events Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 25/27] iotests: fix loading of common.config from tests/ subdir Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` [PULL 26/27] migration: introduce snapshot-{save, load, delete} QMP commands Dr. David Alan Gilbert (git)
2021-02-08 11:29 ` Dr. David Alan Gilbert (git) [this message]
2021-02-08 20:02 ` [PULL 00/27] migration queue Peter Maydell

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=20210208112918.185058-28-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=andrey.gruzdev@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=gaojinhao@huawei.com \
    --cc=mst@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=s.reiter@proxmox.com \
    --cc=wainersm@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.