[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase
From: |
“William Roche |
Subject: |
[PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase |
Date: |
Wed, 6 Sep 2023 13:59:51 +0000 |
From: William Roche <william.roche@oracle.com>
A memory page poisoned from the hypervisor level is no longer readable.
Thus, it is now treated as a zero-page for the ram saving migration phase.
The migration of a VM will crash Qemu when it tries to read the
memory address space and stumbles on the poisoned page with a similar
stack trace:
Program terminated with signal SIGBUS, Bus error.
#0 _mm256_loadu_si256
#1 buffer_zero_avx2
#2 select_accel_fn
#3 buffer_is_zero
#4 save_zero_page_to_file
#5 save_zero_page
#6 ram_save_target_page_legacy
#7 ram_save_host_page
#8 ram_find_and_save_block
#9 ram_save_iterate
#10 qemu_savevm_state_iterate
#11 migration_iteration_run
#12 migration_thread
#13 qemu_thread_start
Fix it by considering poisoned pages as if they were zero-pages for
the migration copy. This fix also works with underlying large pages,
taking into account the RAMBlock segment "page-size".
Signed-off-by: William Roche <william.roche@oracle.com>
---
accel/kvm/kvm-all.c | 14 ++++++++++++++
accel/stubs/kvm-stub.c | 5 +++++
include/sysemu/kvm.h | 10 ++++++++++
migration/ram.c | 3 ++-
4 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 2ba7521695..24a7709495 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1152,6 +1152,20 @@ static void kvm_unpoison_all(void *param)
}
}
+bool kvm_hwpoisoned_page(RAMBlock *block, void *offset)
+{
+ HWPoisonPage *pg;
+ ram_addr_t ram_addr = (ram_addr_t) offset;
+
+ QLIST_FOREACH(pg, &hwpoison_page_list, list) {
+ if ((ram_addr >= pg->ram_addr) &&
+ (ram_addr - pg->ram_addr < block->page_size)) {
+ return true;
+ }
+ }
+ return false;
+}
+
void kvm_hwpoison_page_add(ram_addr_t ram_addr)
{
HWPoisonPage *page;
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
index 235dc661bc..c0a31611df 100644
--- a/accel/stubs/kvm-stub.c
+++ b/accel/stubs/kvm-stub.c
@@ -133,3 +133,8 @@ uint32_t kvm_dirty_ring_size(void)
{
return 0;
}
+
+bool kvm_hwpoisoned_page(RAMBlock *block, void *ram_addr)
+{
+ return false;
+}
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index ebdca41052..a2196e9e6b 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -580,4 +580,14 @@ bool kvm_arch_cpu_check_are_resettable(void);
bool kvm_dirty_ring_enabled(void);
uint32_t kvm_dirty_ring_size(void);
+
+/**
+ * kvm_hwpoisoned_page - indicate if the given page is poisoned
+ * @block: memory block of the given page
+ * @ram_addr: offset of the page
+ *
+ * Returns: true: page is poisoned
+ * false: page not yet poisoned
+ */
+bool kvm_hwpoisoned_page(RAMBlock *block, void *ram_addr);
#endif
diff --git a/migration/ram.c b/migration/ram.c
index 9040d66e61..48d875b12d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1145,7 +1145,8 @@ static int save_zero_page_to_file(PageSearchStatus *pss,
QEMUFile *file,
uint8_t *p = block->host + offset;
int len = 0;
- if (buffer_is_zero(p, TARGET_PAGE_SIZE)) {
+ if ((kvm_enabled() && kvm_hwpoisoned_page(block, (void *)offset)) ||
+ buffer_is_zero(p, TARGET_PAGE_SIZE)) {
len += save_page_header(pss, file, block, offset | RAM_SAVE_FLAG_ZERO);
qemu_put_byte(file, 0);
len += 1;
--
2.39.3
- [PATCH 0/1] Qemu crashes on VM migration after an handled memory error, “William Roche, 2023/09/06
- [PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase,
“William Roche <=
- Re: [PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase, Joao Martins, 2023/09/06
- Re: [PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase, Peter Xu, 2023/09/06
- Re: [PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase, William Roche, 2023/09/06
- Re: [PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase, Joao Martins, 2023/09/09
- Re: [PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase, Peter Xu, 2023/09/11
- Re: [PATCH 1/1] migration: skip poisoned memory pages on "ram saving" phase, Peter Xu, 2023/09/12
- [PATCH v2 0/1] Qemu crashes on VM migration after an handled memory error, “William Roche, 2023/09/14
- [PATCH v2 1/1] migration: skip poisoned memory pages on "ram saving" phase, “William Roche, 2023/09/14
- Re: [PATCH v2 1/1] migration: skip poisoned memory pages on "ram saving" phase, Zhijian Li (Fujitsu), 2023/09/14
- Re: [PATCH v2 1/1] migration: skip poisoned memory pages on "ram saving" phase, William Roche, 2023/09/15