migration: Fix migration crash when target psize larger than host
PATCH 1/1 migration: Fix migration crash when target psize larger than host
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.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1456
--- migration/ram.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
migration/ram.c +19 -2
@@ -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); + } }/*
Signature · 1 line
2.37.3
Quoted 10 lines · Peter Xu
Commit
d9e474ea56overlooked 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.
Quoted 8 lines
Reported-by Thomas Huth <[email protected]>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1456
Fixes d9e474ea56 ("migration: Teach PSS about host page")Signed-off-by Peter Xu <[email protected]>--- migration/ram.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
Thanks, I've checked that this fixes the issue for me, indeed!
Quoted 7 lines · Peter Xu
Commit
d9e474ea56overlooked 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.
Quoted 8 lines
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.
Reported-by Thomas Huth <[email protected]>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1456
Fixes d9e474ea56 ("migration: Teach PSS about host page")Signed-off-by Peter Xu <[email protected]>
queued