qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
	"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Halil Pasic" <pasic@linux.ibm.com>,
	"John Snow" <jsnow@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	qemu-s390x@nongnu.org,
	"Christian Borntraeger" <borntraeger@linux.ibm.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Coiby Xu" <Coiby.Xu@gmail.com>,
	"Ilya Leoshkevich" <iii@linux.ibm.com>,
	"Eduardo Habkost" <eduardo@habkost.net>,
	"Yanan Wang" <wangyanan55@huawei.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Eric Blake" <eblake@redhat.com>,
	"Eric Farman" <farman@linux.ibm.com>,
	"Peter Xu" <peterx@redhat.com>,
	qemu-stable@nongnu.org
Subject: [PULL 01/30] migration: Fix migration crash when target psize larger than host
Date: Tue,  7 Feb 2023 01:56:21 +0100	[thread overview]
Message-ID: <20230207005650.1810-2-quintela@redhat.com> (raw)
In-Reply-To: <20230207005650.1810-1-quintela@redhat.com>

From: Peter Xu <peterx@redhat.com>

Commit d9e474ea56 overlooked the case where the target psize is even larger
than the host psize.  One example is Alpha has 8K page size and migration
will start to crash the source QEMU when running Alpha migration on x86.

Fix it by detecting that case and set host start/end just to cover the
single page to be migrated.

This will slightly optimize the common case where host psize equals to
guest psize so we don't even need to do the roundups, but that's trivial.

Cc: qemu-stable@nongnu.org
Reported-by: Thomas Huth <thuth@redhat.com>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1456
Fixes: d9e474ea56 ("migration: Teach PSS about host page")
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 334309f1c6..68a45338e3 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2319,8 +2319,25 @@ static void pss_host_page_prepare(PageSearchStatus *pss)
     size_t guest_pfns = qemu_ram_pagesize(pss->block) >> TARGET_PAGE_BITS;
 
     pss->host_page_sending = true;
-    pss->host_page_start = ROUND_DOWN(pss->page, guest_pfns);
-    pss->host_page_end = ROUND_UP(pss->page + 1, guest_pfns);
+    if (guest_pfns <= 1) {
+        /*
+         * This covers both when guest psize == host psize, or when guest
+         * has larger psize than the host (guest_pfns==0).
+         *
+         * For the latter, we always send one whole guest page per
+         * iteration of the host page (example: an Alpha VM on x86 host
+         * will have guest psize 8K while host psize 4K).
+         */
+        pss->host_page_start = pss->page;
+        pss->host_page_end = pss->page + 1;
+    } else {
+        /*
+         * The host page spans over multiple guest pages, we send them
+         * within the same host page iteration.
+         */
+        pss->host_page_start = ROUND_DOWN(pss->page, guest_pfns);
+        pss->host_page_end = ROUND_UP(pss->page + 1, guest_pfns);
+    }
 }
 
 /*
-- 
2.39.1



  reply	other threads:[~2023-02-07  0:57 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-07  0:56 [PULL 00/30] Migration 20230206 patches Juan Quintela
2023-02-07  0:56 ` Juan Quintela [this message]
2023-02-10  9:32   ` [PULL 01/30] migration: Fix migration crash when target psize larger than host Michael Tokarev
2023-02-10 12:11     ` Juan Quintela
2023-02-10 15:01       ` Peter Xu
2023-02-10 15:15         ` Juan Quintela
2023-02-10 15:28         ` Michael Tokarev
2023-02-10 15:48           ` Peter Xu
2023-02-07  0:56 ` [PULL 02/30] migration: No save_live_pending() method uses the QEMUFile parameter Juan Quintela
2023-02-07  0:56 ` [PULL 03/30] migration: Split save_live_pending() into state_pending_* Juan Quintela
2023-02-09  7:48   ` Avihai Horon
2023-02-09 15:24     ` Juan Quintela
2023-03-24 18:41   ` s390x TCG migration failure Nina Schoetterl-Glausch
2023-03-28 13:01     ` Thomas Huth
2023-03-28 22:21       ` Nina Schoetterl-Glausch
2023-03-29  6:36         ` Thomas Huth
2023-04-04 15:18           ` Thomas Huth
2023-04-12 20:31     ` Juan Quintela
2023-04-12 20:46     ` Juan Quintela
2023-04-12 21:01     ` Juan Quintela
2023-04-13 11:42       ` Nina Schoetterl-Glausch
2023-02-07  0:56 ` [PULL 04/30] migration: Remove unused threshold_size parameter Juan Quintela
2023-02-07  0:56 ` [PULL 05/30] migration: simplify migration_iteration_run() Juan Quintela
2023-02-07  0:56 ` [PULL 06/30] util/userfaultfd: Add uffd_open() Juan Quintela
2023-02-07  0:56 ` [PULL 07/30] migration/ram: Fix populate_read_range() Juan Quintela
2023-02-07  0:56 ` [PULL 08/30] migration/ram: Fix error handling in ram_write_tracking_start() Juan Quintela
2023-02-07  0:56 ` [PULL 09/30] migration/ram: Don't explicitly unprotect when unregistering uffd-wp Juan Quintela
2023-02-07  0:56 ` [PULL 10/30] migration/ram: Rely on used_length for uffd_change_protection() Juan Quintela
2023-02-07  0:56 ` [PULL 11/30] migration/ram: Optimize ram_write_tracking_start() for RamDiscardManager Juan Quintela
2023-02-07  0:56 ` [PULL 12/30] migration/savevm: Move more savevm handling into vmstate_save() Juan Quintela
2023-02-07  0:56 ` [PULL 13/30] migration/savevm: Prepare vmdesc json writer in qemu_savevm_state_setup() Juan Quintela
2023-02-07  0:56 ` [PULL 14/30] migration/savevm: Allow immutable device state to be migrated early (i.e., before RAM) Juan Quintela
2023-02-07  0:56 ` [PULL 15/30] migration/vmstate: Introduce VMSTATE_WITH_TMP_TEST() and VMSTATE_BITMAP_TEST() Juan Quintela
2023-02-07  0:56 ` [PULL 16/30] migration/ram: Factor out check for advised postcopy Juan Quintela
2023-02-07  0:56 ` [PULL 17/30] virtio-mem: Fail if a memory backend with "prealloc=on" is specified Juan Quintela
2023-02-07  0:56 ` [PULL 18/30] virtio-mem: Migrate immutable properties early Juan Quintela
2023-02-07  0:56 ` [PULL 19/30] virtio-mem: Proper support for preallocation with migration Juan Quintela
2023-02-07  0:56 ` [PULL 20/30] migration: Show downtime during postcopy phase Juan Quintela
2023-02-07  0:56 ` [PULL 21/30] migration/rdma: fix return value for qio_channel_rdma_{readv, writev} Juan Quintela
2023-02-07  0:56 ` [PULL 22/30] migration: Add canary to VMSTATE_END_OF_LIST Juan Quintela
2023-02-07  0:56 ` [PULL 23/30] migration: Perform vmsd structure check during tests Juan Quintela
2023-02-07  0:56 ` [PULL 24/30] migration/dirtyrate: Show sample pages only in page-sampling mode Juan Quintela
2023-02-07  0:56 ` [PULL 25/30] io: Add support for MSG_PEEK for socket channel Juan Quintela
2023-02-07  0:56 ` [PULL 26/30] migration: check magic value for deciding the mapping of channels Juan Quintela
2023-02-07  0:56 ` [PULL 27/30] multifd: Fix a race on reading MultiFDPages_t.block Juan Quintela
2023-02-07  0:56 ` [PULL 28/30] multifd: Fix flush of zero copy page send request Juan Quintela
2023-02-09  1:27   ` Duan, Zhenzhong
2023-02-09 12:29     ` Juan Quintela
2023-02-07  0:56 ` [PULL 29/30] migration: Introduce interface query-migrationthreads Juan Quintela
2023-02-07  0:56 ` [PULL 30/30] migration: save/delete migration thread info Juan Quintela
2023-02-07 16:52 ` [PULL 00/30] Migration 20230206 patches 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=20230207005650.1810-2-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=Coiby.Xu@gmail.com \
    --cc=alex.williamson@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=david@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=fam@euphon.net \
    --cc=farman@linux.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=jsnow@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=pasic@linux.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanb@linux.vnet.ibm.com \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    --cc=wangyanan55@huawei.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).